Update IOTA to v1.26.1 (#1834)

* update product-core and iota-types

* update SDK version

* cargo audit ignores

* point to notarization working branch

* point to tags instead of branches

Author: UMR1352

.cargo/audit.toml

@@ -9,4 +9,6 @@ ignore = [
   "RUSTSEC-2023-0065", # temporary ignore until fix is provided
   "RUSTSEC-2023-0071", # temporary ignore until fix is provided
   "RUSTSEC-2024-0437", # temporary ignore until fix is provided
+  "RUSTSEC-2026-0194", # should be fixed by next IOTA version
+  "RUSTSEC-2026-0195", # should be fixed by next IOTA version
 ]

Cargo.toml

@@ -30,10 +30,10 @@ exclude = ["bindings/wasm/identity_wasm", "bindings/grpc"]
 
 [workspace.dependencies]
 bls12_381_plus = { version = "0.8.17" }
-iota_interaction = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.8.21", package = "iota_interaction" }
-iota_interaction_ts = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.8.21", package = "iota_interaction_ts" }
-iota-sdk-types = { git = "https://github.com/iotaledger/iota-rust-sdk.git", rev = "35a27488b887e28e844a1e46d7edb78605871155", default-features = false }
-product_common = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.8.21", package = "product_common" }
+iota_interaction = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.8.22", package = "iota_interaction" }
+iota_interaction_ts = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.8.22", package = "iota_interaction_ts" }
+iota-sdk-types = { git = "https://github.com/iotaledger/iota-rust-sdk.git", rev = "36bffd625e1b1d38307eb9e49bd2cb7dd988bb11", default-features = false }
+product_common = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.8.22", package = "product_common" }
 serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
 serde_json = { version = "1.0", default-features = false }
 oqs = { version = "0.10", default-features = false, features = ["sigs", "std", "vendored"] }

bindings/grpc/Cargo.toml

@@ -24,7 +24,7 @@ identity_iota = { path = "../../identity_iota", features = ["resolver", "sd-jwt"
 identity_jose = { path = "../../identity_jose" }
 identity_storage = { path = "../../identity_storage", features = ["memstore"] }
 identity_stronghold = { path = "../../identity_stronghold", features = ["send-sync-storage"] }
-iota-sdk = { git = "https://github.com/iotaledger/iota.git", package = "iota-sdk", tag = "v1.25.0" }
+iota-sdk = { git = "https://github.com/iotaledger/iota.git", package = "iota-sdk", tag = "v1.26.1" }
 iota-sdk-legacy = { package = "iota-sdk", version = "1.1.2", features = ["stronghold"] }
 prost = "0.13"
 rand = "0.8.5"

bindings/grpc/tests/api/helpers.rs

@@ -26,7 +26,7 @@ use identity_iota::iota::rebased::transaction::Transaction;
 use iota_sdk_legacy::client::secret::stronghold::StrongholdSecretManager;
 use iota_sdk_legacy::client::stronghold::StrongholdAdapter;
 use iota_sdk_legacy::client::Password;
-use iota_sdk::types::base_types::IotaAddress;
+use iota_sdk_types::Address;
 use iota_sdk::IotaClient;
 use iota_sdk::IotaClientBuilder;
 use iota_sdk_types::ObjectId;
@@ -125,7 +125,7 @@ impl TestServer {
 pub async fn create_did<K, I>(
   client: &IdentityClientReadOnly,
   storage: &Storage<K, I>,
-) -> anyhow::Result<(IotaAddress, IotaDocument, KeyId, String)>
+) -> anyhow::Result<(Address, IotaDocument, KeyId, String)>
 where
   K: JwkStorage,
   I: KeyIdStorage,
@@ -179,7 +179,7 @@ where
 }
 
 /// Generates a new Ed25519 key pair
-pub async fn get_address<I, K>(storage: &Storage<K, I>) -> anyhow::Result<(IotaAddress, KeyId, Jwk)>
+pub async fn get_address<I, K>(storage: &Storage<K, I>) -> anyhow::Result<(Address, KeyId, Jwk)>
 where
   K: JwkStorage,
   I: KeyIdStorage,
@@ -198,11 +198,11 @@ where
 
   let address = Ed25519PublicKey::from_bytes(&pub_key_bytes)?;
 
-  Ok((IotaAddress::from(&address), key_id, pub_key_jwt))
+  Ok((Address::from(&address), key_id, pub_key_jwt))
 }
 
 /// Requests funds from the faucet for the given `address`.
-async fn request_faucet_funds(address: IotaAddress, faucet_endpoint: &str) -> anyhow::Result<()> {
+async fn request_faucet_funds(address: Address, faucet_endpoint: &str) -> anyhow::Result<()> {
   let output = Command::new("iota")
     .arg("client")
     .arg("faucet")
@@ -228,7 +228,7 @@ async fn request_faucet_funds(address: IotaAddress, faucet_endpoint: &str) -> an
 
 pub struct Entity<K, I> {
   storage: Storage<K, I>,
-  did: Option<(IotaAddress, IotaDocument, KeyId, String)>,
+  did: Option<(Address, IotaDocument, KeyId, String)>,
 }
 
 pub fn random_password(len: usize) -> Password {
@@ -323,15 +323,15 @@ pub fn make_stronghold() -> StrongholdAdapter {
     .expect("Failed to create temporary stronghold")
 }
 
-async fn get_active_address() -> anyhow::Result<IotaAddress> {
+async fn get_active_address() -> anyhow::Result<Address> {
   Command::new("iota")
     .arg("client")
     .arg("active-address")
     .arg("--json")
     .output()
     .await
     .context("Failed to execute command")
-    .and_then(|output| Ok(serde_json::from_slice::<IotaAddress>(&output.stdout)?))
+    .and_then(|output| Ok(serde_json::from_slice::<Address>(&output.stdout)?))
 }
 
 async fn init(iota_client: &IotaClient) -> anyhow::Result<ObjectId> {
@@ -361,7 +361,7 @@ async fn get_cached_id(network_id: &str) -> anyhow::Result<String> {
   }
 }
 
-async fn publish_package(active_address: IotaAddress) -> anyhow::Result<ObjectId> {
+async fn publish_package(active_address: Address) -> anyhow::Result<ObjectId> {
   let output = Command::new("sh")
     .current_dir(SCRIPT_DIR)
     .arg("publish_identity_package.sh")

bindings/wasm/identity_wasm/Cargo.toml

@@ -25,13 +25,13 @@ identity_ecdsa_verifier = { path = "../../../identity_ecdsa_verifier", default-f
 identity_eddsa_verifier = { path = "../../../identity_eddsa_verifier", default-features = false, features = ["ed25519"] }
 iota-caip = { git = "https://github.com/iotaledger/iota-caip.git", features = ["serde"] }
 iota-sdk = { version = "1.1.5", default-features = false, features = ["serde", "std"] }
-iota-sdk-types = { git = "https://github.com/iotaledger/iota-rust-sdk.git", rev = "35a27488b887e28e844a1e46d7edb78605871155", default-features = false }
-iota_interaction = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.8.21", package = "iota_interaction", default-features = false }
-iota_interaction_ts = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.8.21", package = "iota_interaction_ts" }
+iota-sdk-types = { git = "https://github.com/iotaledger/iota-rust-sdk.git", rev = "36bffd625e1b1d38307eb9e49bd2cb7dd988bb11", default-features = false }
+iota_interaction = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.8.22", package = "iota_interaction", default-features = false }
+iota_interaction_ts = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.8.22", package = "iota_interaction_ts" }
 js-sys = { version = "0.3.61" }
 json-proof-token = "0.4"
 proc_typescript = { version = "0.1.0", path = "./proc_typescript" }
-product_common = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.8.21", package = "product_common", features = ["core-client", "transaction", "bindings", "gas-station", "default-http-client"] }
+product_common = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.8.22", package = "product_common", features = ["core-client", "transaction", "bindings", "gas-station", "default-http-client"] }
 secret-storage = { git = "https://github.com/iotaledger/secret-storage.git", default-features = false, tag = "v0.3.0" }
 serde = { version = "1.0", features = ["derive"] }
 serde-wasm-bindgen = "0.6.5"

bindings/wasm/identity_wasm/src/rebased/identity.rs

@@ -9,10 +9,10 @@ use identity_iota::iota::rebased::migration::IdentityBuilder;
 use identity_iota::iota::rebased::migration::OnChainIdentity;
 use identity_iota::iota::rebased::Error as RebasedError;
 use identity_iota::iota::IotaDocument;
-use iota_interaction::types::base_types::IotaAddress;
 use iota_interaction_ts::bindings::WasmIotaTransactionBlockEffects;
 use iota_interaction_ts::core_client::WasmCoreClientReadOnly;
 use iota_interaction_ts::wasm_error::WasmError;
+use iota_sdk_types::Address;
 use iota_sdk_types::ObjectId;
 use js_sys::Object;
 use product_common::bindings::core_client::WasmManagedCoreClientReadOnly;
@@ -131,9 +131,7 @@ impl WasmOnChainIdentity {
     address: &str,
     client: &WasmIdentityClient,
   ) -> Result<Option<WasmControllerToken>> {
-    let address = address
-      .parse::<IotaAddress>()
-      .map_err(|e| JsError::new(&e.to_string()))?;
+    let address = address.parse::<Address>().map_err(|e| JsError::new(&e.to_string()))?;
     let maybe_controller_token = self
       .0
       .read()

bindings/wasm/identity_wasm/src/rebased/proposals/borrow.rs

@@ -14,12 +14,12 @@ use identity_iota::iota::rebased::proposals::ProposalResult;
 use identity_iota::iota::rebased::proposals::ProposalT as _;
 use iota_interaction::rpc_types::IotaObjectData;
 use iota_interaction::types::programmable_transaction_builder::ProgrammableTransactionBuilder;
-use iota_interaction::types::transaction::ProgrammableTransaction;
-use iota_interaction::types::transaction::TransactionKind;
 use iota_interaction_ts::bindings::WasmIotaTransactionBlockEffects;
 use iota_interaction_ts::core_client::WasmCoreClientReadOnly;
+use iota_sdk_types::transaction::TransactionKind;
 use iota_sdk_types::Argument;
 use iota_sdk_types::ObjectId;
+use iota_sdk_types::ProgrammableTransaction;
 use product_common::bindings::core_client::WasmManagedCoreClientReadOnly;
 use product_common::bindings::transaction::WasmTransactionBuilder;
 use product_common::core_client::CoreClientReadOnly;

bindings/wasm/identity_wasm/src/rebased/proposals/controller_execution.rs

@@ -11,14 +11,14 @@ use identity_iota::iota::rebased::proposals::ControllerExecution;
 use identity_iota::iota::rebased::proposals::ControllerIntentFnT;
 use identity_iota::iota::rebased::proposals::ProposalResult;
 use identity_iota::iota::rebased::proposals::ProposalT as _;
-use iota_interaction::types::base_types::IotaAddress;
 use iota_interaction::types::programmable_transaction_builder::ProgrammableTransactionBuilder;
-use iota_interaction::types::transaction::ProgrammableTransaction;
-use iota_interaction::types::transaction::TransactionKind;
 use iota_interaction_ts::bindings::WasmIotaTransactionBlockEffects;
 use iota_interaction_ts::core_client::WasmCoreClientReadOnly;
+use iota_sdk_types::transaction::TransactionKind;
+use iota_sdk_types::Address;
 use iota_sdk_types::Argument;
 use iota_sdk_types::ObjectId;
+use iota_sdk_types::ProgrammableTransaction;
 use product_common::bindings::core_client::WasmManagedCoreClientReadOnly;
 use product_common::bindings::transaction::WasmTransactionBuilder;
 use product_common::core_client::CoreClientReadOnly;
@@ -98,7 +98,7 @@ impl WasmControllerExecutionFn {
 #[wasm_bindgen(js_name = ControllerExecution, inspectable, getter_with_clone)]
 pub struct WasmControllerExecution {
   controller_cap: ObjectId,
-  identity: IotaAddress,
+  identity: Address,
   pub controller_exec_fn: Option<WasmControllerExecutionFn>,
 }
 

bindings/wasm/identity_wasm/src/rebased/proposals/mod.rs

@@ -18,7 +18,7 @@ pub use update_did::*;
 use std::collections::HashMap;
 use std::collections::HashSet;
 
-use identity_iota::iota_interaction::types::base_types::IotaAddress;
+use iota_sdk_types::Address;
 use iota_sdk_types::ObjectId;
 use js_sys::JsString;
 use js_sys::Reflect;
@@ -63,16 +63,16 @@ impl From<(String, String)> for StringCouple {
   }
 }
 
-impl TryFrom<MapStringNumber> for HashMap<IotaAddress, u64> {
+impl TryFrom<MapStringNumber> for HashMap<Address, u64> {
   type Error = JsValue;
   fn try_from(value: MapStringNumber) -> Result<Self, Self::Error> {
     Ok(serde_wasm_bindgen::from_value(value.into())?)
   }
 }
 
-impl TryFrom<&'_ HashMap<IotaAddress, u64>> for MapStringNumber {
+impl TryFrom<&'_ HashMap<Address, u64>> for MapStringNumber {
   type Error = JsValue;
-  fn try_from(value: &'_ HashMap<IotaAddress, u64>) -> Result<Self, Self::Error> {
+  fn try_from(value: &'_ HashMap<Address, u64>) -> Result<Self, Self::Error> {
     let js_value = serde_wasm_bindgen::to_value(value)?;
     js_value.dyn_into()
   }

bindings/wasm/identity_wasm/src/rebased/wasm_identity_client_read_only.rs

@@ -7,8 +7,8 @@ use std::str::FromStr;
 
 use identity_iota::iota::rebased::client::IdentityClientReadOnly;
 use identity_iota::iota::rebased::migration::Identity;
-use iota_interaction::types::base_types::IotaAddress;
 use iota_interaction_ts::bindings::WasmIotaClient;
+use iota_sdk_types::Address;
 use iota_sdk_types::ObjectId;
 use product_common::core_client::CoreClientReadOnly as _;
 use wasm_bindgen::prelude::*;
@@ -142,7 +142,7 @@ impl WasmIdentityClientReadOnly {
   /// @throws {Error} when the passed `address` string is not a valid IOTA address.
   #[wasm_bindgen(js_name = didsControlledBy)]
   pub async fn dids_controlled_by(&self, address: &str) -> Result<Vec<WasmIotaDID>, js_sys::Error> {
-    let address = IotaAddress::from_str(address).map_err(|e| js_sys::Error::new(&format!("{e:#}")))?;
+    let address = Address::from_str(address).map_err(|e| js_sys::Error::new(&format!("{e:#}")))?;
     let dids = self
       .0
       .dids_controlled_by(address)