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

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

@@ -4,8 +4,7 @@
 import { _AssetType } from '@subwallet/chain-list/types';
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
 import { ASTAR_REFRESH_BALANCE_INTERVAL, SUB_TOKEN_REFRESH_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
-import { getEVMBalance } from '@subwallet/extension-base/koni/api/tokens/evm/balance';
-import { getERC20Contract } from '@subwallet/extension-base/koni/api/tokens/evm/web3';
+import { getERC20Contract } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
 import { _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { filterAssetsByChainAndType } from '@subwallet/extension-base/utils';
 import { BN } from '@polkadot/util';
@@ -56,6 +55,15 @@ export function subscribeERC20Interval({
     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';
+    }
+  }));
+}
 export function subscribeEVMBalance(params) {
   var _Object$values$;
   const {
@@ -69,7 +77,7 @@ export function subscribeEVMBalance(params) {
   const nativeTokenInfo = filterAssetsByChainAndType(assetMap, chain, [_AssetType.NATIVE]);
   const nativeTokenSlug = ((_Object$values$ = Object.values(nativeTokenInfo)[0]) === null || _Object$values$ === void 0 ? void 0 : _Object$values$.slug) || '';
   function getBalance() {
-    getEVMBalance(chain, addresses, evmApi).then(balances => {
+    getEVMBalance(addresses, evmApi).then(balances => {
       return balances.map((balance, index) => {
         return {
           address: addresses[index],

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

@@ -5,12 +5,13 @@ import { GearApi } from '@gear-js/api';
 import { _AssetType } from '@subwallet/chain-list/types';
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
 import { SUB_TOKEN_REFRESH_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
+import { _getForeignAssetPalletLockedBalance, _getForeignAssetPalletTransferable } from '@subwallet/extension-base/core/substrate/foreign-asset-pallet';
 import { _getTotalStakeInNominationPool } from '@subwallet/extension-base/core/substrate/nominationpools-pallet';
 import { _getSystemPalletTotalBalance, _getSystemPalletTransferable } from '@subwallet/extension-base/core/substrate/system-pallet';
-import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/tokens/wasm';
-import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
+import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/contract-handler/wasm';
+import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/contract-handler/wasm/utils';
 import { _BALANCE_CHAIN_GROUP, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
-import { _checkSmartContractSupportByChain, _getChainExistentialDeposit, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getTokenTypesSupportedByChain, _isBridgedToken, _isChainEvmCompatible, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _checkSmartContractSupportByChain, _getChainExistentialDeposit, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getTokenTypesSupportedByChain, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { filterAssetsByChainAndType, getGRC20ContractPromise } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { combineLatest, Observable } from 'rxjs';
@@ -59,7 +60,7 @@ export const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap,
       unsubLocalToken = await subscribeOrmlTokensPallet(substrateParams);
     }
     if (_BALANCE_CHAIN_GROUP.supportBridged.includes(chain)) {
-      unsubBridgedToken = await subscribeBridgedBalance(substrateParams);
+      unsubBridgedToken = await subscribeForeignAssetBalance(substrateParams);
     }
 
     /**
@@ -150,7 +151,7 @@ const subscribeWithSystemAccountPallet = async ({
     subscription.unsubscribe();
   };
 };
-const subscribeBridgedBalance = async ({
+const subscribeForeignAssetBalance = async ({
   addresses,
   assetMap,
   callback,
@@ -165,30 +166,15 @@ const subscribeBridgedBalance = async ({
     try {
       const isBridgedToken = _isBridgedToken(tokenInfo);
       if (isBridgedToken) {
-        const onChainInfo = _getTokenOnChainInfo(tokenInfo);
-        return await substrateApi.query.foreignAssets.account.multi(addresses.map(address => [onChainInfo, address]), balances => {
+        const assetLocation = _getTokenOnChainInfo(tokenInfo) || _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 = BN_ZERO;
-            let total = BN_ZERO;
-            if (bdata) {
-              // @ts-ignore
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument
-              const addressBalance = new 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 ? _getForeignAssetPalletTransferable(accountInfo).toString() : '0',
+              locked: accountInfo ? _getForeignAssetPalletLockedBalance(accountInfo).toString() : '0',
               state: APIItemState.READY
             };
           });

package/services/balance-service/index.d.ts

@@ -1,8 +1,10 @@
 import { AmountData, DetectBalanceCache, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
+import { RequestOptimalTransferProcess } from '@subwallet/extension-base/services/balance-service/helpers/process';
 import { ServiceStatus, StoppableServiceInterface } from '@subwallet/extension-base/services/base/types';
 import { EventItem, EventType } from '@subwallet/extension-base/services/event-service/types';
 import { BalanceItem, BalanceJson } from '@subwallet/extension-base/types';
+import { CommonOptimalPath } from '@subwallet/extension-base/types/service-base';
 import { PromiseHandler } from '@subwallet/extension-base/utils';
 import { BehaviorSubject } from 'rxjs';
 /**
@@ -93,4 +95,5 @@ export declare class BalanceService implements StoppableServiceInterface {
     private startBalanceDetectCache;
     private startScanBalance;
     private stopScanBalance;
+    getOptimalTransferProcess(params: RequestOptimalTransferProcess): Promise<CommonOptimalPath>;
 }

package/services/balance-service/index.js

@@ -4,8 +4,10 @@
 import { BalanceError } from '@subwallet/extension-base/background/errors/BalanceError';
 import { BalanceErrorType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
+import { _isXcmWithinSameConsensus } from '@subwallet/extension-base/core/substrate/xcm-parser';
+import { getDefaultTransferProcess, getSnowbridgeTransferProcessFromEvm } from '@subwallet/extension-base/services/balance-service/helpers/process';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
-import { _getChainNativeTokenSlug } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getChainNativeTokenSlug, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
 import DetectAccountBalanceStore from '@subwallet/extension-base/stores/DetectAccountBalance';
 import { addLazy, createPromiseHandler, isAccountAll, waitTimeout } from '@subwallet/extension-base/utils';
 import keyring from '@subwallet/ui-keyring';
@@ -464,4 +466,22 @@ export class BalanceService {
     this._unsubscribeBalanceDetectCache = undefined;
     this.startBalanceDetectCache = undefined;
   }
+
+  // process
+  async getOptimalTransferProcess(params) {
+    const originChainInfo = this.state.chainService.getChainInfoByKey(params.originChain);
+    if (!params.destChain) {
+      // normal transfers
+      return getDefaultTransferProcess();
+    }
+    const destChainInfo = this.state.chainService.getChainInfoByKey(params.destChain);
+
+    // xcm
+    if (!_isXcmWithinSameConsensus(originChainInfo, destChainInfo) && _isPureEvmChain(originChainInfo)) {
+      const evmApi = this.state.chainService.getEvmApi(originChainInfo.slug);
+      const tokenInfo = this.state.chainService.getAssetBySlug(params.tokenSlug);
+      return getSnowbridgeTransferProcessFromEvm(params.address, evmApi, tokenInfo, params.amount);
+    }
+    return getDefaultTransferProcess();
+  }
 }

package/services/balance-service/transfer/smart-contract.d.ts

@@ -0,0 +1,7 @@
+import { _ChainInfo } from '@subwallet/chain-list/types';
+import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
+import { TransactionConfig } from 'web3-core';
+export declare function getEVMTransactionObject(chainInfo: _ChainInfo, from: string, to: string, value: string, transferAll: boolean, web3Api: _EvmApi): Promise<[TransactionConfig, string]>;
+export declare function getERC20TransactionObject(assetAddress: string, chainInfo: _ChainInfo, from: string, to: string, value: string, transferAll: boolean, evmApi: _EvmApi): Promise<[TransactionConfig, string]>;
+export declare function getERC721Transaction(web3Api: _EvmApi, chain: string, contractAddress: string, senderAddress: string, recipientAddress: string, tokenId: string): Promise<TransactionConfig>;
+export declare function getPSP34TransferExtrinsic(substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null>;

package/{koni/api/tokens/evm/transfer.js → services/balance-service/transfer/smart-contract.js}

@@ -1,39 +1,13 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { ExternalRequestPromiseStatus } from '@subwallet/extension-base/background/KoniTypes';
-import { getERC20Contract } from '@subwallet/extension-base/koni/api/tokens/evm/web3';
-import { _BALANCE_PARSING_CHAIN_GROUP, EVM_REFORMAT_DECIMALS } from '@subwallet/extension-base/services/chain-service/constants';
-import { _ERC721_ABI } from '@subwallet/extension-base/services/chain-service/helper';
+import { getERC20Contract } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
+import { _ERC721_ABI } from '@subwallet/extension-base/koni/api/contract-handler/utils';
+import { getPSP34ContractPromise } from '@subwallet/extension-base/koni/api/contract-handler/wasm';
+import { getWasmContractGasLimit } from '@subwallet/extension-base/koni/api/contract-handler/wasm/utils';
+import { EVM_REFORMAT_DECIMALS } from '@subwallet/extension-base/services/chain-service/constants';
 import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import BigN from 'bignumber.js';
-import { hexToBn } from '@polkadot/util';
-export const handleTransferBalanceResult = ({
-  callback,
-  changeValue,
-  networkKey,
-  receipt,
-  response,
-  updateState
-}) => {
-  response.status = true;
-  let fee;
-  if (_BALANCE_PARSING_CHAIN_GROUP.bobabeam.indexOf(networkKey) > -1) {
-    // @ts-ignore
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    fee = hexToBn(receipt.l1Fee || '0x0').add(hexToBn(receipt.l2BobaFee || '0x0')).toString();
-  } else {
-    fee = (receipt.gasUsed * receipt.effectiveGasPrice).toString();
-  }
-  response.txResult = {
-    change: changeValue || '0',
-    fee
-  };
-  updateState && updateState({
-    status: receipt.status ? ExternalRequestPromiseStatus.COMPLETED : ExternalRequestPromiseStatus.FAILED
-  });
-  callback(response);
-};
 export async function getEVMTransactionObject(chainInfo, from, to, value, transferAll, web3Api) {
   var _priority$maxFeePerGa, _priority$maxPriority;
   const networkKey = chainInfo.slug;
@@ -120,4 +94,27 @@ export async function getERC721Transaction(web3Api, chain, contractAddress, send
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
     data: contract.methods.safeTransferFrom(senderAddress, recipientAddress, tokenId).encodeABI()
   };
+}
+const mustFormatNumberReg = /^-?[0-9][0-9,.]+$/;
+export async function getPSP34TransferExtrinsic(substrateApi, senderAddress, recipientAddress, params) {
+  const contractAddress = params.contractAddress;
+  const onChainOption = params.onChainOption;
+  for (const [key, value] of Object.entries(onChainOption)) {
+    if (mustFormatNumberReg.test(value)) {
+      onChainOption[key] = value.replaceAll(',', '');
+    }
+  }
+  try {
+    const contractPromise = getPSP34ContractPromise(substrateApi.api, contractAddress);
+    // @ts-ignore
+    const gasLimit = await getWasmContractGasLimit(substrateApi.api, senderAddress, 'psp34::transfer', contractPromise, {}, [recipientAddress, onChainOption, {}]);
+
+    // @ts-ignore
+    return contractPromise.tx['psp34::transfer']({
+      gasLimit
+    }, recipientAddress, onChainOption, {});
+  } catch (e) {
+    console.debug(e);
+    return null;
+  }
 }

package/{koni/api/dotsama/transfer.js → services/balance-service/transfer/token.js}

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { GearApi } from '@gear-js/api';
-import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/tokens/wasm';
-import { getWasmContractGasLimit } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
+import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/contract-handler/wasm';
+import { getWasmContractGasLimit } from '@subwallet/extension-base/koni/api/contract-handler/wasm/utils';
 import { _TRANSFER_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
-import { _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _isBridgedToken, _isChainEvmCompatible, _isNativeToken, _isTokenGearSmartContract, _isTokenTransferredByEvm, _isTokenWasmSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible, _isNativeToken, _isTokenGearSmartContract, _isTokenTransferredByEvm, _isTokenWasmSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import { getGRC20ContractPromise } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
@@ -36,7 +36,7 @@ export const createTransferExtrinsic = async ({
   let transferAmount; // for PSP-22 tokens, might be deprecated in the future
 
   if (_isBridgedToken(tokenInfo) && api.tx.foreignAssets) {
-    const onChainInfo = _getTokenOnChainInfo(tokenInfo);
+    const onChainInfo = _getTokenOnChainInfo(tokenInfo) || _getXcmAssetMultilocation(tokenInfo);
     if (transferAll) {
       transfer = api.tx.foreignAssets.transfer(onChainInfo, to, value);
     } else {

package/{koni/api → services/balance-service/transfer}/xcm/index.d.ts

@@ -1,15 +1,21 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
-import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
+import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import BigN from 'bignumber.js';
+import { TransactionConfig } from 'web3-core';
 import { SubmittableExtrinsic } from '@polkadot/api/types';
-interface CreateXcmExtrinsicProps {
+declare type CreateXcmExtrinsicProps = {
     originTokenInfo: _ChainAsset;
     destinationTokenInfo: _ChainAsset;
     recipient: string;
     sendingValue: string;
     substrateApi: _SubstrateApi;
     chainInfoMap: Record<string, _ChainInfo>;
-}
+};
+declare type CreateSnowBridgeExtrinsicProps = Omit<CreateXcmExtrinsicProps, 'substrateApi'> & {
+    evmApi: _EvmApi;
+    sender: string;
+};
+export declare const createSnowBridgeExtrinsic: ({ chainInfoMap, destinationTokenInfo, evmApi, originTokenInfo, recipient, sender, sendingValue }: CreateSnowBridgeExtrinsicProps) => Promise<TransactionConfig>;
 export declare const createXcmExtrinsic: ({ chainInfoMap, destinationTokenInfo, originTokenInfo, recipient, sendingValue, substrateApi }: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'>>;
 export declare const getXcmMockTxFee: (substrateApi: _SubstrateApi, chainInfoMap: Record<string, _ChainInfo>, address: string, originTokenInfo: _ChainAsset, destinationTokenInfo: _ChainAsset) => Promise<BigN>;
 export {};

package/{koni/api → services/balance-service/transfer}/xcm/index.js

@@ -1,14 +1,32 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { getExtrinsicByPolkadotXcmPallet } from '@subwallet/extension-base/koni/api/xcm/polkadotXcm';
-import { getExtrinsicByXcmPalletPallet } from '@subwallet/extension-base/koni/api/xcm/xcmPallet';
-import { getExtrinsicByXtokensPallet } from '@subwallet/extension-base/koni/api/xcm/xTokens';
+import { _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
+import { getExtrinsicByPolkadotXcmPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polkadotXcm';
+import { getSnowBridgeEvmTransfer } from '@subwallet/extension-base/services/balance-service/transfer/xcm/snowBridge';
+import { getExtrinsicByXcmPalletPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/xcmPallet';
+import { getExtrinsicByXtokensPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/xTokens';
 import { _XCM_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _isChainEvmCompatible, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 import BigN from 'bignumber.js';
 import { u8aToHex } from '@polkadot/util';
 import { addressToEvm, isEthereumAddress } from '@polkadot/util-crypto';
+export const createSnowBridgeExtrinsic = async ({
+  chainInfoMap,
+  destinationTokenInfo,
+  evmApi,
+  originTokenInfo,
+  recipient,
+  sender,
+  sendingValue
+}) => {
+  const originChainInfo = chainInfoMap[originTokenInfo.originChain];
+  const destinationChainInfo = chainInfoMap[destinationTokenInfo.originChain];
+  if (!_isSnowBridgeXcm(originChainInfo, destinationChainInfo)) {
+    throw new Error('This is not a valid SnowBridge transfer');
+  }
+  return getSnowBridgeEvmTransfer(originTokenInfo, originChainInfo, destinationChainInfo, sender, recipient, sendingValue, evmApi);
+};
 export const createXcmExtrinsic = async ({
   chainInfoMap,
   destinationTokenInfo,

package/{koni/api → services/balance-service/transfer}/xcm/polkadotXcm.js

@@ -1,13 +1,13 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { _getXcmBeneficiary, _getXcmDestWeight, _getXcmMultiAssets, _getXcmMultiLocation } from '@subwallet/extension-base/core/substrate/xcm-parser';
-import { isUseTeleportProtocol, STABLE_XCM_VERSION } from '@subwallet/extension-base/koni/api/xcm/utils';
+import { _getXcmBeneficiary, _getXcmDestWeight, _getXcmMultiAssets, _getXcmMultiLocation, _isXcmWithinSameConsensus } from '@subwallet/extension-base/core/substrate/xcm-parser';
+import { isUseTeleportProtocol, STABLE_XCM_VERSION } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
 import { _isBridgedToken } from '@subwallet/extension-base/services/chain-service/utils';
 export function getExtrinsicByPolkadotXcmPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   let version = STABLE_XCM_VERSION;
   let method = 'limitedReserveTransferAssets';
-  if (_isBridgedToken(tokenInfo)) {
+  if (_isBridgedToken(tokenInfo) && !_isXcmWithinSameConsensus(originChainInfo, destinationChainInfo)) {
     version = 4;
     method = 'transferAssets';
   }

package/services/balance-service/transfer/xcm/snowBridge.d.ts

@@ -0,0 +1,4 @@
+import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
+import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
+import { TransactionConfig } from 'web3-core';
+export declare function getSnowBridgeEvmTransfer(tokenInfo: _ChainAsset, originChainInfo: _ChainInfo, destinationChainInfo: _ChainInfo, sender: string, recipientAddress: string, value: string, evmApi: _EvmApi): Promise<TransactionConfig>;

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

@@ -0,0 +1,54 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { getWeb3Contract } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
+import { _SNOWBRIDGE_GATEWAY_ABI, getSnowBridgeGatewayContract } from '@subwallet/extension-base/koni/api/contract-handler/utils';
+import { _getContractAddressOfToken, _getSubstrateParaId, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
+import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
+import { u8aToHex } from '@polkadot/util';
+import { decodeAddress } from '@polkadot/util-crypto';
+async function getSendFeeToken(contract, tokenContract, destChainParaId, destinationFee) {
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+  const quoteSendTokenFee = contract.methods.quoteSendTokenFee(tokenContract, destChainParaId, destinationFee);
+
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+  return await quoteSendTokenFee.call();
+}
+export async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, destinationChainInfo, sender, recipientAddress, value, evmApi) {
+  var _priority$maxFeePerGa, _priority$maxPriority;
+  const snowBridgeContractAddress = getSnowBridgeGatewayContract(originChainInfo.slug);
+  const snowBridgeContract = getWeb3Contract(snowBridgeContractAddress, evmApi, _SNOWBRIDGE_GATEWAY_ABI);
+  const tokenContract = _getContractAddressOfToken(tokenInfo);
+  const destinationChainParaId = _getSubstrateParaId(destinationChainInfo);
+  const recipient = {
+    kind: 1,
+    data: _isChainEvmCompatible(destinationChainInfo) ? recipientAddress : u8aToHex(decodeAddress(recipientAddress))
+  };
+  const destinationFee = '0';
+
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+  const transferCall = snowBridgeContract.methods.sendToken(tokenContract, destinationChainParaId, recipient, destinationFee, value);
+  // 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 {
+    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()
+  };
+}

package/{koni/api → services/balance-service/transfer}/xcm/xTokens.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { _getXcmDestWeight, _getXcmMultiAssets, _getXcmMultiLocation } from '@subwallet/extension-base/core/substrate/xcm-parser';
-import { STABLE_XCM_VERSION } from '@subwallet/extension-base/koni/api/xcm/utils';
+import { STABLE_XCM_VERSION } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
 import { _getTokenOnChainAssetId, _getTokenOnChainInfo, _getXcmAssetId, _getXcmAssetMultilocation, _getXcmAssetType } from '@subwallet/extension-base/services/chain-service/utils';
 function getCurrencyId(tokenInfo) {
   if (['moonbeam', 'moonbase', 'moonriver'].includes(tokenInfo.originChain)) {

package/{koni/api → services/balance-service/transfer}/xcm/xcmPallet.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { _getXcmBeneficiary, _getXcmDestWeight, _getXcmMultiAssets, _getXcmMultiLocation } from '@subwallet/extension-base/core/substrate/xcm-parser';
-import { isUseTeleportProtocol, STABLE_XCM_VERSION } from '@subwallet/extension-base/koni/api/xcm/utils';
+import { isUseTeleportProtocol, STABLE_XCM_VERSION } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
 // this pallet is only used by Relaychains
 export function getExtrinsicByXcmPalletPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = _getXcmDestWeight(originChainInfo);

package/services/chain-service/handler/EvmChainHandler.js

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { _AssetType } from '@subwallet/chain-list/types';
+import { _ERC20_ABI, _ERC721_ABI } from '@subwallet/extension-base/koni/api/contract-handler/utils';
 import { AbstractChainHandler } from '@subwallet/extension-base/services/chain-service/handler/AbstractChainHandler';
 import { EvmApi } from '@subwallet/extension-base/services/chain-service/handler/EvmApi';
-import { _ERC20_ABI, _ERC721_ABI } from '@subwallet/extension-base/services/chain-service/helper';
 import BigN from 'bignumber.js';
 import { logger as createLogger } from '@polkadot/util/logger';
 export class EvmChainHandler extends AbstractChainHandler {

package/services/chain-service/handler/SubstrateChainHandler.js

@@ -3,14 +3,14 @@
 
 import { GearApi } from '@gear-js/api';
 import { _AssetType } from '@subwallet/chain-list/types';
-import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
+import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/contract-handler/wasm/utils';
 import { AbstractChainHandler } from '@subwallet/extension-base/services/chain-service/handler/AbstractChainHandler';
 import { SubstrateApi } from '@subwallet/extension-base/services/chain-service/handler/SubstrateApi';
 import { DEFAULT_GEAR_ADDRESS, getGRC20ContractPromise } from '@subwallet/extension-base/utils';
 import { ContractPromise } from '@polkadot/api-contract';
 import { BN } from '@polkadot/util';
 import { logger as createLogger } from '@polkadot/util/logger';
-import { _PSP22_ABI, _PSP34_ABI } from "../helper/index.js";
+import { _PSP22_ABI, _PSP34_ABI } from "../../../koni/api/contract-handler/utils/index.js";
 export const DEFAULT_AUX = ['Aux1', 'Aux2', 'Aux3', 'Aux4', 'Aux5', 'Aux6', 'Aux7', 'Aux8', 'Aux9'];
 export class SubstrateChainHandler extends AbstractChainHandler {
   substrateApiMap = {};

package/services/chain-service/health-check/utils/asset-info.js

@@ -1,9 +1,9 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { getERC20Contract } from '@subwallet/extension-base/koni/api/tokens/evm/web3';
-import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
-import { _PSP22_ABI } from '@subwallet/extension-base/services/chain-service/helper';
+import { getERC20Contract } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
+import { _PSP22_ABI } from '@subwallet/extension-base/koni/api/contract-handler/utils';
+import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/contract-handler/wasm/utils';
 import { _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import BigN from 'bignumber.js';
 import { ContractPromise } from '@polkadot/api-contract';

package/services/earning-service/handlers/liquid-staking/stella-swap.js

@@ -3,7 +3,7 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BasicTxErrorType, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { getERC20Contract } from '@subwallet/extension-base/koni/api/tokens/evm/web3';
+import { getERC20Contract, getERC20SpendingApprovalTx } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
 import { _getAssetDecimals, _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import { EarningStatus, UnstakingStatus, YieldStepType } from '@subwallet/extension-base/types';
@@ -17,7 +17,6 @@ export const getStellaswapLiquidStakingContract = (networkKey, assetAddress, evm
 };
 const APR_STATS_URL = 'https://apr-api.stellaswap.com/api/v1/stdot';
 const SUBWALLET_REFERRAL = '0x7e6815f45E624768548d085231f2d453f16FD7DD';
-const MAX_INT = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
 export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakingPoolHandler {
   inputAsset = 'moonbeam-LOCAL-xcDOT';
   altInputAsset = '';
@@ -247,7 +246,6 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     return Promise.resolve([]);
   }
   async handleTokenApproveStep(data, path) {
-    var _priority$maxFeePerGa, _priority$maxPriority;
     const {
       address
     } = data;
@@ -256,33 +254,16 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     const derivativeTokenInfo = this.state.getAssetBySlug(this.derivativeAssets[0]);
     const derivativeTokenContractAddress = _getContractAddressOfToken(derivativeTokenInfo);
     const evmApi = this.evmApi;
-    const inputTokenContract = getERC20Contract(_getContractAddressOfToken(inputTokenInfo), evmApi);
-
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-    const approveCall = inputTokenContract.methods.approve(derivativeTokenContractAddress, MAX_INT); // TODO: need test
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-    const approveEncodedCall = approveCall.encodeABI();
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-    const gasLimit = await approveCall.estimateGas({
-      from: address
-    });
-    const priority = await calculateGasFeeParams(evmApi, this.chain);
-    const transactionObject = {
-      from: address,
-      to: _getContractAddressOfToken(inputTokenInfo),
-      data: approveEncodedCall,
-      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()
-    };
+    const transactionObject = await getERC20SpendingApprovalTx(derivativeTokenContractAddress, address, _getContractAddressOfToken(inputTokenInfo), evmApi);
     const _data = {
-      inputTokenSlug: inputTokenSlug,
-      spenderTokenSlug: this.derivativeAssets[0]
+      contractAddress: inputTokenSlug,
+      spenderAddress: this.derivativeAssets[0],
+      owner: address,
+      chain: this.chain
     };
     return Promise.resolve({
       txChain: this.chain,
-      extrinsicType: ExtrinsicType.TOKEN_APPROVE,
+      extrinsicType: ExtrinsicType.TOKEN_SPENDING_APPROVAL,
       extrinsic: transactionObject,
       txData: _data,
       transferNativeAmount: '0',
@@ -290,7 +271,7 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     });
   }
   async handleSubmitStep(data, path) {
-    var _priority$maxFeePerGa2, _priority$maxPriority2;
+    var _priority$maxFeePerGa, _priority$maxPriority;
     const {
       address,
       amount
@@ -316,8 +297,8 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
       data: depositEncodedCall,
       gas: gasLimit,
       gasPrice: priority.gasPrice,
-      maxFeePerGas: (_priority$maxFeePerGa2 = priority.maxFeePerGas) === null || _priority$maxFeePerGa2 === void 0 ? void 0 : _priority$maxFeePerGa2.toString(),
-      maxPriorityFeePerGas: (_priority$maxPriority2 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority2 === void 0 ? void 0 : _priority$maxPriority2.toString()
+      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()
     };
     return {
       txChain: this.chain,
@@ -337,7 +318,7 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     return Promise.reject(new TransactionError(BasicTxErrorType.UNSUPPORTED));
   }
   async handleYieldUnstake(amount, address, selectedTarget) {
-    var _priority$maxFeePerGa3, _priority$maxPriority3;
+    var _priority$maxFeePerGa2, _priority$maxPriority2;
     const evmApi = this.evmApi;
     const derivativeTokenSlug = this.derivativeAssets[0];
     const derivativeTokenInfo = this.state.getAssetBySlug(derivativeTokenSlug);
@@ -359,8 +340,8 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
       data: redeemEncodedCall,
       gas: gasLimit,
       gasPrice: priority.gasPrice,
-      maxFeePerGas: (_priority$maxFeePerGa3 = priority.maxFeePerGas) === null || _priority$maxFeePerGa3 === void 0 ? void 0 : _priority$maxFeePerGa3.toString(),
-      maxPriorityFeePerGas: (_priority$maxPriority3 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority3 === void 0 ? void 0 : _priority$maxPriority3.toString()
+      maxFeePerGas: (_priority$maxFeePerGa2 = priority.maxFeePerGas) === null || _priority$maxFeePerGa2 === void 0 ? void 0 : _priority$maxFeePerGa2.toString(),
+      maxPriorityFeePerGas: (_priority$maxPriority2 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority2 === void 0 ? void 0 : _priority$maxPriority2.toString()
     };
     return [ExtrinsicType.UNSTAKE_STDOT, transaction];
   }
@@ -370,7 +351,7 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
   /* Other actions */
 
   async handleYieldWithdraw(address, unstakingInfo) {
-    var _priority$maxFeePerGa4, _priority$maxPriority4;
+    var _priority$maxFeePerGa3, _priority$maxPriority3;
     const evmApi = this.evmApi;
     const derivativeTokenSlug = this.derivativeAssets[0];
     const derivativeTokenInfo = this.state.getAssetBySlug(derivativeTokenSlug);
@@ -392,8 +373,8 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
       data: withdrawEncodedCall,
       gas: gasLimit,
       gasPrice: priority.gasPrice,
-      maxFeePerGas: (_priority$maxFeePerGa4 = priority.maxFeePerGas) === null || _priority$maxFeePerGa4 === void 0 ? void 0 : _priority$maxFeePerGa4.toString(),
-      maxPriorityFeePerGas: (_priority$maxPriority4 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority4 === void 0 ? void 0 : _priority$maxPriority4.toString()
+      maxFeePerGas: (_priority$maxFeePerGa3 = priority.maxFeePerGas) === null || _priority$maxFeePerGa3 === void 0 ? void 0 : _priority$maxFeePerGa3.toString(),
+      maxPriorityFeePerGas: (_priority$maxPriority3 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority3 === void 0 ? void 0 : _priority$maxPriority3.toString()
     }; // TODO: check tx history parsing
   }
 

package/services/earning-service/handlers/special.js

@@ -4,8 +4,8 @@
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BasicTxErrorType, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
-import { createXcmExtrinsic } from '@subwallet/extension-base/koni/api/xcm';
 import { YIELD_POOL_STAT_REFRESH_INTERVAL } from '@subwallet/extension-base/koni/api/yield/helper/utils';
+import { createXcmExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
 import { _getChainNativeTokenSlug } from '@subwallet/extension-base/services/chain-service/utils';
 import { YieldStepType, YieldValidationStatus } from '@subwallet/extension-base/types';
 import { createPromiseHandler, formatNumber } from '@subwallet/extension-base/utils';