Skip to content

Integrate product core into identity.rs #1658

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 10 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
10 changes: 8 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,20 @@ members = [
"identity_ecdsa_verifier",
"identity_eddsa_verifier",
"examples",
"identity_iota_interaction",
"bindings/wasm/iota_interaction_ts",
"identity_iota_move_calls",
"bindings/wasm/iota_move_calls_ts",
]

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", branch = "feat/transaction-client-core-for-identity", package = "iota_interaction" }
#iota_interaction = { path = "../product-core/iota_interaction" }
iota_interaction_ts = { git = "https://github.com/iotaledger/product-core.git", branch = "feat/transaction-client-core-for-identity", package = "iota_interaction_ts" }
#iota_interaction_ts = { path = "../product-core/bindings/wasm/iota_interaction_ts" }
product_common = { git = "https://github.com/iotaledger/product-core.git", branch = "feat/transaction-client-core-for-identity", package = "product_common" }
#product_common = { path = "../product-core/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
4 changes: 2 additions & 2 deletions bindings/wasm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ Here is an overview of the existing artifacts:
* `identity_wasm`<br>
Exports the IdentityClient to TypeScript using wasm-bindgen generated wasm bindings

* `iota_interaction_ts`<br>
* `iota_move_calls_ts`<br>
Imports TypeScript IOTA Client SDK types using wasm-bindgen generated wasm bindings
and implements identity_iota_interaction traits (among others, IotaClient and MoveCall traits) for wasm32 platforms.
and implements identity_iota_move_calls traits for wasm32 platforms.

## Building an Artifact

Expand Down
12 changes: 6 additions & 6 deletions bindings/wasm/identity_wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ tsify = "0.4.5"
wasm-bindgen = { version = "0.2.100", features = ["serde-serialize"] }
wasm-bindgen-futures = { version = "0.4", default-features = false }

# dummy-client dependencies
iota_interaction_ts = { git = "https://github.com/iotaledger/product-core.git", branch = "feat/transaction-client-core-for-identity", package = "iota_interaction_ts", optional = true }
#iota_interaction_ts = { path = "../../../../product-core/bindings/wasm/iota_interaction_ts", optional = true }
iota_move_calls_ts = { version = "=1.6.0-alpha", path = "../iota_move_calls_ts", optional = true }

[dependencies.identity_iota]
path = "../../../identity_iota"
default-features = false
Expand All @@ -53,11 +58,6 @@ features = [
"jpt-bbs-plus",
]

# dummy-client dependencies
[dependencies.iota_interaction_ts]
path = "../iota_interaction_ts"
optional = true

[target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'.dependencies]
getrandom = { version = "0.2", default-features = false, features = ["js"] }

Expand All @@ -81,5 +81,5 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(wasm_bindgen_unstable_test

[features]
default = ["dummy-client"]
dummy-client = ["dep:iota_interaction_ts"]
dummy-client = ["dep:iota_interaction_ts", "iota_move_calls_ts"] # TODO: Rename this feature or remove it
keytool = ["dep:iota_interaction_ts", "iota_interaction_ts/keytool", "identity_iota/keytool"]
3 changes: 3 additions & 0 deletions bindings/wasm/identity_wasm/lib/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"@iota/iota-interaction-ts/": [
"@iota/iota-interaction-ts/node/"
],
"@iota/iota-move-calls-identity/": [
"@iota/iota-move-calls-identity/node/"
],
"../lib": [
"."
]
Expand Down
3 changes: 3 additions & 0 deletions bindings/wasm/identity_wasm/lib/tsconfig.web.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"@iota/iota-interaction-ts/": [
"@iota/iota-interaction-ts/web/"
],
"@iota/iota-move-calls-identity/": [
"@iota/iota-move-calls-identity/web/"
],
"../lib": [
"."
]
Expand Down
3 changes: 2 additions & 1 deletion bindings/wasm/identity_wasm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@
"wasm-opt": "^1.4.0"
},
"dependencies": {
"@iota/iota-interaction-ts": "^0.3.0",
"@iota/iota-interaction-ts": "file:../../../../product-core/bindings/wasm/iota_interaction_ts",
"@iota/iota-move-calls-identity": "file:../iota_move_calls_ts",
"@noble/ed25519": "^1.7.3",
"@noble/hashes": "^1.4.0",
"@types/node-fetch": "^2.6.2",
Expand Down
181 changes: 0 additions & 181 deletions bindings/wasm/iota_interaction_ts/lib/iota_client_helpers.ts

This file was deleted.

Loading
Loading