Merge branch '2.0' into semantic-optional-unlocks

iotaledger · Nov 30, 2023 · 027e155 · 027e155
2 parents 4a5add5 + 2ef44ee
commit 027e155
Show file tree

Hide file tree

Showing 91 changed files with 370 additions and 71 deletions.
diff --git a/.github/workflows/bindings-wasm-publish.yml b/.github/workflows/bindings-wasm-publish.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Install wasm-bindgen-cli
         uses: jetli/[email protected]
         with:
-          version: "0.2.87"
+          version: "0.2.89"
 
       - name: Set up Node.js
         uses: actions/setup-node@v3

diff --git a/.github/workflows/bindings-wasm.yml b/.github/workflows/bindings-wasm.yml
@@ -65,7 +65,7 @@ jobs:
       - name: Install wasm-bindgen-cli
         uses: jetli/[email protected]
         with:
-          version: "0.2.88"
+          version: "0.2.89"
 
       - name: Set Up Node.js ${{ matrix.node }} and Yarn Cache
         uses: actions/setup-node@v3

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindings/core/Cargo.toml b/bindings/core/Cargo.toml
@@ -26,12 +26,12 @@ log = { version = "0.4.20", default-features = false }
 packable = { version = "0.10.0", default-features = false }
 prefix-hex = { version = "0.7.1", default-features = false }
 primitive-types = { version = "0.12.2", default-features = false }
-serde = { version = "1.0.190", default-features = false }
-serde_json = { version = "1.0.107", default-features = false }
+serde = { version = "1.0.193", default-features = false }
+serde_json = { version = "1.0.108", default-features = false }
 thiserror = { version = "1.0.50", default-features = false }
-tokio = { version = "1.33.0", default-features = false }
+tokio = { version = "1.34.0", default-features = false }
 url = { version = "2.4.1", default-features = false, features = ["serde"] }
-zeroize = { version = "1.6.0", default-features = false }
+zeroize = { version = "1.7.0", default-features = false }
 
 [dev-dependencies]
 pretty_assertions = { version = "1.4.0", default-features = false, features = [

diff --git a/bindings/nodejs/Cargo.toml b/bindings/nodejs/Cargo.toml
@@ -33,9 +33,9 @@ log = { version = "0.4.20", default-features = false }
 napi = { version = "2.13.3", default-features = false, features = ["async"] }
 napi-derive = { version = "2.13.0", default-features = false }
 once_cell = { version = "1.18.0", default-features = false }
-serde_json = { version = "1.0.107", default-features = false }
+serde_json = { version = "1.0.108", default-features = false }
 thiserror = { version = "1.0.49", default-features = false }
-tokio = { version = "1.33.0", default-features = false }
+tokio = { version = "1.34.0", default-features = false }
 
 [build-dependencies]
 napi-build = { version = "2.0.1", default-features = false }

diff --git a/bindings/python/Cargo.toml b/bindings/python/Cargo.toml
@@ -33,5 +33,5 @@ pyo3 = { version = "0.20.0", default-features = false, features = [
     "macros",
     "extension-module",
 ] }
-serde_json = { version = "1.0.107", default-features = false }
-tokio = { version = "1.33.0", default-features = false }
+serde_json = { version = "1.0.108", default-features = false }
+tokio = { version = "1.34.0", default-features = false }
diff --git a/bindings/wasm/Cargo.toml b/bindings/wasm/Cargo.toml
@@ -24,20 +24,20 @@ iota-sdk-bindings-core = { path = "../core", default-features = false, features
 ] }
 
 console_error_panic_hook = { version = "0.1.7", default-features = false }
-js-sys = { version = "0.3.64", default-features = false, features = [] }
+js-sys = { version = "0.3.66", default-features = false, features = [] }
 log = { version = "0.4.20", default-features = false }
-serde_json = { version = "1.0.107", default-features = false }
-tokio = { version = "1.33.0", default-features = false, features = ["sync"] }
-wasm-bindgen = { version = "0.2.88", default-features = false, features = [
+serde_json = { version = "1.0.108", default-features = false }
+tokio = { version = "1.34.0", default-features = false, features = ["sync"] }
+wasm-bindgen = { version = "0.2.89", default-features = false, features = [
     "spans",
     "std",
     "serde-serialize",
 ] }
-wasm-bindgen-futures = { version = "0.4.37", default-features = false }
+wasm-bindgen-futures = { version = "0.4.39", default-features = false }
 wasm-logger = { version = "0.2.0", default-features = false }
 
 [target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'.dependencies]
-getrandom = { version = "0.2.10", default-features = false, features = ["js"] }
+getrandom = { version = "0.2.11", default-features = false, features = ["js"] }
 instant = { version = "0.1.12", default-features = false, features = [
     "wasm-bindgen",
 ] }
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -25,7 +25,7 @@ iota-sdk = { path = "../sdk", default-features = false, features = [
 ] }
 
 chrono = { version = "0.4.31", default-features = false, features = ["std"] }
-clap = { version = "4.4.7", default-features = false, features = [
+clap = { version = "4.4.10", default-features = false, features = [
     "std",
     "color",
     "help",
@@ -44,10 +44,10 @@ fern-logger = { version = "0.5.0", default-features = false }
 log = { version = "0.4.20", default-features = false }
 prefix-hex = { version = "0.7.1", default-features = false, features = ["std"] }
 rustyline = { version = "12.0.0", features = ["derive"] }
-serde_json = { version = "1.0.107", default-features = false }
+serde_json = { version = "1.0.108", default-features = false }
 thiserror = { version = "1.0.50", default-features = false }
-tokio = { version = "1.33.0", default-features = false, features = ["fs"] }
-zeroize = { version = "1.6.0", default-features = false }
+tokio = { version = "1.34.0", default-features = false, features = ["fs"] }
+zeroize = { version = "1.7.0", default-features = false }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = { version = "0.3.9", default-features = false }

diff --git a/sdk/CHANGELOG.md b/sdk/CHANGELOG.md
@@ -29,6 +29,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Display of `WalletError::InsufficientFunds`;
 
+### Fixed
+
+- `needs_blind_signing()` for non Ed25519 addresses;
+
 ## 1.1.2 - 2023-10-26
 
 ### Added

diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -34,7 +34,7 @@ derive_more = { version = "0.99.17", default-features = false, features = [
 ] }
 derive_setters = { version = "0.1.6", default-features = false }
 getset = { version = "0.1.2", default-features = false }
-hashbrown = { version = "0.14.2", default-features = false, features = [
+hashbrown = { version = "0.14.3", default-features = false, features = [
     "ahash",
     "inline-more",
 ] }
@@ -53,8 +53,8 @@ prefix-hex = { version = "0.7.1", default-features = false, features = [
     "primitive-types",
 ] }
 primitive-types = { version = "0.12.2", default-features = false }
-serde = { version = "1.0.190", default-features = false, features = ["derive"] }
-serde_json = { version = "1.0.107", default-features = false, features = [
+serde = { version = "1.0.193", default-features = false, features = ["derive"] }
+serde_json = { version = "1.0.108", default-features = false, features = [
     "alloc",
 ] }
 
@@ -86,21 +86,21 @@ rocksdb = { version = "0.21.0", default-features = false, features = [
 rumqttc = { version = "0.23.0", default-features = false, features = [
     "websocket",
 ], optional = true }
-serde_repr = { version = "0.1.16", default-features = false, optional = true }
+serde_repr = { version = "0.1.17", default-features = false, optional = true }
 thiserror = { version = "1.0.50", default-features = false, optional = true }
 time = { version = "0.3.30", default-features = false, features = [
     "serde",
     "macros",
 ], optional = true }
-url = { version = "2.4.1", default-features = false, features = [
+url = { version = "2.5.0", default-features = false, features = [
     "serde",
 ], optional = true }
-zeroize = { version = "1.6.0", default-features = false, features = [
+zeroize = { version = "1.7.0", default-features = false, features = [
     "zeroize_derive",
 ], optional = true }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
-tokio = { version = "1.33.0", default-features = false, features = [
+tokio = { version = "1.34.0", default-features = false, features = [
     "macros",
     "rt-multi-thread",
     "time",
@@ -116,13 +116,13 @@ instant = { version = "0.1.12", default-features = false, features = [
     "wasm-bindgen",
 ], optional = true }
 lazy_static = { version = "1.4.0", default-features = false }
-tokio = { version = "1.33.0", default-features = false, features = [
+tokio = { version = "1.34.0", default-features = false, features = [
     "macros",
     "rt",
     "time",
     "sync",
 ], optional = true }
-wasm-bindgen-futures = { version = "0.4.37", default-features = false, optional = true }
+wasm-bindgen-futures = { version = "0.4.39", default-features = false, optional = true }
 
 [dev-dependencies]
 iota-sdk = { path = ".", default-features = false, features = ["rand"] }
@@ -134,7 +134,7 @@ dotenvy = { version = "0.15.7", default-features = false }
 fern-logger = { version = "0.5.0", default-features = false }
 num_cpus = { version = "1.16.0", default-features = false }
 once_cell = { version = "1.18.0", default-features = false }
-tokio = { version = "1.33.0", default-features = false, features = [
+tokio = { version = "1.34.0", default-features = false, features = [
     "macros",
     "rt",
     "rt-multi-thread",

diff --git a/sdk/examples/client/01_generate_addresses.rs b/sdk/examples/client/01_generate_addresses.rs
@@ -19,6 +19,10 @@ async fn main() -> Result<()> {
     // This example uses secrets in environment variables for simplicity which should not be done in production.
     dotenvy::dotenv().ok();
 
+    for var in ["NODE_URL", "MNEMONIC"] {
+        std::env::var(var).unwrap_or_else(|_| panic!(".env variable '{var}' is undefined, see .env.example"));
+    }
+
     // Create a node client.
     let client = Client::builder()
         .with_node(&std::env::var("NODE_URL").unwrap())?

diff --git a/sdk/examples/client/02_address_balance.rs b/sdk/examples/client/02_address_balance.rs
@@ -22,6 +22,10 @@ async fn main() -> Result<()> {
     // This example uses secrets in environment variables for simplicity which should not be done in production.
     dotenvy::dotenv().ok();
 
+    for var in ["NODE_URL", "MNEMONIC"] {
+        std::env::var(var).unwrap_or_else(|_| panic!(".env variable '{var}' is undefined, see .env.example"));
+    }
+
     // Create a node client.
     let client = Client::builder()
         .with_node(&std::env::var("NODE_URL").unwrap())?

diff --git a/sdk/examples/client/block/00_block_no_payload.rs b/sdk/examples/client/block/00_block_no_payload.rs
@@ -23,6 +23,10 @@ async fn main() -> Result<()> {
     // This example uses secrets in environment variables for simplicity which should not be done in production.
     dotenvy::dotenv().ok();
 
+    for var in ["NODE_URL", "EXPLORER_URL"] {
+        std::env::var(var).unwrap_or_else(|_| panic!(".env variable '{var}' is undefined, see .env.example"));
+    }
+
     let node_url = std::env::var("NODE_URL").unwrap();
     let issuer_id = std::env::var("ISSUER_ID").unwrap().parse::<AccountId>().unwrap();
 

diff --git a/sdk/examples/client/block/01_block_confirmation_time.rs b/sdk/examples/client/block/01_block_confirmation_time.rs
@@ -23,6 +23,10 @@ async fn main() -> Result<()> {
     // This example uses secrets in environment variables for simplicity which should not be done in production.
     dotenvy::dotenv().ok();
 
+    for var in ["NODE_URL", "EXPLORER_URL"] {
+        std::env::var(var).unwrap_or_else(|_| panic!(".env variable '{var}' is undefined, see .env.example"));
+    }
+
     let node_url = std::env::var("NODE_URL").unwrap();
     let issuer_id = std::env::var("ISSUER_ID").unwrap().parse::<AccountId>().unwrap();
 

diff --git a/sdk/examples/client/block/02_block_custom_parents.rs b/sdk/examples/client/block/02_block_custom_parents.rs
@@ -23,6 +23,10 @@ async fn main() -> Result<()> {
     // This example uses secrets in environment variables for simplicity which should not be done in production.
     dotenvy::dotenv().ok();
 
+    for var in ["NODE_URL", "EXPLORER_URL"] {
+        std::env::var(var).unwrap_or_else(|_| panic!(".env variable '{var}' is undefined, see .env.example"));
+    }
+
     let node_url = std::env::var("NODE_URL").unwrap();
     let issuer_id = std::env::var("ISSUER_ID").unwrap().parse::<AccountId>().unwrap();
 

diff --git a/sdk/examples/client/block/03_block_custom_payload.rs b/sdk/examples/client/block/03_block_custom_payload.rs
@@ -26,6 +26,10 @@ async fn main() -> Result<()> {
     // This example uses secrets in environment variables for simplicity which should not be done in production.
     dotenvy::dotenv().ok();
 
+    for var in ["NODE_URL", "EXPLORER_URL"] {
+        std::env::var(var).unwrap_or_else(|_| panic!(".env variable '{var}' is undefined, see .env.example"));
+    }
+
     let node_url = std::env::var("NODE_URL").unwrap();
     let issuer_id = std::env::var("ISSUER_ID").unwrap().parse::<AccountId>().unwrap();
 

diff --git a/sdk/examples/client/block/04_block_tagged_data.rs b/sdk/examples/client/block/04_block_tagged_data.rs
@@ -26,6 +26,10 @@ async fn main() -> Result<()> {
     // This example uses secrets in environment variables for simplicity which should not be done in production.
     dotenvy::dotenv().ok();
 
+    for var in ["NODE_URL", "EXPLORER_URL"] {
+        std::env::var(var).unwrap_or_else(|_| panic!(".env variable '{var}' is undefined, see .env.example"));
+    }
+
     let node_url = std::env::var("NODE_URL").unwrap();
     let issuer_id = std::env::var("ISSUER_ID").unwrap().parse::<AccountId>().unwrap();
 

diff --git a/sdk/examples/client/get_block.rs b/sdk/examples/client/get_block.rs
@@ -15,6 +15,11 @@ async fn main() -> Result<()> {
     // This example uses secrets in environment variables for simplicity which should not be done in production.
     dotenvy::dotenv().ok();
 
+    #[allow(clippy::single_element_loop)]
+    for var in ["NODE_URL"] {
+        std::env::var(var).unwrap_or_else(|_| panic!(".env variable '{var}' is undefined, see .env.example"));
+    }
+
     // Create a node client.
     let client = Client::builder()
         .with_node(&std::env::var("NODE_URL").unwrap())?

diff --git a/sdk/examples/client/high_level/consolidation.rs b/sdk/examples/client/high_level/consolidation.rs
@@ -15,6 +15,10 @@ async fn main() -> Result<()> {
     // This example uses secrets in environment variables for simplicity which should not be done in production.
     dotenvy::dotenv().ok();
 
+    for var in ["NODE_URL", "EXPLORER_URL", "MNEMONIC"] {
+        std::env::var(var).unwrap_or_else(|_| panic!(".env variable '{var}' is undefined, see .env.example"));
+    }
+
     let address_range_start = std::env::args().nth(1).map(|s| s.parse::<u32>().unwrap()).unwrap_or(0);
     let address_range_len = std::env::args().nth(2).map(|s| s.parse::<u32>().unwrap()).unwrap_or(10);
 

diff --git a/sdk/examples/client/high_level/inputs_from_transaction_id.rs b/sdk/examples/client/high_level/inputs_from_transaction_id.rs
@@ -20,6 +20,11 @@ async fn main() -> Result<()> {
     // This example uses secrets in environment variables for simplicity which should not be done in production.
     dotenvy::dotenv().ok();
 
+    #[allow(clippy::single_element_loop)]
+    for var in ["NODE_URL"] {
+        std::env::var(var).unwrap_or_else(|_| panic!(".env variable '{var}' is undefined, see .env.example"));
+    }
+
     let node_url = std::env::var("NODE_URL").unwrap();
 
     // Create a node client.