@subwallet/extension-base 1.2.11-0 → 1.2.12-0

package/background/KoniTypes.d.ts

@@ -951,6 +951,7 @@ export interface EvmSendTransactionParams {
     maxFeePerGas?: string | number;
     gasPrice?: string | number;
     data?: string;
+    gas?: string | number;
 }
 export interface SwitchNetworkRequest {
     networkKey: string;

package/cjs/koni/background/handlers/Extension.js

@@ -3015,7 +3015,6 @@ class KoniExtension {
       payload
     } = request;
     let registry;
-    let isEvm = false;
     if (isJsonPayload(payload)) {
       const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
       let metadata;
@@ -3069,9 +3068,6 @@ class KoniExtension {
           registry = this.#koniState.getSubstrateApi(chainInfo.slug).api.registry;
         }
       }
-      if (chainInfo) {
-        isEvm = (0, _utils3._isChainEvmCompatible)(chainInfo);
-      }
     } else {
       // for non-payload, just create a registry to use
       registry = new _types3.TypeRegistry();
@@ -3080,7 +3076,7 @@ class KoniExtension {
     resolve({
       id,
       // In case evm chain, must be cut 2 character after 0x
-      signature: isEvm ? `0x${result.signature.slice(4)}` : result.signature
+      signature: result.signature
     });
     if (this.#alwaysLock) {
       this.keyringLock();

package/cjs/koni/background/handlers/State.js

@@ -1225,35 +1225,38 @@ class KoniState {
       from: transactionParams.from,
       to: transactionParams.to,
       value: autoFormatNumber(transactionParams.value),
-      gasPrice: autoFormatNumber(transactionParams.gasPrice),
+      gas: autoFormatNumber(transactionParams.gas),
+      gasPrice: autoFormatNumber(transactionParams.gasPrice || transactionParams.gasLimit),
       maxPriorityFeePerGas: autoFormatNumber(transactionParams.maxPriorityFeePerGas),
       maxFeePerGas: autoFormatNumber(transactionParams.maxFeePerGas),
       data: transactionParams.data
     };
-    const getTransactionGas = async () => {
+    if (!transactionParams.gas) {
+      const getTransactionGas = async () => {
+        try {
+          transaction.gas = await web3.eth.estimateGas({
+            ...transaction
+          });
+        } catch (e) {
+          // @ts-ignore
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+          throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
+        }
+      };
+
+      // Calculate transaction data
       try {
-        transaction.gas = await web3.eth.estimateGas({
-          ...transaction
-        });
+        await Promise.race([getTransactionGas(), (0, _utils3.wait)(3000).then(async () => {
+          if (!transaction.gas) {
+            await this.chainService.initSingleApi(networkKey);
+            await getTransactionGas();
+          }
+        })]);
       } catch (e) {
         // @ts-ignore
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
       }
-    };
-
-    // Calculate transaction data
-    try {
-      await Promise.race([getTransactionGas(), (0, _utils3.wait)(3000).then(async () => {
-        if (!transaction.gas) {
-          await this.chainService.initSingleApi(networkKey);
-          await getTransactionGas();
-        }
-      })]);
-    } catch (e) {
-      // @ts-ignore
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
     }
     if (!transaction.gas) {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS);

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.2.11-0'
+  version: '1.2.12-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/balance-service/transfer/xcm/snowBridge.js

@@ -37,24 +37,22 @@ async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, destinationC
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
   const transferEncodedCall = transferCall.encodeABI();
   const [priority, sendTokenFee] = await Promise.all([(0, _utils3.calculateGasFeeParams)(evmApi, evmApi.chainSlug), getSendFeeToken(snowBridgeContract, tokenContract, destinationChainParaId, destinationFee)]);
-  let gasLimit;
-  try {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-    gasLimit = await transferCall.estimateGas({
-      from: sender
-    });
-  } catch (e) {
-    gasLimit = 200000; // todo: handle this better
-  }
-
-  return {
+  const transactionConfig = {
     from: sender,
     to: snowBridgeContractAddress,
     value: sendTokenFee,
     data: transferEncodedCall,
-    gas: gasLimit,
     gasPrice: priority.gasPrice,
     maxFeePerGas: (_priority$maxFeePerGa = priority.maxFeePerGas) === null || _priority$maxFeePerGa === void 0 ? void 0 : _priority$maxFeePerGa.toString(),
     maxPriorityFeePerGas: (_priority$maxPriority = priority.maxPriorityFeePerGas) === null || _priority$maxPriority === void 0 ? void 0 : _priority$maxPriority.toString()
   };
+  let gasLimit;
+  try {
+    gasLimit = await evmApi.api.eth.estimateGas(transactionConfig);
+  } catch (e) {
+    gasLimit = 200000; // todo: handle this better
+  }
+
+  transactionConfig.gas = gasLimit;
+  return transactionConfig;
 }

package/cjs/services/chain-service/index.js

@@ -22,12 +22,13 @@ var _logger = require("@polkadot/util/logger");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const filterChainInfoMap = data => {
+const filterChainInfoMap = (data, ignoredChains) => {
   return Object.fromEntries(Object.entries(data).filter(_ref => {
-    let [, info] = _ref;
-    return !info.bitcoinInfo;
+    let [slug, info] = _ref;
+    return !info.bitcoinInfo && !ignoredChains.includes(slug);
   }));
 };
+const ignoredList = ['bevm', 'bevmTest', 'bevm_testnet', 'layerEdge_testnet', 'merlinEvm', 'botanixEvmTest'];
 const filterAssetInfoMap = (chainInfo, assets) => {
   return Object.fromEntries(Object.entries(assets).filter(_ref2 => {
     let [, info] = _ref2;
@@ -857,7 +858,7 @@ class ChainService {
   }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
-    const defaultChainInfoMap = filterChainInfoMap(_chainList.ChainInfoMap);
+    const defaultChainInfoMap = filterChainInfoMap(_chainList.ChainInfoMap, ignoredList);
     const storedChainSettingMap = {};
     storedChainSettings.forEach(chainStoredSetting => {
       storedChainSettingMap[chainStoredSetting.slug] = chainStoredSetting;

package/cjs/services/earning-service/handlers/lending/interlay.js

@@ -98,7 +98,7 @@ class InterlayLendingPoolHandler extends _base.default {
       for (let i = 0; i < balances.length; i++) {
         const balanceItem = balances[i];
         const address = useAddresses[i];
-        const bnActiveBalance = balanceItem.free || _util.BN_ZERO;
+        const bnActiveBalance = balanceItem.reserved || _util.BN_ZERO;
         const bnTotalBalance = bnActiveBalance.mul(new _util.BN(exchangeRate)).div(decimals);
         const result = {
           ...this.baseInfo,

package/cjs/utils/metadata.js

@@ -10,7 +10,7 @@ exports.getShortMetadata = exports.getMetadataHash = exports._isRuntimeUpdated =
 const LEDGER_API_URL = 'https://ledger-api.subwallet.app';
 const createUrl = path => `${LEDGER_API_URL}/${path}`;
 const _isRuntimeUpdated = signedExtensions => {
-  return signedExtensions.includes('CheckMetadataHash');
+  return signedExtensions ? signedExtensions.includes('CheckMetadataHash') : false;
 };
 exports._isRuntimeUpdated = _isRuntimeUpdated;
 const getMetadataHash = async chain => {

package/koni/background/handlers/Extension.js

@@ -2932,7 +2932,6 @@ export default class KoniExtension {
       payload
     } = request;
     let registry;
-    let isEvm = false;
     if (isJsonPayload(payload)) {
       const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
       let metadata;
@@ -2986,9 +2985,6 @@ export default class KoniExtension {
           registry = this.#koniState.getSubstrateApi(chainInfo.slug).api.registry;
         }
       }
-      if (chainInfo) {
-        isEvm = _isChainEvmCompatible(chainInfo);
-      }
     } else {
       // for non-payload, just create a registry to use
       registry = new TypeRegistry();
@@ -2997,7 +2993,7 @@ export default class KoniExtension {
     resolve({
       id,
       // In case evm chain, must be cut 2 character after 0x
-      signature: isEvm ? `0x${result.signature.slice(4)}` : result.signature
+      signature: result.signature
     });
     if (this.#alwaysLock) {
       this.keyringLock();

package/koni/background/handlers/State.js

@@ -1202,35 +1202,38 @@ export default class KoniState {
       from: transactionParams.from,
       to: transactionParams.to,
       value: autoFormatNumber(transactionParams.value),
-      gasPrice: autoFormatNumber(transactionParams.gasPrice),
+      gas: autoFormatNumber(transactionParams.gas),
+      gasPrice: autoFormatNumber(transactionParams.gasPrice || transactionParams.gasLimit),
       maxPriorityFeePerGas: autoFormatNumber(transactionParams.maxPriorityFeePerGas),
       maxFeePerGas: autoFormatNumber(transactionParams.maxFeePerGas),
       data: transactionParams.data
     };
-    const getTransactionGas = async () => {
+    if (!transactionParams.gas) {
+      const getTransactionGas = async () => {
+        try {
+          transaction.gas = await web3.eth.estimateGas({
+            ...transaction
+          });
+        } catch (e) {
+          // @ts-ignore
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+          throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
+        }
+      };
+
+      // Calculate transaction data
       try {
-        transaction.gas = await web3.eth.estimateGas({
-          ...transaction
-        });
+        await Promise.race([getTransactionGas(), wait(3000).then(async () => {
+          if (!transaction.gas) {
+            await this.chainService.initSingleApi(networkKey);
+            await getTransactionGas();
+          }
+        })]);
       } catch (e) {
         // @ts-ignore
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
       }
-    };
-
-    // Calculate transaction data
-    try {
-      await Promise.race([getTransactionGas(), wait(3000).then(async () => {
-        if (!transaction.gas) {
-          await this.chainService.initSingleApi(networkKey);
-          await getTransactionGas();
-        }
-      })]);
-    } catch (e) {
-      // @ts-ignore
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
     }
     if (!transaction.gas) {
       throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS);

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.2.11-0",
+  "version": "1.2.12-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1948,11 +1948,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.70",
-    "@subwallet/extension-base": "^1.2.11-0",
-    "@subwallet/extension-chains": "^1.2.11-0",
-    "@subwallet/extension-dapp": "^1.2.11-0",
-    "@subwallet/extension-inject": "^1.2.11-0",
+    "@subwallet/chain-list": "0.2.71",
+    "@subwallet/extension-base": "^1.2.12-0",
+    "@subwallet/extension-chains": "^1.2.12-0",
+    "@subwallet/extension-dapp": "^1.2.12-0",
+    "@subwallet/extension-inject": "^1.2.12-0",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/keyvaluestorage": "^1.1.1",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.2.11-0'
+  version: '1.2.12-0'
 };

package/services/balance-service/transfer/xcm/snowBridge.js

@@ -31,24 +31,22 @@ export async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, desti
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
   const transferEncodedCall = transferCall.encodeABI();
   const [priority, sendTokenFee] = await Promise.all([calculateGasFeeParams(evmApi, evmApi.chainSlug), getSendFeeToken(snowBridgeContract, tokenContract, destinationChainParaId, destinationFee)]);
-  let gasLimit;
-  try {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-    gasLimit = await transferCall.estimateGas({
-      from: sender
-    });
-  } catch (e) {
-    gasLimit = 200000; // todo: handle this better
-  }
-
-  return {
+  const transactionConfig = {
     from: sender,
     to: snowBridgeContractAddress,
     value: sendTokenFee,
     data: transferEncodedCall,
-    gas: gasLimit,
     gasPrice: priority.gasPrice,
     maxFeePerGas: (_priority$maxFeePerGa = priority.maxFeePerGas) === null || _priority$maxFeePerGa === void 0 ? void 0 : _priority$maxFeePerGa.toString(),
     maxPriorityFeePerGas: (_priority$maxPriority = priority.maxPriorityFeePerGas) === null || _priority$maxPriority === void 0 ? void 0 : _priority$maxPriority.toString()
   };
+  let gasLimit;
+  try {
+    gasLimit = await evmApi.api.eth.estimateGas(transactionConfig);
+  } catch (e) {
+    gasLimit = 200000; // todo: handle this better
+  }
+
+  transactionConfig.gas = gasLimit;
+  return transactionConfig;
 }

package/services/chain-service/index.js

@@ -15,9 +15,10 @@ import { addLazy, fetchStaticData, filterAssetsByChainAndType, MODULE_SUPPORT }
 import { BehaviorSubject, Subject } from 'rxjs';
 import Web3 from 'web3';
 import { logger as createLogger } from '@polkadot/util/logger';
-const filterChainInfoMap = data => {
-  return Object.fromEntries(Object.entries(data).filter(([, info]) => !info.bitcoinInfo));
+const filterChainInfoMap = (data, ignoredChains) => {
+  return Object.fromEntries(Object.entries(data).filter(([slug, info]) => !info.bitcoinInfo && !ignoredChains.includes(slug)));
 };
+const ignoredList = ['bevm', 'bevmTest', 'bevm_testnet', 'layerEdge_testnet', 'merlinEvm', 'botanixEvmTest'];
 const filterAssetInfoMap = (chainInfo, assets) => {
   return Object.fromEntries(Object.entries(assets).filter(([, info]) => chainInfo[info.originChain]));
 };
@@ -829,7 +830,7 @@ export class ChainService {
   }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
-    const defaultChainInfoMap = filterChainInfoMap(ChainInfoMap);
+    const defaultChainInfoMap = filterChainInfoMap(ChainInfoMap, ignoredList);
     const storedChainSettingMap = {};
     storedChainSettings.forEach(chainStoredSetting => {
       storedChainSettingMap[chainStoredSetting.slug] = chainStoredSetting;

package/services/earning-service/handlers/lending/interlay.js

@@ -91,7 +91,7 @@ export default class InterlayLendingPoolHandler extends BaseLendingPoolHandler {
       for (let i = 0; i < balances.length; i++) {
         const balanceItem = balances[i];
         const address = useAddresses[i];
-        const bnActiveBalance = balanceItem.free || BN_ZERO;
+        const bnActiveBalance = balanceItem.reserved || BN_ZERO;
         const bnTotalBalance = bnActiveBalance.mul(new BN(exchangeRate)).div(decimals);
         const result = {
           ...this.baseInfo,

package/utils/metadata.d.ts

@@ -1,3 +1,3 @@
-export declare const _isRuntimeUpdated: (signedExtensions: string[]) => boolean;
+export declare const _isRuntimeUpdated: (signedExtensions?: string[]) => boolean;
 export declare const getMetadataHash: (chain: string) => Promise<string>;
 export declare const getShortMetadata: (chain: string, blob: string) => Promise<string>;

package/utils/metadata.js

@@ -4,7 +4,7 @@
 const LEDGER_API_URL = 'https://ledger-api.subwallet.app';
 const createUrl = path => `${LEDGER_API_URL}/${path}`;
 export const _isRuntimeUpdated = signedExtensions => {
-  return signedExtensions.includes('CheckMetadataHash');
+  return signedExtensions ? signedExtensions.includes('CheckMetadataHash') : false;
 };
 export const getMetadataHash = async chain => {
   const data = {