From e2ead6dbe1336a0e62705156119aedfaea7a51a8 Mon Sep 17 00:00:00 2001 From: benedettadavico Date: Fri, 26 Jul 2024 15:25:47 +0200 Subject: [PATCH 1/5] bumping binaries versions --- Cargo.lock | 16 ++++++++-------- clients/native/Cargo.toml | 2 +- clients/socks5/Cargo.toml | 2 +- explorer-api/Cargo.toml | 2 +- nym-api/Cargo.toml | 2 +- nym-node/Cargo.toml | 2 +- service-providers/network-requester/Cargo.toml | 2 +- tools/nym-cli/Cargo.toml | 2 +- tools/nymvisor/Cargo.toml | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 251fde9db4..80c9660bcc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2093,7 +2093,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "explorer-api" -version = "1.1.37" +version = "1.1.38" dependencies = [ "chrono", "clap 4.5.4", @@ -3849,7 +3849,7 @@ dependencies = [ [[package]] name = "nym-api" -version = "1.1.41" +version = "1.1.42" dependencies = [ "anyhow", "async-trait", @@ -4057,7 +4057,7 @@ dependencies = [ [[package]] name = "nym-cli" -version = "1.1.39" +version = "1.1.40" dependencies = [ "anyhow", "base64 0.13.1", @@ -4136,7 +4136,7 @@ dependencies = [ [[package]] name = "nym-client" -version = "1.1.38" +version = "1.1.39" dependencies = [ "bs58 0.5.1", "clap 4.5.4", @@ -4950,7 +4950,7 @@ dependencies = [ [[package]] name = "nym-network-requester" -version = "1.1.39" +version = "1.1.40" dependencies = [ "addr", "anyhow", @@ -5001,7 +5001,7 @@ dependencies = [ [[package]] name = "nym-node" -version = "1.1.5" +version = "1.1.6" dependencies = [ "anyhow", "bip39", @@ -5264,7 +5264,7 @@ dependencies = [ [[package]] name = "nym-socks5-client" -version = "1.1.38" +version = "1.1.39" dependencies = [ "bs58 0.5.1", "clap 4.5.4", @@ -5779,7 +5779,7 @@ dependencies = [ [[package]] name = "nymvisor" -version = "0.1.4" +version = "0.1.5" dependencies = [ "anyhow", "bytes", diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml index 1cb349c872..a951162886 100644 --- a/clients/native/Cargo.toml +++ b/clients/native/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-client" -version = "1.1.38" +version = "1.1.39" authors = ["Dave Hrycyszyn ", "Jędrzej Stuczyński "] description = "Implementation of the Nym Client" edition = "2021" diff --git a/clients/socks5/Cargo.toml b/clients/socks5/Cargo.toml index 7788430c9c..b7641e6496 100644 --- a/clients/socks5/Cargo.toml +++ b/clients/socks5/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-socks5-client" -version = "1.1.38" +version = "1.1.39" authors = ["Dave Hrycyszyn "] description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address" edition = "2021" diff --git a/explorer-api/Cargo.toml b/explorer-api/Cargo.toml index fa799825b1..2a33ae5fc8 100644 --- a/explorer-api/Cargo.toml +++ b/explorer-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "explorer-api" -version = "1.1.37" +version = "1.1.38" edition = "2021" license.workspace = true diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml index a3a22e8154..1d11d5994c 100644 --- a/nym-api/Cargo.toml +++ b/nym-api/Cargo.toml @@ -4,7 +4,7 @@ [package] name = "nym-api" license = "GPL-3.0" -version = "1.1.41" +version = "1.1.42" authors = [ "Dave Hrycyszyn ", "Jędrzej Stuczyński ", diff --git a/nym-node/Cargo.toml b/nym-node/Cargo.toml index 8e1eda2c53..b897f2d008 100644 --- a/nym-node/Cargo.toml +++ b/nym-node/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "nym-node" -version = "1.1.5" +version = "1.1.6" authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml index 73700d59b3..7a9ffb06ff 100644 --- a/service-providers/network-requester/Cargo.toml +++ b/service-providers/network-requester/Cargo.toml @@ -4,7 +4,7 @@ [package] name = "nym-network-requester" license = "GPL-3.0" -version = "1.1.39" +version = "1.1.40" authors.workspace = true edition.workspace = true rust-version = "1.70" diff --git a/tools/nym-cli/Cargo.toml b/tools/nym-cli/Cargo.toml index eabfeb4b83..e590e45141 100644 --- a/tools/nym-cli/Cargo.toml +++ b/tools/nym-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-cli" -version = "1.1.39" +version = "1.1.40" authors.workspace = true edition = "2021" license.workspace = true diff --git a/tools/nymvisor/Cargo.toml b/tools/nymvisor/Cargo.toml index 2049fcf279..8f5658c8d3 100644 --- a/tools/nymvisor/Cargo.toml +++ b/tools/nymvisor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nymvisor" -version = "0.1.4" +version = "0.1.5" authors.workspace = true repository.workspace = true homepage.workspace = true From de0fb7459d93662f12339a442f2834fb3a9a7d95 Mon Sep 17 00:00:00 2001 From: benedettadavico Date: Fri, 26 Jul 2024 15:28:06 +0200 Subject: [PATCH 2/5] update changelog --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9586c949fb..1a39429e55 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] +## [2024.9-topdeck] (2024-07-26) + +- chore: fix 1.80 lint issues ([#4731]) +- Handle clients with different versions in IPR ([#4723]) +- Add 1GB/day/user bandwidth cap ([#4717]) +- Feature/merge back ([#4710]) +- removed mixnode/gateway config migration code and disabled cli without explicit flag ([#4706]) + +[#4731]: https://github.com/nymtech/nym/pull/4731 +[#4723]: https://github.com/nymtech/nym/pull/4723 +[#4717]: https://github.com/nymtech/nym/pull/4717 +[#4710]: https://github.com/nymtech/nym/pull/4710 +[#4706]: https://github.com/nymtech/nym/pull/4706 + ## [2024.8-wispa] (2024-07-10) - add event parsing to support cosmos_sdk > 0.50 ([#4697]) From 3d5ac0b8833091f73002a7eb6eb8fc2e36d5c16b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogdan-=C8=98tefan=20Neac=C5=9Fu?= Date: Mon, 29 Jul 2024 12:38:27 +0200 Subject: [PATCH 3/5] Fix version 1 not having template correspondent initially (#4733) --- nym-node/src/config/old_configs/old_config_v1.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nym-node/src/config/old_configs/old_config_v1.rs b/nym-node/src/config/old_configs/old_config_v1.rs index e3a76cdc56..a09eee36e7 100644 --- a/nym-node/src/config/old_configs/old_config_v1.rs +++ b/nym-node/src/config/old_configs/old_config_v1.rs @@ -15,7 +15,9 @@ use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)] #[serde(deny_unknown_fields)] pub struct WireguardPathsV1 { + #[serde(skip)] pub private_diffie_hellman_key_file: PathBuf, + #[serde(skip)] pub public_diffie_hellman_key_file: PathBuf, } From f8523dc7d1c677e187a5aeeaa086b928d8647060 Mon Sep 17 00:00:00 2001 From: Tommy Verrall <60836166+tommyv1987@users.noreply.github.com> Date: Mon, 5 Aug 2024 11:47:00 +0200 Subject: [PATCH 4/5] Update publish-nym-binaries.yml --- .github/workflows/publish-nym-binaries.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-nym-binaries.yml b/.github/workflows/publish-nym-binaries.yml index 3d1e6fc5e9..be70c514ba 100644 --- a/.github/workflows/publish-nym-binaries.yml +++ b/.github/workflows/publish-nym-binaries.yml @@ -51,6 +51,10 @@ jobs: echo 'RUSTFLAGS="--cfg tokio_unstable"' >> $GITHUB_ENV if: github.event_name == 'workflow_dispatch' && inputs.add_tokio_unstable == true + - name: Set CARGO_FEATURES + run: | + echo 'CARGO_FEATURES=--features wireguard' >> $GITHUB_ENV + - name: Install Rust stable uses: actions-rs/toolchain@v1 with: @@ -60,8 +64,8 @@ jobs: uses: actions-rs/cargo@v1 with: command: build - args: --workspace --release - + args: --workspace --release ${{ env.CARGO_FEATURES }} + - name: Upload Artifact uses: actions/upload-artifact@v3 with: From b45eb16783e21c35d158bf1faab4e66e38726a98 Mon Sep 17 00:00:00 2001 From: Tommy Verrall <60836166+tommyv1987@users.noreply.github.com> Date: Mon, 5 Aug 2024 11:48:07 +0200 Subject: [PATCH 5/5] Update ci-build-upload-binaries.yml --- .github/workflows/ci-build-upload-binaries.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/ci-build-upload-binaries.yml b/.github/workflows/ci-build-upload-binaries.yml index 02803c4327..00c28191bd 100644 --- a/.github/workflows/ci-build-upload-binaries.yml +++ b/.github/workflows/ci-build-upload-binaries.yml @@ -8,11 +8,6 @@ on: required: true default: false type: boolean - enable_wireguard: - description: "Add --features wireguard" - required: true - default: false - type: boolean enable_deb: description: "True to enable cargo-deb installation and .deb package building" required: false @@ -42,7 +37,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-20.04] + platform: [ ubuntu-20.04 ] runs-on: ${{ matrix.platform }} env: @@ -70,9 +65,6 @@ jobs: - name: Set CARGO_FEATURES run: | echo 'CARGO_FEATURES=--features wireguard' >> $GITHUB_ENV - if: > - github.event_name == 'schedule' || - (github.event_name == 'workflow_dispatch' && inputs.enable_wireguard == true) - name: Install Rust stable uses: actions-rs/toolchain@v1