@subwallet/extension-base 1.3.30-0 → 1.3.31-0

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.30-0",
+  "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",
@@ -2615,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": {
@@ -2663,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.30-0",
-    "@subwallet/extension-chains": "^1.3.30-0",
-    "@subwallet/extension-dapp": "^1.3.30-0",
-    "@subwallet/extension-inject": "^1.3.30-0",
+    "@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.30-0",
+    "@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.30-0'
+  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 {};

package/services/balance-service/transfer/xcm/acrossBridge/index.js

@@ -0,0 +1,216 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
+import { _isAcrossBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
+import subwalletApiSdk from '@subwallet/subwallet-api-sdk';
+// Across Bridge
+const acrossPairsMap = new Map([[COMMON_CHAIN_SLUGS.ETHEREUM, new Set(['optimism', 'base_mainnet', 'arbitrum_one'])], ['optimism', new Set([COMMON_CHAIN_SLUGS.ETHEREUM, 'base_mainnet', 'arbitrum_one'])], ['base_mainnet', new Set([COMMON_CHAIN_SLUGS.ETHEREUM, 'optimism', 'arbitrum_one'])], ['arbitrum_one', new Set([COMMON_CHAIN_SLUGS.ETHEREUM, 'optimism', 'base_mainnet'])], [COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA, new Set(['base_sepolia', 'arbitrum_sepolia'])],
+// TESTNET START HERE
+['base_sepolia', new Set([COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA])], ['arbitrum_sepolia', new Set([COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA])]]);
+export function _isAcrossChainBridge(srcChain, destChain) {
+  var _acrossPairsMap$get$h, _acrossPairsMap$get;
+  return (_acrossPairsMap$get$h = (_acrossPairsMap$get = acrossPairsMap.get(srcChain)) === null || _acrossPairsMap$get === void 0 ? void 0 : _acrossPairsMap$get.has(destChain)) !== null && _acrossPairsMap$get$h !== void 0 ? _acrossPairsMap$get$h : false;
+}
+export function _isAcrossTestnetBridge(srcChain) {
+  return srcChain === 'base_sepolia' || srcChain === 'arbitrum_sepolia' || srcChain === COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA;
+}
+export const SpokePoolMapping = {
+  1: {
+    SpokePool: {
+      address: '0x5c7BCd6E7De5423a257D81B442095A1a6ced35C5',
+      blockNumber: 17117454
+    }
+  },
+  10: {
+    SpokePool: {
+      address: '0x6f26Bf09B1C792e3228e5467807a900A503c0281',
+      blockNumber: 93903076
+    }
+  },
+  11155111: {
+    SpokePool: {
+      address: '0x5ef6C01E11889d86803e0B23e3cB3F9E9d97B662',
+      blockNumber: 5288470
+    }
+  },
+  11155420: {
+    SpokePool: {
+      address: '0x4e8E101924eDE233C13e2D8622DC8aED2872d505',
+      blockNumber: 7762656
+    }
+  },
+  1135: {
+    SpokePool: {
+      address: '0x9552a0a6624A23B848060AE5901659CDDa1f83f8',
+      blockNumber: 2602337
+    }
+  },
+  130: {
+    SpokePool: {
+      address: '0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64',
+      blockNumber: 7915488
+    }
+  },
+  137: {
+    SpokePool: {
+      address: '0x9295ee1d8C5b022Be115A2AD3c30C72E34e7F096',
+      blockNumber: 41908657
+    }
+  },
+  168587773: {
+    SpokePool: {
+      address: '0x5545092553Cf5Bf786e87a87192E902D50D8f022',
+      blockNumber: 7634204
+    }
+  },
+  1868: {
+    SpokePool: {
+      address: '0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96',
+      blockNumber: 1709997
+    }
+  },
+  288: {
+    SpokePool: {
+      address: '0xBbc6009fEfFc27ce705322832Cb2068F8C1e0A58',
+      blockNumber: 619993
+    }
+  },
+  324: {
+    SpokePool: {
+      address: '0xE0B015E54d54fc84a6cB9B666099c46adE9335FF',
+      blockNumber: 10352565
+    }
+  },
+  34443: {
+    SpokePool: {
+      address: '0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96',
+      blockNumber: 8043187
+    }
+  },
+  37111: {
+    SpokePool: {
+      address: '0x6A0a7f39530923911832Dd60667CE5da5449967B',
+      blockNumber: 156275
+    }
+  },
+  41455: {
+    SpokePool: {
+      address: '0x13fDac9F9b4777705db45291bbFF3c972c6d1d97',
+      blockNumber: 4240318
+    }
+  },
+  4202: {
+    SpokePool: {
+      address: '0xeF684C38F94F48775959ECf2012D7E864ffb9dd4',
+      blockNumber: 7267988
+    }
+  },
+  42161: {
+    SpokePool: {
+      address: '0xe35e9842fceaCA96570B734083f4a58e8F7C5f2A',
+      blockNumber: 83868041
+    }
+  },
+  421614: {
+    SpokePool: {
+      address: '0x7E63A5f1a8F0B4d0934B2f2327DAED3F6bb2ee75',
+      blockNumber: 12411026
+    }
+  },
+  480: {
+    SpokePool: {
+      address: '0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64',
+      blockNumber: 4524742
+    }
+  },
+  534352: {
+    SpokePool: {
+      address: '0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96',
+      blockNumber: 7489705
+    }
+  },
+  57073: {
+    SpokePool: {
+      address: '0xeF684C38F94F48775959ECf2012D7E864ffb9dd4',
+      blockNumber: 1139240
+    }
+  },
+  59144: {
+    SpokePool: {
+      address: '0x7E63A5f1a8F0B4d0934B2f2327DAED3F6bb2ee75',
+      blockNumber: 2721169
+    }
+  },
+  690: {
+    SpokePool: {
+      address: '0x13fDac9F9b4777705db45291bbFF3c972c6d1d97',
+      blockNumber: 5512122
+    }
+  },
+  7777777: {
+    SpokePool: {
+      address: '0x13fDac9F9b4777705db45291bbFF3c972c6d1d97',
+      blockNumber: 18382867
+    }
+  },
+  80002: {
+    SpokePool: {
+      address: '0xd08baaE74D6d2eAb1F3320B2E1a53eeb391ce8e5',
+      blockNumber: 7529960
+    }
+  },
+  81457: {
+    SpokePool: {
+      address: '0x2D509190Ed0172ba588407D4c2df918F955Cc6E1',
+      blockNumber: 5574280
+    }
+  },
+  8453: {
+    SpokePool: {
+      address: '0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64',
+      blockNumber: 2164878
+    }
+  },
+  84532: {
+    SpokePool: {
+      address: '0x82B564983aE7274c86695917BBf8C99ECb6F0F8F',
+      blockNumber: 6082004
+    }
+  },
+  919: {
+    SpokePool: {
+      address: '0xbd886FC0725Cc459b55BbFEb3E4278610331f83b',
+      blockNumber: 13999465
+    }
+  }
+};
+// Calculate fee for across bridge transfer
+export const getAcrossQuote = async ({
+  destinationChain,
+  destinationTokenInfo,
+  originChain,
+  originTokenInfo,
+  recipient,
+  sender,
+  sendingValue
+}) => {
+  const isAcrossBridgeXcm = _isAcrossBridgeXcm(originChain, destinationChain);
+  console.log('sendingValue', sendingValue);
+  if (!isAcrossBridgeXcm) {
+    throw new Error('This is not a valid AcrossBridge transfer');
+  }
+  if (!sender) {
+    throw new Error('Sender is required');
+  }
+  try {
+    var _subwalletApiSdk$xcmA;
+    const data = await ((_subwalletApiSdk$xcmA = subwalletApiSdk.xcmApi) === null || _subwalletApiSdk$xcmA === void 0 ? void 0 : _subwalletApiSdk$xcmA.fetchXcmData(sender, originTokenInfo.slug, destinationTokenInfo.slug, recipient, sendingValue));
+    if (!data || !data.metadata) {
+      throw new Error('Failed to get AcrossBridge quote');
+    }
+    return data.metadata;
+  } catch (error) {
+    return Promise.reject(error);
+  }
+};

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

@@ -1,4 +1,5 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
+import { DryRunInfo } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { FeeInfo, TransactionFee } from '@subwallet/extension-base/types';
 import { TransactionConfig } from 'web3-core';
@@ -15,9 +16,12 @@ export declare type CreateXcmExtrinsicProps = {
     substrateApi?: _SubstrateApi;
     feeInfo: FeeInfo;
 } & TransactionFee;
-export declare type FunctionCreateXcmExtrinsic = (props: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'> | TransactionConfig>;
+export declare type FunctionCreateXcmExtrinsic = (props: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'> | TransactionConfig | undefined>;
 export declare const createSnowBridgeExtrinsic: ({ destinationChain, evmApi, feeCustom, feeInfo, feeOption, originChain, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;
 export declare const createXcmExtrinsic: ({ destinationChain, originChain, originTokenInfo, recipient, sendingValue, substrateApi }: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'>>;
 export declare const createAvailBridgeTxFromEth: ({ evmApi, feeCustom, feeInfo, feeOption, originChain, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;
 export declare const createAvailBridgeExtrinsicFromAvail: ({ recipient, sendingValue, substrateApi }: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'>>;
 export declare const createPolygonBridgeExtrinsic: ({ destinationChain, evmApi, feeCustom, feeInfo, feeOption, originChain, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;
+export declare const createXcmExtrinsicV2: (request: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'> | undefined>;
+export declare const dryRunXcmExtrinsicV2: (request: CreateXcmExtrinsicProps) => Promise<DryRunInfo>;
+export declare const createAcrossBridgeExtrinsic: ({ destinationChain, destinationTokenInfo, evmApi, feeCustom, feeInfo, feeOption, originChain, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;

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

@@ -1,15 +1,19 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { _isPolygonBridgeXcm, _isPosBridgeXcm, _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
+import { XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
+import { _isAcrossBridgeXcm, _isPolygonBridgeXcm, _isPosBridgeXcm, _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { getAvailBridgeExtrinsicFromAvail, getAvailBridgeTxFromEth } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { getExtrinsicByPolkadotXcmPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polkadotXcm';
 import { _createPolygonBridgeL1toL2Extrinsic, _createPolygonBridgeL2toL1Extrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge';
 import { getSnowBridgeEvmTransfer } from '@subwallet/extension-base/services/balance-service/transfer/xcm/snowBridge';
+import { buildXcm, dryRunXcmV2, isChainNotSupportDryRun, isChainNotSupportPolkadotApi } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
 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 { _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
+import { combineEthFee } from '@subwallet/extension-base/utils';
+import subwalletApiSdk from '@subwallet/subwallet-api-sdk';
 import { _createPosBridgeL1toL2Extrinsic, _createPosBridgeL2toL1Extrinsic } from "./posBridge.js";
 // SnowBridge
 export const createSnowBridgeExtrinsic = async ({
@@ -111,4 +115,84 @@ export const createPolygonBridgeExtrinsic = async ({
   const sourceChain = originChain.slug;
   const createExtrinsic = isPolygonBridgeXcm ? sourceChain === 'polygonzkEvm_cardona' || sourceChain === 'polygonZkEvm' ? _createPolygonBridgeL2toL1Extrinsic : _createPolygonBridgeL1toL2Extrinsic : sourceChain === 'polygon_amoy' || sourceChain === 'polygon' ? _createPosBridgeL2toL1Extrinsic : _createPosBridgeL1toL2Extrinsic;
   return createExtrinsic(originTokenInfo, originChain, sender, recipient, sendingValue, evmApi, feeInfo, feeCustom, feeOption);
+};
+export const createXcmExtrinsicV2 = async request => {
+  try {
+    return await buildXcm(request);
+  } catch (e) {
+    console.log('createXcmExtrinsicV2 error: ', e);
+    const errorMessage = e instanceof Error ? e.message : 'Unknown error occurred';
+    if (isChainNotSupportPolkadotApi(errorMessage)) {
+      return createXcmExtrinsic(request);
+    }
+    return undefined;
+  }
+};
+export const dryRunXcmExtrinsicV2 = async request => {
+  try {
+    return await dryRunXcmV2(request);
+  } catch (e) {
+    const errorMessage = e instanceof Error ? e.message : 'Unknown error occurred';
+    if (isChainNotSupportDryRun(errorMessage) || isChainNotSupportPolkadotApi(errorMessage)) {
+      const xcmTransfer = await createXcmExtrinsicV2(request);
+      if (!xcmTransfer) {
+        return {
+          success: false
+        };
+      }
+      const _xcmFeeInfo = await xcmTransfer.paymentInfo(request.sender);
+      const xcmFeeInfo = _xcmFeeInfo.toPrimitive();
+
+      // skip dry run in this case
+      return {
+        success: true,
+        fee: Math.round(xcmFeeInfo.partialFee * XCM_MIN_AMOUNT_RATIO).toString()
+      };
+    }
+    return {
+      success: false
+    };
+  }
+};
+export const createAcrossBridgeExtrinsic = async ({
+  destinationChain,
+  destinationTokenInfo,
+  evmApi,
+  feeCustom,
+  feeInfo,
+  feeOption,
+  originChain,
+  originTokenInfo,
+  recipient,
+  sender,
+  sendingValue
+}) => {
+  const isAcrossBridgeXcm = _isAcrossBridgeXcm(originChain, destinationChain);
+  if (!isAcrossBridgeXcm) {
+    throw new Error('This is not a valid AcrossBridge transfer');
+  }
+  if (!evmApi) {
+    throw new Error('Evm API is not available');
+  }
+  if (!sender) {
+    throw new Error('Sender is required');
+  }
+  try {
+    var _subwalletApiSdk$xcmA;
+    const data = await ((_subwalletApiSdk$xcmA = subwalletApiSdk.xcmApi) === null || _subwalletApiSdk$xcmA === void 0 ? void 0 : _subwalletApiSdk$xcmA.fetchXcmData(sender, originTokenInfo.slug, destinationTokenInfo.slug, recipient, sendingValue));
+    const _feeCustom = feeCustom;
+    const feeCombine = combineEthFee(feeInfo, feeOption, _feeCustom);
+    const transactionConfig = {
+      from: data === null || data === void 0 ? void 0 : data.sender,
+      to: data === null || data === void 0 ? void 0 : data.to,
+      value: data === null || data === void 0 ? void 0 : data.value,
+      data: data === null || data === void 0 ? void 0 : data.transferEncodedCall,
+      ...feeCombine
+    };
+    const gasLimit = await evmApi.api.eth.estimateGas(transactionConfig).catch(() => 200000);
+    transactionConfig.gas = gasLimit.toString();
+    return transactionConfig;
+  } catch (error) {
+    return Promise.reject(error);
+  }
 };

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

@@ -1,3 +1,14 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
+import { CreateXcmExtrinsicProps } from '@subwallet/extension-base/services/balance-service/transfer/xcm/index';
+import { SubmittableExtrinsic } from '@polkadot/api/types';
+export interface DryRunInfo {
+    success: boolean;
+    fee?: string;
+}
+export declare function buildXcm(request: CreateXcmExtrinsicProps): Promise<SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
+export declare function dryRunXcm(request: CreateXcmExtrinsicProps): Promise<DryRunInfo>;
+export declare function dryRunXcmV2(request: CreateXcmExtrinsicProps): Promise<DryRunInfo>;
+export declare function isChainNotSupportPolkadotApi(str: string): boolean;
+export declare function isChainNotSupportDryRun(str: string): boolean;
 export declare const STABLE_XCM_VERSION = 3;
 export declare function isUseTeleportProtocol(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, tokenSlug?: string): boolean;