@subwallet/extension-base 1.2.8-1 → 1.2.10-0

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

@@ -14,21 +14,23 @@ var _subscriptions = require("@subwallet/extension-base/background/handlers/subs
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
 var _transfer = require("@subwallet/extension-base/core/logic-validation/transfer");
+var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
 var _defaults = require("@subwallet/extension-base/defaults");
+var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
+var _utils = require("@subwallet/extension-base/koni/api/contract-handler/utils");
 var _domain = require("@subwallet/extension-base/koni/api/dotsama/domain");
 var _parseTransaction = require("@subwallet/extension-base/koni/api/dotsama/parseTransaction");
-var _transfer2 = require("@subwallet/extension-base/koni/api/dotsama/transfer");
-var _transfer3 = require("@subwallet/extension-base/koni/api/nft/transfer");
+var _transfer2 = require("@subwallet/extension-base/koni/api/nft/transfer");
 var _bonding = require("@subwallet/extension-base/koni/api/staking/bonding");
 var _paraChain = require("@subwallet/extension-base/koni/api/staking/bonding/paraChain");
 var _relayChain = require("@subwallet/extension-base/koni/api/staking/bonding/relayChain");
-var _transfer4 = require("@subwallet/extension-base/koni/api/tokens/evm/transfer");
-var _wasm = require("@subwallet/extension-base/koni/api/tokens/wasm");
-var _xcm = require("@subwallet/extension-base/koni/api/xcm");
-var _utils = require("@subwallet/extension-base/koni/api/yield/helper/utils");
+var _utils2 = require("@subwallet/extension-base/koni/api/yield/helper/utils");
+var _smartContract = require("@subwallet/extension-base/services/balance-service/transfer/smart-contract");
+var _token = require("@subwallet/extension-base/services/balance-service/transfer/token");
+var _xcm = require("@subwallet/extension-base/services/balance-service/transfer/xcm");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _types = require("@subwallet/extension-base/services/chain-service/types");
-var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils3 = require("@subwallet/extension-base/services/chain-service/utils");
 var _constants3 = require("@subwallet/extension-base/services/request-service/constants");
 var _constants4 = require("@subwallet/extension-base/services/setting-service/constants");
 var _constants5 = require("@subwallet/extension-base/services/wallet-connect-service/constants");
@@ -36,11 +38,11 @@ var _helpers2 = require("@subwallet/extension-base/services/wallet-connect-servi
 var _storage = require("@subwallet/extension-base/storage");
 var _stores = require("@subwallet/extension-base/stores");
 var _types2 = require("@subwallet/extension-base/types");
-var _utils3 = require("@subwallet/extension-base/utils");
+var _utils4 = require("@subwallet/extension-base/utils");
 var _parseTransaction2 = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _keyring = require("@subwallet/keyring");
 var _uiKeyring = require("@subwallet/ui-keyring");
-var _utils4 = require("@walletconnect/utils");
+var _utils5 = require("@walletconnect/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 var _rxjs = require("rxjs");
@@ -565,7 +567,7 @@ class KoniExtension {
     const _cb = (0, _subscriptions.createSubscription)(id, port);
     let old = '';
     const subscription = this.#koniState.keyringService.addressesSubject.subscribe(subjectInfo => {
-      const addresses = (0, _utils3.convertSubjectInfoToAddresses)(subjectInfo);
+      const addresses = (0, _utils4.convertSubjectInfoToAddresses)(subjectInfo);
       const _new = JSON.stringify(addresses);
       if (old !== _new) {
         _cb({
@@ -580,7 +582,7 @@ class KoniExtension {
     });
     const subjectInfo = this.#koniState.keyringService.addresses;
     return {
-      addresses: (0, _utils3.convertSubjectInfoToAddresses)(subjectInfo)
+      addresses: (0, _utils4.convertSubjectInfoToAddresses)(subjectInfo)
     };
   }
   saveRecentAccount(_ref22) {
@@ -589,7 +591,7 @@ class KoniExtension {
       chain
     } = _ref22;
     if ((0, _utilCrypto.isAddress)(accountId)) {
-      const address = (0, _utils3.reformatAddress)(accountId);
+      const address = (0, _utils4.reformatAddress)(accountId);
       const account = _uiKeyring.keyring.getAccount(address);
       const contact = _uiKeyring.keyring.getAddress(address, 'address');
       if (account) {
@@ -631,7 +633,7 @@ class KoniExtension {
       meta
     } = _ref23;
     if ((0, _utilCrypto.isAddress)(address)) {
-      const _address = (0, _utils3.reformatAddress)(address);
+      const _address = (0, _utils4.reformatAddress)(address);
       _uiKeyring.keyring.saveAddress(_address, meta);
       return true;
     } else {
@@ -643,7 +645,7 @@ class KoniExtension {
       address
     } = _ref24;
     if ((0, _utilCrypto.isAddress)(address)) {
-      const _address = (0, _utils3.reformatAddress)(address);
+      const _address = (0, _utils4.reformatAddress)(address);
       _uiKeyring.keyring.forgetAddress(_address);
       return true;
     } else {
@@ -1573,7 +1575,7 @@ class KoniExtension {
       const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address);
 
       // Re-filter
-      cb(histories.filter(item => addresses.some(address => (0, _utils3.isSameAddress)(item.address, address))));
+      cb(histories.filter(item => addresses.some(address => (0, _utils4.isSameAddress)(item.address, address))));
     });
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
     port.onDisconnect.addListener(() => {
@@ -1582,7 +1584,7 @@ class KoniExtension {
     const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address);
 
     // Re-filter
-    return historySubject.getValue().filter(item => addresses.some(address => (0, _utils3.isSameAddress)(item.address, address)));
+    return historySubject.getValue().filter(item => addresses.some(address => (0, _utils4.isSameAddress)(item.address, address)));
   }
   subscribeHistoryByChainAndAddress(_ref46, id, port) {
     let {
@@ -1600,6 +1602,38 @@ class KoniExtension {
       items: subscribeHistoriesResponse.value
     };
   }
+  async getOptimalTransferProcess(params) {
+    return this.#koniState.balanceService.getOptimalTransferProcess(params);
+  }
+  async approveSpending(params) {
+    const {
+      amount,
+      chain,
+      contractAddress,
+      owner,
+      spenderAddress
+    } = params;
+    if (!(0, _utils.isSnowBridgeGatewayContract)(spenderAddress)) {
+      throw new Error('Only SnowBridge is supported'); // todo: support all ERC20 spending approval
+    }
+
+    const evmApi = this.#koniState.getEvmApi(chain);
+    const transactionConfig = await (0, _web.getERC20SpendingApprovalTx)(spenderAddress, owner, contractAddress, evmApi, amount);
+    return this.#koniState.transactionService.handleTransaction({
+      errors: [],
+      warnings: [],
+      address: owner,
+      chain,
+      chainType: _KoniTypes.ChainType.EVM,
+      transferNativeAmount: '0',
+      transaction: transactionConfig,
+      data: params,
+      resolveOnDone: true,
+      // todo: double-check this for other transactions
+      extrinsicType: _KoniTypes.ExtrinsicType.TOKEN_SPENDING_APPROVAL,
+      isTransferAll: false
+    });
+  }
   async makeTransfer(inputData) {
     const {
       from,
@@ -1621,8 +1655,8 @@ class KoniExtension {
     let chainType = _KoniTypes.ChainType.SUBSTRATE;
     const transferAmount = {
       value: '0',
-      symbol: (0, _utils2._getAssetSymbol)(transferTokenInfo),
-      decimals: (0, _utils2._getAssetDecimals)(transferTokenInfo)
+      symbol: (0, _utils3._getAssetSymbol)(transferTokenInfo),
+      decimals: (0, _utils3._getAssetDecimals)(transferTokenInfo)
     };
     let transaction;
     const transferTokenAvailable = await this.getAddressTransferableBalance({
@@ -1632,23 +1666,23 @@ class KoniExtension {
       extrinsicType
     });
     try {
-      if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils2._isTokenTransferredByEvm)(transferTokenInfo)) {
+      if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils3._isTokenTransferredByEvm)(transferTokenInfo)) {
         chainType = _KoniTypes.ChainType.EVM;
         const txVal = transferAll ? transferTokenAvailable.value : value || '0';
         const evmApi = evmApiMap[networkKey];
 
         // Estimate with EVM API
-        if ((0, _utils2._isTokenEvmSmartContract)(transferTokenInfo) || (0, _utils2._isLocalToken)(transferTokenInfo)) {
-          [transaction, transferAmount.value] = await (0, _transfer4.getERC20TransactionObject)((0, _utils2._getContractAddressOfToken)(transferTokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApi);
+        if ((0, _utils3._isTokenEvmSmartContract)(transferTokenInfo) || (0, _utils3._isLocalToken)(transferTokenInfo)) {
+          [transaction, transferAmount.value] = await (0, _smartContract.getERC20TransactionObject)((0, _utils3._getContractAddressOfToken)(transferTokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApi);
         } else {
-          [transaction, transferAmount.value] = await (0, _transfer4.getEVMTransactionObject)(chainInfo, from, to, txVal, !!transferAll, evmApi);
+          [transaction, transferAmount.value] = await (0, _smartContract.getEVMTransactionObject)(chainInfo, from, to, txVal, !!transferAll, evmApi);
         }
-      } else if ((0, _utils2._isMantaZkAsset)(transferTokenInfo)) {
+      } else if ((0, _utils3._isMantaZkAsset)(transferTokenInfo)) {
         transaction = undefined;
         transferAmount.value = '0';
       } else {
         const substrateApi = this.#koniState.getSubstrateApi(networkKey);
-        [transaction, transferAmount.value] = await (0, _transfer2.createTransferExtrinsic)({
+        [transaction, transferAmount.value] = await (0, _token.createTransferExtrinsic)({
           transferAll: !!transferAll,
           value: value || '0',
           from: from,
@@ -1726,19 +1760,33 @@ class KoniExtension {
     if (errors.length > 0) {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors(errors);
     }
+    const chainInfoMap = this.#koniState.getChainInfoMap();
+    const isFromSnowBridgeXcm = (0, _utils3._isPureEvmChain)(chainInfoMap[originNetworkKey]) && (0, _xcmParser._isSnowBridgeXcm)(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]);
     let additionalValidator;
     let eventsHandler;
     if (fromKeyPair && destinationTokenInfo) {
-      const substrateApi = this.#koniState.getSubstrateApi(originNetworkKey);
-      const chainInfoMap = this.#koniState.getChainInfoMap();
-      extrinsic = await (0, _xcm.createXcmExtrinsic)({
-        destinationTokenInfo,
-        originTokenInfo,
-        sendingValue: value,
-        recipient: to,
-        chainInfoMap,
-        substrateApi
-      });
+      if (isFromSnowBridgeXcm) {
+        const evmApi = this.#koniState.getEvmApi(originNetworkKey);
+        extrinsic = await (0, _xcm.createSnowBridgeExtrinsic)({
+          destinationTokenInfo,
+          originTokenInfo,
+          sendingValue: value,
+          sender: from,
+          recipient: to,
+          chainInfoMap,
+          evmApi
+        });
+      } else {
+        const substrateApi = this.#koniState.getSubstrateApi(originNetworkKey);
+        extrinsic = await (0, _xcm.createXcmExtrinsic)({
+          destinationTokenInfo,
+          originTokenInfo,
+          sendingValue: value,
+          recipient: to,
+          chainInfoMap,
+          substrateApi
+        });
+      }
       additionalValidator = async inputTransaction => {
         const {
           value: senderTransferable
@@ -1747,7 +1795,19 @@ class KoniExtension {
           networkKey: originNetworkKey,
           token: originTokenInfo.slug
         });
-        const [warning, error] = (0, _transfer.additionalValidateXcmTransfer)(originTokenInfo, destinationTokenInfo, value, senderTransferable);
+        const isSnowBridge = (0, _xcmParser._isSnowBridgeXcm)(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]);
+        let recipientNativeBalance = '0';
+        if (isSnowBridge) {
+          const {
+            value
+          } = await this.getAddressTransferableBalance({
+            address: to,
+            networkKey: destinationNetworkKey,
+            extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_BALANCE
+          });
+          recipientNativeBalance = value;
+        }
+        const [warning, error] = (0, _transfer.additionalValidateXcmTransfer)(originTokenInfo, destinationTokenInfo, value, senderTransferable, recipientNativeBalance, chainInfoMap[destinationNetworkKey], isSnowBridge);
         error && inputTransaction.errors.push(error);
         warning && inputTransaction.warnings.push(warning);
       };
@@ -1775,8 +1835,8 @@ class KoniExtension {
       transaction: extrinsic,
       data: inputData,
       extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_XCM,
-      chainType: _KoniTypes.ChainType.SUBSTRATE,
-      transferNativeAmount: (0, _utils2._isNativeToken)(originTokenInfo) ? value : '0',
+      chainType: !isFromSnowBridgeXcm ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM,
+      transferNativeAmount: (0, _utils3._isNativeToken)(originTokenInfo) ? value : '0',
       ignoreWarnings: inputData.transferAll,
       isTransferAll: inputData.transferAll,
       errors,
@@ -1793,7 +1853,7 @@ class KoniExtension {
     } = inputData;
     const contractAddress = params.contractAddress;
     const tokenId = params.tokenId;
-    const transaction = await (0, _transfer4.getERC721Transaction)(this.#koniState.getEvmApi(networkKey), networkKey, contractAddress, senderAddress, recipientAddress, tokenId);
+    const transaction = await (0, _smartContract.getERC721Transaction)(this.#koniState.getEvmApi(networkKey), networkKey, contractAddress, senderAddress, recipientAddress, tokenId);
 
     // this.addContact(recipientAddress);
 
@@ -1860,10 +1920,10 @@ class KoniExtension {
   }
   async deleteCustomAsset(assetSlug) {
     const assetInfo = this.#koniState.getAssetBySlug(assetSlug);
-    if (assetInfo && (0, _utils2._isCustomAsset)(assetSlug)) {
-      if ((0, _utils2._isAssetSmartContractNft)(assetInfo)) {
+    if (assetInfo && (0, _utils3._isCustomAsset)(assetSlug)) {
+      if ((0, _utils3._isAssetSmartContractNft)(assetInfo)) {
         // check if deleting a smart contract NFT
-        await this.#koniState.deleteNftCollection(assetInfo.originChain, (0, _utils2._getContractAddressOfToken)(assetInfo));
+        await this.#koniState.deleteNftCollection(assetInfo.originChain, (0, _utils3._getContractAddressOfToken)(assetInfo));
       }
       this.#koniState.deleteCustomAssets([assetSlug]);
       return true;
@@ -1897,7 +1957,7 @@ class KoniExtension {
       token
     } = _ref50;
     const tokenInfo = token ? this.#koniState.chainService.getAssetBySlug(token) : this.#koniState.chainService.getNativeTokenInfo(networkKey);
-    if (!(0, _utils2._isNativeToken)(tokenInfo)) {
+    if (!(0, _utils3._isNativeToken)(tokenInfo)) {
       return await this.getAddressTransferableBalance({
         extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_TOKEN,
         address,
@@ -1913,7 +1973,7 @@ class KoniExtension {
         maxTransferable = await this.getNativeTokenMaxTransferable(tokenInfo, networkKey, address);
       }
       return {
-        value: maxTransferable.gt(_utils3.BN_ZERO) ? maxTransferable.toFixed(0) || '0' : '0',
+        value: maxTransferable.gt(_utils4.BN_ZERO) ? maxTransferable.toFixed(0) || '0' : '0',
         decimals: tokenInfo.decimals,
         symbol: tokenInfo.symbol
       };
@@ -1941,10 +2001,10 @@ class KoniExtension {
   }
   async getNativeTokenMaxTransferable(tokenInfo, networkKey, address) {
     const chainInfo = this.#koniState.chainService.getChainInfoByKey(networkKey);
-    const api = (0, _utils2._isChainEvmCompatible)(chainInfo) && (0, _utils2._isTokenTransferredByEvm)(tokenInfo) ? this.#koniState.chainService.getEvmApi(networkKey) : this.#koniState.chainService.getSubstrateApi(networkKey);
+    const api = (0, _utils3._isChainEvmCompatible)(chainInfo) && (0, _utils3._isTokenTransferredByEvm)(tokenInfo) ? this.#koniState.chainService.getEvmApi(networkKey) : this.#koniState.chainService.getSubstrateApi(networkKey);
     const [mockTxFee, {
       value
-    }] = await Promise.all([(0, _transfer2.getTransferMockTxFee)(address, chainInfo, tokenInfo, api), this.getAddressTransferableBalance({
+    }] = await Promise.all([(0, _token.getTransferMockTxFee)(address, chainInfo, tokenInfo, api), this.getAddressTransferableBalance({
       extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_BALANCE,
       address,
       networkKey,
@@ -1984,13 +2044,13 @@ class KoniExtension {
       recipientAddress,
       senderAddress
     } = inputData;
-    const isSendingSelf = (0, _transfer3.isRecipientSelf)(senderAddress, recipientAddress);
+    const isSendingSelf = (0, _transfer2.isRecipientSelf)(senderAddress, recipientAddress);
 
     // TODO: do better to detect tokenType
     const isPSP34 = params === null || params === void 0 ? void 0 : params.isPsp34;
     const networkKey = params === null || params === void 0 ? void 0 : params.networkKey;
     const apiProps = this.#koniState.getSubstrateApi(networkKey);
-    const extrinsic = !isPSP34 ? await (0, _transfer3.getNftTransferExtrinsic)(networkKey, apiProps, senderAddress, recipientAddress, params || {}) : await (0, _wasm.getPSP34TransferExtrinsic)(networkKey, apiProps, senderAddress, recipientAddress, params || {});
+    const extrinsic = !isPSP34 ? await (0, _transfer2.getNftTransferExtrinsic)(networkKey, apiProps, senderAddress, recipientAddress, params || {}) : await (0, _smartContract.getPSP34TransferExtrinsic)(apiProps, senderAddress, recipientAddress, params || {});
 
     // this.addContact(recipientAddress);
 
@@ -2069,9 +2129,9 @@ class KoniExtension {
         let _gen = '';
         if (genesisHash) {
           for (const network of Object.values(chainInfoMap)) {
-            if ((0, _utils2._getEvmChainId)(network) === parseInt(genesisHash)) {
+            if ((0, _utils3._getEvmChainId)(network) === parseInt(genesisHash)) {
               // TODO: pure EVM chains do not have genesisHash
-              _gen = (0, _utils2._getSubstrateGenesisHash)(network);
+              _gen = (0, _utils3._getSubstrateGenesisHash)(network);
             }
           }
         }
@@ -2355,7 +2415,7 @@ class KoniExtension {
           continue;
         }
         const networkInfo = chainInfoMap[n];
-        if ((0, _utils2._isChainEvmCompatible)(networkInfo)) {
+        if ((0, _utils3._isChainEvmCompatible)(networkInfo)) {
           return networkInfo;
         }
       }
@@ -2366,7 +2426,7 @@ class KoniExtension {
         continue;
       }
       const networkInfo = chainInfoMap[n];
-      if ((0, _utils2._getEvmChainId)(networkInfo) === chainId) {
+      if ((0, _utils3._getEvmChainId)(networkInfo) === chainId) {
         return networkInfo;
       }
     }
@@ -2408,7 +2468,7 @@ class KoniExtension {
       withType: true
     })));
     const network = this.#koniState.getChainInfo(networkKey);
-    if ((0, _utils2._isChainEvmCompatible)(network)) {
+    if ((0, _utils3._isChainEvmCompatible)(network)) {
       signed = signed.substring(2);
     }
     return {
@@ -2444,7 +2504,7 @@ class KoniExtension {
       signed = await pair.evmSigner.signMessage(data, 'personal_sign');
     } else {
       var _signedTranaction$r, _signedTranaction$s, _signedTranaction$v;
-      const tx = (0, _utils3.createTransactionFromRLP)(message);
+      const tx = (0, _utils4.createTransactionFromRLP)(message);
       if (!tx) {
         throw new Error((0, _i18next.t)('Failed to decode data. Please use a valid QR code'));
       }
@@ -2458,8 +2518,8 @@ class KoniExtension {
       };
       const common = _common.Common.custom({
         name: network.name,
-        networkId: (0, _utils2._getEvmChainId)(network),
-        chainId: (0, _utils2._getEvmChainId)(network)
+        networkId: (0, _utils3._getEvmChainId)(network),
+        chainId: (0, _utils3._getEvmChainId)(network)
       }, {
         hardfork: 'petersburg'
       });
@@ -2469,7 +2529,7 @@ class KoniExtension {
         common
       });
       const signedTranaction = _tx.LegacyTransaction.fromSerializedTx((0, _util.hexToU8a)(pair.evmSigner.signTransaction(transaction)));
-      signed = (0, _utils3.signatureToHex)({
+      signed = (0, _utils4.signatureToHex)({
         r: ((_signedTranaction$r = signedTranaction.r) === null || _signedTranaction$r === void 0 ? void 0 : _signedTranaction$r.toString(16)) || '',
         s: ((_signedTranaction$s = signedTranaction.s) === null || _signedTranaction$s === void 0 ? void 0 : _signedTranaction$s.toString(16)) || '',
         v: ((_signedTranaction$v = signedTranaction.v) === null || _signedTranaction$v === void 0 ? void 0 : _signedTranaction$v.toString(16)) || ''
@@ -2518,7 +2578,7 @@ class KoniExtension {
     }
     const {
       decimals
-    } = (0, _utils2._getChainNativeTokenBasicInfo)(chainInfo);
+    } = (0, _utils3._getChainNativeTokenBasicInfo)(chainInfo);
     return await (0, _bonding.getValidatorsInfo)(chain, apiProps, decimals, chainStakingMetadata);
   }
   async getNominationPoolOptions(chain) {
@@ -2723,7 +2783,7 @@ class KoniExtension {
     const chainInfo = this.#koniState.getChainInfo(networkKey);
     const {
       decimals
-    } = (0, _utils2._getChainNativeTokenBasicInfo)(chainInfo);
+    } = (0, _utils3._getChainNativeTokenBasicInfo)(chainInfo);
     const parsedAccountMinimum = parseFloat(accountMinimum) * 10 ** decimals;
     const extrinsic = await (0, _paraChain.getTuringCompoundExtrinsic)(dotSamaApi, address, collatorAddress, parsedAccountMinimum.toString(), bondedAmount);
     return await this.#koniState.transactionService.handleTransaction({
@@ -2985,7 +3045,7 @@ class KoniExtension {
         }
       }
       if (chainInfo) {
-        isEvm = (0, _utils2._isChainEvmCompatible)(chainInfo);
+        isEvm = (0, _utils3._isChainEvmCompatible)(chainInfo);
       }
     }
     const result = request.sign(registry, pair);
@@ -3394,12 +3454,12 @@ class KoniExtension {
         if (namespace.chains) {
           const unSupportChains = namespace.chains.filter(chain => !(0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap));
           if (unSupportChains.length) {
-            throw new Error((0, _utils4.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + unSupportChains.toString());
+            throw new Error((0, _utils5.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + unSupportChains.toString());
           }
           availableNamespaces[key] = namespace;
         }
       } else {
-        throw new Error((0, _utils4.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
+        throw new Error((0, _utils5.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
       }
     });
     Object.entries(optionalNamespaces).forEach(_ref83 => {
@@ -3431,7 +3491,7 @@ class KoniExtension {
       let [key, namespace] = _ref84;
       if (namespace.chains) {
         const accounts = [];
-        const chains = (0, _utils3.uniqueStringArray)(namespace.chains);
+        const chains = (0, _utils4.uniqueStringArray)(namespace.chains);
         chains.forEach(chain => {
           accounts.push(...selectedAccounts.filter(address => (0, _utilCrypto.isEthereumAddress)(address) === (key === _constants5.WALLET_CONNECT_EIP155_NAMESPACE)).map(address => `${chain}:${address}`));
         });
@@ -3573,7 +3633,7 @@ class KoniExtension {
   }
   async initSyncMantaPay(address) {
     var _this$koniState$chain3, _this$koniState$chain4, _this$koniState$chain5, _this$koniState$chain6;
-    if ((_this$koniState$chain3 = this.#koniState.chainService) !== null && _this$koniState$chain3 !== void 0 && (_this$koniState$chain4 = _this$koniState$chain3.mantaPay) !== null && _this$koniState$chain4 !== void 0 && _this$koniState$chain4.getSyncState().isSyncing || !_utils3.MODULE_SUPPORT.MANTA_ZK) {
+    if ((_this$koniState$chain3 = this.#koniState.chainService) !== null && _this$koniState$chain3 !== void 0 && (_this$koniState$chain4 = _this$koniState$chain3.mantaPay) !== null && _this$koniState$chain4 !== void 0 && _this$koniState$chain4.getSyncState().isSyncing || !_utils4.MODULE_SUPPORT.MANTA_ZK) {
       return;
     }
     this.#skipAutoLock = true;
@@ -3722,7 +3782,7 @@ class KoniExtension {
       txData
     } = await this.#koniState.earningService.handleYieldJoin(inputData);
     const isPoolSupportAlternativeFee = this.#koniState.earningService.isPoolSupportAlternativeFee(inputData.data.slug);
-    const isMintingStep = _utils.YIELD_EXTRINSIC_TYPES.includes(extrinsicType);
+    const isMintingStep = _utils2.YIELD_EXTRINSIC_TYPES.includes(extrinsicType);
     return await this.#koniState.transactionService.handleTransaction({
       address,
       chain: txChain,
@@ -4430,6 +4490,10 @@ class KoniExtension {
         return await this.makeTransfer(request);
       case 'pri(accounts.crossChainTransfer)':
         return await this.makeCrossChainTransfer(request);
+      case 'pri(accounts.getOptimalTransferProcess)':
+        return await this.getOptimalTransferProcess(request);
+      case 'pri(accounts.approveSpending)':
+        return await this.approveSpending(request);
 
       /// Sign QR
       case 'pri(qr.transaction.parse.substrate)':

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.8-1'
+  version: '1.2.10-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/balance-service/helpers/index.js

@@ -24,4 +24,15 @@ Object.keys(_subscribe).forEach(function (key) {
       return _subscribe[key];
     }
   });
+});
+var _process = require("./process");
+Object.keys(_process).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _process[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _process[key];
+    }
+  });
 });

package/cjs/services/balance-service/helpers/process.js

@@ -0,0 +1,50 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultTransferProcess = getDefaultTransferProcess;
+exports.getSnowbridgeTransferProcessFromEvm = getSnowbridgeTransferProcessFromEvm;
+var _chainList = require("@subwallet/chain-list");
+var _serviceBase = require("@subwallet/extension-base/types/service-base");
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+function getDefaultTransferProcess() {
+  return {
+    totalFee: [_serviceBase.MOCK_STEP_FEE, _serviceBase.MOCK_STEP_FEE],
+    steps: [_serviceBase.DEFAULT_FIRST_STEP, {
+      id: 1,
+      type: _serviceBase.CommonStepType.TRANSFER,
+      name: 'Transfer'
+    }]
+  };
+}
+async function getSnowbridgeTransferProcessFromEvm(address, evmApi, tokenInfo, amount) {
+  if (![_chainList.COMMON_CHAIN_SLUGS.ETHEREUM, _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA].includes(tokenInfo.originChain)) {
+    throw new Error('Snowbridge only has support for Ethereum');
+  }
+  const result = {
+    totalFee: [_serviceBase.MOCK_STEP_FEE],
+    steps: [_serviceBase.DEFAULT_FIRST_STEP]
+  };
+  // const allowance = await getERC20Allowance(getSnowBridgeGatewayContract(evmApi.chainSlug), address, _getContractAddressOfToken(tokenInfo), evmApi);
+
+  result.steps.push({
+    // always approve spending because sometimes allowance check fails
+    id: result.steps.length,
+    type: _serviceBase.CommonStepType.TOKEN_APPROVAL,
+    name: 'Approve spending'
+  });
+  result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
+  // if (!allowance || BigInt(allowance) < BigInt(amount)) {
+  // }
+
+  result.steps.push({
+    id: result.steps.length,
+    type: _serviceBase.CommonStepType.TRANSFER,
+    name: 'Transfer'
+  });
+  result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
+  return Promise.resolve(result);
+}

package/cjs/services/balance-service/helpers/subscribe/evm.js

@@ -8,8 +8,7 @@ exports.subscribeEVMBalance = subscribeEVMBalance;
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
-var _balance = require("@subwallet/extension-base/koni/api/tokens/evm/balance");
-var _web = require("@subwallet/extension-base/koni/api/tokens/evm/web3");
+var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
@@ -65,6 +64,15 @@ function subscribeERC20Interval(_ref) {
     clearInterval(interval);
   };
 }
+async function getEVMBalance(addresses, web3Api) {
+  return await Promise.all(addresses.map(async address => {
+    try {
+      return await web3Api.api.eth.getBalance(address);
+    } catch (e) {
+      return '0';
+    }
+  }));
+}
 function subscribeEVMBalance(params) {
   var _Object$values$;
   const {
@@ -78,7 +86,7 @@ function subscribeEVMBalance(params) {
   const nativeTokenInfo = (0, _utils2.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.NATIVE]);
   const nativeTokenSlug = ((_Object$values$ = Object.values(nativeTokenInfo)[0]) === null || _Object$values$ === void 0 ? void 0 : _Object$values$.slug) || '';
   function getBalance() {
-    (0, _balance.getEVMBalance)(chain, addresses, evmApi).then(balances => {
+    getEVMBalance(addresses, evmApi).then(balances => {
       return balances.map((balance, index) => {
         return {
           address: addresses[index],

package/cjs/services/balance-service/helpers/subscribe/substrate/index.js

@@ -9,10 +9,11 @@ var _api = require("@gear-js/api");
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
+var _foreignAssetPallet = require("@subwallet/extension-base/core/substrate/foreign-asset-pallet");
 var _nominationpoolsPallet = require("@subwallet/extension-base/core/substrate/nominationpools-pallet");
 var _systemPallet = require("@subwallet/extension-base/core/substrate/system-pallet");
-var _wasm = require("@subwallet/extension-base/koni/api/tokens/wasm");
-var _utils = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
+var _wasm = require("@subwallet/extension-base/koni/api/contract-handler/wasm");
+var _utils = require("@subwallet/extension-base/koni/api/contract-handler/wasm/utils");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils3 = require("@subwallet/extension-base/utils");
@@ -66,7 +67,7 @@ const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substra
       unsubLocalToken = await subscribeOrmlTokensPallet(substrateParams);
     }
     if (_constants2._BALANCE_CHAIN_GROUP.supportBridged.includes(chain)) {
-      unsubBridgedToken = await subscribeBridgedBalance(substrateParams);
+      unsubBridgedToken = await subscribeForeignAssetBalance(substrateParams);
     }
 
     /**
@@ -160,7 +161,7 @@ const subscribeWithSystemAccountPallet = async _ref => {
     subscription.unsubscribe();
   };
 };
-const subscribeBridgedBalance = async _ref3 => {
+const subscribeForeignAssetBalance = async _ref3 => {
   let {
     addresses,
     assetMap,
@@ -176,30 +177,15 @@ const subscribeBridgedBalance = async _ref3 => {
     try {
       const isBridgedToken = (0, _utils2._isBridgedToken)(tokenInfo);
       if (isBridgedToken) {
-        const onChainInfo = (0, _utils2._getTokenOnChainInfo)(tokenInfo);
-        return await substrateApi.query.foreignAssets.account.multi(addresses.map(address => [onChainInfo, address]), balances => {
+        const assetLocation = (0, _utils2._getTokenOnChainInfo)(tokenInfo) || (0, _utils2._getXcmAssetMultilocation)(tokenInfo);
+        return await substrateApi.query.foreignAssets.account.multi(addresses.map(address => [assetLocation, address]), balances => {
           const items = balances.map((balance, index) => {
-            const bdata = balance === null || balance === void 0 ? void 0 : balance.toHuman();
-            let frozen = _util.BN_ZERO;
-            let total = _util.BN_ZERO;
-            if (bdata) {
-              // @ts-ignore
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument
-              const addressBalance = new _util.BN(String(bdata === null || bdata === void 0 ? void 0 : bdata.balance).replaceAll(',', '') || '0');
-
-              // @ts-ignore
-              if (bdata !== null && bdata !== void 0 && bdata.isFrozen) {
-                frozen = addressBalance;
-              } else {
-                total = addressBalance;
-              }
-            }
-            const free = total.sub(frozen);
+            const accountInfo = balance === null || balance === void 0 ? void 0 : balance.toPrimitive();
             return {
               address: addresses[index],
               tokenSlug: tokenInfo.slug,
-              free: free.toString(),
-              locked: frozen.toString(),
+              free: accountInfo ? (0, _foreignAssetPallet._getForeignAssetPalletTransferable)(accountInfo).toString() : '0',
+              locked: accountInfo ? (0, _foreignAssetPallet._getForeignAssetPalletLockedBalance)(accountInfo).toString() : '0',
               state: _KoniTypes.APIItemState.READY
             };
           });