From 8e7918cc450d0d7d07228ae96045a0c33fb1d077 Mon Sep 17 00:00:00 2001 From: Tommy Verrall Date: Tue, 2 Jul 2024 11:19:50 +0200 Subject: [PATCH 1/3] add an early return in parse_raw_str_logs for empty raw log strings. this accommodates for the v50 chain upgrade --- .../src/nyxd/cosmwasm_client/logs.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common/client-libs/validator-client/src/nyxd/cosmwasm_client/logs.rs b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/logs.rs index d16b3055c2..4725033dfb 100644 --- a/common/client-libs/validator-client/src/nyxd/cosmwasm_client/logs.rs +++ b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/logs.rs @@ -9,16 +9,12 @@ pub use nym_coconut_bandwidth_contract_common::event_attributes::*; pub use nym_coconut_dkg_common::event_attributes::*; // it seems that currently validators just emit stringified events (which are also returned as part of deliverTx response) -// as theirs logs +// as their logs #[derive(Debug, Serialize, Deserialize)] pub struct Log { #[serde(default)] // weird thing is that the first msg_index seems to always be undefined on the raw logs pub msg_index: usize, - // unless I'm missing something obvious, the "log" type in cosmjs is always an empty string - // and launchpad cosmos validator was setting it to what essentially is just the raw version of what - // we received (and we don't care about launchpad, we, as the time of writing this, work on the stargate) - // log: String, pub events: Vec, } @@ -37,8 +33,12 @@ pub fn find_attribute<'a>( .find(|attr| attr.key == attribute_key) } -// those two functions were separated so that the internal logic could actually be tested +// these two functions were separated so that the internal logic could actually be tested fn parse_raw_str_logs(raw: &str) -> Result, NyxdError> { + if raw.is_empty() { + return Ok(Vec::new()); + } + let logs: Vec = serde_json::from_str(raw).map_err(|_| NyxdError::MalformedLogString)?; if logs.len() != logs.iter().unique_by(|log| log.msg_index).count() { // this check is only here because I don't yet fully understand raw log string generation and From da816647290809da9c06a850bbe0f3c9f3679a11 Mon Sep 17 00:00:00 2001 From: benedettadavico Date: Thu, 4 Jul 2024 09:36:09 +0200 Subject: [PATCH 2/3] update versions and changelog --- CHANGELOG.md | 32 +++++++++++++++++++ Cargo.lock | 22 ++++++------- 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 +- .../network-requester/Cargo.toml | 2 +- tools/nym-cli/Cargo.toml | 2 +- tools/nymvisor/Cargo.toml | 2 +- 10 files changed, 51 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bac3e624c..46d463aed3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,38 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https:// ## [Unreleased] +## [2024.7-doubledecker] (2024-07-04) + +- Add an early return in `parse_raw_str_logs` for empty raw log strings. ([#4686]) +- Bump braces from 3.0.2 to 3.0.3 in /wasm/mix-fetch/internal-dev ([#4672]) +- add expiry returned on import ([#4670]) +- [bugfix] missing rustls feature ([#4666]) +- Bump ws from 8.13.0 to 8.17.1 in /wasm/client/internal-dev-node ([#4665]) +- Bump braces from 3.0.2 to 3.0.3 in /clients/native/examples/js-examples/websocket ([#4663]) +- Bump ws from 8.14.2 to 8.17.1 in /sdk/typescript/packages/nodejs-client ([#4662]) +- Update setup.md ([#4661]) +- New clippy lints ([#4660]) +- Bump braces from 3.0.2 to 3.0.3 in /nym-api/tests ([#4659]) +- Bump braces from 3.0.2 to 3.0.3 in /docker/typescript_client/upload_contract ([#4658]) +- Update vps-setup.md ([#4656]) +- Update configuration.md ([#4655]) +- Remove old PR template ([#4639]) + +[#4686]: https://github.com/nymtech/nym/pull/4686 +[#4672]: https://github.com/nymtech/nym/pull/4672 +[#4670]: https://github.com/nymtech/nym/pull/4670 +[#4666]: https://github.com/nymtech/nym/pull/4666 +[#4665]: https://github.com/nymtech/nym/pull/4665 +[#4663]: https://github.com/nymtech/nym/pull/4663 +[#4662]: https://github.com/nymtech/nym/pull/4662 +[#4661]: https://github.com/nymtech/nym/pull/4661 +[#4660]: https://github.com/nymtech/nym/pull/4660 +[#4659]: https://github.com/nymtech/nym/pull/4659 +[#4658]: https://github.com/nymtech/nym/pull/4658 +[#4656]: https://github.com/nymtech/nym/pull/4656 +[#4655]: https://github.com/nymtech/nym/pull/4655 +[#4639]: https://github.com/nymtech/nym/pull/4639 + ## [2024.6-chomp] (2024-06-25) - Remove additional code as part of Ephemera Purge and SP and contracts ([#4650]) diff --git a/Cargo.lock b/Cargo.lock index 03807367fc..51dedb3751 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2093,7 +2093,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "explorer-api" -version = "1.1.35" +version = "1.1.36" dependencies = [ "chrono", "clap 4.5.4", @@ -3858,7 +3858,7 @@ dependencies = [ [[package]] name = "nym-api" -version = "1.1.39" +version = "1.1.40" dependencies = [ "anyhow", "async-trait", @@ -4018,7 +4018,7 @@ dependencies = [ [[package]] name = "nym-cli" -version = "1.1.37" +version = "1.1.38" dependencies = [ "anyhow", "base64 0.13.1", @@ -4097,7 +4097,7 @@ dependencies = [ [[package]] name = "nym-client" -version = "1.1.36" +version = "1.1.37" dependencies = [ "bs58 0.5.1", "clap 4.5.4", @@ -4506,7 +4506,7 @@ dependencies = [ [[package]] name = "nym-gateway" -version = "1.1.37" +version = "1.1.36" dependencies = [ "anyhow", "async-trait", @@ -4805,7 +4805,7 @@ dependencies = [ [[package]] name = "nym-mixnode" -version = "1.1.38" +version = "1.1.37" dependencies = [ "anyhow", "axum 0.7.5", @@ -4910,7 +4910,7 @@ dependencies = [ [[package]] name = "nym-network-requester" -version = "1.1.37" +version = "1.1.38" dependencies = [ "addr", "anyhow", @@ -4962,7 +4962,7 @@ dependencies = [ [[package]] name = "nym-network-statistics" -version = "1.1.35" +version = "1.1.34" dependencies = [ "dirs 4.0.0", "log", @@ -4979,7 +4979,7 @@ dependencies = [ [[package]] name = "nym-node" -version = "1.1.3" +version = "1.1.4" dependencies = [ "anyhow", "bip39", @@ -5241,7 +5241,7 @@ dependencies = [ [[package]] name = "nym-socks5-client" -version = "1.1.36" +version = "1.1.37" dependencies = [ "bs58 0.5.1", "clap 4.5.4", @@ -5767,7 +5767,7 @@ dependencies = [ [[package]] name = "nymvisor" -version = "0.1.2" +version = "0.1.3" dependencies = [ "anyhow", "bytes", diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml index 2fb280e996..049910541c 100644 --- a/clients/native/Cargo.toml +++ b/clients/native/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-client" -version = "1.1.36" +version = "1.1.37" 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 a77c01ab01..b4165fa19b 100644 --- a/clients/socks5/Cargo.toml +++ b/clients/socks5/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-socks5-client" -version = "1.1.36" +version = "1.1.37" 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 d0987b9bb1..8840fab46a 100644 --- a/explorer-api/Cargo.toml +++ b/explorer-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "explorer-api" -version = "1.1.35" +version = "1.1.36" edition = "2021" license.workspace = true diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml index e8b1c2a6ef..d422937e80 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.39" +version = "1.1.40" authors = [ "Dave Hrycyszyn ", "Jędrzej Stuczyński ", diff --git a/nym-node/Cargo.toml b/nym-node/Cargo.toml index 9b9b7196e6..901febac3c 100644 --- a/nym-node/Cargo.toml +++ b/nym-node/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "nym-node" -version = "1.1.3" +version = "1.1.4" 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 dc7043c643..0a956208ea 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.37" +version = "1.1.38" 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 d0e85bc282..b16072c50a 100644 --- a/tools/nym-cli/Cargo.toml +++ b/tools/nym-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-cli" -version = "1.1.37" +version = "1.1.38" authors.workspace = true edition = "2021" license.workspace = true diff --git a/tools/nymvisor/Cargo.toml b/tools/nymvisor/Cargo.toml index 769dd74df2..6f0288170c 100644 --- a/tools/nymvisor/Cargo.toml +++ b/tools/nymvisor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nymvisor" -version = "0.1.2" +version = "0.1.3" authors.workspace = true repository.workspace = true homepage.workspace = true From ebac4e85642d63c981fe2e852376a2ca11e97a4e Mon Sep 17 00:00:00 2001 From: Tommy Verrall <60836166+tommyv1987@users.noreply.github.com> Date: Thu, 4 Jul 2024 09:57:37 +0200 Subject: [PATCH 3/3] Update ci-build-upload-binaries.yml --- .github/workflows/ci-build-upload-binaries.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci-build-upload-binaries.yml b/.github/workflows/ci-build-upload-binaries.yml index 5a0f325b45..02803c4327 100644 --- a/.github/workflows/ci-build-upload-binaries.yml +++ b/.github/workflows/ci-build-upload-binaries.yml @@ -104,12 +104,9 @@ jobs: name: nym-binaries-artifacts path: | target/release/nym-client - target/release/nym-gateway - target/release/nym-mixnode target/release/nym-socks5-client target/release/nym-api target/release/nym-network-requester - target/release/nym-network-statistics target/release/nym-cli target/release/nymvisor target/release/nym-node @@ -124,12 +121,9 @@ jobs: OUTPUT_DIR: ci-builds/${{ github.ref_name }} run: | cp target/release/nym-client $OUTPUT_DIR - cp target/release/nym-gateway $OUTPUT_DIR - cp target/release/nym-mixnode $OUTPUT_DIR cp target/release/nym-socks5-client $OUTPUT_DIR cp target/release/nym-api $OUTPUT_DIR cp target/release/nym-network-requester $OUTPUT_DIR - cp target/release/nym-network-statistics $OUTPUT_DIR cp target/release/nymvisor $OUTPUT_DIR cp target/release/nym-node $OUTPUT_DIR cp target/release/nym-cli $OUTPUT_DIR