Merge branch '1.1' into merge-1.1-into-2.0-1

iotaledger · Sep 18, 2023 · f8f021d · f8f021d
2 parents 4c878a3 + 4dfc5b5
commit f8f021d
Show file tree

Hide file tree

Showing 52 changed files with 4,767 additions and 4,247 deletions.
diff --git a/.github/workflows/bindings-python.yml b/.github/workflows/bindings-python.yml
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.9"]
 
     steps:
       - name: Checkout the Source Code
@@ -78,7 +78,7 @@ jobs:
       matrix:
         # os: [windows-latest, macos-latest, ubuntu-latest]
         os: [windows-latest, ubuntu-latest]
-        python-version: ["3.10"]
+        python-version: ["3.9"]
 
     steps:
       - name: Checkout the Source Code

diff --git a/.github/workflows/bindings-wasm-publish.yml b/.github/workflows/bindings-wasm-publish.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Rust
         uses: ./.github/actions/setup-rust
         with:
-          target: "wasm32-unknown-unknown"
+          targets: "wasm32-unknown-unknown"
 
       # Download a pre-compiled wasm-bindgen binary.
       - name: Install wasm-bindgen-cli

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindings/core/Cargo.toml b/bindings/core/Cargo.toml
@@ -23,11 +23,11 @@ iota-crypto = { version = "0.23.0", default-features = false, features = [
     "bip44",
 ] }
 log = { version = "0.4.20", default-features = false }
-packable = { version = "0.8.1", default-features = false }
+packable = { version = "0.8.2", default-features = false }
 prefix-hex = { version = "0.7.1", default-features = false }
 primitive-types = { version = "0.12.1", default-features = false }
 serde = { version = "1.0.188", default-features = false }
-serde_json = { version = "1.0.105", default-features = false }
+serde_json = { version = "1.0.107", default-features = false }
 thiserror = { version = "1.0.48", default-features = false }
 tokio = { version = "1.32.0", default-features = false }
 zeroize = { version = "1.6.0", default-features = false }

diff --git a/bindings/core/src/method_handler/client.rs b/bindings/core/src/method_handler/client.rs
@@ -168,7 +168,7 @@ pub(crate) async fn call_client_method_internal(client: &Client, method: ClientM
         }
         ClientMethod::GetNode => Response::Node(client.get_node().await?),
         ClientMethod::GetNetworkInfo => Response::NetworkInfo(client.get_network_info().await?),
-        ClientMethod::GetNetworkId => Response::NetworkId(client.get_network_id().await?),
+        ClientMethod::GetNetworkId => Response::NetworkId(client.get_network_id().await?.to_string()),
         ClientMethod::GetBech32Hrp => Response::Bech32Hrp(client.get_bech32_hrp().await?),
         ClientMethod::GetProtocolParameters => Response::ProtocolParameters(client.get_protocol_parameters().await?),
         ClientMethod::PostBlockPayload { payload } => {

diff --git a/bindings/core/src/response.rs b/bindings/core/src/response.rs
@@ -68,7 +68,7 @@ pub enum Response {
     NetworkInfo(NetworkInfo),
     /// Response for:
     /// - [`GetNetworkId`](crate::method::ClientMethod::GetNetworkId)
-    NetworkId(u64),
+    NetworkId(String),
     /// Response for:
     /// - [`GetBech32Hrp`](crate::method::ClientMethod::GetBech32Hrp)
     Bech32Hrp(Hrp),

diff --git a/bindings/nodejs/CHANGELOG.md b/bindings/nodejs/CHANGELOG.md
@@ -25,7 +25,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `Account::{burn(), consolidateOutputs(), createAliasOutput(), meltNativeToken(), mintNativeToken(), createNativeToken(), mintNfts(), sendTransaction(), sendNativeTokens(), sendNft()}` methods;
 
-## 1.0.10 - 2023-mm-dd
+## 1.0.11 - 2023-09-14
+
+### Fixed
+
+- `Client::getNetworkId()` return type;
+- `RegularTransactionEssence::networkId` type;
+- `FilterOptions::outputTypes` type;
+
+## 1.0.10 - 2023-09-12
+
+### Changed
+
+- `migrateDbChrysalisToStardust()` returns an error if no chrysalis data was found;
 
 ### Fixed
 

diff --git a/bindings/nodejs/Cargo.toml b/bindings/nodejs/Cargo.toml
@@ -35,7 +35,7 @@ neon = { version = "0.10.1", default-features = false, features = [
     "promise-api",
 ] }
 once_cell = { version = "1.18.0", default-features = false }
-serde_json = { version = "1.0.105", default-features = false }
+serde_json = { version = "1.0.107", default-features = false }
 tokio = { version = "1.32.0", default-features = false }
 
 [profile.production]