@subwallet/extension-base 1.2.3-0 → 1.2.4-0

package/cjs/koni/api/dotsama/transfer.js

@@ -1,121 +1,23 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.checkReferenceCount = checkReferenceCount;
-exports.checkSupportTransfer = checkSupportTransfer;
-exports.createTransferExtrinsic = void 0;
+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 _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/utils");
+var _utils3 = require("@subwallet/extension-base/services/fee-service/utils");
+var _utils4 = require("@subwallet/extension-base/utils");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-function isRefCount(accountInfo) {
-  return !!accountInfo.refcount;
-}
-async function checkReferenceCount(networkKey, address, substrateApiMap, chainInfo) {
-  const apiProps = await substrateApiMap[networkKey].isReady;
-  const api = apiProps.api;
-  if ((0, _utils2._isChainEvmCompatible)(chainInfo)) {
-    return false;
-  }
-
-  // @ts-ignore
-  const accountInfo = await api.query.system.account(address);
-  return accountInfo ? isRefCount(accountInfo) ? !accountInfo.refcount.isZero() : !accountInfo.consumers.isZero() : false;
-}
-async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMap, chainInfo) {
-  const substrateApi = await substrateApiMap[networkKey].isReady;
-  if (!tokenInfo) {
-    return {
-      supportTransfer: false,
-      supportTransferAll: false
-    };
-  }
-  if ((0, _utils2._isChainEvmCompatible)(chainInfo)) {
-    return {
-      supportTransfer: true,
-      supportTransferAll: true
-    };
-  }
-  if (tokenInfo.symbol.startsWith(_constants._ZK_ASSET_PREFIX) && _constants._MANTA_ZK_CHAIN_GROUP.includes(tokenInfo.originChain)) {
-    return {
-      supportTransfer: false,
-      supportTransferAll: false
-    };
-  }
-  if (_constants._TRANSFER_NOT_SUPPORTED_CHAINS.includes(networkKey)) {
-    return {
-      supportTransfer: false,
-      supportTransferAll: false
-    };
-  }
-  const api = substrateApi.api;
-  const isTxCurrenciesSupported = !!api && !!api.tx && !!api.tx.currencies;
-  const isTxBalancesSupported = !!api && !!api.tx && !!api.tx.balances;
-  const isTxTokensSupported = !!api && !!api.tx && !!api.tx.tokens;
-  const isTxEqBalancesSupported = !!api && !!api.tx && !!api.tx.eqBalances;
-  const result = {
-    supportTransfer: false,
-    supportTransferAll: false
-  };
-  if (!(isTxCurrenciesSupported || isTxBalancesSupported || isTxTokensSupported || isTxEqBalancesSupported)) {
-    return result;
-  }
-  if ((0, _utils2._isTokenWasmSmartContract)(tokenInfo) && api.query.contracts) {
-    // for PSP tokens
-    return {
-      supportTransfer: true,
-      supportTransferAll: true
-    };
-  }
-
-  // TODO: need review
-  if (_constants._TRANSFER_CHAIN_GROUP.acala.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo) && isTxCurrenciesSupported) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
-  } else if (_constants._TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo) && isTxTokensSupported) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
-  } else if (_constants._TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey)
-  // && !_isNativeToken(tokenInfo) && isTxEqBalancesSupported
-  ) {
-    result.supportTransfer = false;
-    result.supportTransferAll = false;
-    // } else if (_TRANSFER_CHAIN_GROUP.crab.includes(networkKey) && _BALANCE_TOKEN_GROUP.crab.includes(tokenInfo.symbol)) {
-    //   result.supportTransfer = true;
-    //   result.supportTransferAll = true;
-  } else if (isTxBalancesSupported && (0, _utils2._isNativeToken)(tokenInfo)) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
-  } else if (_constants._TRANSFER_CHAIN_GROUP.bitcountry.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo) && _constants._BALANCE_TOKEN_GROUP.bitcountry.includes(tokenInfo.symbol)) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
-  } else if (_constants._TRANSFER_CHAIN_GROUP.statemine.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo)) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
-  } else if (_constants._TRANSFER_CHAIN_GROUP.sora_substrate.includes(networkKey)) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
-    // } else if (_TRANSFER_CHAIN_GROUP.riochain.includes(networkKey) && _isNativeToken(tokenInfo)) {
-    //   result.supportTransfer = true;
-    //   result.supportTransferAll = true;
-  } else if (_constants._TRANSFER_CHAIN_GROUP.avail.includes(networkKey)) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
-  } else if (_constants._TRANSFER_CHAIN_GROUP.centrifuge.includes(networkKey)) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
-  }
-  return result;
-}
 const createTransferExtrinsic = async _ref => {
   var _tokenInfo$metadata;
   let {
@@ -138,11 +40,17 @@ const createTransferExtrinsic = async _ref => {
   const isTxCurrenciesSupported = !!api && !!api.tx && !!api.tx.currencies;
   const isTxBalancesSupported = !!api && !!api.tx && !!api.tx.balances;
   const isTxTokensSupported = !!api && !!api.tx && !!api.tx.tokens;
-  // const isTxEqBalancesSupported = !!api && !!api.tx && !!api.tx.eqBalances;
   const isTxAssetsSupported = !!api && !!api.tx && !!api.tx.assets;
   let transferAmount; // for PSP-22 tokens, might be deprecated in the future
 
-  if ((0, _utils2._isTokenWasmSmartContract)(tokenInfo) && api.query.contracts) {
+  if ((0, _utils2._isBridgedToken)(tokenInfo) && api.tx.foreignAssets) {
+    const onChainInfo = (0, _utils2._getTokenOnChainInfo)(tokenInfo);
+    if (transferAll) {
+      transfer = api.tx.foreignAssets.transfer(onChainInfo, to, value);
+    } else {
+      transfer = api.tx.foreignAssets.transferKeepAlive(onChainInfo, to, value);
+    }
+  } else if ((0, _utils2._isTokenWasmSmartContract)(tokenInfo) && api.query.contracts) {
     const contractPromise = (0, _wasm.getPSP22ContractPromise)(api, (0, _utils2._getContractAddressOfToken)(tokenInfo));
     // @ts-ignore
     const gasLimit = await (0, _utils.getWasmContractGasLimit)(api, from, 'psp22::transfer', contractPromise, {}, [from, value, {}]);
@@ -153,7 +61,7 @@ const createTransferExtrinsic = async _ref => {
     }, to, value, {});
     transferAmount = value;
   } else if ((0, _utils2._isTokenGearSmartContract)(tokenInfo) && api instanceof _api.GearApi) {
-    const contractPromise = (0, _utils3.getGRC20ContractPromise)(api, (0, _utils2._getContractAddressOfToken)(tokenInfo));
+    const contractPromise = (0, _utils4.getGRC20ContractPromise)(api, (0, _utils2._getContractAddressOfToken)(tokenInfo));
     const transaction = await contractPromise.transfer((0, _util.u8aToHex)((0, _utilCrypto.decodeAddress)(to)), BigInt(value)) // Create transfer transaction
     .withAccount(from) // Set sender account
     .calculateGas(); // Add account arg to extrinsic
@@ -184,25 +92,10 @@ const createTransferExtrinsic = async _ref => {
     } else if (value) {
       transfer = api.tx.tokens.transfer(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo) || (0, _utils2._getTokenOnChainAssetId)(tokenInfo), new _util.BN(value));
     }
-  } else if (_constants._TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey)
-  // && isTxEqBalancesSupported
-  ) {
-    // transfer = api.tx.eqBalances.transfer(_getTokenOnChainAssetId(tokenInfo), to, value);
-    /* empty */
-    // } else if (!_isNativeToken(tokenInfo) && (_TRANSFER_CHAIN_GROUP.crab.includes(networkKey) || _BALANCE_TOKEN_GROUP.crab.includes(tokenInfo.symbol))) {
-    //   if (transferAll) {
-    //     transfer = api.tx.kton.transferAll(to, false);
-    //   } else if (value) {
-    //     transfer = api.tx.kton.transfer(to, new BN(value));
-    //   }
   } else if (_constants._TRANSFER_CHAIN_GROUP.bitcountry.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo)) {
     transfer = api.tx.currencies.transfer(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo), value);
   } else if (_constants._TRANSFER_CHAIN_GROUP.statemine.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo)) {
     transfer = api.tx.assets.transfer((0, _utils2._getTokenOnChainAssetId)(tokenInfo), to, value);
-    // } else if (_TRANSFER_CHAIN_GROUP.riochain.includes(networkKey)) {
-    //   if (_isNativeToken(tokenInfo)) {
-    //     transfer = api.tx.currencies.transferNativeCurrency(to, value);
-    //   }
   } else if (_constants._TRANSFER_CHAIN_GROUP.sora_substrate.includes(networkKey) && isTxAssetsSupported) {
     transfer = api.tx.assets.transfer((0, _utils2._getTokenOnChainAssetId)(tokenInfo), to, value);
   } else if (isTxBalancesSupported && (0, _utils2._isNativeToken)(tokenInfo)) {
@@ -221,4 +114,47 @@ const createTransferExtrinsic = async _ref => {
   }
   return [transfer, transferAmount || value];
 };
-exports.createTransferExtrinsic = createTransferExtrinsic;
+exports.createTransferExtrinsic = createTransferExtrinsic;
+const getTransferMockTxFee = async (address, chainInfo, tokenInfo, api) => {
+  try {
+    let estimatedFee;
+    if ((0, _utils2._isChainEvmCompatible)(chainInfo) && (0, _utils2._isTokenTransferredByEvm)(tokenInfo)) {
+      const web3 = api;
+      const transaction = {
+        value: 0,
+        to: '0x0000000000000000000000000000000000000000',
+        // null address
+        from: address
+      };
+      const gasLimit = await web3.api.eth.estimateGas(transaction);
+      const priority = await (0, _utils3.calculateGasFeeParams)(web3, chainInfo.slug);
+      if (priority.baseGasFee) {
+        const maxFee = priority.maxFeePerGas;
+        estimatedFee = maxFee.multipliedBy(gasLimit);
+      } else {
+        estimatedFee = new _bignumber.default(priority.gasPrice).multipliedBy(gasLimit);
+      }
+    } else {
+      var _paymentInfo$partialF;
+      const substrateApi = api;
+      const chainApi = await substrateApi.isReady;
+      const [mockTx] = await createTransferExtrinsic({
+        from: address,
+        networkKey: chainInfo.slug,
+        substrateApi: chainApi,
+        to: address,
+        tokenInfo,
+        transferAll: true,
+        value: '1000000000000000000'
+      });
+      const paymentInfo = await (mockTx === null || mockTx === void 0 ? void 0 : mockTx.paymentInfo(address));
+      estimatedFee = new _bignumber.default((paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF = paymentInfo.partialFee) === null || _paymentInfo$partialF === void 0 ? void 0 : _paymentInfo$partialF.toString()) || '0'); // todo: should handle error case instead of setting fee to 0
+    }
+
+    return estimatedFee;
+  } catch (e) {
+    console.error('error mocking tx fee', e);
+    return new _bignumber.default(0);
+  }
+};
+exports.getTransferMockTxFee = getTransferMockTxFee;

package/cjs/koni/api/staking/bonding/utils.js

@@ -423,7 +423,7 @@ function getTopValidatorByPoints(validatorPointsList) {
 const getMinStakeErrorMessage = (chainInfo, bnMinStake) => {
   const tokenInfo = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
   const number = (0, _number.formatNumber)(bnMinStake.toString(), tokenInfo.decimals || 0, _number.balanceFormatter);
-  return (0, _i18next.t)('Insufficient stake. Please stake at least {{number}} {{tokenSymbol}} to get rewards', {
+  return (0, _i18next.t)('Insufficient stake. You need to stake at least {{number}} {{tokenSymbol}} to earn rewards', {
     replace: {
       tokenSymbol: tokenInfo.symbol,
       number

package/cjs/koni/api/xcm/index.js

@@ -1,14 +1,18 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createXcmExtrinsic = void 0;
+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");
 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"));
+var _util = require("@polkadot/util");
+var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -39,4 +43,28 @@ const createXcmExtrinsic = async _ref => {
   }
   return extrinsic;
 };
-exports.createXcmExtrinsic = createXcmExtrinsic;
+exports.createXcmExtrinsic = createXcmExtrinsic;
+const getXcmMockTxFee = async (substrateApi, chainInfoMap, address, originTokenInfo, destinationTokenInfo) => {
+  try {
+    var _paymentInfo$partialF;
+    const destChainInfo = chainInfoMap[destinationTokenInfo.originChain];
+    const originChainInfo = chainInfoMap[originTokenInfo.originChain];
+
+    // mock receiving account from sender
+    const recipient = !(0, _utilCrypto.isEthereumAddress)(address) && (0, _utils._isChainEvmCompatible)(destChainInfo) && !(0, _utils._isChainEvmCompatible)(originChainInfo) ? (0, _util.u8aToHex)((0, _utilCrypto.addressToEvm)(address)) : address;
+    const mockTx = await createXcmExtrinsic({
+      chainInfoMap,
+      destinationTokenInfo,
+      originTokenInfo,
+      recipient: recipient,
+      sendingValue: '1000000000000000000',
+      substrateApi
+    });
+    const paymentInfo = await mockTx.paymentInfo(address);
+    return new _bignumber.default((paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF = paymentInfo.partialFee) === null || _paymentInfo$partialF === void 0 ? void 0 : _paymentInfo$partialF.toString()) || '0');
+  } catch (e) {
+    console.error('error mocking xcm tx fee', e);
+    return new _bignumber.default(0);
+  }
+};
+exports.getXcmMockTxFee = getXcmMockTxFee;

package/cjs/koni/api/xcm/polkadotXcm.js

@@ -4,35 +4,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getExtrinsicByPolkadotXcmPallet = getExtrinsicByPolkadotXcmPallet;
+var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
 var _utils = require("@subwallet/extension-base/koni/api/xcm/utils");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
 function getExtrinsicByPolkadotXcmPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
-  const weightParam = (0, _utils.getDestWeight)();
-  const version = ['statemint', 'statemine', 'shiden', 'astar'].includes(originChainInfo.slug) ? 'V3' : 'V1';
-  const beneficiary = (0, _utils.getBeneficiary)(destinationChainInfo, recipientAddress, version);
-  const destination = (0, _utils.getDestinationChainLocation)(originChainInfo, destinationChainInfo, version);
-  let assetLocation = (0, _utils.getTokenLocation)(tokenInfo, value, version);
+  let version = _utils.STABLE_XCM_VERSION;
   let method = 'limitedReserveTransferAssets';
-  if (['statemint', 'statemine'].includes(originChainInfo.slug) && (0, _utils2._isSubstrateRelayChain)(destinationChainInfo)) {
-    assetLocation = {
-      [version]: [{
-        id: {
-          Concrete: {
-            parents: 1,
-            interior: 'Here'
-          }
-        },
-        fun: {
-          Fungible: value
-        }
-      }]
-    };
+  if ((0, _utils2._isBridgedToken)(tokenInfo)) {
+    version = 4;
+    method = 'transferAssets';
+  }
+  if ((0, _utils.isUseTeleportProtocol)(originChainInfo, destinationChainInfo)) {
     method = 'limitedTeleportAssets';
   }
-  return api.tx.polkadotXcm[method](destination, beneficiary, assetLocation, 0,
+  const weightParam = (0, _xcmParser._getXcmDestWeight)(originChainInfo);
+  const destination = (0, _xcmParser._getXcmMultiLocation)(originChainInfo, destinationChainInfo, version);
+  const beneficiary = (0, _xcmParser._getXcmBeneficiary)(destinationChainInfo, recipientAddress, version);
+  const tokenLocation = (0, _xcmParser._getXcmMultiAssets)(tokenInfo, value, version);
+  return api.tx.polkadotXcm[method](destination, beneficiary, tokenLocation, 0,
   // FeeAssetItem
   weightParam);
 }

package/cjs/koni/api/xcm/utils.js

@@ -3,133 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FOUR_INSTRUCTIONS_WEIGHT = exports.FOUR_INSTRUCTIONS_LIMITED_WEIGHT = void 0;
-exports.getBeneficiary = getBeneficiary;
-exports.getDestMultilocation = getDestMultilocation;
-exports.getDestWeight = getDestWeight;
-exports.getDestinationChainLocation = getDestinationChainLocation;
-exports.getReceiverLocation = getReceiverLocation;
-exports.getTokenLocation = getTokenLocation;
-var _chainList = require("@subwallet/chain-list");
-var _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _utilCrypto = require("@polkadot/util-crypto");
+exports.STABLE_XCM_VERSION = void 0;
+exports.isUseTeleportProtocol = isUseTeleportProtocol;
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const FOUR_INSTRUCTIONS_WEIGHT = 5000000000;
-exports.FOUR_INSTRUCTIONS_WEIGHT = FOUR_INSTRUCTIONS_WEIGHT;
-const FOUR_INSTRUCTIONS_LIMITED_WEIGHT = {
-  Limited: 5000000000
-};
-
-// get multilocation for destination chain from a parachain
-exports.FOUR_INSTRUCTIONS_LIMITED_WEIGHT = FOUR_INSTRUCTIONS_LIMITED_WEIGHT;
-function getReceiverLocation(destinationChainInfo, toAddress, version) {
-  const network = version && version === 'V3' ? undefined : 'Any';
-  if (destinationChainInfo.slug === _chainList.COMMON_CHAIN_SLUGS.ASTAR_EVM) {
-    const ss58Address = (0, _utilCrypto.evmToAddress)(toAddress, 2006); // TODO: shouldn't pass addressPrefix directly
-
-    return {
-      AccountId32: {
-        network,
-        id: (0, _utilCrypto.decodeAddress)(ss58Address)
-      }
-    };
-  }
-  if ((0, _utils._isChainEvmCompatible)(destinationChainInfo)) {
-    return {
-      AccountKey20: {
-        network,
-        key: toAddress
-      }
-    };
-  }
-  return {
-    AccountId32: {
-      network,
-      id: (0, _utilCrypto.decodeAddress)(toAddress)
-    }
-  };
-}
-function getBeneficiary(destinationChainInfo, recipientAddress) {
-  let version = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'V1';
-  const receiverLocation = getReceiverLocation(destinationChainInfo, recipientAddress, version);
-  return {
-    [version]: {
-      parents: 0,
-      interior: {
-        X1: receiverLocation
-      }
-    }
-  };
-}
-function getDestWeight() {
-  return 'Unlimited';
-}
-function getTokenLocation(tokenInfo, sendingValue) {
-  let version = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'V1';
-  if (!(0, _utils._isNativeToken)(tokenInfo)) {
-    const multilocation = (0, _utils._getXcmAssetMultilocation)(tokenInfo);
-    return {
-      [version]: [{
-        id: multilocation,
-        fun: {
-          Fungible: sendingValue
-        }
-      }]
-    };
-  }
-  return {
-    [version]: [{
-      id: {
-        Concrete: {
-          parents: 0,
-          interior: 'Here'
-        }
-      },
-      fun: {
-        Fungible: sendingValue
-      }
-    }]
-  };
-}
-function getDestMultilocation(destinationChainInfo, recipient) {
-  let version = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'V1';
-  const receiverLocation = getReceiverLocation(destinationChainInfo, recipient, version);
-  if ((0, _utils._isSubstrateParaChain)(destinationChainInfo)) {
-    const interior = {
-      X2: [{
-        Parachain: (0, _utils._getSubstrateParaId)(destinationChainInfo)
-      }, receiverLocation]
-    };
-    return {
-      [version]: {
-        parents: 1,
-        interior
-      }
-    };
-  }
-  return {
-    [version]: {
-      parents: 1,
-      interior: {
-        X1: receiverLocation
-      }
-    }
-  };
-}
-function getDestinationChainLocation(originChainInfo, destinationChainInfo) {
-  let version = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'V1';
-  const parents = (0, _utils._isSubstrateRelayChain)(originChainInfo) ? 0 : 1;
-  const interior = (0, _utils._isSubstrateParaChain)(destinationChainInfo) ? {
-    X1: {
-      Parachain: (0, _utils._getSubstrateParaId)(destinationChainInfo)
-    }
-  } : 'Here';
-  return {
-    [version]: {
-      parents,
-      interior
-    }
-  };
+const STABLE_XCM_VERSION = 3;
+exports.STABLE_XCM_VERSION = STABLE_XCM_VERSION;
+function isUseTeleportProtocol(originChainInfo, destChainInfo) {
+  const relayChainToSystemChain = ['polkadot'].includes(originChainInfo.slug) && ['statemint'].includes(destChainInfo.slug) || ['kusama'].includes(originChainInfo.slug) && ['statemine'].includes(destChainInfo.slug);
+  const systemChainToRelayChain = ['polkadot'].includes(destChainInfo.slug) && ['statemint'].includes(originChainInfo.slug) || ['kusama'].includes(destChainInfo.slug) && ['statemine'].includes(originChainInfo.slug);
+  return relayChainToSystemChain || systemChainToRelayChain;
 }

package/cjs/koni/api/xcm/xTokens.js

@@ -4,27 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getExtrinsicByXtokensPallet = getExtrinsicByXtokensPallet;
+var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
 var _utils = require("@subwallet/extension-base/koni/api/xcm/utils");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
 function getCurrencyId(tokenInfo) {
-  if (['acala', 'karura'].includes(tokenInfo.originChain) && (0, _utils2._isNativeToken)(tokenInfo)) {
-    return (0, _utils2._getXcmAssetMultilocation)(tokenInfo);
-  } else if (['moonbeam', 'moonbase', 'moonriver'].includes(tokenInfo.originChain)) {
+  if (['moonbeam', 'moonbase', 'moonriver'].includes(tokenInfo.originChain)) {
     const tokenType = (0, _utils2._getXcmAssetType)(tokenInfo);
     const assetId = (0, _utils2._getXcmAssetId)(tokenInfo);
     return {
       [tokenType]: assetId
     };
-  } else if (['pioneer'].includes(tokenInfo.originChain)) {
-    return (0, _utils2._getXcmAssetMultilocation)(tokenInfo);
   }
   return (0, _utils2._getTokenOnChainInfo)(tokenInfo) || (0, _utils2._getTokenOnChainAssetId)(tokenInfo);
 }
 function getExtrinsicByXtokensPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
-  const weightParam = ['pioneer'].includes(originChainInfo.slug) ? _utils.FOUR_INSTRUCTIONS_WEIGHT : (0, _utils.getDestWeight)();
-  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot', 'interlay', 'hydradx_main', 'acala', 'parallel', 'astar', 'shiden', 'centrifuge', 'manta_network'].includes(originChainInfo.slug) ? 'V3' : undefined;
-  return api.tx.xTokens.transfer(getCurrencyId(tokenInfo), value, (0, _utils.getDestMultilocation)(destinationChainInfo, recipientAddress, destVersion), weightParam);
+  const version = _utils.STABLE_XCM_VERSION;
+  const destination = (0, _xcmParser._getXcmMultiLocation)(originChainInfo, destinationChainInfo, version, recipientAddress);
+  if (!(0, _utils2._getXcmAssetMultilocation)(tokenInfo)) {
+    const tokenCurrencyId = getCurrencyId(tokenInfo);
+    return api.tx.xTokens.transfer(tokenCurrencyId, value, destination, (0, _xcmParser._getXcmDestWeight)(originChainInfo));
+  }
+  const tokenMultiAsset = (0, _xcmParser._getXcmMultiAssets)(tokenInfo, value, version);
+  return api.tx.xTokens.transferMultiassets(tokenMultiAsset, 0, destination, (0, _xcmParser._getXcmDestWeight)(originChainInfo));
 }

package/cjs/koni/api/xcm/xcmPallet.js

@@ -4,19 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getExtrinsicByXcmPalletPallet = getExtrinsicByXcmPalletPallet;
+var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
 var _utils = require("@subwallet/extension-base/koni/api/xcm/utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
 // this pallet is only used by Relaychains
 function getExtrinsicByXcmPalletPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
-  const weightParam = (0, _utils.getDestWeight)();
-  const xcmVer = 'V3';
-  const destination = (0, _utils.getDestinationChainLocation)(originChainInfo, destinationChainInfo, xcmVer);
-  const beneficiary = (0, _utils.getBeneficiary)(destinationChainInfo, recipientAddress, xcmVer);
-  const tokenLocation = (0, _utils.getTokenLocation)(tokenInfo, value, xcmVer);
+  const weightParam = (0, _xcmParser._getXcmDestWeight)(originChainInfo);
+  const destination = (0, _xcmParser._getXcmMultiLocation)(originChainInfo, destinationChainInfo, _utils.STABLE_XCM_VERSION);
+  const beneficiary = (0, _xcmParser._getXcmBeneficiary)(destinationChainInfo, recipientAddress, _utils.STABLE_XCM_VERSION);
+  const tokenLocation = (0, _xcmParser._getXcmMultiAssets)(tokenInfo, value, _utils.STABLE_XCM_VERSION);
   let method = 'limitedReserveTransferAssets';
-  if (['statemint', 'statemine'].includes(destinationChainInfo.slug)) {
+  if ((0, _utils.isUseTeleportProtocol)(originChainInfo, destinationChainInfo)) {
     method = 'limitedTeleportAssets';
   }
   return api.tx.xcmPallet[method](destination, beneficiary, tokenLocation, 0, weightParam);