@subwallet/extension-base 1.0.7-1 → 1.0.8-0

package/background/KoniTypes.d.ts

@@ -4,7 +4,7 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { AuthUrls, Resolver } from '@subwallet/extension-base/background/handlers/State';
 import { AccountAuthType, AccountJson, AddressJson, AuthorizeRequest, ConfirmationRequestBase, RequestAccountList, RequestAccountSubscribe, RequestAuthorizeCancel, RequestAuthorizeReject, RequestAuthorizeSubscribe, RequestAuthorizeTab, RequestCurrentAccountAddress, ResponseAuthorizeList, ResponseJsonGetAccountInfo, SeedLengths } from '@subwallet/extension-base/background/types';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
-import { _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse } from '@subwallet/extension-base/services/chain-service/types';
+import { _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse, EnableChainParams, EnableMultiChainParams } from '@subwallet/extension-base/services/chain-service/types';
 import { SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
 import { InjectedAccount, MetadataDefBase } from '@subwallet/extension-inject/types';
 import { KeyringPair$Json, KeyringPair$Meta } from '@subwallet/keyring/types';
@@ -386,6 +386,7 @@ export interface AmountData extends BasicTokenInfo {
 }
 export interface XCMTransactionAdditionalInfo {
     destinationChain: string;
+    originalChain: string;
     fee?: AmountData;
 }
 export interface NFTTransactionAdditionalInfo {
@@ -458,7 +459,8 @@ export declare enum TransferTxErrorType {
     NOT_ENOUGH_VALUE = "NOT_ENOUGH_VALUE",
     NOT_ENOUGH_FEE = "NOT_ENOUGH_FEE",
     INVALID_TOKEN = "INVALID_TOKEN",
-    TRANSFER_ERROR = "TRANSFER_ERROR"
+    TRANSFER_ERROR = "TRANSFER_ERROR",
+    RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT = "RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT"
 }
 export declare type TransactionErrorType = BasicTxErrorType | TransferTxErrorType | StakingTxErrorType;
 export declare enum BasicTxWarningCode {
@@ -1415,9 +1417,9 @@ export interface KoniRequestSignatures {
     'pri(chainService.subscribeMultiChainAssetMap)': [null, Record<string, _MultiChainAsset>, Record<string, _MultiChainAsset>];
     'pri(chainService.subscribeXcmRefMap)': [null, Record<string, _AssetRef>, Record<string, _AssetRef>];
     'pri(chainService.upsertChain)': [_NetworkUpsertParams, boolean];
-    'pri(chainService.enableChains)': [string[], boolean];
+    'pri(chainService.enableChains)': [EnableMultiChainParams, boolean];
+    'pri(chainService.enableChain)': [EnableChainParams, boolean];
     'pri(chainService.disableChains)': [string[], boolean];
-    'pri(chainService.enableChain)': [string, boolean];
     'pri(chainService.disableChain)': [string, boolean];
     'pri(chainService.removeChain)': [string, boolean];
     'pri(chainService.deleteCustomAsset)': [string, boolean];

package/background/KoniTypes.js

@@ -120,6 +120,7 @@ export let TransferTxErrorType;
   TransferTxErrorType["NOT_ENOUGH_FEE"] = "NOT_ENOUGH_FEE";
   TransferTxErrorType["INVALID_TOKEN"] = "INVALID_TOKEN";
   TransferTxErrorType["TRANSFER_ERROR"] = "TRANSFER_ERROR";
+  TransferTxErrorType["RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT"] = "RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT";
 })(TransferTxErrorType || (TransferTxErrorType = {}));
 export let BasicTxWarningCode;
 (function (BasicTxWarningCode) {

package/background/errors/TransactionError.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { SWError } from '@subwallet/extension-base/background/errors/SWError';
-import { BasicTxErrorType, StakingTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
+import { BasicTxErrorType, StakingTxErrorType, TransferTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
 
 // Todo: finish this map in the future
 const defaultErrorMap = {
@@ -77,6 +77,10 @@ const defaultErrorMap = {
   [StakingTxErrorType.INACTIVE_NOMINATION_POOL]: {
     message: 'This nomination pool is not active',
     code: undefined
+  },
+  [TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT]: {
+    message: 'Receiver is not enough existential deposit',
+    code: undefined
   }
 };
 export class TransactionError extends SWError {

package/cjs/background/KoniTypes.js

@@ -127,6 +127,7 @@ exports.TransferTxErrorType = TransferTxErrorType;
   TransferTxErrorType["NOT_ENOUGH_FEE"] = "NOT_ENOUGH_FEE";
   TransferTxErrorType["INVALID_TOKEN"] = "INVALID_TOKEN";
   TransferTxErrorType["TRANSFER_ERROR"] = "TRANSFER_ERROR";
+  TransferTxErrorType["RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT"] = "RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT";
 })(TransferTxErrorType || (exports.TransferTxErrorType = TransferTxErrorType = {}));
 let BasicTxWarningCode;
 exports.BasicTxWarningCode = BasicTxWarningCode;

package/cjs/background/errors/TransactionError.js

@@ -82,6 +82,10 @@ const defaultErrorMap = {
   [_KoniTypes.StakingTxErrorType.INACTIVE_NOMINATION_POOL]: {
     message: 'This nomination pool is not active',
     code: undefined
+  },
+  [_KoniTypes.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT]: {
+    message: 'Receiver is not enough existential deposit',
+    code: undefined
   }
 };
 class TransactionError extends _SWError.SWError {

package/cjs/constants/index.js

@@ -22,9 +22,10 @@ var _exportNames = {
   ALL_NETWORK_KEY: true,
   ALL_GENESIS_HASH: true,
   IGNORE_GET_SUBSTRATE_FEATURES_LIST: true,
-  IGNORE_QR_SIGNER: true
+  IGNORE_QR_SIGNER: true,
+  XCM_MIN_AMOUNT_RATIO: true
 };
-exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_RECOVER_HISTORY_INTERVAL = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = void 0;
+exports.XCM_MIN_AMOUNT_RATIO = exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_RECOVER_HISTORY_INTERVAL = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = void 0;
 var _staking = require("./staking");
 Object.keys(_staking).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -77,4 +78,6 @@ exports.ALL_GENESIS_HASH = ALL_GENESIS_HASH;
 const IGNORE_GET_SUBSTRATE_FEATURES_LIST = ['astarEvm', 'ethereum', 'ethereum_goerli', 'binance', 'binance_test', 'boba_rinkeby', 'boba', 'bobabase', 'bobabeam'];
 exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = IGNORE_GET_SUBSTRATE_FEATURES_LIST;
 const IGNORE_QR_SIGNER = [];
-exports.IGNORE_QR_SIGNER = IGNORE_QR_SIGNER;
+exports.IGNORE_QR_SIGNER = IGNORE_QR_SIGNER;
+const XCM_MIN_AMOUNT_RATIO = 1.2;
+exports.XCM_MIN_AMOUNT_RATIO = XCM_MIN_AMOUNT_RATIO;

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

@@ -296,10 +296,11 @@ async function subscribeTokensAccountsPallet(addresses, chain, api, callBack, in
   const unsubList = await Promise.all(Object.values(tokenMap).map(async tokenInfo => {
     try {
       const onChainInfo = (0, _utils2._getTokenOnChainInfo)(tokenInfo);
+      const assetId = (0, _utils2._getTokenOnChainAssetId)(tokenInfo);
 
       // Get Token Balance
       // @ts-ignore
-      return await api.query.tokens.accounts.multi(addresses.map(address => [address, onChainInfo]), balances => {
+      return await api.query.tokens.accounts.multi(addresses.map(address => [address, onChainInfo || assetId]), balances => {
         const tokenBalance = {
           reserved: (0, _utils3.sumBN)(balances.map(b => b.reserved || new _util.BN(0))),
           frozen: (0, _utils3.sumBN)(balances.map(b => b.frozen || new _util.BN(0))),

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

@@ -112,7 +112,7 @@ async function subscribeCrowdloan(addresses, substrateApiMap, callback, chainInf
     });
     Object.entries(chainInfoMap).forEach(_ref3 => {
       let [networkKey, chainInfo] = _ref3;
-      if ((0, _utils._isSubstrateParachain)(chainInfo)) {
+      if ((0, _utils._isSubstrateParaChain)(chainInfo)) {
         const parentChain = (0, _utils._getSubstrateRelayParent)(chainInfo);
         const crowdloanCb = rs => {
           callback(networkKey, rs);

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

@@ -127,9 +127,9 @@ const createTransferExtrinsic = async _ref => {
     transfer = api.tx.currencies.transfer(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo), value);
   } else if (_constants._TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo) && isTxTokensSupported) {
     if (transferAll) {
-      transfer = api.tx.tokens.transferAll(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo), false);
+      transfer = api.tx.tokens.transferAll(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo) || (0, _utils2._getTokenOnChainAssetId)(tokenInfo), false);
     } else if (value) {
-      transfer = api.tx.tokens.transfer(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo), new _util.BN(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) && !(0, _utils2._isNativeToken)(tokenInfo) && isTxEqBalancesSupported) {
     transfer = api.tx.eqBalances.transfer([(0, _utils2._getTokenOnChainAssetId)(tokenInfo)], to, value);

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

@@ -184,14 +184,15 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
     const dAppInfoMap = {};
     const allDapps = await allDappsReq;
     allDapps.forEach(dappInfo => {
-      dAppInfoMap[dappInfo.address.toLowerCase()] = dappInfo;
+      const address = (0, _utilCrypto.isEthereumAddress)(dappInfo.address) ? dappInfo.address.toLowerCase() : dappInfo.address;
+      dAppInfoMap[address] = dappInfo;
     });
     for (const item of _stakerInfo) {
       const data = item[0].toHuman();
       const stakedDapp = data[1];
       const stakeData = item[1].toPrimitive();
       const stakeList = stakeData.stakes;
-      const dappAddress = stakedDapp.Evm.toLowerCase();
+      const dappAddress = (0, _utilCrypto.isEthereumAddress)(stakedDapp.Evm) ? stakedDapp.Evm.toLowerCase() : stakedDapp.Evm;
       const currentStake = stakeList.slice(-1)[0].staked.toString() || '0';
       const bnCurrentStake = new _util.BN(currentStake);
       if (bnCurrentStake.gt(_util.BN_ZERO)) {
@@ -201,7 +202,7 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
         nominationList.push({
           status: dappStakingStatus,
           chain,
-          validatorAddress: dappAddress.toLowerCase(),
+          validatorAddress: dappAddress,
           activeStake: currentStake,
           validatorMinStake: '0',
           validatorIdentity: dappInfo === null || dappInfo === void 0 ? void 0 : dappInfo.name,
@@ -334,7 +335,7 @@ async function getAstarClaimRewardExtrinsic(substrateApi, address) {
     const stakedDapp = data[1];
     const stakeData = item[1].toHuman();
     const stakes = stakeData.stakes;
-    const dappAddress = stakedDapp.Evm.toLowerCase();
+    const dappAddress = (0, _utilCrypto.isEthereumAddress)(stakedDapp.Evm) ? stakedDapp.Evm.toLowerCase() : stakedDapp.Evm;
     let numberOfUnclaimedEra = 0;
     const maxTx = 50;
     for (let i = 0; i < stakes.length; i++) {

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

@@ -162,7 +162,7 @@ async function getRelayChainStakingMetadata(chainInfo, substrateApi) {
     chain,
     type: _KoniTypes.StakingType.NOMINATED,
     era: parseInt(currentEra),
-    expectedReturn,
+    expectedReturn: !_constants._STAKING_CHAIN_GROUP.ternoa.includes(chain) ? expectedReturn : undefined,
     // in %, annually
     inflation,
     minStake: minStake.toString(),
@@ -503,7 +503,8 @@ async function getRelayValidatorsInfo(chain, substrateApi, decimals, chainStakin
   const currentEra = _era.toString();
   const allValidators = [];
   const validatorInfoList = [];
-  const [_totalEraStake, _eraStakers, _minBond] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond()]);
+  const [_totalEraStake, _eraStakers, _minBond, _stakingRewards] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond(), chainApi.api.query.stakingRewards && chainApi.api.query.stakingRewards.data()]);
+  const stakingRewards = _stakingRewards === null || _stakingRewards === void 0 ? void 0 : _stakingRewards.toPrimitive();
   const maxNominatorRewarded = chainApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
   const bnTotalEraStake = new _util.BN(_totalEraStake.toString());
   const eraStakers = _eraStakers;
@@ -566,7 +567,15 @@ async function getRelayValidatorsInfo(chain, substrateApi, decimals, chainStakin
   for (const validator of validatorInfoList) {
     const commission = extraInfoMap[validator.address].commission;
     const bnValidatorStake = totalStakeMap[validator.address].div(bnDecimals);
-    validator.expectedReturn = _constants._STAKING_CHAIN_GROUP.aleph.includes(chain) ? (0, _utils.calculateAlephZeroValidatorReturn)(chainStakingMetadata.expectedReturn, (0, _utils.getCommission)(commission)) : (0, _utils.calculateValidatorStakedReturn)(chainStakingMetadata.expectedReturn, bnValidatorStake, bnAvgStake, (0, _utils.getCommission)(commission));
+    if (_constants._STAKING_CHAIN_GROUP.aleph.includes(chain)) {
+      validator.expectedReturn = (0, _utils.calculateAlephZeroValidatorReturn)(chainStakingMetadata.expectedReturn, (0, _utils.getCommission)(commission));
+    } else if (_constants._STAKING_CHAIN_GROUP.ternoa.includes(chain)) {
+      const rewardPerValidator = new _util.BN(stakingRewards.sessionExtraRewardPayout).divn(allValidators.length).div(bnDecimals);
+      const validatorStake = totalStakeMap[validator.address].div(bnDecimals).toNumber();
+      validator.expectedReturn = (0, _utils.calculateTernoaValidatorReturn)(rewardPerValidator.toNumber(), validatorStake, (0, _utils.getCommission)(commission));
+    } else {
+      validator.expectedReturn = (0, _utils.calculateValidatorStakedReturn)(chainStakingMetadata.expectedReturn, bnValidatorStake, bnAvgStake, (0, _utils.getCommission)(commission));
+    }
     validator.commission = parseFloat(commission.split('%')[0]);
     validator.blocked = extraInfoMap[validator.address].blocked;
     validator.identity = extraInfoMap[validator.address].identity;

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

@@ -9,6 +9,7 @@ exports.calcInflationUniformEraPayout = calcInflationUniformEraPayout;
 exports.calculateAlephZeroValidatorReturn = calculateAlephZeroValidatorReturn;
 exports.calculateChainStakedReturn = calculateChainStakedReturn;
 exports.calculateInflation = calculateInflation;
+exports.calculateTernoaValidatorReturn = calculateTernoaValidatorReturn;
 exports.calculateValidatorStakedReturn = calculateValidatorStakedReturn;
 exports.getBondedValidators = getBondedValidators;
 exports.getCommission = getCommission;
@@ -113,6 +114,12 @@ function calculateChainStakedReturn(inflation, totalEraStake, totalIssuance, net
 function calculateAlephZeroValidatorReturn(chainStakedReturn, commission) {
   return chainStakedReturn * (100 - commission) / 100;
 }
+function calculateTernoaValidatorReturn(rewardPerValidator, validatorStake, commission) {
+  const percentRewardForNominators = (100 - commission) / 100;
+  const rewardForNominators = rewardPerValidator * percentRewardForNominators;
+  const stakeRatio = rewardForNominators / validatorStake;
+  return stakeRatio * 365 * 100;
+}
 function calculateValidatorStakedReturn(chainStakedReturn, totalValidatorStake, avgStake, commission) {
   const bnAdjusted = avgStake.mul(_util.BN_HUNDRED).div(totalValidatorStake);
   const adjusted = bnAdjusted.toNumber() * chainStakedReturn;

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

@@ -9,47 +9,28 @@ var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-function getDestinationChainLocation(destinationChainInfo) {
-  if ((0, _utils2._isSubstrateParaChain)(destinationChainInfo)) {
-    return {
-      V1: {
-        parents: 1,
-        interior: {
-          X1: {
-            Parachain: (0, _utils2._getSubstrateParaId)(destinationChainInfo)
-          }
-        }
-      }
-    };
-  }
-  return {
-    // to relaychain by default
-    V1: {
-      parents: 1,
-      interior: 'Here'
-    }
-  };
-}
-function getAssetLocation(tokenInfo, sendingValue) {
-  const multilocation = (0, _utils2._getXcmAssetMultilocation)(tokenInfo);
-  return {
-    V1: [{
-      id: multilocation,
-      fun: {
-        Fungible: sendingValue
-      }
-    }]
-  };
-}
 function getExtrinsicByPolkadotXcmPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = (0, _utils.getDestWeight)();
-  const beneficiary = (0, _utils.getBeneficiary)(originChainInfo, destinationChainInfo, recipientAddress);
-  const destination = getDestinationChainLocation(destinationChainInfo);
-  const assetLocation = getAssetLocation(tokenInfo, value);
+  const beneficiary = (0, _utils.getBeneficiary)(destinationChainInfo, recipientAddress);
+  const destination = (0, _utils.getDestinationChainLocation)(originChainInfo, destinationChainInfo);
+  let assetLocation = (0, _utils.getTokenLocation)(tokenInfo, value);
   let method = 'limitedReserveTransferAssets';
-  if (['astar', 'shiden'].includes(originChainInfo.slug)) {
+  if (['astar', 'shiden'].includes(originChainInfo.slug) && !(0, _utils2._isNativeToken)(tokenInfo)) {
     method = 'limitedReserveWithdrawAssets';
-  } else if ((0, _utils2._isSubstrateRelayChain)(destinationChainInfo)) {
+  } else if (['statemint', 'statemine'].includes(originChainInfo.slug) && (0, _utils2._isSubstrateRelayChain)(destinationChainInfo)) {
+    assetLocation = {
+      V1: [{
+        id: {
+          Concrete: {
+            parents: 1,
+            interior: 'Here'
+          }
+        },
+        fun: {
+          Fungible: value
+        }
+      }]
+    };
     method = 'limitedTeleportAssets';
   }
   return api.tx.polkadotXcm[method](destination, beneficiary, assetLocation, 0,

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

@@ -5,8 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 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");
@@ -21,13 +24,14 @@ const FOUR_INSTRUCTIONS_LIMITED_WEIGHT = {
 
 // get multilocation for destination chain from a parachain
 exports.FOUR_INSTRUCTIONS_LIMITED_WEIGHT = FOUR_INSTRUCTIONS_LIMITED_WEIGHT;
-function getReceiverLocation(originChainInfo, destinationChainInfo, toAddress) {
+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: 'Any',
+        network,
         id: (0, _utilCrypto.decodeAddress)(ss58Address)
       }
     };
@@ -35,21 +39,21 @@ function getReceiverLocation(originChainInfo, destinationChainInfo, toAddress) {
   if ((0, _utils._isChainEvmCompatible)(destinationChainInfo)) {
     return {
       AccountKey20: {
-        network: 'Any',
+        network,
         key: toAddress
       }
     };
   }
   return {
     AccountId32: {
-      network: 'Any',
+      network,
       id: (0, _utilCrypto.decodeAddress)(toAddress)
     }
   };
 }
-function getBeneficiary(originChainInfo, destinationChainInfo, recipientAddress) {
-  let version = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'V1';
-  const receiverLocation = getReceiverLocation(originChainInfo, destinationChainInfo, recipientAddress);
+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,
@@ -61,8 +65,71 @@ function getBeneficiary(originChainInfo, destinationChainInfo, recipientAddress)
 }
 function getDestWeight() {
   return 'Unlimited';
-  // return api.tx.xTokens.transfer.meta.args[3].type.toString() ===
-  // 'XcmV2WeightLimit'
-  //   ? 'Unlimited'
-  //   : FOUR_INSTRUCTIONS_WEIGHT;
+}
+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
+    }
+  };
 }

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getExtrinsicByXtokensPallet = getExtrinsicByXtokensPallet;
 var _utils = require("@subwallet/extension-base/koni/api/xcm/utils");
-var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -22,38 +21,10 @@ function getCurrencyId(tokenInfo) {
   } else if (['pioneer'].includes(tokenInfo.originChain)) {
     return (0, _utils2._getXcmAssetMultilocation)(tokenInfo);
   }
-  return (0, _utils2._getTokenOnChainInfo)(tokenInfo);
-}
-function getMultiLocationForXtokensPallet(originChainInfo, destinationChainInfo, toAddress) {
-  const xcmType = (0, _utils2._getXcmTransferType)(originChainInfo, destinationChainInfo);
-  const paraId = (0, _utils2._getSubstrateParaId)(destinationChainInfo);
-  const receiverLocation = (0, _utils.getReceiverLocation)(originChainInfo, destinationChainInfo, toAddress);
-  if (xcmType === _constants._XCM_TYPE.PP) {
-    // parachain -> parachain
-    const interior = {
-      X2: [{
-        Parachain: paraId
-      }, receiverLocation]
-    };
-    return {
-      V1: {
-        parents: 1,
-        interior
-      }
-    };
-  }
-
-  // parachain -> relaychain by default
-  return {
-    V1: {
-      parents: 1,
-      interior: {
-        X1: receiverLocation
-      }
-    }
-  };
+  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)();
-  return api.tx.xTokens.transfer(getCurrencyId(tokenInfo), value, getMultiLocationForXtokensPallet(originChainInfo, destinationChainInfo, recipientAddress), weightParam);
+  const weightParam = ['pioneer', 'hydradx_main'].includes(originChainInfo.slug) ? _utils.FOUR_INSTRUCTIONS_WEIGHT : (0, _utils.getDestWeight)();
+  const destVersion = ['moonbeam', 'moonriver'].includes(originChainInfo.slug) ? 'V3' : undefined;
+  return api.tx.xTokens.transfer(getCurrencyId(tokenInfo), value, (0, _utils.getDestMultilocation)(destinationChainInfo, recipientAddress, destVersion), weightParam);
 }

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

@@ -5,48 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getExtrinsicByXcmPalletPallet = getExtrinsicByXcmPalletPallet;
 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 getDestinationChainLocation(destinationChainInfo) {
-  let version = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'V1';
-  return {
-    [version]: {
-      parents: 0,
-      interior: {
-        X1: {
-          Parachain: (0, _utils2._getSubstrateParaId)(destinationChainInfo)
-        }
-      }
-    }
-  };
-}
-function getTokenLocation(sendingValue) {
-  let version = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'V2';
-  return {
-    // always native token of relaychain
-    [version]: [{
-      id: {
-        Concrete: {
-          parents: 0,
-          interior: 'Here'
-        }
-      },
-      fun: {
-        Fungible: sendingValue
-      }
-    }]
-  };
-}
-
 // this pallet is only used by Relaychains
 function getExtrinsicByXcmPalletPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = (0, _utils.getDestWeight)();
-  const xcmVer = ['kusama'].includes(originChainInfo.slug) ? 'V2' : 'V1';
-  const destination = getDestinationChainLocation(destinationChainInfo, xcmVer);
-  const beneficiary = (0, _utils.getBeneficiary)(originChainInfo, destinationChainInfo, recipientAddress, xcmVer);
-  const tokenLocation = getTokenLocation(value, xcmVer);
+  const xcmVer = ['kusama'].includes(originChainInfo.slug) ? 'V3' : 'V1';
+  const destination = (0, _utils.getDestinationChainLocation)(originChainInfo, destinationChainInfo, xcmVer);
+  const beneficiary = (0, _utils.getBeneficiary)(destinationChainInfo, recipientAddress, xcmVer);
+  const tokenLocation = (0, _utils.getTokenLocation)(tokenInfo, value, xcmVer);
   let method = 'limitedReserveTransferAssets';
   if (['statemint', 'statemine'].includes(destinationChainInfo.slug)) {
     method = 'limitedTeleportAssets';