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

package/cjs/services/chain-service/utils/index.js

@@ -54,6 +54,7 @@ var _exportNames = {
   _getXcmAssetId: true,
   _getXcmAssetMultilocation: true,
   _getXcmTransferType: true,
+  _isRelayChain: true,
   _isSubstrateRelayChain: true,
   _isSubstrateParaChain: true,
   _getEvmAbiExplorer: true,
@@ -145,6 +146,7 @@ exports._isNativeTokenBySlug = _isNativeTokenBySlug;
 exports._isNativeTokenTransferredByEvm = _isNativeTokenTransferredByEvm;
 exports._isPureEvmChain = _isPureEvmChain;
 exports._isPureSubstrateChain = _isPureSubstrateChain;
+exports._isRelayChain = _isRelayChain;
 exports._isSmartContractToken = _isSmartContractToken;
 exports._isSubstrateChain = _isSubstrateChain;
 exports._isSubstrateParaChain = _isSubstrateParaChain;
@@ -305,7 +307,7 @@ function _isSubstrateChain(chainInfo) {
 
 function _getEvmChainId(chainInfo) {
   var _chainInfo$evmInfo;
-  return ((_chainInfo$evmInfo = chainInfo.evmInfo) === null || _chainInfo$evmInfo === void 0 ? void 0 : _chainInfo$evmInfo.evmChainId) || 1; // fallback to Ethereum
+  return (_chainInfo$evmInfo = chainInfo.evmInfo) === null || _chainInfo$evmInfo === void 0 ? void 0 : _chainInfo$evmInfo.evmChainId; // fallback to Ethereum
 }
 
 function _getSubstrateParaId(chainInfo) {
@@ -314,7 +316,7 @@ function _getSubstrateParaId(chainInfo) {
 }
 function _getSubstrateRelayParent(chainInfo) {
   var _chainInfo$substrateI2;
-  return ((_chainInfo$substrateI2 = chainInfo.substrateInfo) === null || _chainInfo$substrateI2 === void 0 ? void 0 : _chainInfo$substrateI2.relaySlug) || '';
+  return (_chainInfo$substrateI2 = chainInfo.substrateInfo) === null || _chainInfo$substrateI2 === void 0 ? void 0 : _chainInfo$substrateI2.relaySlug;
 }
 function _getSubstrateGenesisHash(chainInfo) {
   var _chainInfo$substrateI3;
@@ -467,6 +469,9 @@ function _getXcmTransferType(originChainInfo, destinationChainInfo) {
   var _originChainInfo$subs, _destinationChainInfo;
   return `${((_originChainInfo$subs = originChainInfo.substrateInfo) === null || _originChainInfo$subs === void 0 ? void 0 : _originChainInfo$subs.chainType) || ''}-${((_destinationChainInfo = destinationChainInfo.substrateInfo) === null || _destinationChainInfo === void 0 ? void 0 : _destinationChainInfo.chainType) || ''}`;
 }
+function _isRelayChain(chainInfo) {
+  return _isSubstrateRelayChain(chainInfo) || _isPureEvmChain(chainInfo);
+}
 function _isSubstrateRelayChain(chainInfo) {
   var _chainInfo$substrateI14;
   return ((_chainInfo$substrateI14 = chainInfo.substrateInfo) === null || _chainInfo$substrateI14 === void 0 ? void 0 : _chainInfo$substrateI14.chainType) === _types._SubstrateChainType.RELAYCHAIN;

package/cjs/services/earning-service/handlers/special.js

@@ -284,11 +284,11 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     const xcmFee = new _util.BN(path.totalFee[1].amount || '0');
     const xcmAmount = missingAmount.add(xcmFee);
     const bnAltInputTokenBalance = new _util.BN(altInputTokenBalance.value || '0');
-    if (!bnAltInputTokenBalance.sub(xcmAmount).gt(_util.BN_ZERO)) {
+    if (!bnAltInputTokenBalance.sub(xcmAmount).sub(xcmFee).gt(_util.BN_ZERO)) {
       processValidation.failedStep = path.steps[1];
       processValidation.ok = false;
       processValidation.status = _types.YieldValidationStatus.NOT_ENOUGH_BALANCE;
-      const maxBn = bnInputTokenBalance.add(new _util.BN(altInputTokenBalance.value)).sub(xcmFee);
+      const maxBn = bnInputTokenBalance.add(new _util.BN(altInputTokenBalance.value)).sub(xcmFee).sub(xcmFee);
       const maxValue = (0, _utils3.formatNumber)(maxBn.toString(), inputTokenInfo.decimals || 0);
       const altInputTokenInfo = this.state.getAssetBySlug(altInputTokenSlug);
       const symbol = altInputTokenInfo.symbol;
@@ -296,7 +296,7 @@ class BaseSpecialStakingPoolHandler extends _base.default {
       const inputNetworkName = this.chainInfo.name;
       const altNetworkName = altNetwork.name;
       const currentValue = (0, _utils3.formatNumber)(bnInputTokenBalance.toString(), inputTokenInfo.decimals || 0);
-      const bnMaxXCM = new _util.BN(altInputTokenBalance.value).sub(xcmFee);
+      const bnMaxXCM = new _util.BN(altInputTokenBalance.value).sub(xcmFee).sub(xcmFee);
       const maxXCMValue = (0, _utils3.formatNumber)(bnMaxXCM.toString(), inputTokenInfo.decimals || 0);
       processValidation.message = (0, _i18next.t)('You can only enter a maximum of {{maxValue}} {{symbol}}, which is {{currentValue}} {{symbol}} ({{inputNetworkName}}) and {{maxXCMValue}} {{symbol}} ({{altNetworkName}}). Lower your amount and try again.', {
         replace: {

package/cjs/services/migration-service/scripts/MigrateTransactionHistoryBySymbol.js

@@ -14,7 +14,8 @@ class MigrateTransactionHistoryBySymbol extends _Base.default {
     const state = this.state;
     try {
       const changeSlugsMap = {
-        'commune-NATIVE-C': 'commune-NATIVE-COMAI'
+        'bobMainnet-LOCAL-wBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3': 'bobMainnet-LOCAL-WBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3',
+        'hydradx_main-LOCAL-LRNA': 'hydradx_main-LOCAL-H2O'
       };
       const allTxs = [];
       await Promise.all(Object.entries(changeSlugsMap).map(async (_ref, i) => {

package/cjs/services/migration-service/scripts/databases/MigrateAssetSetting.js

@@ -13,7 +13,8 @@ class MigrateAssetSetting extends _Base.default {
   async run() {
     try {
       const changeSlugsMap = {
-        'commune-NATIVE-C': 'commune-NATIVE-COMAI'
+        'bobMainnet-LOCAL-wBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3': 'bobMainnet-LOCAL-WBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3',
+        'hydradx_main-LOCAL-LRNA': 'hydradx_main-LOCAL-H2O'
       };
       const assetSetting = await this.state.chainService.getAssetSettings();
       const migratedAssetSetting = {};

package/cjs/services/migration-service/scripts/index.js

@@ -57,8 +57,8 @@ var _default = {
   '1.1.28-01': _MigrateEarningVersion.default,
   '1.1.41-01': _DeleteChainStaking.default,
   '1.1.46-01': _AutoEnableSomeTokens.default,
-  '1.1.62-01': _MigrateAssetSetting.default,
-  '1.1.62-02': _MigrateTransactionHistoryBySymbol.default,
+  '1.1.69-03': _MigrateAssetSetting.default,
+  '1.1.69-02': _MigrateTransactionHistoryBySymbol.default,
   '1.2.69-01': _MigrateRemoveGenesisHash.default
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens

package/cjs/services/swap-service/handler/base-handler.js

@@ -68,11 +68,13 @@ class SwapBaseHandler {
     const xcmFeeComponent = params.process.totalFee[stepIndex].feeComponent[0]; // todo: can do better than indexing
     const xcmFee = new _bignumber.default(xcmFeeComponent.amount || '0');
     let xcmAmount = bnAmount.minus(bnFromAssetBalance);
+    let editedXcmFee = new _bignumber.default(0);
     if ((0, _utils._isNativeToken)(alternativeAsset)) {
       xcmAmount = xcmAmount.plus(xcmFee);
+      editedXcmFee = xcmFee.times(2);
     }
-    if (!bnAlternativeAssetBalance.minus(xcmAmount).gt(0)) {
-      const maxBn = bnFromAssetBalance.plus(new _bignumber.default(alternativeAssetBalance.value)).minus(xcmFee);
+    if (!bnAlternativeAssetBalance.minus((0, _utils._isNativeToken)(alternativeAsset) ? xcmAmount.plus(xcmFee) : xcmFee).gt(0)) {
+      const maxBn = bnFromAssetBalance.plus(new _bignumber.default(alternativeAssetBalance.value)).minus((0, _utils._isNativeToken)(alternativeAsset) ? editedXcmFee : xcmFee);
       const maxValue = (0, _utils3.formatNumber)(maxBn.toString(), fromAsset.decimals || 0);
       const altInputTokenInfo = this.chainService.getAssetBySlug(alternativeAssetSlug);
       const symbol = altInputTokenInfo.symbol;
@@ -81,7 +83,7 @@ class SwapBaseHandler {
       const inputNetworkName = chain.name;
       const altNetworkName = alternativeChain.name;
       const currentValue = (0, _utils3.formatNumber)(bnFromAssetBalance.toString(), fromAsset.decimals || 0);
-      const bnMaxXCM = new _bignumber.default(alternativeAssetBalance.value).minus(xcmFee);
+      const bnMaxXCM = new _bignumber.default(alternativeAssetBalance.value).minus((0, _utils._isNativeToken)(alternativeAsset) ? editedXcmFee : xcmFee);
       const maxXCMValue = (0, _utils3.formatNumber)(bnMaxXCM.toString(), fromAsset.decimals || 0);
       if (maxBn.lte(0) || bnFromAssetBalance.lte(0) || bnMaxXCM.lte(0)) {
         return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_BALANCE, (0, _i18next.t)(`Insufficient balance. Deposit ${fromAsset.symbol} and try again.`))];

package/cjs/services/swap-service/handler/hydradx-handler.js

@@ -34,7 +34,7 @@ class HydradxHandler {
     this.swapBaseHandler = new _baseHandler.SwapBaseHandler({
       balanceService,
       chainService,
-      providerName: isTestnet ? 'HydraDX Testnet' : 'HydraDX',
+      providerName: isTestnet ? 'Hydration Testnet' : 'Hydration',
       providerSlug: isTestnet ? _swap2.SwapProviderId.HYDRADX_TESTNET : _swap2.SwapProviderId.HYDRADX_MAINNET
     });
     this.providerSlug = isTestnet ? _swap2.SwapProviderId.HYDRADX_TESTNET : _swap2.SwapProviderId.HYDRADX_MAINNET;

package/core/logic-validation/earning.d.ts

@@ -4,7 +4,7 @@ export declare function _handleDisplayForEarningError(error: TransactionError):
     message: string;
 } | undefined;
 export declare const INSUFFICIENT_MESSAGES: string[];
-export declare function _handleDisplayInsufficientEarningError(error: Error, availableBalance: string, amount: string, minJoinPool: string): {
+export declare function _handleDisplayInsufficientEarningError(error: Error, isXCM: boolean, availableBalance: string, amount: string, minJoinPool: string): {
     title: string;
     message: string;
 } | undefined;

package/core/logic-validation/earning.js

@@ -12,8 +12,8 @@ export function _handleDisplayForEarningError(error) {
   return undefined;
 }
 export const INSUFFICIENT_MESSAGES = ['残高不足', 'Недостаточный баланс', 'Insufficient balance'];
-export function _handleDisplayInsufficientEarningError(error, availableBalance, amount, minJoinPool) {
-  if (!INSUFFICIENT_MESSAGES.some(v => error.message.includes(v))) {
+export function _handleDisplayInsufficientEarningError(error, isXCM, availableBalance, amount, minJoinPool) {
+  if (isXCM || !INSUFFICIENT_MESSAGES.some(v => error.message.includes(v))) {
     return undefined;
   }
   const bnAvailableBalance = new BigN(availableBalance);

package/core/logic-validation/transfer.js

@@ -170,13 +170,6 @@ export function checkBalanceWithTransactionFee(validationResponse, transactionIn
     // todo: estimateFee should be must-have, need to refactor interface
     return;
   }
-
-  // if (!nativeTokenAvailable.metadata) {
-  //   validationResponse.errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR));
-  //
-  //   return;
-  // }
-
   const {
     edAsWarning,
     extrinsicType,

package/core/substrate/nominationpools-pallet.d.ts

@@ -1,7 +1,10 @@
+import BigN from 'bignumber.js';
 export declare type PalletNominationPoolsPoolMember = {
     poolId: number;
     points: number;
     lastRecordedRewardCounter: number;
     unbondingEras: Record<string, number>;
 };
-export declare function _getActiveStakeInNominationPool(memberInfo: PalletNominationPoolsPoolMember): string;
+export declare function _getActiveStakeInNominationPool(memberInfo: PalletNominationPoolsPoolMember): BigN;
+export declare function _getUnbondingStakeInNominationPool(memberInfo: PalletNominationPoolsPoolMember): BigN;
+export declare function _getTotalStakeInNominationPool(memberInfo: PalletNominationPoolsPoolMember): BigN;

package/core/substrate/nominationpools-pallet.js

@@ -1,6 +1,13 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+import BigN from 'bignumber.js';
 export function _getActiveStakeInNominationPool(memberInfo) {
-  return memberInfo.points.toString();
+  return new BigN(memberInfo.points.toString());
+}
+export function _getUnbondingStakeInNominationPool(memberInfo) {
+  return new BigN(Object.values(memberInfo.unbondingEras).reduce((a, b) => a + b, 0));
+}
+export function _getTotalStakeInNominationPool(memberInfo) {
+  return _getActiveStakeInNominationPool(memberInfo).plus(_getUnbondingStakeInNominationPool(memberInfo));
 }

package/core/substrate/system-pallet.js

@@ -62,10 +62,9 @@ function _getSystemPalletTotalBalanceV2(accountInfo) {
 function _getSystemPalletTransferableV1(accountInfo, existentialDeposit, strictMode) {
   const bnAppliedExistentialDeposit = new BigN(_getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMode));
   const bnAppliedFrozen = BigN.max(accountInfo.data.feeFrozen, accountInfo.data.miscFrozen);
-  const bnTotalBalance = new BigN(_getSystemPalletTotalBalanceV1(accountInfo));
-  const bnTransferableBalance = bnTotalBalance.minus(BigN.max(bnAppliedFrozen, accountInfo.data.reserved, bnAppliedExistentialDeposit));
+  const bnTransferableBalance = new BigN(accountInfo.data.free).minus(BigN.max(bnAppliedFrozen, bnAppliedExistentialDeposit));
   return BigN.max(bnTransferableBalance, 0).toFixed();
 }
 function _getSystemPalletTotalBalanceV1(accountInfo) {
-  return new BigN(accountInfo.data.free).toFixed();
+  return new BigN(accountInfo.data.free).plus(accountInfo.data.reserved).toFixed();
 }

package/core/substrate/xcm-parser.d.ts

@@ -0,0 +1,49 @@
+import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
+import { _Address } from '@subwallet/extension-base/background/KoniTypes';
+export declare function _getXcmDestWeight(originChainInfo: _ChainInfo): "Unlimited" | 5000000000;
+export declare function _getXcmBeneficiary(destChainInfo: _ChainInfo, recipient: _Address, version: number): {
+    [x: string]: {
+        parents: number;
+        interior: {
+            X1: {
+                AccountId32: {
+                    network: string | undefined;
+                    id: Uint8Array;
+                };
+                AccountKey20?: undefined;
+            } | {
+                AccountKey20: {
+                    network: string | undefined;
+                    key: string;
+                };
+                AccountId32?: undefined;
+            } | ({
+                AccountId32: {
+                    network: string | undefined;
+                    id: Uint8Array;
+                };
+                AccountKey20?: undefined;
+            } | {
+                AccountKey20: {
+                    network: string | undefined;
+                    key: string;
+                };
+                AccountId32?: undefined;
+            })[];
+        };
+    };
+};
+export declare function _getXcmMultiAssets(tokenInfo: _ChainAsset, value: string, version: number): {
+    [x: string]: {
+        id: Record<string, any>;
+        fun: {
+            Fungible: string;
+        };
+    }[];
+};
+export declare function _getXcmMultiLocation(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, version: number, recipient?: _Address): {
+    [x: string]: {
+        parents: number;
+        interior: unknown;
+    };
+};

package/core/substrate/xcm-parser.js

@@ -0,0 +1,181 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
+import { _getChainSubstrateAddressPrefix, _getEvmChainId, _getSubstrateParaId, _getSubstrateRelayParent, _getXcmAssetMultilocation, _isChainEvmCompatible, _isSubstrateParaChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { decodeAddress, evmToAddress } from '@polkadot/util-crypto';
+const FOUR_INSTRUCTIONS_WEIGHT = 5000000000;
+const UNLIMITED_WEIGHT = 'Unlimited';
+export function _getXcmDestWeight(originChainInfo) {
+  if (['pioneer'].includes(originChainInfo.slug)) {
+    return FOUR_INSTRUCTIONS_WEIGHT;
+  }
+  return UNLIMITED_WEIGHT;
+}
+export function _getXcmBeneficiary(destChainInfo, recipient, version) {
+  const receiverLocation = version < 4 // from V4, X1 is also an array
+  ? _getRecipientLocation(destChainInfo, recipient, version) : [_getRecipientLocation(destChainInfo, recipient, version)];
+  return {
+    [`V${version}`]: {
+      parents: 0,
+      interior: {
+        X1: receiverLocation
+      }
+    }
+  };
+}
+export function _getXcmMultiAssets(tokenInfo, value, version) {
+  const assetId = _getAssetIdentifier(tokenInfo, version);
+  return {
+    [`V${version}`]: [{
+      id: assetId,
+      fun: {
+        Fungible: value
+      }
+    }]
+  };
+}
+export function _getXcmMultiLocation(originChainInfo, destChainInfo, version, recipient) {
+  const isWithinSameConsensus = _isXcmWithinSameConsensus(originChainInfo, destChainInfo);
+  const parents = _getMultiLocationParent(originChainInfo, isWithinSameConsensus);
+  const interior = _getMultiLocationInterior(destChainInfo, isWithinSameConsensus, version, recipient);
+  return {
+    [`V${version}`]: {
+      parents,
+      interior
+    }
+  };
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+
+function _isXcmWithinSameConsensus(originChainInfo, destChainInfo) {
+  return _getSubstrateRelayParent(originChainInfo) === destChainInfo.slug || _getSubstrateRelayParent(destChainInfo) === originChainInfo.slug || _getSubstrateRelayParent(originChainInfo) === _getSubstrateRelayParent(destChainInfo);
+}
+function _getMultiLocationParent(originChainInfo, isWithinSameConsensus) {
+  let parent = 0; // how many hops up the hierarchy
+
+  if (_isSubstrateParaChain(originChainInfo)) {
+    parent += 1;
+  }
+  if (!isWithinSameConsensus) {
+    parent += 1;
+  }
+  return parent;
+}
+function _getMultiLocationInterior(destChainInfo, isWithinSameConsensus, version, recipient) {
+  const junctions = [];
+  if (isWithinSameConsensus) {
+    if (_isSubstrateParaChain(destChainInfo)) {
+      junctions.push({
+        Parachain: _getSubstrateParaId(destChainInfo)
+      });
+    }
+  } else {
+    junctions.push({
+      GlobalConsensus: _getGlobalConsensusJunction(destChainInfo, version)
+    });
+    if (_isSubstrateParaChain(destChainInfo)) {
+      junctions.push({
+        Parachain: _getSubstrateParaId(destChainInfo)
+      });
+    }
+  }
+  if (recipient) {
+    junctions.push(_getRecipientLocation(destChainInfo, recipient, version));
+  }
+  if (junctions.length === 0 && !recipient) {
+    return 'Here';
+  }
+  if (version < 4 && junctions.length === 1) {
+    return {
+      X1: junctions[0]
+    };
+  }
+  return {
+    [`X${junctions.length}`]: junctions
+  };
+}
+function _getGlobalConsensusJunction(destChainInfo, version) {
+  let chainSlug = destChainInfo.slug;
+  let evmChainId;
+  if (_isSubstrateParaChain(destChainInfo)) {
+    const relaySlug = _getSubstrateRelayParent(destChainInfo);
+    if (!relaySlug) {
+      throw Error('Parachain must have a parent chainSlug');
+    }
+    chainSlug = relaySlug;
+  } else {
+    evmChainId = _getEvmChainId(destChainInfo);
+  }
+  if (evmChainId) {
+    return {
+      Ethereum: {
+        chainId: evmChainId
+      }
+    };
+  }
+  switch (chainSlug) {
+    case COMMON_CHAIN_SLUGS.POLKADOT:
+      return version < 4 ? {
+        Polkadot: null
+      } : 'Polkadot';
+    case COMMON_CHAIN_SLUGS.KUSAMA:
+      return version < 4 ? {
+        Kusama: null
+      } : 'Kusama';
+    default:
+      return version < 4 ? {
+        Rococo: null
+      } : 'Rococo';
+  }
+}
+function _getRecipientLocation(destChainInfo, recipient, version) {
+  const network = _getNetworkByVersion(version);
+  if (destChainInfo.slug === COMMON_CHAIN_SLUGS.ASTAR_EVM) {
+    const ss58Address = evmToAddress(recipient, _getChainSubstrateAddressPrefix(destChainInfo)); // TODO: shouldn't pass addressPrefix directly
+
+    return {
+      AccountId32: {
+        network,
+        id: decodeAddress(ss58Address)
+      }
+    };
+  }
+  if (_isChainEvmCompatible(destChainInfo)) {
+    return {
+      AccountKey20: {
+        network,
+        key: recipient
+      }
+    };
+  }
+  return {
+    AccountId32: {
+      network,
+      id: decodeAddress(recipient)
+    }
+  };
+}
+function _getAssetIdentifier(tokenInfo, version) {
+  const assetIdentifier = _getXcmAssetMultilocation(tokenInfo);
+  if (!assetIdentifier) {
+    throw new Error('Asset must have multilocation');
+  }
+  return version >= 4 // from V4, Concrete is removed
+  ? assetIdentifier : {
+    Concrete: assetIdentifier
+  };
+}
+function _getNetworkByVersion(version) {
+  switch (version) {
+    case 1:
+    case 2:
+      return 'Any';
+    case 3:
+    case 4:
+      return undefined;
+    default:
+      return undefined;
+  }
+}

package/koni/api/dotsama/transfer.d.ts

@@ -1,10 +1,7 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
-import { SupportTransferResponse } from '@subwallet/extension-base/background/KoniTypes';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import BigN from 'bignumber.js';
 import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
-export declare function checkReferenceCount(networkKey: string, address: string, substrateApiMap: Record<string, _SubstrateApi>, chainInfo: _ChainInfo): Promise<boolean>;
-export declare function checkSupportTransfer(networkKey: string, tokenInfo: _ChainAsset, substrateApiMap: Record<string, _SubstrateApi>, chainInfo: _ChainInfo): Promise<SupportTransferResponse>;
 interface CreateTransferExtrinsicProps {
     substrateApi: _SubstrateApi;
     networkKey: string;

package/koni/api/dotsama/transfer.js

@@ -4,112 +4,13 @@
 import { GearApi } from '@gear-js/api';
 import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/tokens/wasm';
 import { getWasmContractGasLimit } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
-import { _BALANCE_TOKEN_GROUP, _MANTA_ZK_CHAIN_GROUP, _TRANSFER_CHAIN_GROUP, _TRANSFER_NOT_SUPPORTED_CHAINS, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
-import { _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _isChainEvmCompatible, _isNativeToken, _isTokenGearSmartContract, _isTokenTransferredByEvm, _isTokenWasmSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
+import { _TRANSFER_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
+import { _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _isBridgedToken, _isChainEvmCompatible, _isNativeToken, _isTokenGearSmartContract, _isTokenTransferredByEvm, _isTokenWasmSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import { getGRC20ContractPromise } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { BN, u8aToHex } from '@polkadot/util';
 import { decodeAddress } from '@polkadot/util-crypto';
-function isRefCount(accountInfo) {
-  return !!accountInfo.refcount;
-}
-export async function checkReferenceCount(networkKey, address, substrateApiMap, chainInfo) {
-  const apiProps = await substrateApiMap[networkKey].isReady;
-  const api = apiProps.api;
-  if (_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;
-}
-export async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMap, chainInfo) {
-  const substrateApi = await substrateApiMap[networkKey].isReady;
-  if (!tokenInfo) {
-    return {
-      supportTransfer: false,
-      supportTransferAll: false
-    };
-  }
-  if (_isChainEvmCompatible(chainInfo)) {
-    return {
-      supportTransfer: true,
-      supportTransferAll: true
-    };
-  }
-  if (tokenInfo.symbol.startsWith(_ZK_ASSET_PREFIX) && _MANTA_ZK_CHAIN_GROUP.includes(tokenInfo.originChain)) {
-    return {
-      supportTransfer: false,
-      supportTransferAll: false
-    };
-  }
-  if (_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 (_isTokenWasmSmartContract(tokenInfo) && api.query.contracts) {
-    // for PSP tokens
-    return {
-      supportTransfer: true,
-      supportTransferAll: true
-    };
-  }
-
-  // TODO: need review
-  if (_TRANSFER_CHAIN_GROUP.acala.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxCurrenciesSupported) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
-  } else if (_TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxTokensSupported) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
-  } else if (_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 && _isNativeToken(tokenInfo)) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
-  } else if (_TRANSFER_CHAIN_GROUP.bitcountry.includes(networkKey) && !_isNativeToken(tokenInfo) && _BALANCE_TOKEN_GROUP.bitcountry.includes(tokenInfo.symbol)) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
-  } else if (_TRANSFER_CHAIN_GROUP.statemine.includes(networkKey) && !_isNativeToken(tokenInfo)) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
-  } else if (_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 (_TRANSFER_CHAIN_GROUP.avail.includes(networkKey)) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
-  } else if (_TRANSFER_CHAIN_GROUP.centrifuge.includes(networkKey)) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
-  }
-  return result;
-}
 export const createTransferExtrinsic = async ({
   from,
   networkKey,
@@ -131,11 +32,17 @@ export const createTransferExtrinsic = async ({
   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 (_isTokenWasmSmartContract(tokenInfo) && api.query.contracts) {
+  if (_isBridgedToken(tokenInfo) && api.tx.foreignAssets) {
+    const onChainInfo = _getTokenOnChainInfo(tokenInfo);
+    if (transferAll) {
+      transfer = api.tx.foreignAssets.transfer(onChainInfo, to, value);
+    } else {
+      transfer = api.tx.foreignAssets.transferKeepAlive(onChainInfo, to, value);
+    }
+  } else if (_isTokenWasmSmartContract(tokenInfo) && api.query.contracts) {
     const contractPromise = getPSP22ContractPromise(api, _getContractAddressOfToken(tokenInfo));
     // @ts-ignore
     const gasLimit = await getWasmContractGasLimit(api, from, 'psp22::transfer', contractPromise, {}, [from, value, {}]);
@@ -177,25 +84,10 @@ export const createTransferExtrinsic = async ({
     } else if (value) {
       transfer = api.tx.tokens.transfer(to, _getTokenOnChainInfo(tokenInfo) || _getTokenOnChainAssetId(tokenInfo), new BN(value));
     }
-  } else if (_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 (_TRANSFER_CHAIN_GROUP.bitcountry.includes(networkKey) && !_isNativeToken(tokenInfo)) {
     transfer = api.tx.currencies.transfer(to, _getTokenOnChainInfo(tokenInfo), value);
   } else if (_TRANSFER_CHAIN_GROUP.statemine.includes(networkKey) && !_isNativeToken(tokenInfo)) {
     transfer = api.tx.assets.transfer(_getTokenOnChainAssetId(tokenInfo), to, value);
-    // } else if (_TRANSFER_CHAIN_GROUP.riochain.includes(networkKey)) {
-    //   if (_isNativeToken(tokenInfo)) {
-    //     transfer = api.tx.currencies.transferNativeCurrency(to, value);
-    //   }
   } else if (_TRANSFER_CHAIN_GROUP.sora_substrate.includes(networkKey) && isTxAssetsSupported) {
     transfer = api.tx.assets.transfer(_getTokenOnChainAssetId(tokenInfo), to, value);
   } else if (isTxBalancesSupported && _isNativeToken(tokenInfo)) {
@@ -236,10 +128,11 @@ export const getTransferMockTxFee = async (address, chainInfo, tokenInfo, api) =
     } else {
       var _paymentInfo$partialF;
       const substrateApi = api;
+      const chainApi = await substrateApi.isReady;
       const [mockTx] = await createTransferExtrinsic({
         from: address,
         networkKey: chainInfo.slug,
-        substrateApi,
+        substrateApi: chainApi,
         to: address,
         tokenInfo,
         transferAll: true,