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

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

@@ -8,6 +8,8 @@ exports.BalanceService = void 0;
 var _BalanceError = require("@subwallet/extension-base/background/errors/BalanceError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
+var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
+var _process = require("@subwallet/extension-base/services/balance-service/helpers/process");
 var _types = require("@subwallet/extension-base/services/base/types");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _DetectAccountBalance = _interopRequireDefault(require("@subwallet/extension-base/stores/DetectAccountBalance"));
@@ -470,5 +472,23 @@ 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 (0, _process.getDefaultTransferProcess)();
+    }
+    const destChainInfo = this.state.chainService.getChainInfoByKey(params.destChain);
+
+    // xcm
+    if (!(0, _xcmParser._isXcmWithinSameConsensus)(originChainInfo, destChainInfo) && (0, _utils._isPureEvmChain)(originChainInfo)) {
+      const evmApi = this.state.chainService.getEvmApi(originChainInfo.slug);
+      const tokenInfo = this.state.chainService.getAssetBySlug(params.tokenSlug);
+      return (0, _process.getSnowbridgeTransferProcessFromEvm)(params.address, evmApi, tokenInfo, params.amount);
+    }
+    return (0, _process.getDefaultTransferProcess)();
+  }
 }
 exports.BalanceService = BalanceService;

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

@@ -7,49 +7,21 @@ Object.defineProperty(exports, "__esModule", {
 exports.getERC20TransactionObject = getERC20TransactionObject;
 exports.getERC721Transaction = getERC721Transaction;
 exports.getEVMTransactionObject = getEVMTransactionObject;
-exports.handleTransferBalanceResult = void 0;
-var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
-var _web = require("@subwallet/extension-base/koni/api/tokens/evm/web3");
+exports.getPSP34TransferExtrinsic = getPSP34TransferExtrinsic;
+var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
+var _utils = require("@subwallet/extension-base/koni/api/contract-handler/utils");
+var _wasm = require("@subwallet/extension-base/koni/api/contract-handler/wasm");
+var _utils2 = require("@subwallet/extension-base/koni/api/contract-handler/wasm/utils");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
-var _helper = require("@subwallet/extension-base/services/chain-service/helper");
-var _utils = require("@subwallet/extension-base/services/fee-service/utils");
+var _utils3 = require("@subwallet/extension-base/services/fee-service/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
-var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const handleTransferBalanceResult = _ref => {
-  let {
-    callback,
-    changeValue,
-    networkKey,
-    receipt,
-    response,
-    updateState
-  } = _ref;
-  response.status = true;
-  let fee;
-  if (_constants._BALANCE_PARSING_CHAIN_GROUP.bobabeam.indexOf(networkKey) > -1) {
-    // @ts-ignore
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    fee = (0, _util.hexToBn)(receipt.l1Fee || '0x0').add((0, _util.hexToBn)(receipt.l2BobaFee || '0x0')).toString();
-  } else {
-    fee = (receipt.gasUsed * receipt.effectiveGasPrice).toString();
-  }
-  response.txResult = {
-    change: changeValue || '0',
-    fee
-  };
-  updateState && updateState({
-    status: receipt.status ? _KoniTypes.ExternalRequestPromiseStatus.COMPLETED : _KoniTypes.ExternalRequestPromiseStatus.FAILED
-  });
-  callback(response);
-};
-exports.handleTransferBalanceResult = handleTransferBalanceResult;
 async function getEVMTransactionObject(chainInfo, from, to, value, transferAll, web3Api) {
   var _priority$maxFeePerGa, _priority$maxPriority;
   const networkKey = chainInfo.slug;
-  const priority = await (0, _utils.calculateGasFeeParams)(web3Api, networkKey);
+  const priority = await (0, _utils3.calculateGasFeeParams)(web3Api, networkKey);
   const transactionObject = {
     to: to,
     value: value,
@@ -95,7 +67,7 @@ async function getERC20TransactionObject(assetAddress, chainInfo, from, to, valu
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
   erc20Contract.methods.transfer(to, transferValue).estimateGas({
     from
-  }), (0, _utils.calculateGasFeeParams)(evmApi, networkKey)]);
+  }), (0, _utils3.calculateGasFeeParams)(evmApi, networkKey)]);
   const transactionObject = {
     gas: gasLimit,
     from,
@@ -115,12 +87,12 @@ async function getERC20TransactionObject(assetAddress, chainInfo, from, to, valu
 async function getERC721Transaction(web3Api, chain, contractAddress, senderAddress, recipientAddress, tokenId) {
   var _priority$maxFeePerGa3, _priority$maxPriority3;
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-  const contract = new web3Api.api.eth.Contract(_helper._ERC721_ABI, contractAddress);
+  const contract = new web3Api.api.eth.Contract(_utils._ERC721_ABI, contractAddress);
   const [gasLimit, priority] = await Promise.all([
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
   contract.methods.safeTransferFrom(senderAddress, recipientAddress, tokenId).estimateGas({
     from: senderAddress
-  }), (0, _utils.calculateGasFeeParams)(web3Api, chain)]);
+  }), (0, _utils3.calculateGasFeeParams)(web3Api, chain)]);
   return {
     from: senderAddress,
     gasPrice: priority.gasPrice,
@@ -132,4 +104,27 @@ async function getERC721Transaction(web3Api, chain, contractAddress, senderAddre
     // 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,.]+$/;
+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 = (0, _wasm.getPSP34ContractPromise)(substrateApi.api, contractAddress);
+    // @ts-ignore
+    const gasLimit = await (0, _utils2.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/cjs/{koni/api/dotsama/transfer.js → services/balance-service/transfer/token.js}

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getTransferMockTxFee = exports.createTransferExtrinsic = void 0;
 var _api = require("@gear-js/api");
-var _wasm = require("@subwallet/extension-base/koni/api/tokens/wasm");
-var _utils = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
+var _wasm = require("@subwallet/extension-base/koni/api/contract-handler/wasm");
+var _utils = require("@subwallet/extension-base/koni/api/contract-handler/wasm/utils");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils3 = require("@subwallet/extension-base/services/fee-service/utils");
@@ -44,7 +44,7 @@ const createTransferExtrinsic = async _ref => {
   let transferAmount; // for PSP-22 tokens, might be deprecated in the future
 
   if ((0, _utils2._isBridgedToken)(tokenInfo) && api.tx.foreignAssets) {
-    const onChainInfo = (0, _utils2._getTokenOnChainInfo)(tokenInfo);
+    const onChainInfo = (0, _utils2._getTokenOnChainInfo)(tokenInfo) || (0, _utils2._getXcmAssetMultilocation)(tokenInfo);
     if (transferAll) {
       transfer = api.tx.foreignAssets.transfer(onChainInfo, to, value);
     } else {

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

@@ -4,10 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getXcmMockTxFee = exports.createXcmExtrinsic = void 0;
-var _polkadotXcm = require("@subwallet/extension-base/koni/api/xcm/polkadotXcm");
-var _xcmPallet = require("@subwallet/extension-base/koni/api/xcm/xcmPallet");
-var _xTokens = require("@subwallet/extension-base/koni/api/xcm/xTokens");
+exports.getXcmMockTxFee = exports.createXcmExtrinsic = exports.createSnowBridgeExtrinsic = void 0;
+var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
+var _polkadotXcm = require("@subwallet/extension-base/services/balance-service/transfer/xcm/polkadotXcm");
+var _snowBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/snowBridge");
+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 _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -16,7 +18,25 @@ var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const createXcmExtrinsic = async _ref => {
+const createSnowBridgeExtrinsic = async _ref => {
+  let {
+    chainInfoMap,
+    destinationTokenInfo,
+    evmApi,
+    originTokenInfo,
+    recipient,
+    sender,
+    sendingValue
+  } = _ref;
+  const originChainInfo = chainInfoMap[originTokenInfo.originChain];
+  const destinationChainInfo = chainInfoMap[destinationTokenInfo.originChain];
+  if (!(0, _xcmParser._isSnowBridgeXcm)(originChainInfo, destinationChainInfo)) {
+    throw new Error('This is not a valid SnowBridge transfer');
+  }
+  return (0, _snowBridge.getSnowBridgeEvmTransfer)(originTokenInfo, originChainInfo, destinationChainInfo, sender, recipient, sendingValue, evmApi);
+};
+exports.createSnowBridgeExtrinsic = createSnowBridgeExtrinsic;
+const createXcmExtrinsic = async _ref2 => {
   let {
     chainInfoMap,
     destinationTokenInfo,
@@ -24,7 +44,7 @@ const createXcmExtrinsic = async _ref => {
     recipient,
     sendingValue,
     substrateApi
-  } = _ref;
+  } = _ref2;
   const originChainInfo = chainInfoMap[originTokenInfo.originChain];
   const destinationChainInfo = chainInfoMap[destinationTokenInfo.originChain];
   const chainApi = await substrateApi.isReady;

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getExtrinsicByPolkadotXcmPallet = getExtrinsicByPolkadotXcmPallet;
 var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
-var _utils = require("@subwallet/extension-base/koni/api/xcm/utils");
+var _utils = require("@subwallet/extension-base/services/balance-service/transfer/xcm/utils");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -13,7 +13,7 @@ var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 function getExtrinsicByPolkadotXcmPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   let version = _utils.STABLE_XCM_VERSION;
   let method = 'limitedReserveTransferAssets';
-  if ((0, _utils2._isBridgedToken)(tokenInfo)) {
+  if ((0, _utils2._isBridgedToken)(tokenInfo) && !(0, _xcmParser._isXcmWithinSameConsensus)(originChainInfo, destinationChainInfo)) {
     version = 4;
     method = 'transferAssets';
   }

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

@@ -0,0 +1,60 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getSnowBridgeEvmTransfer = getSnowBridgeEvmTransfer;
+var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
+var _utils = require("@subwallet/extension-base/koni/api/contract-handler/utils");
+var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils3 = require("@subwallet/extension-base/services/fee-service/utils");
+var _util = require("@polkadot/util");
+var _utilCrypto = require("@polkadot/util-crypto");
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+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();
+}
+async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, destinationChainInfo, sender, recipientAddress, value, evmApi) {
+  var _priority$maxFeePerGa, _priority$maxPriority;
+  const snowBridgeContractAddress = (0, _utils.getSnowBridgeGatewayContract)(originChainInfo.slug);
+  const snowBridgeContract = (0, _web.getWeb3Contract)(snowBridgeContractAddress, evmApi, _utils._SNOWBRIDGE_GATEWAY_ABI);
+  const tokenContract = (0, _utils2._getContractAddressOfToken)(tokenInfo);
+  const destinationChainParaId = (0, _utils2._getSubstrateParaId)(destinationChainInfo);
+  const recipient = {
+    kind: 1,
+    data: (0, _utils2._isChainEvmCompatible)(destinationChainInfo) ? recipientAddress : (0, _util.u8aToHex)((0, _utilCrypto.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([(0, _utils3.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/cjs/{koni/api → services/balance-service/transfer}/xcm/xTokens.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getExtrinsicByXtokensPallet = getExtrinsicByXtokensPallet;
 var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
-var _utils = require("@subwallet/extension-base/koni/api/xcm/utils");
+var _utils = require("@subwallet/extension-base/services/balance-service/transfer/xcm/utils");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getExtrinsicByXcmPalletPallet = getExtrinsicByXcmPalletPallet;
 var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
-var _utils = require("@subwallet/extension-base/koni/api/xcm/utils");
+var _utils = require("@subwallet/extension-base/services/balance-service/transfer/xcm/utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 

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

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.EvmChainHandler = void 0;
 var _types = require("@subwallet/chain-list/types");
+var _utils = require("@subwallet/extension-base/koni/api/contract-handler/utils");
 var _AbstractChainHandler = require("@subwallet/extension-base/services/chain-service/handler/AbstractChainHandler");
 var _EvmApi2 = require("@subwallet/extension-base/services/chain-service/handler/EvmApi");
-var _helper = require("@subwallet/extension-base/services/chain-service/helper");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _logger = require("@polkadot/util/logger");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
@@ -119,7 +119,7 @@ class EvmChainHandler extends _AbstractChainHandler.AbstractChainHandler {
     try {
       if (tokenType === _types._AssetType.ERC721) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
-        tokenContract = new evmApi.api.eth.Contract(_helper._ERC721_ABI, contractAddress);
+        tokenContract = new evmApi.api.eth.Contract(_utils._ERC721_ABI, contractAddress);
         const [_name, _symbol] = await Promise.all([
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
         tokenContract.methods.name().call(),
@@ -129,7 +129,7 @@ class EvmChainHandler extends _AbstractChainHandler.AbstractChainHandler {
         symbol = _symbol;
       } else {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
-        tokenContract = new evmApi.api.eth.Contract(_helper._ERC20_ABI, contractAddress);
+        tokenContract = new evmApi.api.eth.Contract(_utils._ERC20_ABI, contractAddress);
         const [_decimals, _symbol, _name] = await Promise.all([
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
         tokenContract.methods.decimals().call(),

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

@@ -6,14 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.SubstrateChainHandler = exports.DEFAULT_AUX = void 0;
 var _api = require("@gear-js/api");
 var _types = require("@subwallet/chain-list/types");
-var _utils = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
+var _utils = require("@subwallet/extension-base/koni/api/contract-handler/wasm/utils");
 var _AbstractChainHandler = require("@subwallet/extension-base/services/chain-service/handler/AbstractChainHandler");
 var _SubstrateApi2 = require("@subwallet/extension-base/services/chain-service/handler/SubstrateApi");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _apiContract = require("@polkadot/api-contract");
 var _util = require("@polkadot/util");
 var _logger = require("@polkadot/util/logger");
-var _helper = require("../helper");
+var _utils3 = require("../../../koni/api/contract-handler/utils");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -96,7 +96,7 @@ class SubstrateChainHandler extends _AbstractChainHandler.AbstractChainHandler {
     return result;
   }
   async getPsp22TokenInfo(apiPromise, contractAddress, contractCaller) {
-    const tokenContract = new _apiContract.ContractPromise(apiPromise, _helper._PSP22_ABI, contractAddress);
+    const tokenContract = new _apiContract.ContractPromise(apiPromise, _utils3._PSP22_ABI, contractAddress);
     const [nameResp, symbolResp, decimalsResp] = await Promise.all([tokenContract.query['psp22Metadata::tokenName'](contractCaller || contractAddress, {
       gasLimit: (0, _utils.getDefaultWeightV2)(apiPromise)
     }),
@@ -124,7 +124,7 @@ class SubstrateChainHandler extends _AbstractChainHandler.AbstractChainHandler {
     }
   }
   async getPsp34TokenInfo(apiPromise, contractAddress, contractCaller) {
-    const tokenContract = new _apiContract.ContractPromise(apiPromise, _helper._PSP34_ABI, contractAddress);
+    const tokenContract = new _apiContract.ContractPromise(apiPromise, _utils3._PSP34_ABI, contractAddress);
     const collectionIdResp = await tokenContract.query['psp34::collectionId'](contractCaller || contractAddress, {
       gasLimit: (0, _utils.getDefaultWeightV2)(apiPromise)
     }); // read-only operation so no gas limit

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

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getSubstrateNativeInfo = exports.getPsp22AssetInfo = exports.getLocalAssetInfo = exports.getEvmNativeInfo = exports.getErc20AssetInfo = exports.compareAsset = void 0;
-var _web = require("@subwallet/extension-base/koni/api/tokens/evm/web3");
-var _utils = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
-var _helper = require("@subwallet/extension-base/services/chain-service/helper");
-var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
+var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
+var _utils = require("@subwallet/extension-base/koni/api/contract-handler/utils");
+var _utils2 = require("@subwallet/extension-base/koni/api/contract-handler/wasm/utils");
+var _utils3 = require("@subwallet/extension-base/services/chain-service/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _apiContract = require("@polkadot/api-contract");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
@@ -16,7 +16,7 @@ var _apiContract = require("@polkadot/api-contract");
 
 const BN_TEN = new _bignumber.default(10);
 const getByAssetPallet = async (asset, api) => {
-  const [_info, _metadata] = await api.queryMulti([[api.query.assets.asset, (0, _utils2._getTokenOnChainAssetId)(asset)], [api.query.assets.metadata, (0, _utils2._getTokenOnChainAssetId)(asset)]]);
+  const [_info, _metadata] = await api.queryMulti([[api.query.assets.asset, (0, _utils3._getTokenOnChainAssetId)(asset)], [api.query.assets.metadata, (0, _utils3._getTokenOnChainAssetId)(asset)]]);
   const info = _info.toPrimitive();
   const metadata = _metadata.toPrimitive();
   return {
@@ -26,7 +26,7 @@ const getByAssetPallet = async (asset, api) => {
   };
 };
 const getByAssetRegistryWithChainInfoPallet = async (asset, api) => {
-  const raw = (0, _utils2._getTokenOnChainInfo)(asset);
+  const raw = (0, _utils3._getTokenOnChainInfo)(asset);
   let data;
   if ('ForeignAsset' in raw) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -54,7 +54,7 @@ const getByAssetRegistryWithChainInfoPallet = async (asset, api) => {
   };
 };
 const getByAssetRegistryWithChainInfoPalletV2 = async (asset, api) => {
-  const data = (0, _utils2._getTokenOnChainInfo)(asset);
+  const data = (0, _utils3._getTokenOnChainInfo)(asset);
   const _metadata = await api.query.assetRegistry.currencyMetadatas(data);
   const metadata = _metadata.toPrimitive();
   return {
@@ -64,7 +64,7 @@ const getByAssetRegistryWithChainInfoPalletV2 = async (asset, api) => {
   };
 };
 const getByAssetRegistryWithChainInfoPalletV3 = async (asset, api) => {
-  const data = (0, _utils2._getTokenOnChainInfo)(asset);
+  const data = (0, _utils3._getTokenOnChainInfo)(asset);
   const _metadata = await api.query.assetRegistry.metadata(data);
   const metadata = _metadata.toPrimitive();
   return {
@@ -74,7 +74,7 @@ const getByAssetRegistryWithChainInfoPalletV3 = async (asset, api) => {
   };
 };
 const getByOrmlAssetRegistryPallet = async (asset, api) => {
-  const data = (0, _utils2._getTokenOnChainInfo)(asset);
+  const data = (0, _utils3._getTokenOnChainInfo)(asset);
   const _metadata = await api.query.ormlAssetRegistry.metadata(data);
   const metadata = _metadata.toPrimitive();
   return {
@@ -84,7 +84,7 @@ const getByOrmlAssetRegistryPallet = async (asset, api) => {
   };
 };
 const getByAssetManagerWithChainInfoPallet = async (asset, api) => {
-  const raw = (0, _utils2._getTokenOnChainInfo)(asset);
+  const raw = (0, _utils3._getTokenOnChainInfo)(asset);
   let data;
   if ('ForeignAsset' in raw) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -107,7 +107,7 @@ const getByAssetManagerWithChainInfoPallet = async (asset, api) => {
   };
 };
 const getByAssetManagerWithAssetIdPallet = async (asset, api) => {
-  const _metadata = await api.query.assetManager.assetIdMetadata((0, _utils2._getTokenOnChainAssetId)(asset));
+  const _metadata = await api.query.assetManager.assetIdMetadata((0, _utils3._getTokenOnChainAssetId)(asset));
   const metadata = _metadata.toPrimitive();
   return {
     decimals: metadata.metadata.decimals,
@@ -116,7 +116,7 @@ const getByAssetManagerWithAssetIdPallet = async (asset, api) => {
   };
 };
 const getByAssetRegistryWithAssetIdPallet = async (asset, api) => {
-  const [_info, _metadata] = await api.queryMulti([[api.query.assetRegistry.assets, (0, _utils2._getTokenOnChainAssetId)(asset)], [api.query.assetRegistry.assetMetadataMap, (0, _utils2._getTokenOnChainAssetId)(asset)]]);
+  const [_info, _metadata] = await api.queryMulti([[api.query.assetRegistry.assets, (0, _utils3._getTokenOnChainAssetId)(asset)], [api.query.assetRegistry.assetMetadataMap, (0, _utils3._getTokenOnChainAssetId)(asset)]]);
   const info = _info.toPrimitive();
   const metadata = _metadata.toPrimitive();
   return {
@@ -160,16 +160,16 @@ const getSubstrateNativeInfo = async api => {
 };
 exports.getSubstrateNativeInfo = getSubstrateNativeInfo;
 const getPsp22AssetInfo = async (asset, api) => {
-  const contractAddress = (0, _utils2._getContractAddressOfToken)(asset);
-  const tokenContract = new _apiContract.ContractPromise(api, _helper._PSP22_ABI, contractAddress);
+  const contractAddress = (0, _utils3._getContractAddressOfToken)(asset);
+  const tokenContract = new _apiContract.ContractPromise(api, _utils._PSP22_ABI, contractAddress);
   const [nameResp, symbolResp, decimalsResp] = await Promise.all([tokenContract.query['psp22Metadata::tokenName'](contractAddress, {
-    gasLimit: (0, _utils.getDefaultWeightV2)(api)
+    gasLimit: (0, _utils2.getDefaultWeightV2)(api)
   }),
   // read-only operation so no gas limit
   tokenContract.query['psp22Metadata::tokenSymbol'](contractAddress, {
-    gasLimit: (0, _utils.getDefaultWeightV2)(api)
+    gasLimit: (0, _utils2.getDefaultWeightV2)(api)
   }), tokenContract.query['psp22Metadata::tokenDecimals'](contractAddress, {
-    gasLimit: (0, _utils.getDefaultWeightV2)(api)
+    gasLimit: (0, _utils2.getDefaultWeightV2)(api)
   })]);
   if (!(nameResp.result.isOk && symbolResp.result.isOk && decimalsResp.result.isOk) || !nameResp.output || !decimalsResp.output || !symbolResp.output) {
     return {
@@ -226,7 +226,7 @@ const getEvmNativeInfo = async api => {
 };
 exports.getEvmNativeInfo = getEvmNativeInfo;
 const getErc20AssetInfo = async (asset, api) => {
-  const contractAddress = (0, _utils2._getContractAddressOfToken)(asset);
+  const contractAddress = (0, _utils3._getContractAddressOfToken)(asset);
   const tokenContract = (0, _web.getERC20Contract)(contractAddress, api);
   const [_decimals, _symbol, _name] = await Promise.all([
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access

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

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getStellaswapLiquidStakingContract = exports.default = void 0;
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
-var _web = require("@subwallet/extension-base/koni/api/tokens/evm/web3");
+var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/services/fee-service/utils");
 var _types = require("@subwallet/extension-base/types");
@@ -26,7 +26,6 @@ const getStellaswapLiquidStakingContract = function (networkKey, assetAddress, e
 exports.getStellaswapLiquidStakingContract = getStellaswapLiquidStakingContract;
 const APR_STATS_URL = 'https://apr-api.stellaswap.com/api/v1/stdot';
 const SUBWALLET_REFERRAL = '0x7e6815f45E624768548d085231f2d453f16FD7DD';
-const MAX_INT = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
 class StellaSwapLiquidStakingPoolHandler extends _base.default {
   inputAsset = 'moonbeam-LOCAL-xcDOT';
   altInputAsset = '';
@@ -256,7 +255,6 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
     return Promise.resolve([]);
   }
   async handleTokenApproveStep(data, path) {
-    var _priority$maxFeePerGa, _priority$maxPriority;
     const {
       address
     } = data;
@@ -265,33 +263,16 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
     const derivativeTokenInfo = this.state.getAssetBySlug(this.derivativeAssets[0]);
     const derivativeTokenContractAddress = (0, _utils._getContractAddressOfToken)(derivativeTokenInfo);
     const evmApi = this.evmApi;
-    const inputTokenContract = (0, _web.getERC20Contract)((0, _utils._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 (0, _utils2.calculateGasFeeParams)(evmApi, this.chain);
-    const transactionObject = {
-      from: address,
-      to: (0, _utils._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 (0, _web.getERC20SpendingApprovalTx)(derivativeTokenContractAddress, address, (0, _utils._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: _KoniTypes.ExtrinsicType.TOKEN_APPROVE,
+      extrinsicType: _KoniTypes.ExtrinsicType.TOKEN_SPENDING_APPROVAL,
       extrinsic: transactionObject,
       txData: _data,
       transferNativeAmount: '0',
@@ -299,7 +280,7 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
     });
   }
   async handleSubmitStep(data, path) {
-    var _priority$maxFeePerGa2, _priority$maxPriority2;
+    var _priority$maxFeePerGa, _priority$maxPriority;
     const {
       address,
       amount
@@ -325,8 +306,8 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
       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,
@@ -346,7 +327,7 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
     return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.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);
@@ -368,8 +349,8 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
       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 [_KoniTypes.ExtrinsicType.UNSTAKE_STDOT, transaction];
   }
@@ -379,7 +360,7 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
   /* 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);
@@ -401,8 +382,8 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
       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/cjs/services/earning-service/handlers/special.js

@@ -8,8 +8,8 @@ exports.default = void 0;
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
-var _xcm = require("@subwallet/extension-base/koni/api/xcm");
 var _utils = require("@subwallet/extension-base/koni/api/yield/helper/utils");
+var _xcm = require("@subwallet/extension-base/services/balance-service/transfer/xcm");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/types");
 var _utils3 = require("@subwallet/extension-base/utils");