From 20a01343a89ff5ce45c22c655067d50b3c5e005e Mon Sep 17 00:00:00 2001 From: chrisgitiota Date: Fri, 20 Jun 2025 09:06:41 +0200 Subject: [PATCH 1/3] Pin iota dependency version to v1.2.3 and temporarily use product-core branch chore/pin-iota-dependency-to-v1-2-3 --- Cargo.toml | 6 +++--- bindings/grpc/Cargo.toml | 2 +- bindings/wasm/identity_wasm/Cargo.toml | 18 +++++++++++++++--- examples/Cargo.toml | 4 ++-- identity_iota/Cargo.toml | 4 ++-- identity_iota_core/Cargo.toml | 16 ++++++++-------- .../packages/iota_identity/Move.toml | 11 +++++++---- identity_jose/Cargo.toml | 4 ++-- identity_storage/Cargo.toml | 6 +++--- 9 files changed, 43 insertions(+), 28 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e18a1291b2..22514a0c6b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,9 +29,9 @@ 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.2.1", package = "iota_interaction" } -iota_interaction_ts = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "iota_interaction_ts" } -product_common = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "product_common" } +iota_interaction = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "iota_interaction" } +iota_interaction_ts = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "iota_interaction_ts" } +product_common = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "product_common" } serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] } serde_json = { version = "1.0", default-features = false } strum = { version = "0.25", default-features = false, features = ["std", "derive"] } diff --git a/bindings/grpc/Cargo.toml b/bindings/grpc/Cargo.toml index a9265ef4ac..dfa20915d1 100644 --- a/bindings/grpc/Cargo.toml +++ b/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 = "v0.12.0-rc" } +iota-sdk = { git = "https://github.com/iotaledger/iota.git", package = "iota-sdk", tag = "v1.2.3" } iota-sdk-legacy = { package = "iota-sdk", version = "1.1.2", features = ["stronghold"] } prost = "0.13" rand = "0.8.5" diff --git a/bindings/wasm/identity_wasm/Cargo.toml b/bindings/wasm/identity_wasm/Cargo.toml index ecac76c87b..fa7b344c66 100644 --- a/bindings/wasm/identity_wasm/Cargo.toml +++ b/bindings/wasm/identity_wasm/Cargo.toml @@ -25,12 +25,12 @@ identity_ecdsa_verifier = { path = "../../../identity_ecdsa_verifier", default-f identity_eddsa_verifier = { path = "../../../identity_eddsa_verifier", default-features = false, features = ["ed25519"] } # Remove iota-sdk dependency while working on issue #1445 iota-sdk = { version = "1.1.5", default-features = false, features = ["serde", "std"] } -iota_interaction = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "iota_interaction", default-features = false } -iota_interaction_ts = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "iota_interaction_ts" } +iota_interaction = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "iota_interaction", default-features = false } +iota_interaction_ts = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "iota_interaction_ts" } js-sys = { version = "0.3.61" } json-proof-token = "0.3.4" proc_typescript = { version = "0.1.0", path = "./proc_typescript" } -product_common = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "product_common", features = ["core-client", "transaction", "bindings"] } +product_common = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "product_common", features = ["core-client", "transaction", "bindings"] } 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" @@ -82,3 +82,15 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(wasm_bindgen_unstable_test [features] default = [] keytool = ["iota_interaction_ts/keytool", "identity_iota/keytool"] + +# Uncomment the following patch if you need to use a local `product-core` repository for development purposes. +# -------------------------------------------------------------------------- +# IMPORTANT: +# * Remember to comment out the patch before committing your changes. +# * Remember also to comment out the patch in the root workspace Cargo.toml file +# -------------------------------------------------------------------------- +[patch."https://github.com/iotaledger/product-core.git"] +iota_interaction = { version = "0.2.1", path = "../../../../product-core/iota_interaction" } +iota_interaction_rust = { version = "0.2.1", path = "../../../../product-core/iota_interaction_rust" } +iota_interaction_ts = { version = "0.2.1", path = "../../../../product-core/bindings/wasm/iota_interaction_ts" } +product_common = { version = "0.2.1", path = "../../../../product-core/product_common" } diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 0277760bbd..3838d28c51 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -10,10 +10,10 @@ anyhow = "1.0.62" identity_eddsa_verifier = { path = "../identity_eddsa_verifier", default-features = false, features = ["ed25519"] } identity_storage = { path = "../identity_storage" } identity_stronghold = { path = "../identity_stronghold", default-features = false, features = ["send-sync-storage"] } -iota-sdk = { git = "https://github.com/iotaledger/iota.git", package = "iota-sdk", tag = "v0.12.0-rc" } +iota-sdk = { git = "https://github.com/iotaledger/iota.git", package = "iota-sdk", tag = "v1.2.3" } iota-sdk-legacy = { package = "iota-sdk", version = "1.0", default-features = false, features = ["tls", "client", "stronghold"] } json-proof-token.workspace = true -product_common = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "product_common", features = ["core-client", "transaction"] } +product_common = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "product_common", features = ["core-client", "transaction"] } rand = "0.8.5" sd-jwt-payload = { version = "0.2.1", default-features = false, features = ["sha"] } secret-storage = { git = "https://github.com/iotaledger/secret-storage.git", tag = "v0.3.0" } diff --git a/identity_iota/Cargo.toml b/identity_iota/Cargo.toml index 63271f5326..4627457c66 100644 --- a/identity_iota/Cargo.toml +++ b/identity_iota/Cargo.toml @@ -24,13 +24,13 @@ identity_verification = { version = "=1.6.0-beta", path = "../identity_verificat iota_interaction.workspace = true [target.'cfg(target_arch = "wasm32")'.dependencies] -iota_interaction = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "iota_interaction", default-features = false } +iota_interaction = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "iota_interaction", default-features = false } [dev-dependencies] # required for doc test anyhow = "1.0.64" identity_iota = { version = "=1.6.0-beta", path = "./", features = ["memstore"] } -iota-sdk = { git = "https://github.com/iotaledger/iota.git", package = "iota-sdk", tag = "v0.12.0-rc" } +iota-sdk = { git = "https://github.com/iotaledger/iota.git", package = "iota-sdk", tag = "v1.2.3" } rand = "0.8.5" secret-storage = { git = "https://github.com/iotaledger/secret-storage.git", tag = "v0.3.0" } tokio = { version = "1.43", features = ["full"] } diff --git a/identity_iota_core/Cargo.toml b/identity_iota_core/Cargo.toml index 6542ef64e4..14e95e542c 100644 --- a/identity_iota_core/Cargo.toml +++ b/identity_iota_core/Cargo.toml @@ -24,7 +24,7 @@ num-derive = { version = "0.4", default-features = false } num-traits = { version = "0.2", default-features = false, features = ["std"] } once_cell = { version = "1.18", default-features = false, features = ["std"] } prefix-hex = { version = "0.7", default-features = false } -product_common = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "product_common", default-features = false } +product_common = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "product_common", default-features = false } ref-cast = { version = "1.0.14", default-features = false } serde.workspace = true serde_json.workspace = true @@ -46,16 +46,16 @@ serde-aux = { version = "4.5.0", optional = true } toml = "0.8.22" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -iota-config = { git = "https://github.com/iotaledger/iota.git", package = "iota-config", tag = "v0.12.0-rc", optional = true } -iota_interaction = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "iota_interaction", optional = true } -iota_interaction_rust = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "iota_interaction_rust", optional = true } -iota-sdk = { git = "https://github.com/iotaledger/iota.git", package = "iota-sdk", tag = "v0.12.0-rc", optional = true } -move-core-types = { git = "https://github.com/iotaledger/iota.git", package = "move-core-types", tag = "v0.12.0-rc", optional = true } -shared-crypto = { git = "https://github.com/iotaledger/iota.git", package = "shared-crypto", tag = "v0.12.0-rc", optional = true } +iota-config = { git = "https://github.com/iotaledger/iota.git", package = "iota-config", tag = "v1.2.3", optional = true } +iota_interaction = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "iota_interaction", optional = true } +iota_interaction_rust = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "iota_interaction_rust", optional = true } +iota-sdk = { git = "https://github.com/iotaledger/iota.git", package = "iota-sdk", tag = "v1.2.3", optional = true } +move-core-types = { git = "https://github.com/iotaledger/iota.git", package = "move-core-types", tag = "v1.2.3", optional = true } +shared-crypto = { git = "https://github.com/iotaledger/iota.git", package = "shared-crypto", tag = "v1.2.3", optional = true } tokio = { version = "1.43", default-features = false, features = ["macros", "sync", "rt", "process"] } [target.'cfg(target_arch = "wasm32")'.dependencies] -iota_interaction = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "iota_interaction", default-features = false, optional = true } +iota_interaction = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "iota_interaction", default-features = false, optional = true } # Dependency iota_interaction_ts is always used on wasm32 platform. It is not controlled by the "iota-client" feature # because it's unclear how to implement this. wasm32 build will most probably always use the "iota-client" feature diff --git a/identity_iota_core/packages/iota_identity/Move.toml b/identity_iota_core/packages/iota_identity/Move.toml index 8a282766ef..d3d6f46df9 100644 --- a/identity_iota_core/packages/iota_identity/Move.toml +++ b/identity_iota_core/packages/iota_identity/Move.toml @@ -7,10 +7,13 @@ edition = "2024" [dependencies] # 'tag' keyword not supported here, therefore use rev instead -# 'tag = "v0.12.0-rc"' equals 'rev = "7e49c58b826b34c8e2b61842ef13c8de35a0aee8"', which we use here -MoveStdlib = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/move-stdlib", rev = "7e49c58b826b34c8e2b61842ef13c8de35a0aee8" } -Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "7e49c58b826b34c8e2b61842ef13c8de35a0aee8" } -Stardust = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/stardust", rev = "7e49c58b826b34c8e2b61842ef13c8de35a0aee8" } + +# 'tag = "v1.2.3"' equals 'rev = "d9dbd00f5601f20f9d0d8381fc674f70869c7910"', which we use here +# Version-Tag-History: +# * v0.12.0-rc - "7e49c58b826b34c8e2b61842ef13c8de35a0aee8" +MoveStdlib = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/move-stdlib", rev = "d9dbd00f5601f20f9d0d8381fc674f70869c7910" } +Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "d9dbd00f5601f20f9d0d8381fc674f70869c7910" } +Stardust = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/stardust", rev = "d9dbd00f5601f20f9d0d8381fc674f70869c7910" } [addresses] iota_identity = "0x0" diff --git a/identity_jose/Cargo.toml b/identity_jose/Cargo.toml index ecb0a41ba4..df89589768 100644 --- a/identity_jose/Cargo.toml +++ b/identity_jose/Cargo.toml @@ -25,10 +25,10 @@ thiserror.workspace = true zeroize = { version = "1.6", default-features = false, features = ["std", "zeroize_derive"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -iota_interaction = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "iota_interaction" } +iota_interaction = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "iota_interaction" } [target.'cfg(target_arch = "wasm32")'.dependencies] -iota_interaction = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "iota_interaction", default-features = false } +iota_interaction = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "iota_interaction", default-features = false } [dev-dependencies] iota-crypto = { version = "0.23", features = ["ed25519", "random", "hmac"] } diff --git a/identity_storage/Cargo.toml b/identity_storage/Cargo.toml index f381f18695..99cfc4c520 100644 --- a/identity_storage/Cargo.toml +++ b/identity_storage/Cargo.toml @@ -37,17 +37,17 @@ tokio = { version = "1.43", default-features = false, features = ["macros", "syn zkryptium = { workspace = true, optional = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -iota_interaction = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "iota_interaction", optional = true } +iota_interaction = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "iota_interaction", optional = true } [target.'cfg(target_arch = "wasm32")'.dependencies] -iota_interaction = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "iota_interaction", default-features = false, optional = true } +iota_interaction = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "iota_interaction", default-features = false, optional = true } [dev-dependencies] identity_credential = { version = "=1.6.0-beta", path = "../identity_credential", features = ["revocation-bitmap"] } identity_ecdsa_verifier = { version = "=1.6.0-beta", path = "../identity_ecdsa_verifier", default-features = false, features = ["es256"] } identity_eddsa_verifier = { version = "=1.6.0-beta", path = "../identity_eddsa_verifier", default-features = false, features = ["ed25519"] } once_cell = { version = "1.18", default-features = false } -product_common = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "product_common", default-features = false } +product_common = { git = "https://github.com/iotaledger/product-core.git", branch = "chore/pin-iota-dependency-to-v1-2-3", package = "product_common", default-features = false } tokio = { version = "1.43", default-features = false, features = ["macros", "sync", "rt"] } [features] From 1bdc7b188875a6e28261d3220c63fae1d12ea389 Mon Sep 17 00:00:00 2001 From: chrisgitiota Date: Fri, 20 Jun 2025 14:14:13 +0200 Subject: [PATCH 2/3] Removed temporary patch for product-core dependencies --- bindings/wasm/identity_wasm/Cargo.toml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/bindings/wasm/identity_wasm/Cargo.toml b/bindings/wasm/identity_wasm/Cargo.toml index fa7b344c66..682427d944 100644 --- a/bindings/wasm/identity_wasm/Cargo.toml +++ b/bindings/wasm/identity_wasm/Cargo.toml @@ -83,14 +83,3 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(wasm_bindgen_unstable_test default = [] keytool = ["iota_interaction_ts/keytool", "identity_iota/keytool"] -# Uncomment the following patch if you need to use a local `product-core` repository for development purposes. -# -------------------------------------------------------------------------- -# IMPORTANT: -# * Remember to comment out the patch before committing your changes. -# * Remember also to comment out the patch in the root workspace Cargo.toml file -# -------------------------------------------------------------------------- -[patch."https://github.com/iotaledger/product-core.git"] -iota_interaction = { version = "0.2.1", path = "../../../../product-core/iota_interaction" } -iota_interaction_rust = { version = "0.2.1", path = "../../../../product-core/iota_interaction_rust" } -iota_interaction_ts = { version = "0.2.1", path = "../../../../product-core/bindings/wasm/iota_interaction_ts" } -product_common = { version = "0.2.1", path = "../../../../product-core/product_common" } From 342f2e9395113d7143a3b6bf6da985c782005547 Mon Sep 17 00:00:00 2001 From: chrisgitiota Date: Fri, 20 Jun 2025 14:36:15 +0200 Subject: [PATCH 3/3] Fix dprint issue --- bindings/wasm/identity_wasm/Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/bindings/wasm/identity_wasm/Cargo.toml b/bindings/wasm/identity_wasm/Cargo.toml index 682427d944..328442ba93 100644 --- a/bindings/wasm/identity_wasm/Cargo.toml +++ b/bindings/wasm/identity_wasm/Cargo.toml @@ -82,4 +82,3 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(wasm_bindgen_unstable_test [features] default = [] keytool = ["iota_interaction_ts/keytool", "identity_iota/keytool"] -