Merge branch '2.0' into native-token-feature

iotaledger · Nov 17, 2023 · 8b2fa23 · 8b2fa23
2 parents bccbee2 + eeaea97
commit 8b2fa23
Show file tree

Hide file tree

Showing 51 changed files with 234 additions and 198 deletions.
diff --git a/.github/actions/private-tangle/setup/action.yml b/.github/actions/private-tangle/setup/action.yml
@@ -37,7 +37,7 @@ runs:
 
     - name: Wait for tangle to start
       shell: bash
-      run: wget -qO- https://raw.githubusercontent.com/eficode/wait-for/v2.2.4/wait-for | sh -s -- -t 120 http://localhost:8080/health -- echo "Tangle is up"
+      run: wget -qO- https://raw.githubusercontent.com/eficode/wait-for/v2.2.4/wait-for | sh -s -- -t 120 http://localhost:8050/health -- echo "Tangle is up"
     # TODO enable, maybe need another URL
     # - name: Wait for faucet to start
     # shell: bash

diff --git a/.github/workflows/bindings-wasm.yml b/.github/workflows/bindings-wasm.yml
@@ -65,7 +65,7 @@ jobs:
       - name: Install wasm-bindgen-cli
         uses: jetli/[email protected]
         with:
-          version: "0.2.87"
+          version: "0.2.88"
 
       - name: Set Up Node.js ${{ matrix.node }} and Yarn Cache
         uses: actions/setup-node@v3
@@ -86,16 +86,16 @@ jobs:
         if: ${{ startsWith(matrix.os, 'ubuntu') }}
         uses: "./.github/actions/private-tangle/setup"
 
-      # - name: Run Yarn Test
-      #   if: ${{ startsWith(matrix.os, 'ubuntu') }}
-      #   working-directory: bindings/wasm/
-      #   run: yarn test
+      - name: Run Yarn Test
+        if: ${{ startsWith(matrix.os, 'ubuntu') }}
+        working-directory: bindings/wasm/
+        run: yarn test
 
       - name: Run Yarn Test
         if: ${{ !startsWith(matrix.os, 'ubuntu') }}
         working-directory: bindings/wasm/
         # Only run test that doesn't require a node because we can't use the private tangle script on macos and windows
-        run: yarn test -t 'Wallet methods'
+        run: yarn test -t 'utils methods'
 
       - name: Tear down private tangle
         if: ${{ startsWith(matrix.os, 'ubuntu') }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,8 +5,7 @@ members = [
 	"bindings/nodejs",
 	# TODO: issue #1423
 	#"bindings/python",
-	# TODO: issue #1425
-	#"bindings/wasm",
+	"bindings/wasm",
 	"cli",
 	"sdk",
 ]

diff --git a/bindings/core/src/method_handler/secret_manager.rs b/bindings/core/src/method_handler/secret_manager.rs
@@ -4,11 +4,11 @@
 #[cfg(feature = "ledger_nano")]
 use iota_sdk::client::secret::ledger_nano::LedgerSecretManager;
 #[cfg(feature = "stronghold")]
-use iota_sdk::client::secret::stronghold::StrongholdSecretManager;
+use iota_sdk::client::secret::{stronghold::StrongholdSecretManager, SecretManager};
 use iota_sdk::{
     client::{
         api::{GetAddressesOptions, PreparedTransactionData},
-        secret::{DowncastSecretManager, SecretManage, SecretManager, SignBlock},
+        secret::{DowncastSecretManager, SecretManage, SignBlock},
     },
     types::{
         block::{address::ToBech32Ext, core::UnsignedBlock, unlock::Unlock, BlockDto},

diff --git a/bindings/nodejs/README.md b/bindings/nodejs/README.md
@@ -129,7 +129,7 @@ const walletOptions: WalletOptions = {
         },
     },
 };
-const wallet = new Wallet(walletOptions);
+const wallet = await Wallet.create(walletOptions);
 ```
 
 ## Examples

diff --git a/bindings/nodejs/examples/exchange/1-create-wallet.ts b/bindings/nodejs/examples/exchange/1-create-wallet.ts
@@ -61,7 +61,7 @@ async function run() {
             secretManager: strongholdSecretManager,
         };
 
-        const wallet = new Wallet(walletOptions);
+        const wallet = await Wallet.create(walletOptions);
 
         // Set syncOnlyMostBasicOutputs to true if not interested in outputs that are timelocked,
         // have a storage deposit return, expiration or are nft/account/foundry outputs.
-Original file line number
+Diff line change
@@ Expand Up / @@ -129,7 +129,7 @@ const walletOptions: WalletOptions = { @@
             },
         },
     };
-    const wallet = new Wallet(walletOptions);
+    const wallet = await Wallet.create(walletOptions);
     ```
     ## Examples
@@ Expand Down @@