Merge branch 'develop' into add-api-upload

bindings/core/Cargo.toml

@@ -25,11 +25,11 @@ iota-crypto = { version = "0.23.0", default-features = false, features = [
 log = { version = "0.4.20", default-features = false }
 packable = { version = "0.8.3", default-features = false }
 prefix-hex = { version = "0.7.1", default-features = false }
-primitive-types = { version = "0.12.1", default-features = false }
+primitive-types = { version = "0.12.2", default-features = false }
 serde = { version = "1.0.188", 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 }
+thiserror = { version = "1.0.49", default-features = false }
+tokio = { version = "1.33.0", default-features = false }
 zeroize = { version = "1.6.0", default-features = false }
 
 [features]

bindings/nodejs/CHANGELOG.md

@@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security -->
 
-## 1.1.1 - 2023-MM-DD
+## 1.1.1 - 2023-10-11
 
 ### Added
 
@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Added `SeedSecretManager` to `SecretManagerType`;
+- `migrateDbChrysalisToStardust()` for some ledger nano wallets;
 
 ### Removed
 

bindings/nodejs/Cargo.toml

@@ -26,7 +26,7 @@ iota-sdk-bindings-core = { path = "../core", default-features = false, features
     "participation",
     "rocksdb",
     "mqtt",
-    "private_key_secret_manager"
+    "private_key_secret_manager",
 ] }
 
 log = { version = "0.4.20", default-features = false }
@@ -37,7 +37,7 @@ neon = { version = "0.10.1", default-features = false, features = [
 ] }
 once_cell = { version = "1.18.0", default-features = false }
 serde_json = { version = "1.0.107", default-features = false }
-tokio = { version = "1.32.0", default-features = false }
+tokio = { version = "1.33.0", default-features = false }
 
 [profile.production]
 codegen-units = 1

bindings/python/Cargo.toml

@@ -34,4 +34,4 @@ pyo3 = { version = "0.19.2", default-features = false, features = [
     "extension-module",
 ] }
 serde_json = { version = "1.0.107", default-features = false }
-tokio = { version = "1.32.0", default-features = false }
+tokio = { version = "1.33.0", default-features = false }

bindings/wasm/Cargo.toml

@@ -26,7 +26,7 @@ console_error_panic_hook = { version = "0.1.7", default-features = false }
 js-sys = { version = "0.3.64", default-features = false, features = [] }
 log = { version = "0.4.20", default-features = false }
 serde_json = { version = "1.0.107", default-features = false }
-tokio = { version = "1.32.0", default-features = false, features = ["sync"] }
+tokio = { version = "1.33.0", default-features = false, features = ["sync"] }
 wasm-bindgen = { version = "0.2.87", default-features = false, features = [
     "spans",
     "std",

cli/Cargo.toml

@@ -22,7 +22,7 @@ iota-sdk = { path = "../sdk", default-features = false, features = [
 ] }
 
 chrono = { version = "0.4.31", default-features = false, features = ["std"] }
-clap = { version = "4.4.5", default-features = false, features = [
+clap = { version = "4.4.6", default-features = false, features = [
     "std",
     "color",
     "help",
@@ -43,8 +43,8 @@ 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 }
-thiserror = { version = "1.0.48", default-features = false }
-tokio = { version = "1.32.0", default-features = false, features = ["fs"] }
+thiserror = { version = "1.0.49", default-features = false }
+tokio = { version = "1.33.0", default-features = false, features = ["fs"] }
 zeroize = { version = "1.6.0", default-features = false }
 
 [target.'cfg(target_os = "windows")'.dependencies]

sdk/CHANGELOG.md

@@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security -->
 
-## 1.1.1 - 2023-MM-DD
+## 1.1.1 - 2023-10-11
 
 ### Added
 
@@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Update protocol params and addresses with correct bech32 HRP in `Wallet::set_client_options()`;
+- `migrate_db_chrysalis_to_stardust()` for some ledger nano wallets;
 
 ## 1.1.0 - 2023-09-29
 

sdk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iota-sdk"
-version = "1.1.0"
+version = "1.1.1"
 authors = ["IOTA Stiftung"]
 edition = "2021"
 description = "The IOTA SDK provides developers with a seamless experience to develop on IOTA by providing account abstractions and clients to interact with node APIs."
@@ -28,7 +28,7 @@ derive_more = { version = "0.99.17", default-features = false, features = [
     "deref_mut",
 ] }
 getset = { version = "0.1.2", default-features = false }
-hashbrown = { version = "0.14.0", default-features = false, features = [
+hashbrown = { version = "0.14.1", default-features = false, features = [
     "ahash",
     "inline-more",
 ] }
@@ -49,7 +49,7 @@ packable = { version = "0.8.3", default-features = false, features = [
 prefix-hex = { version = "0.7.1", default-features = false, features = [
     "primitive-types",
 ] }
-primitive-types = { version = "0.12.1", default-features = false }
+primitive-types = { version = "0.12.2", default-features = false }
 serde = { version = "1.0.188", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.107", default-features = false, features = [
     "alloc",
@@ -65,28 +65,28 @@ futures = { version = "0.3.28", default-features = false, features = [
 ], optional = true }
 heck = { version = "0.4.1", default-features = false, optional = true }
 instant = { version = "0.1.12", default-features = false, optional = true }
-iota-ledger-nano = { version = "1.0.0-alpha.5", default-features = false, optional = true }
+iota-ledger-nano = { version = "1.0.0", default-features = false, optional = true }
 iota_stronghold = { version = "2.0.0", default-features = false, optional = true }
 log = { version = "0.4.20", default-features = false, optional = true }
 num_cpus = { version = "1.16.0", default-features = false, optional = true }
 once_cell = { version = "1.18.0", default-features = false, optional = true }
 rand = { version = "0.8.5", default-features = false, features = [
     "min_const_gen",
 ], optional = true }
-regex = { version = "1.9.5", default-features = false, features = [
+regex = { version = "1.10.0", default-features = false, features = [
     "unicode-perl",
 ], optional = true }
-reqwest = { version = "0.11.20", default-features = false, features = [
+reqwest = { version = "0.11.22", default-features = false, features = [
     "json",
 ], optional = true }
 rocksdb = { version = "0.21.0", default-features = false, features = [
     "lz4",
 ], optional = true }
-rumqttc = { version = "0.22.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 }
-thiserror = { version = "1.0.48", default-features = false, optional = true }
+thiserror = { version = "1.0.49", default-features = false, optional = true }
 time = { version = "0.3.29", default-features = false, features = [
     "serde",
     "macros",
@@ -99,7 +99,7 @@ zeroize = { version = "1.6.0", default-features = false, features = [
 ], optional = true }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
-tokio = { version = "1.32.0", default-features = false, features = [
+tokio = { version = "1.33.0", default-features = false, features = [
     "macros",
     "rt-multi-thread",
     "time",
@@ -115,7 +115,7 @@ 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.32.0", default-features = false, features = [
+tokio = { version = "1.33.0", default-features = false, features = [
     "macros",
     "rt",
     "time",
@@ -128,7 +128,7 @@ iota-sdk = { path = ".", default-features = false, features = ["rand"] }
 
 dotenvy = { version = "0.15.7", default-features = false }
 fern-logger = { version = "0.5.0", default-features = false }
-tokio = { version = "1.32.0", default-features = false, features = [
+tokio = { version = "1.33.0", default-features = false, features = [
     "macros",
     "rt",
     "rt-multi-thread",

sdk/src/client/node_api/mqtt/mod.rs

@@ -107,8 +107,9 @@ async fn set_mqtt_client(client: &Client) -> Result<(), Error> {
                 mqtt_options
             };
             let (_, mut connection) = AsyncClient::new(mqtt_options.clone(), 10);
-            connection
-                .set_network_options(*NetworkOptions::new().set_connection_timeout(broker_options.timeout.as_secs()));
+            let mut network_options = NetworkOptions::new();
+            network_options.set_connection_timeout(broker_options.timeout.as_secs());
+            connection.set_network_options(network_options);
             // poll the event loop until we find a ConnAck event,
             // which means that the mqtt client is ready to be used on this host
             // if the event loop returns an error, we check the next node

sdk/src/wallet/migration/chrysalis.rs

@@ -319,7 +319,9 @@ pub(crate) mod rocksdb {
                 let value_utf8 =
                     String::from_utf8(value.to_vec()).map_err(|_| Error::Migration("invalid utf8".into()))?;
                 // "iota-wallet-key-checksum_value" is never an encrypted value
-                if key_utf8 == "iota-wallet-key-checksum_value" {
+                // "FIRST_LEDGER_ADDRESS" was at some point not re-encrypted with the correct password and should
+                // therefore also be ignored to not return an error
+                if key_utf8 == "iota-wallet-key-checksum_value" || key_utf8 == "FIRST_LEDGER_ADDRESS" {
                     value_utf8
                 } else if let Ok(value) = serde_json::from_str::<Vec<u8>>(&value_utf8) {
                     decrypt_record(value, encryption_key)?