web-wallet: Update Wallet service to use dusk-wallet-js 0.4.4

Resolves #1595
dusk-network · May 7, 2024 · 44dcfc5 · 44dcfc5
1 parent 6b55d2c
commit 44dcfc5
Show file tree

Hide file tree

Showing 12 changed files with 272 additions and 128 deletions.
diff --git a/web-wallet/__mocks__/Wallet.js b/web-wallet/__mocks__/Wallet.js
@@ -1,13 +1,13 @@
 class Wallet {
-  constructor(seed, gasLimit = 2900000000, gasPrice = 1) {
-    this.gasLimit = gasLimit;
-    this.gasPrice = gasPrice;
+  constructor(seed) {
     this.seed = seed;
     this.wasm = {};
   }
 
-  gasLimit;
-  gasPrice;
+  static get networkBlockHeight() {
+    return Promise.resolve(0);
+  }
+
   seed;
   wasm;
 

diff --git a/web-wallet/package-lock.json b/web-wallet/package-lock.json
diff --git a/web-wallet/package.json b/web-wallet/package.json
@@ -35,7 +35,7 @@
   "type": "module",
   "version": "0.5.0",
   "dependencies": {
-    "@dusk-network/dusk-wallet-js": "0.4.2",
+    "@dusk-network/dusk-wallet-js": "0.4.4",
     "@floating-ui/dom": "1.6.3",
     "@mdi/js": "7.4.47",
     "bip39": "3.1.0",

diff --git a/web-wallet/src/lib/containers/StakeContract/StakeContract.svelte b/web-wallet/src/lib/containers/StakeContract/StakeContract.svelte
@@ -55,13 +55,15 @@
   const executeOperations = {
     stake: (amount, gasPrice, gasLimit) =>
       walletStore
-        .stake(amount, gasPrice, gasLimit)
+        .stake(amount, { limit: gasLimit, price: gasPrice })
         .then(getLastTransactionHash),
     unstake: (gasPrice, gasLimit) =>
-      walletStore.unstake(gasPrice, gasLimit).then(getLastTransactionHash),
+      walletStore
+        .unstake({ limit: gasLimit, price: gasPrice })
+        .then(getLastTransactionHash),
     "withdraw-rewards": (gasPrice, gasLimit) =>
       walletStore
-        .withdrawReward(gasPrice, gasLimit)
+        .withdrawReward({ limit: gasLimit, price: gasPrice })
         .then(getLastTransactionHash),
   };
 

diff --git a/web-wallet/src/lib/containers/TransferContract/TransferContract.svelte b/web-wallet/src/lib/containers/TransferContract/TransferContract.svelte
@@ -33,7 +33,7 @@
   /** @type {(to: string, amount: number, gasPrice:number, gasLimit:number) => Promise<string>} */
   const executeSend = (to, amount, gasPrice, gasLimit) =>
     walletStore
-      .transfer(to, amount, gasPrice, gasLimit)
+      .transfer(to, amount, { limit: gasLimit, price: gasPrice })
       .then(getLastTransactionHash);
 
   const collectSettings = collect([

diff --git a/web-wallet/src/lib/services/wallet/__tests__/getWallet.spec.js b/web-wallet/src/lib/services/wallet/__tests__/getWallet.spec.js
@@ -21,8 +21,6 @@ describe("getWallet", () => {
 			[
 			  "wasm",
 			  "seed",
-			  "gasLimit",
-			  "gasPrice",
 			  "constructor",
 			  "getBalance",
 			  "getPsks",

diff --git a/web-wallet/src/lib/services/wallet/getWallet.js b/web-wallet/src/lib/services/wallet/getWallet.js
@@ -3,12 +3,9 @@ import { Wallet } from "@dusk-network/dusk-wallet-js";
 /**
  * Gets a `Wallet` instance.
  * @param {Uint8Array} seed
- * @param {Number} [gasLimit=2900000000]
- * @param {Number} [gasPrice=1]
  * @returns {Wallet}
  */
 
-const getWallet = (seed, gasLimit, gasPrice) =>
-  new Wallet(Array.from(seed), gasLimit, gasPrice);
+const getWallet = (seed) => new Wallet(Array.from(seed));
 
 export default getWallet;