Merge remote-tracking branch 'origin/master' into release/v1.1.15

This commit is contained in:
Jon Häggblad
2023-04-17 15:05:03 +02:00
33 changed files with 164 additions and 76 deletions
+14 -2
View File
@@ -11,12 +11,25 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
[#3226]: https://github.com/nymtech/nym/pull/3226
[#3255]: https://github.com/nymtech/nym/pull/3255
## [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])
- 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])
@@ -25,7 +38,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
Generated
+15 -15
View File
@@ -1576,7 +1576,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
[[package]]
name = "explorer-api"
version = "1.1.13"
version = "1.1.14"
dependencies = [
"chrono",
"clap 4.1.11",
@@ -3011,7 +3011,7 @@ dependencies = [
[[package]]
name = "nym-api"
version = "1.1.14"
version = "1.1.15"
dependencies = [
"anyhow",
"async-trait",
@@ -3091,7 +3091,7 @@ dependencies = [
[[package]]
name = "nym-bin-common"
version = "0.3.0"
version = "0.4.0"
dependencies = [
"atty",
"clap 4.1.11",
@@ -3125,7 +3125,7 @@ dependencies = [
[[package]]
name = "nym-cli"
version = "1.1.13"
version = "1.1.14"
dependencies = [
"anyhow",
"base64 0.13.1",
@@ -3186,7 +3186,7 @@ dependencies = [
[[package]]
name = "nym-client"
version = "1.1.13"
version = "1.1.14"
dependencies = [
"clap 4.1.11",
"dirs",
@@ -3222,7 +3222,7 @@ dependencies = [
[[package]]
name = "nym-client-core"
version = "1.1.13"
version = "1.1.14"
dependencies = [
"async-trait",
"dashmap 5.4.0",
@@ -3340,7 +3340,7 @@ dependencies = [
[[package]]
name = "nym-contracts-common"
version = "0.3.0"
version = "0.4.0"
dependencies = [
"bs58",
"cosmwasm-std",
@@ -3456,7 +3456,7 @@ dependencies = [
[[package]]
name = "nym-gateway"
version = "1.1.13"
version = "1.1.14"
dependencies = [
"anyhow",
"async-trait",
@@ -3587,7 +3587,7 @@ dependencies = [
[[package]]
name = "nym-mixnet-contract-common"
version = "0.3.0"
version = "0.4.0"
dependencies = [
"bs58",
"cosmwasm-std",
@@ -3606,7 +3606,7 @@ dependencies = [
[[package]]
name = "nym-mixnode"
version = "1.1.14"
version = "1.1.15"
dependencies = [
"anyhow",
"bs58",
@@ -3716,7 +3716,7 @@ dependencies = [
[[package]]
name = "nym-network-requester"
version = "1.1.13"
version = "1.1.14"
dependencies = [
"async-file-watcher",
"async-trait",
@@ -3757,7 +3757,7 @@ dependencies = [
[[package]]
name = "nym-network-statistics"
version = "1.1.13"
version = "1.1.14"
dependencies = [
"dirs",
"log",
@@ -3868,7 +3868,7 @@ dependencies = [
[[package]]
name = "nym-socks5-client"
version = "1.1.13"
version = "1.1.14"
dependencies = [
"clap 4.1.11",
"lazy_static",
@@ -4190,7 +4190,7 @@ dependencies = [
[[package]]
name = "nym-vesting-contract"
version = "1.2.0"
version = "1.3.0"
dependencies = [
"cosmwasm-derive",
"cosmwasm-std",
@@ -4208,7 +4208,7 @@ dependencies = [
[[package]]
name = "nym-vesting-contract-common"
version = "0.3.0"
version = "0.4.0"
dependencies = [
"cosmwasm-std",
"nym-contracts-common",
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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 }
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "nym-client-core"
version = "1.1.13"
version = "1.1.14"
authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
edition = "2021"
rust-version = "1.66"
@@ -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 }
@@ -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"
@@ -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}
+15
View File
@@ -2,6 +2,21 @@
## Unreleased
## [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])
[#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.2.0] (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])
+5 -5
View File
@@ -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",
@@ -1148,7 +1148,7 @@ dependencies = [
[[package]]
name = "nym-vesting-contract"
version = "1.2.0"
version = "1.3.0"
dependencies = [
"base64 0.21.0",
"cosmwasm-crypto",
@@ -1171,7 +1171,7 @@ dependencies = [
[[package]]
name = "nym-vesting-contract-common"
version = "0.3.0"
version = "0.4.0"
dependencies = [
"cosmwasm-std",
"nym-contracts-common",
+4 -4
View File
@@ -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 }
@@ -12,7 +12,7 @@ cw-controllers = { workspace = true }
cw-storage-plus = { workspace = true }
cw-utils = { workspace = true }
cw2 = { workspace = true }
nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common", version = "0.3.0" }
nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common", version = "0.4.0" }
nym-service-provider-directory-common = { path = "../../common/cosmwasm-smart-contracts/service-provider-directory" }
semver = { version = "1.0.16", default-features = false }
serde = { version = "1.0.155", default-features = false, features = ["derive"] }
+4 -4
View File
@@ -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 }
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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>",
+1 -1
View File
@@ -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>",
+1 -1
View File
@@ -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>",
+7 -7
View File
@@ -3175,7 +3175,7 @@ dependencies = [
[[package]]
name = "nym-bin-common"
version = "0.3.0"
version = "0.4.0"
dependencies = [
"atty",
"clap",
@@ -3190,7 +3190,7 @@ dependencies = [
[[package]]
name = "nym-client-core"
version = "1.1.13"
version = "1.1.14"
dependencies = [
"async-trait",
"dashmap",
@@ -3295,7 +3295,7 @@ dependencies = [
[[package]]
name = "nym-connect"
version = "1.1.12"
version = "1.1.13"
dependencies = [
"anyhow",
"bip39",
@@ -3338,7 +3338,7 @@ dependencies = [
[[package]]
name = "nym-contracts-common"
version = "0.3.0"
version = "0.4.0"
dependencies = [
"bs58",
"cosmwasm-std",
@@ -3477,7 +3477,7 @@ dependencies = [
[[package]]
name = "nym-mixnet-contract-common"
version = "0.3.0"
version = "0.4.0"
dependencies = [
"bs58",
"cosmwasm-std",
@@ -3830,7 +3830,7 @@ dependencies = [
[[package]]
name = "nym-vesting-contract"
version = "1.2.0"
version = "1.3.0"
dependencies = [
"cosmwasm-derive",
"cosmwasm-std",
@@ -3848,7 +3848,7 @@ dependencies = [
[[package]]
name = "nym-vesting-contract-common"
version = "0.3.0"
version = "0.4.0"
dependencies = [
"cosmwasm-std",
"nym-contracts-common",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@nym/nym-connect",
"version": "1.1.12",
"version": "1.1.13",
"main": "index.js",
"license": "MIT",
"scripts": {
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "nym-connect"
version = "1.1.12"
version = "1.1.13"
description = "nym-connect"
authors = ["Nym Technologies SA"]
license = ""
@@ -1,7 +1,7 @@
{
"package": {
"productName": "nym-connect",
"version": "1.1.12"
"version": "1.1.13"
},
"build": {
"distDir": "../dist",
+12
View File
@@ -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])
+6 -6
View File
@@ -2781,7 +2781,7 @@ dependencies = [
[[package]]
name = "nym-bin-common"
version = "0.3.0"
version = "0.4.0"
dependencies = [
"atty",
"clap",
@@ -2861,7 +2861,7 @@ dependencies = [
[[package]]
name = "nym-contracts-common"
version = "0.3.0"
version = "0.4.0"
dependencies = [
"bs58",
"cosmwasm-std",
@@ -2916,7 +2916,7 @@ dependencies = [
[[package]]
name = "nym-mixnet-contract-common"
version = "0.3.0"
version = "0.4.0"
dependencies = [
"bs58",
"cosmwasm-std",
@@ -3040,7 +3040,7 @@ dependencies = [
[[package]]
name = "nym-vesting-contract"
version = "1.2.0"
version = "1.3.0"
dependencies = [
"cosmwasm-derive",
"cosmwasm-std",
@@ -3058,7 +3058,7 @@ dependencies = [
[[package]]
name = "nym-vesting-contract-common"
version = "0.3.0"
version = "0.4.0"
dependencies = [
"cosmwasm-std",
"nym-contracts-common",
@@ -3105,7 +3105,7 @@ dependencies = [
[[package]]
name = "nym_wallet"
version = "1.1.12"
version = "1.2.0"
dependencies = [
"aes-gcm",
"argon2 0.3.4",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@nymproject/nym-wallet-app",
"version": "1.1.12",
"version": "1.2.0",
"main": "index.js",
"license": "MIT",
"scripts": {
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "nym_wallet"
version = "1.1.12"
version = "1.2.0"
description = "Nym Native Wallet"
authors = ["Nym Technologies SA"]
license = ""
+2 -2
View File
@@ -1,7 +1,7 @@
{
"package": {
"productName": "nym-wallet",
"version": "1.1.12"
"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'"
}
}
}
}
@@ -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,
),
});
@@ -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,
}),
)}
+4 -3
View File
@@ -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;
@@ -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"
@@ -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
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "nym-cli"
version = "1.1.13"
version = "1.1.14"
authors.workspace = true
edition = "2021"