Merge pull request #3018 from dusk-network/feature-3010

web-wallet: use `w3sper`'s minimum stake amount instead of env var
dusk-network · Nov 19, 2024 · 34a68ca · 34a68ca
2 parents 6ddfea6 + 5f101c1
commit 34a68ca
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/web-wallet/CHANGELOG.md b/web-wallet/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added gas settings validation on Unstake / Widthdraw Rewards flows [#2000]
 - Add temporary link to the block explorer on the dashboard [#2882]
 - Update Staking-Related functionality to make use of w3sper [#3006]
+- Add minimum stake amount supplied by w3sper instead of using an env var [#3010]
 
 ### Changed
 
@@ -349,6 +350,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#2991]: https://github.com/dusk-network/rusk/issues/2991
 [#3000]: https://github.com/dusk-network/rusk/issues/3000
 [#3006]: https://github.com/dusk-network/rusk/issues/3006
+[#3010]: https://github.com/dusk-network/rusk/issues/3010
 
 <!-- VERSIONS -->
 

diff --git a/web-wallet/README.md b/web-wallet/README.md
@@ -45,7 +45,6 @@ VITE_GAS_LIMIT_UPPER=1000000000
 VITE_GAS_PRICE_DEFAULT=1
 VITE_GAS_PRICE_LOWER=1
 VITE_MIGRATE_CONTRACT=""
-VITE_MINIMUM_ALLOWED_STAKE=1000
 VITE_MODE_MAINTENANCE=false
 VITE_NODE_URL="" # connect to a specific node
 ```

diff --git a/web-wallet/src/lib/containers/StakeContract/StakeContract.svelte b/web-wallet/src/lib/containers/StakeContract/StakeContract.svelte
@@ -31,7 +31,7 @@
 
   export let spendable = 0n;
 
-  $: [gasSettings, language, minAllowedStake] = collectSettings($settingsStore);
+  $: [gasSettings, language] = collectSettings($settingsStore);
   $: duskFormatter = createCurrencyFormatter(language, "DUSK", 9);
 
   const gasLimits = $gasStore;
@@ -54,7 +54,6 @@
       "gasPriceLower",
     ]),
     getKey("language"),
-    getKey("minAllowedStake"),
   ]);
 
   /** @type {Record<string, (info: StakeInfo) => boolean>} */
@@ -139,7 +138,7 @@
 
   $: ({ currentOperation } = $operationsStore);
   const { hideStakingNotice } = $settingsStore;
-  $: ({ balance, syncStatus } = $walletStore);
+  $: ({ balance, minimumStake, syncStatus } = $walletStore);
   $: isSyncOK = !(syncStatus.isInProgress || !!syncStatus.error);
   $: if (!isSyncOK) {
     disableAllOperations(descriptor.operations);
@@ -154,7 +153,7 @@
       formatter={duskFormatter}
       {gasLimits}
       {gasSettings}
-      {minAllowedStake}
+      minAllowedStake={luxToDusk(minimumStake)}
       on:operationChange
       on:suppressStakingNotice
       rewards={luxToDusk(stakeInfo.reward)}

diff --git a/web-wallet/src/lib/stores/settingsStore.js b/web-wallet/src/lib/stores/settingsStore.js
@@ -35,7 +35,6 @@ const initialState = {
   gasLimit: BigInt(import.meta.env.VITE_GAS_LIMIT_DEFAULT ?? 20000000),
   gasPrice: BigInt(import.meta.env.VITE_GAS_PRICE_DEFAULT ?? 1),
   hideStakingNotice: false,
-  minAllowedStake: parseInt(import.meta.env.VITE_MINIMUM_ALLOWED_STAKE, 10),
   userId: "",
 };
 

diff --git a/web-wallet/src/lib/stores/stores.d.ts b/web-wallet/src/lib/stores/stores.d.ts
@@ -18,7 +18,6 @@ type SettingsStoreContent = {
   gasPrice: bigint;
   hideStakingNotice: boolean;
   language: string;
-  minAllowedStake: number;
   userId: string;
 };
 

diff --git a/web-wallet/vite.config.js b/web-wallet/vite.config.js
@@ -51,7 +51,6 @@ export default defineConfig(({ mode }) => {
         VITE_GAS_PRICE_DEFAULT: env.VITE_GAS_PRICE_DEFAULT,
         VITE_GAS_PRICE_LOWER: env.VITE_GAS_PRICE_LOWER,
         VITE_GAS_PRICE_UPPER: env.VITE_GAS_PRICE_UPPER,
-        VITE_MINIMUM_ALLOWED_STAKE: env.VITE_MINIMUM_ALLOWED_STAKE,
         VITE_NODE_URL: env.VITE_NODE_URL,
       },
     },
@@ -99,7 +98,6 @@ export default defineConfig(({ mode }) => {
         VITE_GAS_LIMIT_UPPER: "1000000000",
         VITE_GAS_PRICE_DEFAULT: "1",
         VITE_GAS_PRICE_LOWER: "1",
-        VITE_MINIMUM_ALLOWED_STAKE: "1234",
         VITE_NODE_URL: "",
       },
       environment: "jsdom",