Integrate product core into identity.rs

.github/workflows/build-and-test.yml

@@ -260,14 +260,6 @@ jobs:
         run: npm ci
         working-directory: bindings/wasm/identity_wasm
 
-      - name: Install JS dependencies # This is problematic: @iota/iota-sdk seems to not get used from the identity_wasm package, that is why reinstall deps here
-        run: npm ci
-        working-directory: bindings/wasm/iota_interaction_ts
-
-      - name: Setup link
-        run: npm link ../iota_interaction_ts
-        working-directory: bindings/wasm/identity_wasm
-
       - name: Run Wasm examples
         run: npm run test:readme && npm run test:node
         working-directory: bindings/wasm/identity_wasm
@@ -299,14 +291,6 @@ jobs:
           name: identity-wasm-bindings-build
           path: bindings/wasm/
 
-      - name: Install JS dependencies # This is problematic: @iota/iota-sdk seems to not get used from the identity_wasm package, that is why reinstall deps here
-        run: npm ci
-        working-directory: bindings/wasm/iota_interaction_ts
-
-      - name: Setup link
-        run: npm link ../iota_interaction_ts
-        working-directory: bindings/wasm/identity_wasm
-
       - name: Start iota sandbox
         uses: './.github/actions/iota-rebase-sandbox/setup'
         with:

.github/workflows/shared-build-wasm.yml

@@ -69,14 +69,6 @@ jobs:
         with:
           node-version: 20.x
 
-      - name: Install JS dependencies
-        run: npm ci
-        working-directory: bindings/wasm/iota_interaction_ts
-
-      - name: Build IOTA interaction bindings
-        run: npm run build
-        working-directory: bindings/wasm/iota_interaction_ts
-
       - name: Install JS dependencies
         run: npm ci
         working-directory: bindings/wasm/identity_wasm
@@ -104,7 +96,5 @@ jobs:
             bindings/wasm/identity_wasm/web
             bindings/wasm/identity_wasm/examples/dist
             bindings/wasm/identity_wasm/docs
-            bindings/wasm/iota_interaction_ts/node
-            bindings/wasm/iota_interaction_ts/web
           if-no-files-found: error
           retention-days: 1

Cargo.toml

@@ -23,20 +23,33 @@ members = [
   "identity_ecdsa_verifier",
   "identity_eddsa_verifier",
   "examples",
-  "identity_iota_interaction",
-  "bindings/wasm/iota_interaction_ts",
+  "identity_iota_move_calls",
 ]
 
 exclude = ["bindings/wasm/identity_wasm", "bindings/grpc"]
 
 [workspace.dependencies]
 bls12_381_plus = { version = "0.8.17" }
-serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
+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"] }
+strum = { version = "0.25", default-features = false, features = [
+  "std",
+  "derive",
+] }
 thiserror = { version = "1.0", default-features = false }
 json-proof-token = { version = "0.3.5" }
-zkryptium = { version = "0.2.2", default-features = false, features = ["bbsplus"] }
+zkryptium = { version = "0.2.2", default-features = false, features = [
+  "bbsplus",
+] }
 
 [workspace.lints.clippy]
 result_large_err = "allow"

bindings/wasm/README.md

@@ -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
 

bindings/wasm/identity_wasm/Cargo.toml

@@ -38,6 +38,14 @@ tokio = { version = "1.43", default-features = false, features = ["sync"] }
 tsify = "0.4.5"
 wasm-bindgen = { version = "0.2.100", features = ["serde-serialize"] }
 wasm-bindgen-futures = { version = "0.4", default-features = false }
+product-core = { git = "https://github.com/iotaledger/product-core.git", branch = "feat/transaction-client-core-for-identity", package = "product_common",  features = ["core-client", "transaction"] }
+iota_interaction = { git = "https://github.com/iotaledger/product-core.git", branch = "feat/transaction-client-core-for-identity", package = "iota_interaction", default-features = false, optional = true }
+
+# 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 }
+
 
 [dependencies.identity_iota]
 path = "../../../identity_iota"
@@ -53,11 +61,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"] }
 
@@ -81,5 +84,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"] # TODO: Rename this feature or remove it
 keytool = ["dep:iota_interaction_ts", "iota_interaction_ts/keytool", "identity_iota/keytool"]

bindings/wasm/identity_wasm/lib/index.ts

@@ -14,5 +14,7 @@ export * from "./core_client";
 export * from "./proposal";
 export * from "./transaction_internal";
 
+export * as move_calls from "./move_calls";
+
 // keep this export last to override the original `Resolver` from `identity_wasm` in the exports
 export { Resolver } from "./resolver";

bindings/wasm/identity_wasm/lib/tsconfig.json

@@ -7,8 +7,8 @@
         "../node/identity_wasm",
         "./identity_wasm.js"
       ],
-      "@iota/iota-interaction-ts/": [
-        "@iota/iota-interaction-ts/node/"
+      "@iota/iota-move-calls-identity/": [
+        "@iota/iota-move-calls-identity/node/"
       ],
       "../lib": [
         "."

bindings/wasm/identity_wasm/lib/tsconfig.web.json

@@ -7,8 +7,8 @@
         "../web/identity_wasm",
         "./identity_wasm.js"
       ],
-      "@iota/iota-interaction-ts/": [
-        "@iota/iota-interaction-ts/web/"
+      "@iota/iota-move-calls-identity/": [
+        "@iota/iota-move-calls-identity/web/"
       ],
       "../lib": [
         "."

bindings/wasm/identity_wasm/package.json

@@ -74,7 +74,7 @@
     "wasm-opt": "^1.4.0"
   },
   "dependencies": {
-    "@iota/iota-interaction-ts": "^0.3.0",
+    "@iota/iota-interaction-ts": "^0.4.1",
     "@noble/ed25519": "^1.7.3",
     "@noble/hashes": "^1.4.0",
     "@types/node-fetch": "^2.6.2",

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

@@ -7,8 +7,8 @@ use identity_iota::iota::rebased::migration::DelegateToken;
 use identity_iota::iota::rebased::migration::DelegationToken;
 use identity_iota::iota::rebased::migration::DelegationTokenRevocation;
 use identity_iota::iota::rebased::migration::DeleteDelegationToken;
-use identity_iota::iota::rebased::transaction_builder::Transaction as _;
-use identity_iota::iota::rebased::transaction_builder::TransactionBuilder;
+use product_core::transaction::transaction_builder::TransactionBuilder;
+use product_core::transaction::transaction_builder::Transaction as _;
 use iota_interaction_ts::bindings::WasmIotaTransactionBlockEffects;
 use js_sys::Object;
 use wasm_bindgen::prelude::wasm_bindgen;

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

@@ -1,13 +1,13 @@
 // Copyright 2020-2025 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use identity_iota::iota::rebased::client::CoreClient;
-use identity_iota::iota::rebased::client::CoreClientReadOnly;
-use identity_iota::iota::NetworkName;
+use product_core::core_client::CoreClient;
+use product_core::core_client::CoreClientReadOnly;
+use product_core::network_name::NetworkName;
 use identity_iota::iota_interaction::types::base_types::IotaAddress;
-use identity_iota::iota_interaction::types::base_types::ObjectID;
-use identity_iota::iota_interaction::types::base_types::ObjectIDParseError;
-use identity_iota::iota_interaction::types::crypto::PublicKey;
+use iota_interaction::types::base_types::ObjectID;
+use iota_interaction::types::base_types::ObjectIDParseError;
+use iota_interaction::types::crypto::PublicKey;
 use iota_interaction_ts::bindings::WasmIotaClient;
 use iota_interaction_ts::IotaClientAdapter;
 use iota_interaction_ts::WasmPublicKey;

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

@@ -7,7 +7,7 @@ use identity_iota::iota::rebased::migration::ControllerToken;
 use identity_iota::iota::rebased::migration::CreateIdentity;
 use identity_iota::iota::rebased::migration::IdentityBuilder;
 use identity_iota::iota::rebased::migration::OnChainIdentity;
-use identity_iota::iota::rebased::transaction_builder::Transaction;
+use product_core::transaction::transaction_builder::{Transaction};
 use identity_iota::iota::IotaDocument;
 use iota_interaction_ts::bindings::WasmIotaTransactionBlockEffects;
 use iota_interaction_ts::error::WasmResult as _;

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

@@ -7,11 +7,11 @@ use anyhow::anyhow;
 use anyhow::Context as _;
 use async_trait::async_trait;
 use fastcrypto::traits::EncodeDecodeBase64;
-use identity_iota::iota::rebased::client::CoreClientReadOnly;
-use identity_iota::iota::rebased::transaction::TransactionOutputInternal;
-use identity_iota::iota::rebased::transaction_builder::MutGasDataRef;
-use identity_iota::iota::rebased::transaction_builder::Transaction;
-use identity_iota::iota::rebased::transaction_builder::TransactionBuilder;
+use product_core::core_client::CoreClientReadOnly;
+use product_core::transaction::TransactionOutputInternal;
+use product_core::transaction::transaction_builder::MutGasDataRef;
+use product_core::transaction::transaction_builder::Transaction;
+use product_core::transaction::transaction_builder::TransactionBuilder;
 use identity_iota::iota::rebased::Error as IotaError;
 use identity_iota::iota_interaction::rpc_types::IotaTransactionBlockEffects;
 use identity_iota::iota_interaction::types::crypto::Signature;
@@ -57,8 +57,9 @@ extern "C" {
 #[async_trait(?Send)]
 impl Transaction for WasmTransaction {
   type Output = JsValue;
+  type Error = IotaError;
 
-  async fn build_programmable_transaction<C>(&self, client: &C) -> StdResult<ProgrammableTransaction, IotaError>
+  async fn build_programmable_transaction<C>(&self, client: &C) -> StdResult<ProgrammableTransaction, Self::Error>
   where
     C: CoreClientReadOnly,
   {

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

@@ -5,12 +5,12 @@ use std::ops::Deref;
 use std::rc::Rc;
 
 use anyhow::anyhow;
-use identity_iota::iota::rebased::client::CoreClient as _;
+use product_core::core_client::CoreClient as _;
 use identity_iota::iota::rebased::client::IdentityClient;
 use identity_iota::iota::rebased::client::PublishDidDocument;
-use identity_iota::iota::rebased::transaction::TransactionOutputInternal;
+use product_core::transaction::TransactionOutputInternal;
 
-use identity_iota::iota::rebased::transaction_builder::Transaction as _;
+use product_core::transaction::transaction_builder::{Transaction};
 use iota_interaction_ts::bindings::WasmExecutionStatus;
 use iota_interaction_ts::bindings::WasmIotaClient;
 use iota_interaction_ts::bindings::WasmIotaTransactionBlockEffects;