From cb525477e5c3ab4265b1249b010e95ba5bd2bbfd Mon Sep 17 00:00:00 2001
From: farbanas <arbanasfran@gmail.com>
Date: Wed, 22 Mar 2023 10:39:48 +0100
Subject: [PATCH 1/8] fix: update CHANGELOG for contracts

---
 CHANGELOG.md           | 2 --
 contracts/CHANGELOG.md | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbc5cfaefb..1296602af7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - NE - instead of throwing a "Mixnode/Gateway not found" error for blacklisted nodes due to bad performance, show their history but tag them as "Having poor performance" ([#2979])
 - NE - Upgrade Sandbox and make below changes:  ([#2332])
 - Explorer - Updates ([#3168])
-- Fix contracts and nym-api audit findings ([#3026])
 - Website v2 - deploy infrastructure for strapi and CI ([#2213])
 - add blockstream green to sp list ([#3180])
 - mock-nym-api: fix .storybook lint error ([#3178])
@@ -18,7 +17,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 [#2979]: https://github.com/nymtech/nym/issues/2979
 [#2332]: https://github.com/nymtech/nym/issues/2332
 [#3168]: https://github.com/nymtech/nym/issues/3168
-[#3026]: https://github.com/nymtech/nym/issues/3026
 [#2213]: https://github.com/nymtech/nym/issues/2213
 [#3180]: https://github.com/nymtech/nym/pull/3180
 [#3178]: https://github.com/nymtech/nym/pull/3178
diff --git a/contracts/CHANGELOG.md b/contracts/CHANGELOG.md
index d622d922fa..6aed5c0b06 100644
--- a/contracts/CHANGELOG.md
+++ b/contracts/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## [v1.1.5] (2023-03-21)
+
+- Fix contracts and nym-api audit findings ([#3026])
+
+[#3026]: https://github.com/nymtech/nym/issues/3026
+
 ## [v1.1.4] (2023-02-21)
 
 - Problem 142 (rust-side) ([#3024])

From a69d4bb45705c768049b9bbd173f254d1c4787cf Mon Sep 17 00:00:00 2001
From: fmtabbara <fmtabbara@hotmail.co.uk>
Date: Mon, 3 Apr 2023 10:39:13 +0100
Subject: [PATCH 2/8] location and version needed in gateway settings updates

---
 .../GeneralGatewaySettings.tsx                | 52 +++++++++++++++++--
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/GeneralGatewaySettings.tsx b/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/GeneralGatewaySettings.tsx
index 2ea789bb4d..2a75866ab2 100644
--- a/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/GeneralGatewaySettings.tsx
+++ b/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/GeneralGatewaySettings.tsx
@@ -36,20 +36,22 @@ export const GeneralGatewaySettings = ({ bondedNode }: { bondedNode: TBondedGate
       host: bondedNode.host,
       mixPort: bondedNode.mixPort,
       httpApiPort: bondedNode.httpApiPort,
+      version: bondedNode.version,
+      location: bondedNode.location,
     },
   });
 
   const onSubmit = async (data: any) => {
     resetFeeState();
-    const { host, mixPort, httpApiPort } = data;
+    const { host, mixPort, httpApiPort, version, location } = data;
 
     try {
       const GatewayConfigParams = {
         host,
         mix_port: mixPort,
+        location,
+        version,
         clients_port: httpApiPort,
-        location: bondedNode.location!,
-        version: bondedNode.version,
         verloc_port: bondedNode.verlocPort,
       };
 
@@ -111,7 +113,7 @@ export const GeneralGatewaySettings = ({ bondedNode }: { bondedNode: TBondedGate
               <TextField
                 {...register('httpApiPort')}
                 name="httpApiPort"
-                label="Client WS API Port"
+                label="Client Port"
                 fullWidth
                 error={!!errors.httpApiPort}
                 helperText={errors.httpApiPort?.message}
@@ -141,6 +143,46 @@ export const GeneralGatewaySettings = ({ bondedNode }: { bondedNode: TBondedGate
             </Grid>
           </Grid>
         </Grid>
+        <Grid item container direction="row" alignItems="left" justifyContent="space-between" padding={3}>
+          <Grid item>
+            <Typography variant="body1" sx={{ fontWeight: 600, mb: 1 }}>
+              Version
+            </Typography>
+          </Grid>
+          <Grid spacing={3} item container alignItems="center" xs={12} md={6}>
+            <Grid item width={1}>
+              <TextField
+                {...register('version')}
+                name="version"
+                label="Version"
+                fullWidth
+                error={!!errors.version}
+                helperText={errors.version?.message}
+                InputLabelProps={{ shrink: true }}
+              />
+            </Grid>
+          </Grid>
+        </Grid>
+        <Grid item container direction="row" alignItems="left" justifyContent="space-between" padding={3}>
+          <Grid item>
+            <Typography variant="body1" sx={{ fontWeight: 600, mb: 1 }}>
+              Location
+            </Typography>
+          </Grid>
+          <Grid spacing={3} item container alignItems="center" xs={12} md={6}>
+            <Grid item width={1}>
+              <TextField
+                {...register('location')}
+                name="location"
+                label="Location"
+                fullWidth
+                error={!!errors.location}
+                helperText={errors.location?.message}
+                InputLabelProps={{ shrink: true }}
+              />
+            </Grid>
+          </Grid>
+        </Grid>
         <Divider flexItem />
         <Grid container justifyContent="end">
           <Button
@@ -153,7 +195,7 @@ export const GeneralGatewaySettings = ({ bondedNode }: { bondedNode: TBondedGate
                 mix_port: data.mixPort,
                 clients_port: data.httpApiPort,
                 location: bondedNode.location!,
-                version: bondedNode.version,
+                version: data.version,
                 verloc_port: bondedNode.verlocPort,
               }),
             )}

From 4678059eaf18ee2f8f7ed4399bde594a9d3b1579 Mon Sep 17 00:00:00 2001
From: fmtabbara <fmtabbara@hotmail.co.uk>
Date: Mon, 3 Apr 2023 11:22:49 +0100
Subject: [PATCH 3/8] add validation for version and location

---
 .../components/Bonding/forms/gatewayValidationSchema.ts    | 6 ++++++
 nym-wallet/src/utils/index.ts                              | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/nym-wallet/src/components/Bonding/forms/gatewayValidationSchema.ts b/nym-wallet/src/components/Bonding/forms/gatewayValidationSchema.ts
index bb94d96c66..b36ff2d095 100644
--- a/nym-wallet/src/components/Bonding/forms/gatewayValidationSchema.ts
+++ b/nym-wallet/src/components/Bonding/forms/gatewayValidationSchema.ts
@@ -79,4 +79,10 @@ export const updateGatewayValidationSchema = Yup.object().shape({
   httpApiPort: Yup.number()
     .required('A clients port is required')
     .test('valid-clients', 'A valid clients port is required', (value) => (value ? validateRawPort(value) : false)),
+  location: Yup.string().test('valid-location', 'A valid location is required', (value) =>
+    value ? validateLocation(value) : false,
+  ),
+  version: Yup.string().test('valid-version', 'A valid version is required', (value) =>
+    value ? validateVersion(value) : false,
+  ),
 });
diff --git a/nym-wallet/src/utils/index.ts b/nym-wallet/src/utils/index.ts
index 704fe9b80b..28192993dc 100644
--- a/nym-wallet/src/utils/index.ts
+++ b/nym-wallet/src/utils/index.ts
@@ -62,9 +62,10 @@ export const validateVersion = (version: string): boolean => {
   }
 };
 
-export const validateLocation = (location: string): boolean =>
-  // right now only perform the stupid check of whether the user copy-pasted the tooltip... (with or without brackets)
-  !location.trim().includes('physical location of your node');
+export const validateLocation = (location: string): boolean => {
+  const locationRegex = /^[a-z]+$/i;
+  return locationRegex.test(location);
+};
 
 export const validateRawPort = (rawPort: number): boolean => !Number.isNaN(rawPort) && rawPort >= 1 && rawPort <= 65535;
 

From 78d9030567716123d25b915d56d2611c7635a349 Mon Sep 17 00:00:00 2001
From: farbanas <arbanasfran@gmail.com>
Date: Tue, 4 Apr 2023 10:30:20 +0200
Subject: [PATCH 4/8] update versions in preparation for release v1.1.14

---
 Cargo.lock                                    | 22 +++++++++----------
 clients/client-core/Cargo.toml                |  2 +-
 clients/native/Cargo.toml                     |  2 +-
 clients/socks5/Cargo.toml                     |  2 +-
 common/bin-common/Cargo.toml                  |  2 +-
 .../contracts-common/Cargo.toml               |  2 +-
 .../mixnet-contract/Cargo.toml                |  4 ++--
 .../vesting-contract/Cargo.toml               |  6 ++---
 explorer-api/Cargo.toml                       |  2 +-
 gateway/Cargo.toml                            |  2 +-
 mixnode/Cargo.toml                            |  2 +-
 nym-api/Cargo.toml                            |  2 +-
 nym-connect/desktop/package.json              |  2 +-
 nym-connect/desktop/src-tauri/Cargo.toml      |  2 +-
 nym-connect/desktop/src-tauri/tauri.conf.json |  2 +-
 nym-wallet/package.json                       |  2 +-
 nym-wallet/src-tauri/Cargo.toml               |  2 +-
 nym-wallet/src-tauri/tauri.conf.json          |  2 +-
 .../network-requester/Cargo.toml              |  2 +-
 .../network-statistics/Cargo.toml             |  2 +-
 tools/nym-cli/Cargo.toml                      |  2 +-
 21 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0a069937e8..cd2a657fee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -653,7 +653,7 @@ dependencies = [
 
 [[package]]
 name = "client-core"
-version = "1.1.13"
+version = "1.1.14"
 dependencies = [
  "async-trait",
  "dashmap 5.4.0",
@@ -1610,7 +1610,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "explorer-api"
-version = "1.1.13"
+version = "1.1.14"
 dependencies = [
  "chrono",
  "clap 4.1.11",
@@ -3059,7 +3059,7 @@ dependencies = [
 
 [[package]]
 name = "nym-api"
-version = "1.1.14"
+version = "1.1.15"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3139,7 +3139,7 @@ dependencies = [
 
 [[package]]
 name = "nym-bin-common"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "clap 4.1.11",
  "clap_complete",
@@ -3168,7 +3168,7 @@ dependencies = [
 
 [[package]]
 name = "nym-cli"
-version = "1.1.13"
+version = "1.1.14"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -3228,7 +3228,7 @@ dependencies = [
 
 [[package]]
 name = "nym-client"
-version = "1.1.13"
+version = "1.1.14"
 dependencies = [
  "clap 4.1.11",
  "client-core",
@@ -3403,7 +3403,7 @@ dependencies = [
 
 [[package]]
 name = "nym-gateway"
-version = "1.1.13"
+version = "1.1.14"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3489,7 +3489,7 @@ dependencies = [
 
 [[package]]
 name = "nym-mixnode"
-version = "1.1.14"
+version = "1.1.15"
 dependencies = [
  "anyhow",
  "atty",
@@ -3558,7 +3558,7 @@ dependencies = [
 
 [[package]]
 name = "nym-network-requester"
-version = "1.1.13"
+version = "1.1.14"
 dependencies = [
  "async-trait",
  "clap 4.1.11",
@@ -3596,7 +3596,7 @@ dependencies = [
 
 [[package]]
 name = "nym-network-statistics"
-version = "1.1.13"
+version = "1.1.14"
 dependencies = [
  "dirs",
  "log",
@@ -3696,7 +3696,7 @@ dependencies = [
 
 [[package]]
 name = "nym-socks5-client"
-version = "1.1.13"
+version = "1.1.14"
 dependencies = [
  "clap 4.1.11",
  "client-core",
diff --git a/clients/client-core/Cargo.toml b/clients/client-core/Cargo.toml
index 36fc8b52eb..58937a4183 100644
--- a/clients/client-core/Cargo.toml
+++ b/clients/client-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "client-core"
-version = "1.1.13"
+version = "1.1.14"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"
 rust-version = "1.66"
diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml
index c7190f1b18..e8aeda5224 100644
--- a/clients/native/Cargo.toml
+++ b/clients/native/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.13"
+version = "1.1.14"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
diff --git a/clients/socks5/Cargo.toml b/clients/socks5/Cargo.toml
index a9e131f778..d5719c75d7 100644
--- a/clients/socks5/Cargo.toml
+++ b/clients/socks5/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.13"
+version = "1.1.14"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"
diff --git a/common/bin-common/Cargo.toml b/common/bin-common/Cargo.toml
index 21f90d27f9..7870c0d212 100644
--- a/common/bin-common/Cargo.toml
+++ b/common/bin-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-bin-common"
-version = "0.3.0"
+version = "0.4.0"
 description = "Common code for nym binaries"
 edition = { workspace = true }
 authors = { workspace = true }
diff --git a/common/cosmwasm-smart-contracts/contracts-common/Cargo.toml b/common/cosmwasm-smart-contracts/contracts-common/Cargo.toml
index dbed7f9cf6..4d3fb89711 100644
--- a/common/cosmwasm-smart-contracts/contracts-common/Cargo.toml
+++ b/common/cosmwasm-smart-contracts/contracts-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-contracts-common"
-version = "0.3.0"
+version = "0.4.0"
 description = "Common library for Nym cosmwasm contracts"
 edition = { workspace = true }
 authors = { workspace = true }
diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml b/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml
index 861107ff54..3c2c1cab49 100644
--- a/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml
+++ b/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-mixnet-contract-common"
-version = "0.3.0"
+version = "0.4.0"
 description = "Common library for the Nym mixnet contract"
 rust-version = "1.62"
 edition = { workspace = true }
@@ -15,7 +15,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_repr = "0.1"
 schemars = "0.8"
 thiserror = "1.0"
-contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.3.0" }
+contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.4.0" }
 # use 0.4.1 as that's the version used by cosmwasm-std 1.0.0
 # (and ideally we don't want to pull the same dependency twice)
 serde-json-wasm = "=0.4.1"
diff --git a/common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml b/common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml
index 88a67765d9..63ec16480c 100644
--- a/common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml
+++ b/common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-vesting-contract-common"
-version = "0.3.0"
+version = "0.4.0"
 description = "Common library for the Nym vesting contract"
 edition = { workspace = true }
 authors = { workspace = true }
@@ -9,8 +9,8 @@ repository = { workspace = true }
 
 [dependencies]
 cosmwasm-std = { workspace = true }
-mixnet-contract-common = { path = "../mixnet-contract", package = "nym-mixnet-contract-common", version = "0.3.0" }
-contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.3.0" }
+mixnet-contract-common = { path = "../mixnet-contract", package = "nym-mixnet-contract-common", version = "0.4.0" }
+contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.4.0" }
 serde = { version = "1.0", features = ["derive"] }
 schemars = "0.8"
 ts-rs = {version = "6.1.2", optional = true}
diff --git a/explorer-api/Cargo.toml b/explorer-api/Cargo.toml
index a9dde6c94a..9e59041019 100644
--- a/explorer-api/Cargo.toml
+++ b/explorer-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "explorer-api"
-version = "1.1.13"
+version = "1.1.14"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml
index cc6a1d6a3d..979bdc906f 100644
--- a/gateway/Cargo.toml
+++ b/gateway/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-gateway"
-version = "1.1.13"
+version = "1.1.14"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",
diff --git a/mixnode/Cargo.toml b/mixnode/Cargo.toml
index 1be77655b9..6371d5ba08 100644
--- a/mixnode/Cargo.toml
+++ b/mixnode/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-mixnode"
-version = "1.1.14"
+version = "1.1.15"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",
diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml
index d6e3be4373..bead60e412 100644
--- a/nym-api/Cargo.toml
+++ b/nym-api/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-api"
-version = "1.1.14"
+version = "1.1.15"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",
diff --git a/nym-connect/desktop/package.json b/nym-connect/desktop/package.json
index 032593ab66..d8ff616549 100644
--- a/nym-connect/desktop/package.json
+++ b/nym-connect/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nym/nym-connect",
-  "version": "1.1.12",
+  "version": "1.1.13",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
diff --git a/nym-connect/desktop/src-tauri/Cargo.toml b/nym-connect/desktop/src-tauri/Cargo.toml
index f94185cb82..7c7d7b27af 100644
--- a/nym-connect/desktop/src-tauri/Cargo.toml
+++ b/nym-connect/desktop/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-connect"
-version = "1.1.12"
+version = "1.1.13"
 description = "nym-connect"
 authors = ["Nym Technologies SA"]
 license = ""
diff --git a/nym-connect/desktop/src-tauri/tauri.conf.json b/nym-connect/desktop/src-tauri/tauri.conf.json
index 854e729827..d1a7f201f0 100644
--- a/nym-connect/desktop/src-tauri/tauri.conf.json
+++ b/nym-connect/desktop/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "nym-connect",
-    "version": "1.1.12"
+    "version": "1.1.13"
   },
   "build": {
     "distDir": "../dist",
diff --git a/nym-wallet/package.json b/nym-wallet/package.json
index 05d6195526..ef6edb98e9 100644
--- a/nym-wallet/package.json
+++ b/nym-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nymproject/nym-wallet-app",
-  "version": "1.1.12",
+  "version": "1.1.13",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
diff --git a/nym-wallet/src-tauri/Cargo.toml b/nym-wallet/src-tauri/Cargo.toml
index 932c98deed..55eea53b24 100644
--- a/nym-wallet/src-tauri/Cargo.toml
+++ b/nym-wallet/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym_wallet"
-version = "1.1.12"
+version = "1.1.13"
 description = "Nym Native Wallet"
 authors = ["Nym Technologies SA"]
 license = ""
diff --git a/nym-wallet/src-tauri/tauri.conf.json b/nym-wallet/src-tauri/tauri.conf.json
index c6374a010f..f300b1c926 100644
--- a/nym-wallet/src-tauri/tauri.conf.json
+++ b/nym-wallet/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "nym-wallet",
-    "version": "1.1.12"
+    "version": "1.1.13"
   },
   "build": {
     "distDir": "../dist",
diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml
index 88f8502564..bc57092b5b 100644
--- a/service-providers/network-requester/Cargo.toml
+++ b/service-providers/network-requester/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-network-requester"
-version = "1.1.13"
+version = "1.1.14"
 authors.workspace = true
 edition.workspace = true
 rust-version = "1.65"
diff --git a/service-providers/network-statistics/Cargo.toml b/service-providers/network-statistics/Cargo.toml
index ee6cb15703..e56f904fb0 100644
--- a/service-providers/network-statistics/Cargo.toml
+++ b/service-providers/network-statistics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-network-statistics"
-version = "1.1.13"
+version = "1.1.14"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/tools/nym-cli/Cargo.toml b/tools/nym-cli/Cargo.toml
index f233ec75d1..06c67be3da 100644
--- a/tools/nym-cli/Cargo.toml
+++ b/tools/nym-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-cli"
-version = "1.1.13"
+version = "1.1.14"
 authors.workspace = true
 edition = "2021"
 

From 21611a94344d890efff48afa1d49dae7e3ed81b9 Mon Sep 17 00:00:00 2001
From: farbanas <arbanasfran@gmail.com>
Date: Tue, 4 Apr 2023 11:04:44 +0200
Subject: [PATCH 5/8] update versions of contracts in preparation for release
 v1.1.14

---
 contracts/Cargo.lock         | 10 +++++-----
 contracts/mixnet/Cargo.toml  |  8 ++++----
 contracts/vesting/Cargo.toml |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock
index d1fc837fad..0e466bc66e 100644
--- a/contracts/Cargo.lock
+++ b/contracts/Cargo.lock
@@ -1018,7 +1018,7 @@ dependencies = [
 
 [[package]]
 name = "nym-contracts-common"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "bs58",
  "cosmwasm-std",
@@ -1052,7 +1052,7 @@ dependencies = [
 
 [[package]]
 name = "nym-mixnet-contract"
-version = "1.2.0"
+version = "1.3.0"
 dependencies = [
  "bs58",
  "cosmwasm-derive",
@@ -1076,7 +1076,7 @@ dependencies = [
 
 [[package]]
 name = "nym-mixnet-contract-common"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "bs58",
  "cosmwasm-std",
@@ -1121,7 +1121,7 @@ dependencies = [
 
 [[package]]
 name = "nym-vesting-contract"
-version = "1.2.0"
+version = "1.3.0"
 dependencies = [
  "base64 0.21.0",
  "cosmwasm-crypto",
@@ -1144,7 +1144,7 @@ dependencies = [
 
 [[package]]
 name = "nym-vesting-contract-common"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "cosmwasm-std",
  "nym-contracts-common",
diff --git a/contracts/mixnet/Cargo.toml b/contracts/mixnet/Cargo.toml
index 2870ecd482..7a53933fc9 100644
--- a/contracts/mixnet/Cargo.toml
+++ b/contracts/mixnet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-mixnet-contract"
-version = "1.2.0"
+version = "1.3.0"
 description = "Nym mixnet contract"
 edition = { workspace = true }
 authors = { workspace = true }
@@ -22,9 +22,9 @@ name = "mixnet_contract"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract", package = "nym-mixnet-contract-common", version = "0.3.0" }
-vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract", package = "nym-vesting-contract-common", version = "0.3.0" }
-nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common", version = "0.3.0" }
+mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract", package = "nym-mixnet-contract-common", version = "0.4.0" }
+vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract", package = "nym-vesting-contract-common", version = "0.4.0" }
+nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common", version = "0.4.0" }
 
 cosmwasm-std = { workspace = true }
 cosmwasm-storage = { workspace = true }
diff --git a/contracts/vesting/Cargo.toml b/contracts/vesting/Cargo.toml
index 341fdf284f..f6e456d568 100644
--- a/contracts/vesting/Cargo.toml
+++ b/contracts/vesting/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-vesting-contract"
-version = "1.2.0"
+version = "1.3.0"
 description = "Nym vesting contract"
 edition = { workspace = true }
 authors = { workspace = true }
@@ -20,9 +20,9 @@ name = "vesting_contract"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract", package = "nym-mixnet-contract-common", version = "0.3.0" }
-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common", package = "nym-contracts-common", version = "0.3.0" }
-vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract", package = "nym-vesting-contract-common", version = "0.3.0" }
+mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract", package = "nym-mixnet-contract-common", version = "0.4.0" }
+contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common", package = "nym-contracts-common", version = "0.4.0" }
+vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract", package = "nym-vesting-contract-common", version = "0.4.0" }
 
 cosmwasm-std = { workspace = true }
 cosmwasm-derive = { workspace = true }

From 9d0bc8ab9e955c52df4334a464637fcc8d7ca0fd Mon Sep 17 00:00:00 2001
From: farbanas <arbanasfran@gmail.com>
Date: Tue, 4 Apr 2023 11:38:01 +0200
Subject: [PATCH 6/8] update changelogs

---
 CHANGELOG.md            | 14 ++++++++++++++
 contracts/CHANGELOG.md  |  9 +++++++++
 nym-wallet/CHANGELOG.md | 12 ++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbc5cfaefb..c568c43188 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,20 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 
 ## [Unreleased]
 
+## [v1.1.14] (2023-04-04)
+
+- Investigate cause of qwerty validator being in invalid rewarding state ([#3224])
+- Fix NR config due to changes in #3199 ([#3223])
+- [Issue] Mixnodes and gateway do not close connections properly  ([#3187])
+- disable sign-ext when using wasm-opt + update wasm-opt ([#3203])
+- chore: tidy up client `Debug` config section ([#3199])
+
+[#3224]: https://github.com/nymtech/nym/issues/3224
+[#3223]: https://github.com/nymtech/nym/issues/3223
+[#3187]: https://github.com/nymtech/nym/issues/3187
+[#3203]: https://github.com/nymtech/nym/pull/3203
+[#3199]: https://github.com/nymtech/nym/pull/3199
+
 ## [v1.1.13] (2023-03-15)
 
 - NE - instead of throwing a "Mixnode/Gateway not found" error for blacklisted nodes due to bad performance, show their history but tag them as "Having poor performance" ([#2979])
diff --git a/contracts/CHANGELOG.md b/contracts/CHANGELOG.md
index d622d922fa..c12ca726f4 100644
--- a/contracts/CHANGELOG.md
+++ b/contracts/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+## [v1.1.5] (2023-04-04)
+- change in-contract signatures to include nonces and to sign entire payloads for family-related operations ([#3125])
+- change in-contract signatures to include nonces and to sign entire payloads for node bonding (will require wallet changes) ([#3067])
+- removed migration code from mixnet and vesting contracts ([#3207])
+
+[#3125]: https://github.com/nymtech/nym/issues/3125
+[#3067]: https://github.com/nymtech/nym/issues/3067
+[#3207]: https://github.com/nymtech/nym/pull/3207
+
 ## [v1.1.4] (2023-02-21)
 
 - Problem 142 (rust-side) ([#3024])
diff --git a/nym-wallet/CHANGELOG.md b/nym-wallet/CHANGELOG.md
index 32bba826cb..133ffd6350 100644
--- a/nym-wallet/CHANGELOG.md
+++ b/nym-wallet/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+## [v1.2.0] (2023-04-04)
+
+- Add Version and Location to gateway settings ([#3266])
+- Wallet - bonding screen - short info with link ([#3179])
+- Wallet - discrepancies figma vs wallet ([#2183])
+- Wallet - If a gateway is bonded show gateway settings in the node settings: ([#2242])
+
+[#3266]: https://github.com/nymtech/nym/issues/3266
+[#3179]: https://github.com/nymtech/nym/issues/3179
+[#2183]: https://github.com/nymtech/nym/issues/2183
+[#2242]: https://github.com/nymtech/nym/issues/2242
+
 ## [v1.1.12] (2023-03-15)
 
 - Wallet - in the vesting section separate the "Unlocked transferable tokens" into "Unlocked vesting tokens" and "Transferable rewards" for better clarity ([#3132])

From e21142f1bd9e595fcf04ec74916f475bf77bb2ce Mon Sep 17 00:00:00 2001
From: farbanas <arbanasfran@gmail.com>
Date: Tue, 4 Apr 2023 11:51:14 +0200
Subject: [PATCH 7/8] update contracts changelog

---
 contracts/CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contracts/CHANGELOG.md b/contracts/CHANGELOG.md
index c2b04dafad..c032a8139b 100644
--- a/contracts/CHANGELOG.md
+++ b/contracts/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-## [v1.1.6] (2023-04-04)
+## [v1.3.0] (2023-04-04)
 - change in-contract signatures to include nonces and to sign entire payloads for family-related operations ([#3125])
 - change in-contract signatures to include nonces and to sign entire payloads for node bonding (will require wallet changes) ([#3067])
 - removed migration code from mixnet and vesting contracts ([#3207])
@@ -11,7 +11,7 @@
 [#3067]: https://github.com/nymtech/nym/issues/3067
 [#3207]: https://github.com/nymtech/nym/pull/3207
 
-## [v1.1.5] (2023-03-21)
+## [v1.2.0] (2023-03-21)
 
 - Fix contracts and nym-api audit findings ([#3026])
 

From 20c7f0e96f11393689e8b6f079948b798ad79e70 Mon Sep 17 00:00:00 2001
From: farbanas <arbanasfran@gmail.com>
Date: Tue, 4 Apr 2023 12:56:13 +0200
Subject: [PATCH 8/8] fix: nym-wallet version

---
 nym-wallet/package.json              | 4 ++--
 nym-wallet/src-tauri/Cargo.toml      | 2 +-
 nym-wallet/src-tauri/tauri.conf.json | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nym-wallet/package.json b/nym-wallet/package.json
index ef6edb98e9..8fad50c812 100644
--- a/nym-wallet/package.json
+++ b/nym-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nymproject/nym-wallet-app",
-  "version": "1.1.13",
+  "version": "1.2.0",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
@@ -122,4 +122,4 @@
     "webpack-favicons": "^1.3.8",
     "webpack-merge": "^5.8.0"
   }
-}
\ No newline at end of file
+}
diff --git a/nym-wallet/src-tauri/Cargo.toml b/nym-wallet/src-tauri/Cargo.toml
index 55eea53b24..ab9b9711d4 100644
--- a/nym-wallet/src-tauri/Cargo.toml
+++ b/nym-wallet/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym_wallet"
-version = "1.1.13"
+version = "1.2.0"
 description = "Nym Native Wallet"
 authors = ["Nym Technologies SA"]
 license = ""
diff --git a/nym-wallet/src-tauri/tauri.conf.json b/nym-wallet/src-tauri/tauri.conf.json
index f300b1c926..fb354bb865 100644
--- a/nym-wallet/src-tauri/tauri.conf.json
+++ b/nym-wallet/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "nym-wallet",
-    "version": "1.1.13"
+    "version": "1.2.0"
   },
   "build": {
     "distDir": "../dist",
@@ -74,4 +74,4 @@
       "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self' img-src: 'self'"
     }
   }
-}
\ No newline at end of file
+}