Skip to content

Pin iota dependency version to v1.2.3 and use temp product-core branch #1685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion bindings/grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions bindings/wasm/identity_wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
4 changes: 2 additions & 2 deletions identity_iota/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
16 changes: 8 additions & 8 deletions identity_iota_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
11 changes: 7 additions & 4 deletions identity_iota_core/packages/iota_identity/Move.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions identity_jose/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
6 changes: 3 additions & 3 deletions identity_storage/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Loading