@subwallet/extension-base 1.3.29-1 → 1.3.31-0

package/koni/background/handlers/Extension.js

@@ -9,12 +9,12 @@ import { withErrorLog } from '@subwallet/extension-base/background/handlers/help
 import { createSubscription } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { CampaignDataType, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, MantaPayEnableMessage, StakingType } from '@subwallet/extension-base/background/KoniTypes';
 import { _SUPPORT_TOKEN_PAY_FEE_GROUP, ALL_ACCOUNT_KEY, LATEST_SESSION } from '@subwallet/extension-base/constants';
-import { additionalValidateTransferForRecipient, validateTransferRequest, validateXcmTransferRequest } from '@subwallet/extension-base/core/logic-validation/transfer';
+import { additionalValidateTransferForRecipient, validateTransferRequest, validateXcmMinAmountToMythos, validateXcmTransferRequest } from '@subwallet/extension-base/core/logic-validation/transfer';
 import { _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { _isSufficientToken } from '@subwallet/extension-base/core/utils';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
 import { getERC20SpendingApprovalTx } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
-import { _ERC721_ABI, isAvailBridgeGatewayContract, isSnowBridgeGatewayContract } from '@subwallet/extension-base/koni/api/contract-handler/utils';
+import { _ERC721_ABI } from '@subwallet/extension-base/koni/api/contract-handler/utils';
 import { resolveAzeroAddressToDomain, resolveAzeroDomainToAddress } from '@subwallet/extension-base/koni/api/dotsama/domain';
 import { parseSubstrateTransaction } from '@subwallet/extension-base/koni/api/dotsama/parseTransaction';
 import { UNSUPPORTED_TRANSFER_EVM_CHAIN_NAME } from '@subwallet/extension-base/koni/api/nft/config';
@@ -29,7 +29,8 @@ import { createCardanoTransaction } from '@subwallet/extension-base/services/bal
 import { getERC20TransactionObject, getERC721Transaction, getEVMTransactionObject, getPSP34TransferExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/smart-contract';
 import { createSubstrateExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/token';
 import { createTonTransaction } from '@subwallet/extension-base/services/balance-service/transfer/ton-transfer';
-import { createAvailBridgeExtrinsicFromAvail, createAvailBridgeTxFromEth, createPolygonBridgeExtrinsic, createSnowBridgeExtrinsic, createXcmExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
+import { createAcrossBridgeExtrinsic, createAvailBridgeExtrinsicFromAvail, createAvailBridgeTxFromEth, createPolygonBridgeExtrinsic, createSnowBridgeExtrinsic, createXcmExtrinsicV2, dryRunXcmExtrinsicV2 } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
+import { _isAcrossChainBridge, getAcrossQuote } from '@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge';
 import { getClaimTxOnAvail, getClaimTxOnEthereum, isAvailChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { _isPolygonChainBridge, getClaimPolygonBridge, isClaimedPolygonBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge';
 import { _isPosChainBridge, getClaimPosBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge';
@@ -43,7 +44,7 @@ import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setti
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { AccountsStore } from '@subwallet/extension-base/stores';
-import { AccountSignMode, BasicTxErrorType, BasicTxWarningCode, CommonStepType, EarningProcessType, ProcessType, StakingTxErrorType, StepStatus, SwapFeeType, SwapProviderId, SwapStepType, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
+import { AccountSignMode, BasicTxErrorType, BasicTxWarningCode, CommonStepType, EarningProcessType, ProcessType, StakingTxErrorType, StepStatus, SwapFeeType, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
 import { _analyzeAddress, calculateMaxTransferable, combineAllAccountProxy, createTransactionFromRLP, detectTransferTxType, getAccountSignMode, isSameAddress, MODULE_SUPPORT, reformatAddress, signatureToHex, transformAccounts, transformAddresses, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { getId } from '@subwallet/extension-base/utils/getId';
@@ -278,7 +279,6 @@ export default class KoniExtension {
       const transformedAccounts = Object.values(accountProxies);
       responseData.accounts = transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [combineAllAccountProxy(transformedAccounts), ...transformedAccounts] : [];
       responseData.currentAccountProxy = currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.proxyId;
-      console.debug('subscriptionAccountGroups', responseData);
       cb(responseData);
     });
     this.createUnsubscriptionHandle(id, () => {
@@ -1105,9 +1105,10 @@ export default class KoniExtension {
       owner,
       spenderAddress
     } = params;
-    if (!isSnowBridgeGatewayContract(spenderAddress) && !isAvailBridgeGatewayContract(spenderAddress)) {
-      throw new Error('Only SnowBridge and AvailBridge is supported'); // todo: support all ERC20 spending approval
-    }
+
+    // if (!isSnowBridgeGatewayContract(spenderAddress) && !isAvailBridgeGatewayContract(spenderAddress)) {
+    //   throw new Error('Only SnowBridge and AvailBridge is supported'); // todo: support all ERC20 spending approval
+    // }
 
     const evmApi = this.#koniState.getEvmApi(chain);
     const transactionConfig = await getERC20SpendingApprovalTx(spenderAddress, owner, contractAddress, evmApi, amount);
@@ -1299,7 +1300,8 @@ export default class KoniExtension {
       const receiverSendingTokenKeepAliveBalance = BigInt(_receiverSendingTokenKeepAliveBalance);
       const amount = BigInt(transferAmount.value);
       const substrateApi = this.#koniState.getSubstrateApi(chain);
-      const isSendingTokenSufficient = await _isSufficientToken(transferTokenInfo, substrateApi);
+      const sufficientChain = this.#koniState.chainService.value.sufficientChains;
+      const isSendingTokenSufficient = await _isSufficientToken(transferTokenInfo, substrateApi, sufficientChain);
       const [warnings, errors] = additionalValidateTransferForRecipient(transferTokenInfo, nativeTokenInfo, extrinsicType, receiverSendingTokenKeepAliveBalance, amount, senderSendingTokenTransferable, receiverSystemAccountInfo, isSendingTokenSufficient);
       warnings.length && inputTransaction.warnings.push(...warnings);
       errors.length && inputTransaction.errors.push(...errors);
@@ -1351,7 +1353,7 @@ export default class KoniExtension {
     const destinationNativeTokenInfo = this.#koniState.getNativeTokenInfo(destinationNetworkKey);
     const destinationNativeTokenSlug = destinationNativeTokenInfo.slug;
     const [errors, fromKeyPair] = validateXcmTransferRequest(destinationTokenInfo, from, value);
-    let extrinsic = null;
+    let extrinsic;
     if (errors.length > 0) {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors(errors);
     }
@@ -1361,9 +1363,12 @@ export default class KoniExtension {
     const isSnowBridgeEvmTransfer = _isPureEvmChain(chainInfoMap[originNetworkKey]) && _isSnowBridgeXcm(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]) && !isAvailBridgeFromEvm;
     const isPolygonBridgeTransfer = _isPolygonChainBridge(originNetworkKey, destinationNetworkKey);
     const isPosBridgeTransfer = _isPosChainBridge(originNetworkKey, destinationNetworkKey);
+    const isAcrossBridgeTransfer = _isAcrossChainBridge(originNetworkKey, destinationNetworkKey);
     const extrinsicType = ExtrinsicType.TRANSFER_XCM;
+    const isSubstrateXcm = !(isAvailBridgeFromEvm || isAvailBridgeFromAvail || isSnowBridgeEvmTransfer || isPolygonBridgeTransfer || isPosBridgeTransfer);
     const isTransferNative = this.#koniState.getNativeTokenInfo(originNetworkKey).slug === tokenSlug;
     const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNative && tokenSlug === tokenPayFeeSlug;
+    let xcmFeeDryRun;
     let additionalValidator;
     let eventsHandler;
     if (fromKeyPair && destinationTokenInfo) {
@@ -1374,6 +1379,9 @@ export default class KoniExtension {
       if (isPosBridgeTransfer || isPolygonBridgeTransfer) {
         funcCreateExtrinsic = createPolygonBridgeExtrinsic;
         type = 'evm';
+      } else if (isAcrossBridgeTransfer) {
+        funcCreateExtrinsic = createAcrossBridgeExtrinsic;
+        type = 'evm';
       } else if (isSnowBridgeEvmTransfer) {
         funcCreateExtrinsic = createSnowBridgeExtrinsic;
         type = 'evm';
@@ -1384,7 +1392,7 @@ export default class KoniExtension {
         funcCreateExtrinsic = createAvailBridgeExtrinsicFromAvail;
         type = 'substrate';
       } else {
-        funcCreateExtrinsic = createXcmExtrinsic;
+        funcCreateExtrinsic = createXcmExtrinsicV2;
         type = 'substrate';
       }
       const feeInfo = await this.#koniState.feeService.subscribeChainFee(getId(), originNetworkKey, type);
@@ -1403,6 +1411,19 @@ export default class KoniExtension {
         feeInfo
       };
       extrinsic = await funcCreateExtrinsic(params);
+      let dryRunInfo;
+      if (isSubstrateXcm) {
+        dryRunInfo = await dryRunXcmExtrinsicV2(params);
+        xcmFeeDryRun = dryRunInfo.fee;
+      }
+      if (isAcrossBridgeTransfer) {
+        const metadata = await getAcrossQuote(params);
+        inputData.metadata = {
+          amountOut: metadata.outputAmount,
+          rate: metadata.rate,
+          destChainSlug: destinationTokenInfo.slug
+        };
+      }
       if (_SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(originNetworkKey)) {
         var _this$koniState$chain2, _substrateApi$api$que2;
         const hydrationFeeAssetId = tokenPayFeeSlug && ((_this$koniState$chain2 = this.#koniState.chainService.getAssetBySlug(tokenPayFeeSlug).metadata) === null || _this$koniState$chain2 === void 0 ? void 0 : _this$koniState$chain2.assetId);
@@ -1412,11 +1433,20 @@ export default class KoniExtension {
         extrinsic = batchExtrinsicSetFeeHydration(substrateApi, _extrinsic, feeSetting, hydrationFeeAssetId);
       }
       additionalValidator = async inputTransaction => {
+        // hotfix xcm mythos to mythos chain
+        const mythosError = validateXcmMinAmountToMythos(destinationNetworkKey, destinationTokenInfo.slug, value);
+        if (mythosError) {
+          inputTransaction.errors.push(mythosError);
+        }
         let isSendingTokenSufficient = false;
         let receiverSystemAccountInfo;
         if (!_isChainSubstrateCompatible(chainInfoMap[destinationNetworkKey])) {
           return undefined;
         }
+        const setting = {
+          visible: true
+        };
+        await this.#koniState.chainService.updateAssetSetting(destinationTokenInfo.slug, setting, true);
         const {
           value: _senderTransferable
         } = await this.getAddressTransferableBalance({
@@ -1444,15 +1474,17 @@ export default class KoniExtension {
           });
           receiverSystemAccountInfo = _receiverNativeTotal.metadata;
         }
-        if (_isChainSubstrateCompatible(chainInfoMap[destinationNetworkKey])) {
-          const substrateApi = this.#koniState.getSubstrateApi(destinationNetworkKey);
-          isSendingTokenSufficient = await _isSufficientToken(destinationTokenInfo, substrateApi);
-        }
+        const substrateApi = this.#koniState.getSubstrateApi(destinationNetworkKey);
+        const sufficientChain = this.#koniState.chainService.value.sufficientChains;
+        isSendingTokenSufficient = await _isSufficientToken(destinationTokenInfo, substrateApi, sufficientChain);
         const [warning, error] = additionalValidateTransferForRecipient(destinationTokenInfo, destinationNativeTokenInfo, extrinsicType, receiverDestinationTokenKeepAliveBalance, sendingAmount, senderTransferable,
         // different from sendingTokenInfo being passed in
         receiverSystemAccountInfo, isSendingTokenSufficient);
         warning.length && inputTransaction.warnings.push(...warning);
         error.length && inputTransaction.errors.push(...error);
+        if (isSubstrateXcm && !dryRunInfo.success) {
+          inputTransaction.errors.push(new TransactionError(BasicTxErrorType.UNABLE_TO_SEND, 'Unable to perform transaction. Select another token or destination chain and try again'));
+        }
       };
       eventsHandler = eventEmitter => {
         eventEmitter.on('send', () => {
@@ -1485,13 +1517,14 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: inputData,
       extrinsicType,
-      chainType: !isSnowBridgeEvmTransfer && !isAvailBridgeFromEvm && !isPolygonBridgeTransfer && !isPosBridgeTransfer ? ChainType.SUBSTRATE : ChainType.EVM,
+      chainType: !isSnowBridgeEvmTransfer && !isAvailBridgeFromEvm && !isPolygonBridgeTransfer && !isPosBridgeTransfer && !isAcrossBridgeTransfer ? ChainType.SUBSTRATE : ChainType.EVM,
       transferNativeAmount: _isNativeToken(originTokenInfo) ? value : '0',
       ignoreWarnings,
       tokenPayFeeSlug,
       isTransferAll: transferAll,
       isTransferLocalTokenAndPayThatTokenAsFee,
       isPassConfirmation,
+      xcmFeeDryRun,
       errors,
       additionalValidator: additionalValidator,
       eventsHandler: eventsHandler
@@ -1622,6 +1655,12 @@ export default class KoniExtension {
   }) {
     return await this.#koniState.enableChain(chainSlug, enableTokens);
   }
+  async enableChainWithPriorityAssets({
+    chainSlug,
+    enableTokens
+  }) {
+    return await this.#koniState.enableChainWithPriorityAssets(chainSlug, enableTokens);
+  }
   async reconnectChain(chainSlug) {
     return this.#koniState.chainService.reconnectChain(chainSlug);
   }
@@ -1730,7 +1769,8 @@ export default class KoniExtension {
       feeCustom,
       feeOption,
       token,
-      tokenPayFeeSlug
+      tokenPayFeeSlug,
+      value
     } = request;
     const cb = createSubscription(id, port);
     const transferTokenInfo = this.#koniState.chainService.getAssetBySlug(token);
@@ -1750,6 +1790,8 @@ export default class KoniExtension {
     }
     const _request = {
       address: address,
+      value,
+      // todo: lazy subscribe to improve performance
       cardanoApi: this.#koniState.chainService.getCardanoApi(chain),
       destChain,
       destToken,
@@ -3617,11 +3659,9 @@ export default class KoniExtension {
     ready = true;
     return this.#koniState.swapService.getSwapPairs();
   }
-  async getOptimalSwapProcessOnSelectQuote(request) {
-    return this.#koniState.swapService.generateOptimalProcessWithoutPath(request);
-  }
   async handleSwapRequest(request) {
-    return this.#koniState.swapService.handleSwapRequest(request);
+    // @ts-ignore
+    return Promise.resolve(null);
   }
   async handleSwapRequestV2(request) {
     return this.#koniState.swapService.handleSwapRequestV2(request);
@@ -3633,7 +3673,7 @@ export default class KoniExtension {
     return swapQuoteResponse;
   }
   async validateSwapProcess(params) {
-    return this.#koniState.swapService.validateSwapProcess(params);
+    return this.#koniState.swapService.validateSwapProcessV2(params);
   }
   async handleSwapStep(inputData) {
     const {
@@ -3663,7 +3703,7 @@ export default class KoniExtension {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(BasicTxErrorType.INTERNAL_ERROR)]);
     }
     const isLastStep = inputData.currentStep + 1 === process.steps.length;
-    const swapValidations = await this.#koniState.swapService.validateSwapProcess({
+    const swapValidations = await this.#koniState.swapService.validateSwapProcessV2({
       address,
       process,
       selectedQuote: quote,
@@ -3687,9 +3727,9 @@ export default class KoniExtension {
           status: StepStatus.FAILED
         });
       }
+      console.log('Error handling process step', e);
       throw e;
     }
-    console.log('swap data', submitData);
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const {
@@ -3701,17 +3741,12 @@ export default class KoniExtension {
       txChain,
       txData
     } = submitData;
-
-    // const chosenFeeToken = process.steps.findIndex((step) => step.type === SwapStepType.SET_FEE_TOKEN) > -1;
-    // const allowSkipValidation = [ExtrinsicType.SET_FEE_TOKEN, ExtrinsicType.SWAP].includes(extrinsicType);
-
     const eventsHandler = eventEmitter => {
       if (onSend) {
         eventEmitter.on('send', onSend);
       }
     };
     if (processId) {
-      const _step = process.steps[inputData.currentStep];
       if (!this.#koniState.transactionService.checkProcessExist(processId) && step) {
         const combineInfo = {
           provider: quote.provider,
@@ -3729,23 +3764,6 @@ export default class KoniExtension {
           combineInfo,
           steps: inputData.process.steps.map((step, index) => {
             const fee = inputData.process.totalFee[index];
-            if (step.type === SwapStepType.SWAP) {
-              const metadata = {
-                pair: quote.pair,
-                aliveUntil: quote.aliveUntil,
-                fromAmount: quote.fromAmount,
-                rate: quote.rate,
-                provider: quote.provider,
-                route: quote.route,
-                toAmount: quote.toAmount
-              };
-              return {
-                ...step,
-                status: StepStatus.QUEUED,
-                fee,
-                metadata: metadata
-              };
-            }
             return {
               ...step,
               fee,
@@ -3755,34 +3773,6 @@ export default class KoniExtension {
           status: StepStatus.QUEUED
         });
       }
-      const isLastStep = inputData.currentStep === process.steps.length - 1;
-      if (isLastStep) {
-        const metadata = {
-          pair: quote.pair,
-          aliveUntil: quote.aliveUntil,
-          fromAmount: quote.fromAmount,
-          rate: quote.rate,
-          provider: quote.provider,
-          route: quote.route,
-          toAmount: quote.toAmount
-        };
-        const step = {
-          ..._step,
-          // In case one sign, status already set to prepare before
-          status: process.steps.length > 2 ? StepStatus.PREPARE : StepStatus.QUEUED,
-          fee: process.totalFee[inputData.currentStep],
-          metadata: metadata
-        };
-        const combineInfo = {
-          provider: quote.provider,
-          slippage: inputData.slippage,
-          address,
-          recipient,
-          quote,
-          process
-        };
-        await this.#koniState.transactionService.updateProcessInfo(processId, combineInfo, step);
-      }
     }
     if (isPermit) {
       return await this.#koniState.transactionService.handlePermitTransaction({
@@ -4014,32 +4004,10 @@ export default class KoniExtension {
               nextTxType: ExtrinsicType.SWAP
             };
             submitData = async (step, callback) => {
-              const isLastStep = step === stepNums - 1;
               const isPassConfirmation = !callback;
               const onSend = callback
               // eslint-disable-next-line node/no-callback-literal
               ? rs => callback(rs) : undefined;
-              const specialCaseForUniswap = data.quote.provider.id === SwapProviderId.UNISWAP && !!data.process.steps.find(step => step.type === SwapStepType.PERMIT);
-              if (stepNums > 2 && isLastStep && !specialCaseForUniswap) {
-                const quote = data.quote;
-                const latestSwapQuote = await this.getLatestSwapQuote({
-                  address: data.address,
-                  currentQuote: quote.provider,
-                  feeToken: quote.feeInfo.selectedFeeToken,
-                  recipient: data.recipient,
-                  pair: quote.pair,
-                  fromAmount: quote.fromAmount,
-                  slippage: data.slippage
-                });
-                return this.handleSwapStep({
-                  ...data,
-                  quote: latestSwapQuote.optimalQuote || data.quote,
-                  currentStep: step,
-                  isPassConfirmation,
-                  errorOnTimeOut: true,
-                  processId
-                });
-              }
               return this.handleSwapStep({
                 ...data,
                 currentStep: step,
@@ -4464,6 +4432,8 @@ export default class KoniExtension {
         return this.getSupportedSmartContractTypes();
       case 'pri(chainService.enableChain)':
         return await this.enableChain(request);
+      case 'pri(chainService.enableChainWithPriorityAssets)':
+        return await this.enableChainWithPriorityAssets(request);
       case 'pri(chainService.reconnectChain)':
         return await this.reconnectChain(request);
       case 'pri(chainService.disableChain)':
@@ -4740,8 +4710,6 @@ export default class KoniExtension {
       /* Swap service */
       case 'pri(swapService.subscribePairs)':
         return this.subscribeSwapPairs(id, port);
-      case 'pri(swapService.getOptimalProcessOnSelectQuote)':
-        return this.getOptimalSwapProcessOnSelectQuote(request);
       case 'pri(swapService.handleSwapRequest)':
         return this.handleSwapRequest(request);
       case 'pri(swapService.handleSwapRequestV2)':

package/koni/background/handlers/State.d.ts

@@ -185,6 +185,7 @@ export default class KoniState {
     private getDefaultNetworkKeys;
     disableChain(chainSlug: string): Promise<boolean>;
     enableChain(chainSlug: string, enableTokens?: boolean): Promise<boolean>;
+    enableChainWithPriorityAssets(chainSlug: string, enableTokens?: boolean): Promise<boolean>;
     resetDefaultChains(): boolean;
     getSubstrateApiMap(): Record<string, import("@subwallet/extension-base/services/chain-service/types")._SubstrateApi>;
     getSubstrateApi(networkKey: string): import("@subwallet/extension-base/services/chain-service/types")._SubstrateApi;

package/koni/background/handlers/State.js

@@ -428,7 +428,7 @@ export default class KoniState {
     const chainState = this.chainService.getChainStateByKey(networkKey);
     if (authUrls[shortenUrl]) {
       if (chainInfo && !_isChainEnabled(chainState)) {
-        await this.enableChain(networkKey);
+        await this.enableChainWithPriorityAssets(networkKey);
       }
       authUrls[shortenUrl].currentEvmNetworkKey = networkKey;
       this.setAuthorize(authUrls);
@@ -699,6 +699,12 @@ export default class KoniState {
     }
     return this.chainService.enableChain(chainSlug);
   }
+  async enableChainWithPriorityAssets(chainSlug, enableTokens = true) {
+    if (enableTokens) {
+      await this.chainService.updatePriorityAssetsByChain(chainSlug, true);
+    }
+    return this.chainService.enableChain(chainSlug);
+  }
   resetDefaultChains() {
     const defaultChains = this.getDefaultNetworkKeys();
     return this.chainService.resetChainInfoMap(defaultChains);

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.29-1",
+  "version": "1.3.31-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -129,6 +129,11 @@
       "require": "./cjs/constants/i18n.js",
       "default": "./constants/i18n.js"
     },
+    "./constants/paraspell-chain-map": {
+      "types": "./constants/paraspell-chain-map.d.ts",
+      "require": "./cjs/constants/paraspell-chain-map.js",
+      "default": "./constants/paraspell-chain-map.js"
+    },
     "./constants/remind-notification-time": {
       "types": "./constants/remind-notification-time.d.ts",
       "require": "./cjs/constants/remind-notification-time.js",
@@ -739,6 +744,11 @@
       "require": "./cjs/services/balance-service/transfer/xcm/index.js",
       "default": "./services/balance-service/transfer/xcm/index.js"
     },
+    "./services/balance-service/transfer/xcm/acrossBridge": {
+      "types": "./services/balance-service/transfer/xcm/acrossBridge/index.d.ts",
+      "require": "./cjs/services/balance-service/transfer/xcm/acrossBridge/index.js",
+      "default": "./services/balance-service/transfer/xcm/acrossBridge/index.js"
+    },
     "./services/balance-service/transfer/xcm/availBridge": {
       "types": "./services/balance-service/transfer/xcm/availBridge.d.ts",
       "require": "./cjs/services/balance-service/transfer/xcm/availBridge.js",
@@ -1401,6 +1411,11 @@
       "require": "./cjs/services/migration-service/scripts/DeleteEarningData.js",
       "default": "./services/migration-service/scripts/DeleteEarningData.js"
     },
+    "./services/migration-service/scripts/DisableZeroBalanceTokens": {
+      "types": "./services/migration-service/scripts/DisableZeroBalanceTokens.d.ts",
+      "require": "./cjs/services/migration-service/scripts/DisableZeroBalanceTokens.js",
+      "default": "./services/migration-service/scripts/DisableZeroBalanceTokens.js"
+    },
     "./services/migration-service/scripts/EnableChain": {
       "types": "./services/migration-service/scripts/EnableChain.d.ts",
       "require": "./cjs/services/migration-service/scripts/EnableChain.js",
@@ -1886,11 +1901,6 @@
       "require": "./cjs/services/swap-service/handler/uniswap-handler.js",
       "default": "./services/swap-service/handler/uniswap-handler.js"
     },
-    "./services/swap-service/interface": {
-      "types": "./services/swap-service/interface.d.ts",
-      "require": "./cjs/services/swap-service/interface.js",
-      "default": "./services/swap-service/interface.js"
-    },
     "./services/swap-service/utils": {
       "types": "./services/swap-service/utils.d.ts",
       "require": "./cjs/services/swap-service/utils.js",
@@ -2620,6 +2630,7 @@
     "./utils/staticData/currencySymbol.json": "./utils/staticData/currencySymbol.json",
     "./utils/staticData/marketingCampaigns.json": "./utils/staticData/marketingCampaigns.json",
     "./utils/staticData/oldChainPrefix.json": "./utils/staticData/oldChainPrefix.json",
+    "./utils/staticData/paraSpellChainMap.json": "./utils/staticData/paraSpellChainMap.json",
     "./utils/staticData/remindNotificationTime.json": "./utils/staticData/remindNotificationTime.json",
     "./utils/staticData/termAndCondition.json": "./utils/staticData/termAndCondition.json",
     "./utils/swap": {
@@ -2642,7 +2653,6 @@
     "@ethereumjs/common": "^4.1.0",
     "@ethereumjs/tx": "^5.1.0",
     "@ethersproject/abi": "^5.7.0",
-    "@galacticcouncil/sdk": "^5.1.0",
     "@gear-js/api": "^0.38.1",
     "@json-rpc-tools/utils": "^1.7.6",
     "@metamask/eth-sig-util": "^7.0.3",
@@ -2669,13 +2679,13 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.102",
-    "@subwallet/extension-base": "^1.3.29-1",
-    "@subwallet/extension-chains": "^1.3.29-1",
-    "@subwallet/extension-dapp": "^1.3.29-1",
-    "@subwallet/extension-inject": "^1.3.29-1",
+    "@subwallet/chain-list": "0.2.103",
+    "@subwallet/extension-base": "^1.3.31-0",
+    "@subwallet/extension-chains": "^1.3.31-0",
+    "@subwallet/extension-dapp": "^1.3.31-0",
+    "@subwallet/extension-inject": "^1.3.31-0",
     "@subwallet/keyring": "^0.1.9",
-    "@subwallet/subwallet-api-sdk": "^1.3.29-1",
+    "@subwallet/subwallet-api-sdk": "^1.3.31-0",
     "@subwallet/ui-keyring": "^0.1.9",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",

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.3.29-1'
+  version: '1.3.31-0'
 };

package/services/balance-service/helpers/process.d.ts

@@ -1,4 +1,4 @@
-import { _ChainAsset } from '@subwallet/chain-list/types';
+import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { _Address } from '@subwallet/extension-base/background/KoniTypes';
 import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
 import { CommonOptimalTransferPath } from '@subwallet/extension-base/types/service-base';
@@ -11,3 +11,4 @@ export interface RequestOptimalTransferProcess {
 }
 export declare function getDefaultTransferProcess(): CommonOptimalTransferPath;
 export declare function getSnowbridgeTransferProcessFromEvm(address: string, evmApi: _EvmApi, tokenInfo: _ChainAsset, amount: string): Promise<CommonOptimalTransferPath>;
+export declare function getAcrossbridgeTransferProcessFromEvm(originChainInfo: _ChainInfo): Promise<CommonOptimalTransferPath>;

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

@@ -3,6 +3,8 @@
 
 import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { CommonStepType, DEFAULT_FIRST_STEP, MOCK_STEP_FEE } from '@subwallet/extension-base/types/service-base';
+import { _getEvmChainId } from "../../chain-service/utils/index.js";
+import { SpokePoolMapping } from "../transfer/xcm/acrossBridge/index.js";
 export function getDefaultTransferProcess() {
   return {
     totalFee: [MOCK_STEP_FEE, MOCK_STEP_FEE],
@@ -34,6 +36,30 @@ export async function getSnowbridgeTransferProcessFromEvm(address, evmApi, token
   // if (!allowance || BigInt(allowance) < BigInt(amount)) {
   // }
 
+  result.steps.push({
+    id: result.steps.length,
+    type: CommonStepType.TRANSFER,
+    name: 'Transfer'
+  });
+  result.totalFee.push(MOCK_STEP_FEE);
+  return Promise.resolve(result);
+}
+export async function getAcrossbridgeTransferProcessFromEvm(originChainInfo) {
+  const chainId = _getEvmChainId(originChainInfo);
+  const SpokePoolAddress = SpokePoolMapping[chainId].SpokePool.address;
+  const result = {
+    totalFee: [MOCK_STEP_FEE],
+    steps: [DEFAULT_FIRST_STEP]
+  };
+  result.steps.push({
+    id: result.steps.length,
+    type: CommonStepType.TOKEN_APPROVAL,
+    name: 'Approve spending',
+    metadata: {
+      SpokePoolAddress
+    }
+  });
+  result.totalFee.push(MOCK_STEP_FEE);
   result.steps.push({
     id: result.steps.length,
     type: CommonStepType.TRANSFER,

package/services/balance-service/index.js

@@ -5,9 +5,9 @@ import { BalanceError } from '@subwallet/extension-base/background/errors/Balanc
 import { APIItemState, 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 { getAcrossbridgeTransferProcessFromEvm, getDefaultTransferProcess, getSnowbridgeTransferProcessFromEvm } from '@subwallet/extension-base/services/balance-service/helpers/process';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
-import { _getChainNativeTokenSlug, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getChainNativeTokenSlug, _isNativeToken, _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 { getKeypairTypeByAddress } from '@subwallet/keyring';
@@ -18,6 +18,7 @@ import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { BehaviorSubject } from 'rxjs';
 import { noop } from '@polkadot/util';
+import { _isAcrossChainBridge } from "./transfer/xcm/acrossBridge/index.js";
 import { BalanceMapImpl } from "./BalanceMapImpl.js";
 import { subscribeBalance } from "./helpers/index.js";
 
@@ -571,6 +572,14 @@ export class BalanceService {
       const tokenInfo = this.state.chainService.getAssetBySlug(params.tokenSlug);
       return getSnowbridgeTransferProcessFromEvm(params.address, evmApi, tokenInfo, params.amount);
     }
+
+    // Across Bridge
+    if (_isAcrossChainBridge(originChainInfo.slug, destChainInfo.slug)) {
+      const tokenInfo = this.state.chainService.getAssetBySlug(params.tokenSlug);
+      if (!_isNativeToken(tokenInfo)) {
+        return getAcrossbridgeTransferProcessFromEvm(originChainInfo);
+      }
+    }
     return getDefaultTransferProcess();
   }
 }

package/services/balance-service/transfer/xcm/acrossBridge/index.d.ts

@@ -0,0 +1,15 @@
+import { CreateXcmExtrinsicProps } from '..';
+export declare function _isAcrossChainBridge(srcChain: string, destChain: string): boolean;
+export declare function _isAcrossTestnetBridge(srcChain: string): boolean;
+export declare const SpokePoolMapping: Record<number, {
+    SpokePool: {
+        address: string;
+        blockNumber: number;
+    };
+}>;
+interface AcrossQuote {
+    outputAmount: string;
+    rate: string;
+}
+export declare const getAcrossQuote: ({ destinationChain, destinationTokenInfo, originChain, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<AcrossQuote>;
+export {};