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

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

@@ -438,7 +438,7 @@ class KoniState {
     const chainState = this.chainService.getChainStateByKey(networkKey);
     if (authUrls[shortenUrl]) {
       if (chainInfo && !(0, _utils._isChainEnabled)(chainState)) {
-        await this.enableChain(networkKey);
+        await this.enableChainWithPriorityAssets(networkKey);
       }
       authUrls[shortenUrl].currentEvmNetworkKey = networkKey;
       this.setAuthorize(authUrls);
@@ -712,6 +712,13 @@ class KoniState {
     }
     return this.chainService.enableChain(chainSlug);
   }
+  async enableChainWithPriorityAssets(chainSlug) {
+    let enableTokens = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 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/cjs/packageInfo.js

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

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

@@ -3,10 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getAcrossbridgeTransferProcessFromEvm = getAcrossbridgeTransferProcessFromEvm;
 exports.getDefaultTransferProcess = getDefaultTransferProcess;
 exports.getSnowbridgeTransferProcessFromEvm = getSnowbridgeTransferProcessFromEvm;
 var _chainList = require("@subwallet/chain-list");
 var _serviceBase = require("@subwallet/extension-base/types/service-base");
+var _utils = require("../../chain-service/utils");
+var _acrossBridge = require("../transfer/xcm/acrossBridge");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -41,6 +44,30 @@ async function getSnowbridgeTransferProcessFromEvm(address, evmApi, tokenInfo, a
   // if (!allowance || BigInt(allowance) < BigInt(amount)) {
   // }
 
+  result.steps.push({
+    id: result.steps.length,
+    type: _serviceBase.CommonStepType.TRANSFER,
+    name: 'Transfer'
+  });
+  result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
+  return Promise.resolve(result);
+}
+async function getAcrossbridgeTransferProcessFromEvm(originChainInfo) {
+  const chainId = (0, _utils._getEvmChainId)(originChainInfo);
+  const SpokePoolAddress = _acrossBridge.SpokePoolMapping[chainId].SpokePool.address;
+  const result = {
+    totalFee: [_serviceBase.MOCK_STEP_FEE],
+    steps: [_serviceBase.DEFAULT_FIRST_STEP]
+  };
+  result.steps.push({
+    id: result.steps.length,
+    type: _serviceBase.CommonStepType.TOKEN_APPROVAL,
+    name: 'Approve spending',
+    metadata: {
+      SpokePoolAddress
+    }
+  });
+  result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
   result.steps.push({
     id: result.steps.length,
     type: _serviceBase.CommonStepType.TRANSFER,

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

@@ -22,6 +22,7 @@ var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 var _rxjs = require("rxjs");
 var _util = require("@polkadot/util");
+var _acrossBridge = require("./transfer/xcm/acrossBridge");
 var _BalanceMapImpl = require("./BalanceMapImpl");
 var _helpers = require("./helpers");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
@@ -580,6 +581,14 @@ class BalanceService {
       const tokenInfo = this.state.chainService.getAssetBySlug(params.tokenSlug);
       return (0, _process.getSnowbridgeTransferProcessFromEvm)(params.address, evmApi, tokenInfo, params.amount);
     }
+
+    // Across Bridge
+    if ((0, _acrossBridge._isAcrossChainBridge)(originChainInfo.slug, destChainInfo.slug)) {
+      const tokenInfo = this.state.chainService.getAssetBySlug(params.tokenSlug);
+      if (!(0, _utils._isNativeToken)(tokenInfo)) {
+        return (0, _process.getAcrossbridgeTransferProcessFromEvm)(originChainInfo);
+      }
+    }
     return (0, _process.getDefaultTransferProcess)();
   }
 }

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

@@ -0,0 +1,229 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SpokePoolMapping = void 0;
+exports._isAcrossChainBridge = _isAcrossChainBridge;
+exports._isAcrossTestnetBridge = _isAcrossTestnetBridge;
+exports.getAcrossQuote = void 0;
+var _chainList = require("@subwallet/chain-list");
+var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
+var _subwalletApiSdk = _interopRequireDefault(require("@subwallet/subwallet-api-sdk"));
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+// Across Bridge
+const acrossPairsMap = new Map([[_chainList.COMMON_CHAIN_SLUGS.ETHEREUM, new Set(['optimism', 'base_mainnet', 'arbitrum_one'])], ['optimism', new Set([_chainList.COMMON_CHAIN_SLUGS.ETHEREUM, 'base_mainnet', 'arbitrum_one'])], ['base_mainnet', new Set([_chainList.COMMON_CHAIN_SLUGS.ETHEREUM, 'optimism', 'arbitrum_one'])], ['arbitrum_one', new Set([_chainList.COMMON_CHAIN_SLUGS.ETHEREUM, 'optimism', 'base_mainnet'])], [_chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA, new Set(['base_sepolia', 'arbitrum_sepolia'])],
+// TESTNET START HERE
+['base_sepolia', new Set([_chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA])], ['arbitrum_sepolia', new Set([_chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA])]]);
+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;
+}
+function _isAcrossTestnetBridge(srcChain) {
+  return srcChain === 'base_sepolia' || srcChain === 'arbitrum_sepolia' || srcChain === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA;
+}
+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
+    }
+  }
+};
+exports.SpokePoolMapping = SpokePoolMapping;
+// Calculate fee for across bridge transfer
+const getAcrossQuote = async _ref => {
+  let {
+    destinationChain,
+    destinationTokenInfo,
+    originChain,
+    originTokenInfo,
+    recipient,
+    sender,
+    sendingValue
+  } = _ref;
+  const isAcrossBridgeXcm = (0, _xcmParser._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.default.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);
+  }
+};
+exports.getAcrossQuote = getAcrossQuote;

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

@@ -67,12 +67,12 @@ async function getClaimTxOnAvail(notification, substrateApi) {
   const chainApi = await substrateApi.isReady;
   const chainSlug = chainApi.chainSlug;
   const metadata = notification.metadata;
-  const lastestEthHeadSlot = await getLastestEthHeadSlot(chainSlug);
-  const lastestBlockHash = await getLastestBlockHash(chainSlug, lastestEthHeadSlot);
-  const proof = await getClaimProofOnAvail(chainSlug, lastestBlockHash, metadata.messageId);
-  return chainApi.api.tx.vector.execute(lastestEthHeadSlot, getAddressMessage(notification), proof.accountProof, proof.storageProof);
+  const latestEthHeadSlot = await getLatestEthHeadSlot(chainSlug);
+  const latestBlockHash = await getLatestBlockHash(chainSlug, latestEthHeadSlot);
+  const proof = await getClaimProofOnAvail(chainSlug, latestBlockHash, metadata.messageId);
+  return chainApi.api.tx.vector.execute(latestEthHeadSlot, getAddressMessage(notification), proof.accountProof, proof.storageProof);
 }
-async function getLastestEthHeadSlot(chainSlug) {
+async function getLatestEthHeadSlot(chainSlug) {
   try {
     const api = getAvailBridgeApi(chainSlug);
     const rawResponse = await fetch(`${api}/eth/head`);
@@ -83,7 +83,7 @@ async function getLastestEthHeadSlot(chainSlug) {
     throw e;
   }
 }
-async function getLastestBlockHash(chainSlug, slot) {
+async function getLatestBlockHash(chainSlug, slot) {
   try {
     const api = getAvailBridgeApi(chainSlug);
     const rawResponse = await fetch(`${api}/beacon/slot/${slot}`);

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

@@ -1,18 +1,23 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createXcmExtrinsic = exports.createSnowBridgeExtrinsic = exports.createPolygonBridgeExtrinsic = exports.createAvailBridgeTxFromEth = exports.createAvailBridgeExtrinsicFromAvail = void 0;
+exports.dryRunXcmExtrinsicV2 = exports.createXcmExtrinsicV2 = exports.createXcmExtrinsic = exports.createSnowBridgeExtrinsic = exports.createPolygonBridgeExtrinsic = exports.createAvailBridgeTxFromEth = exports.createAvailBridgeExtrinsicFromAvail = exports.createAcrossBridgeExtrinsic = void 0;
+var _constants = require("@subwallet/extension-base/constants");
 var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
 var _availBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge");
 var _polkadotXcm = require("@subwallet/extension-base/services/balance-service/transfer/xcm/polkadotXcm");
 var _polygonBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge");
 var _snowBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/snowBridge");
+var _utils = require("@subwallet/extension-base/services/balance-service/transfer/xcm/utils");
 var _xcmPallet = require("@subwallet/extension-base/services/balance-service/transfer/xcm/xcmPallet");
 var _xTokens = require("@subwallet/extension-base/services/balance-service/transfer/xcm/xTokens");
-var _constants = require("@subwallet/extension-base/services/chain-service/constants");
-var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
+var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils3 = require("@subwallet/extension-base/utils");
+var _subwalletApiSdk = _interopRequireDefault(require("@subwallet/subwallet-api-sdk"));
 var _posBridge = require("./posBridge");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -57,11 +62,11 @@ const createXcmExtrinsic = async _ref2 => {
   }
   const chainApi = await substrateApi.isReady;
   const api = chainApi.api;
-  const polkadotXcmSpecialCases = _constants._XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChain.slug) && (0, _utils._isNativeToken)(originTokenInfo);
-  if (_constants._XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain) || polkadotXcmSpecialCases) {
+  const polkadotXcmSpecialCases = _constants2._XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChain.slug) && (0, _utils2._isNativeToken)(originTokenInfo);
+  if (_constants2._XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain) || polkadotXcmSpecialCases) {
     return (0, _polkadotXcm.getExtrinsicByPolkadotXcmPallet)(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
   }
-  if (_constants._XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
+  if (_constants2._XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
     return (0, _xcmPallet.getExtrinsicByXcmPalletPallet)(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
   }
   return (0, _xTokens.getExtrinsicByXtokensPallet)(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
@@ -127,4 +132,88 @@ const createPolygonBridgeExtrinsic = async _ref5 => {
   const createExtrinsic = isPolygonBridgeXcm ? sourceChain === 'polygonzkEvm_cardona' || sourceChain === 'polygonZkEvm' ? _polygonBridge._createPolygonBridgeL2toL1Extrinsic : _polygonBridge._createPolygonBridgeL1toL2Extrinsic : sourceChain === 'polygon_amoy' || sourceChain === 'polygon' ? _posBridge._createPosBridgeL2toL1Extrinsic : _posBridge._createPosBridgeL1toL2Extrinsic;
   return createExtrinsic(originTokenInfo, originChain, sender, recipient, sendingValue, evmApi, feeInfo, feeCustom, feeOption);
 };
-exports.createPolygonBridgeExtrinsic = createPolygonBridgeExtrinsic;
+exports.createPolygonBridgeExtrinsic = createPolygonBridgeExtrinsic;
+const createXcmExtrinsicV2 = async request => {
+  try {
+    return await (0, _utils.buildXcm)(request);
+  } catch (e) {
+    console.log('createXcmExtrinsicV2 error: ', e);
+    const errorMessage = e instanceof Error ? e.message : 'Unknown error occurred';
+    if ((0, _utils.isChainNotSupportPolkadotApi)(errorMessage)) {
+      return createXcmExtrinsic(request);
+    }
+    return undefined;
+  }
+};
+exports.createXcmExtrinsicV2 = createXcmExtrinsicV2;
+const dryRunXcmExtrinsicV2 = async request => {
+  try {
+    return await (0, _utils.dryRunXcmV2)(request);
+  } catch (e) {
+    const errorMessage = e instanceof Error ? e.message : 'Unknown error occurred';
+    if ((0, _utils.isChainNotSupportDryRun)(errorMessage) || (0, _utils.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 * _constants.XCM_MIN_AMOUNT_RATIO).toString()
+      };
+    }
+    return {
+      success: false
+    };
+  }
+};
+exports.dryRunXcmExtrinsicV2 = dryRunXcmExtrinsicV2;
+const createAcrossBridgeExtrinsic = async _ref6 => {
+  let {
+    destinationChain,
+    destinationTokenInfo,
+    evmApi,
+    feeCustom,
+    feeInfo,
+    feeOption,
+    originChain,
+    originTokenInfo,
+    recipient,
+    sender,
+    sendingValue
+  } = _ref6;
+  const isAcrossBridgeXcm = (0, _xcmParser._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.default.xcmApi) === null || _subwalletApiSdk$xcmA === void 0 ? void 0 : _subwalletApiSdk$xcmA.fetchXcmData(sender, originTokenInfo.slug, destinationTokenInfo.slug, recipient, sendingValue));
+    const _feeCustom = feeCustom;
+    const feeCombine = (0, _utils3.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);
+  }
+};
+exports.createAcrossBridgeExtrinsic = createAcrossBridgeExtrinsic;