Update version walletconnet to 2.11.2

Koniverse · Mar 2, 2024 · bdc657a · bdc657a
1 parent c1d6cb3
commit bdc657a
Show file tree

Hide file tree

Showing 19 changed files with 200 additions and 2,580 deletions.
diff --git a/packages/capsule/README.md b/packages/capsule/README.md
diff --git a/packages/capsule/package.json b/packages/capsule/package.json
diff --git a/packages/capsule/src/icon.ts b/packages/capsule/src/icon.ts
diff --git a/packages/capsule/src/index.ts b/packages/capsule/src/index.ts
diff --git a/packages/capsule/src/types.ts b/packages/capsule/src/types.ts
diff --git a/packages/capsule/tsconfig.json b/packages/capsule/tsconfig.json
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -76,7 +76,7 @@
   },
   "dependencies": {
     "@polkadot/extension-inject": "^0.46.5",
-    "@walletconnect/universal-provider": "^2.11.0",
+    "@walletconnect/universal-provider": "^2.11.2",
     "bignumber.js": "^9.1.0",
     "ethers": "5.5.4",
     "joi": "17.9.1"

diff --git a/packages/demo/src/utils/api/substrateApi.ts b/packages/demo/src/utils/api/substrateApi.ts
@@ -25,21 +25,26 @@ export class substrateApi {
   public async getMaxTransfer (amount: string, senderAddress: string, recipientAddress: string) {
     if(!this.api || !this.api.isReady ) return '0';
 
+    const transferExtrinsic = this.api.tx.balances.transferKeepAlive(recipientAddress, amount)
+    const  balances  = await this.api.derive.balances?.all(senderAddress)
+    const maxTransfer = balances.availableBalance
+
+    return maxTransfer.toString();
+  }
+
+  public async isAvailableAmount ( amount: string, senderAddress: string, recipientAddress: string ) {
+
     const transferExtrinsic = this.api.tx.balances.transferKeepAlive(recipientAddress, amount)
     const [ { partialFee }, balances ] = await Promise.all([
       transferExtrinsic.paymentInfo(senderAddress),
-      this.api.derive.balances?.all(senderAddress)
+      this.getMaxTransfer(amount, senderAddress, recipientAddress)
     ])
 
     const adjFee = partialFee.muln(110).div(BN_HUNDRED);
-    const maxTransfer = balances.availableBalance.sub(adjFee);
 
-    return maxTransfer.toString();
-  }
+    const maxTransfer = (new BN(balances)).sub(adjFee);
 
-  public async isAvailableAmount ( amount: string, senderAddress: string, recipientAddress: string ) {
 
-    const maxTransfer = new BN( await this.getMaxTransfer(amount, senderAddress, recipientAddress));
     return !!(maxTransfer.gt(new BN(this.api?.consts.balances.existentialDeposit as any)) && maxTransfer.gt(new BN(amount)))
   }
 

diff --git a/packages/demo/src/web3-onboard.ts b/packages/demo/src/web3-onboard.ts
@@ -32,7 +32,7 @@ const injected = injectedModule({
 
 
 const walletConnectPolkadot = walletConnectPolkadotModule({
-  projectId: '762e91498a11e0acc664cdd0fd2af181',
+  projectId: '59b5826141a56b204e9e0a3f7e46641d',
   dappUrl: 'https://w3o-demo.subwallet.app/'
 })
 const metamaskSDKWallet = metamaskSDK({
@@ -52,9 +52,9 @@ const polkadotWallet = polkadot_jsModule();
 const subwalletPolkadotWalet = subwalletPolkadotModule();
 const talismanWallet = talismanModule();
 const polkadotVaultWallet = polkadotVaultModule();
-const ledger = ledgerModule({ projectId : '762e91498a11e0acc664cdd0fd2af181',   walletConnectVersion: 2 })
+const ledger = ledgerModule({ projectId : '59b5826141a56b204e9e0a3f7e46641d',   walletConnectVersion: 2 })
 const walletConnect = walletConnectModule({
-  projectId: '762e91498a11e0acc664cdd0fd2af181',
+  projectId: '59b5826141a56b204e9e0a3f7e46641d',
   dappUrl: 'https://w3o-demo.subwallet.app/'
 })
 
@@ -72,7 +72,7 @@ export default init({
       enabled: false
     }
   },
-  projectId : '762e91498a11e0acc664cdd0fd2af181',
+  projectId : '59b5826141a56b204e9e0a3f7e46641d',
 
   // An array of wallet modules that you would like to be presented to the user to select from when connecting a wallet.
   wallets: [

diff --git a/packages/ledger/package.json b/packages/ledger/package.json
@@ -64,8 +64,7 @@
     "@ethersproject/providers": "5.5.0",
     "@ledgerhq/connect-kit-loader": "^1.1.0",
     "@subwallet-connect/common": "^1.0.1",
-    "@walletconnect/client": "^1.8.0",
-    "@walletconnect/ethereum-provider": "2.11.0",
+    "@walletconnect/ethereum-provider": "^2.11.2",
     "@walletconnect/modal": "^2.6.2",
     "rxjs": "^7.5.2"
   },

diff --git a/packages/ledger/src/index.ts b/packages/ledger/src/index.ts
@@ -1,5 +1,4 @@
 import type { WalletInit } from '@subwallet-connect/common'
-import v1 from './v1.js'
 import v2 from './v2.js'
 
 export type LedgerOptionsWCv1 = {
@@ -50,10 +49,7 @@ export const isHexString = (value: string | number) => {
 }
 
 function ledger(options?: LedgerOptions): WalletInit {
-  const walletConnectVersion = options?.walletConnectVersion || 2
-  return walletConnectVersion === 1
-    ? v1(options as LedgerOptionsWCv1)
-    : v2(options as LedgerOptionsWCv2)
+  return v2(options as LedgerOptionsWCv2)
 }
 
 export default ledger