Integrate product core into identity.rs (#1658)

Author: chrisgitiota

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

@@ -243,7 +243,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: identity-wasm-bindings-build
-          path: bindings/wasm/
+          path: bindings/wasm/identity_wasm
 
       - name: Start iota sandbox
         uses: './.github/actions/iota-rebase-sandbox/setup'
@@ -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
@@ -297,15 +289,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           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
+          path: bindings/wasm/identity_wasm
 
       - name: Start iota sandbox
         uses: './.github/actions/iota-rebase-sandbox/setup'

.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,14 +23,15 @@ members = [
   "identity_ecdsa_verifier",
   "identity_eddsa_verifier",
   "examples",
-  "identity_iota_interaction",
-  "bindings/wasm/iota_interaction_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", tag = "v0.1.0-alpha", package = "iota_interaction" }
+iota_interaction_ts = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.1.0-alpha", package = "iota_interaction_ts" }
+product_common = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.1.0-alpha", 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"] }
@@ -40,6 +41,7 @@ zkryptium = { version = "0.2.2", default-features = false, features = ["bbsplus"
 
 [workspace.lints.clippy]
 result_large_err = "allow"
+large_enum_variant = "allow"
 
 [profile.release.package.iota_interaction_ts]
 opt-level = 's'

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/build/replace_paths.js

@@ -39,6 +39,11 @@ function replace(tsconfig, dist, artifact, mode) {
                 value = path.relative(absoluteFilePath, absoluteIncludePath).replace(/\\/g, "/");
             }
 
+            if(key.endsWith('*')) {
+                console.log(`\t dropping '*' from ${key}`);
+                key = key.slice(0, -1);
+            }
+
             console.log(`\t replace ${key} with ${value}`);
             fileData = fileData.replaceAll(key, value);
         }

bindings/wasm/identity_wasm/Cargo.toml

@@ -25,9 +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.1.0-alpha", package = "iota_interaction", default-features = false }
+iota_interaction_ts = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.1.0-alpha", 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.1.0-alpha", package = "product_common", features = ["core-client", "transaction"] }
 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"
@@ -53,11 +56,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_0_2 = { package = "getrandom", version = "0.2", default-features = false, features = ["js"] }
 getrandom = { version = "0.3", default-features = false, features = ["wasm_js"] }
@@ -81,6 +79,5 @@ empty_docs = "allow"
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(wasm_bindgen_unstable_test_coverage)'] }
 
 [features]
-default = ["dummy-client"]
-dummy-client = ["dep:iota_interaction_ts"]
-keytool = ["dep:iota_interaction_ts", "iota_interaction_ts/keytool", "identity_iota/keytool"]
+default = []
+keytool = ["iota_interaction_ts/keytool", "identity_iota/keytool"]