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

package/koni/api/xcm/polkadotXcm.js

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

package/koni/api/xcm/utils.d.ts

@@ -1,48 +1,3 @@
-import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
-export declare const FOUR_INSTRUCTIONS_WEIGHT = 5000000000;
-export declare const FOUR_INSTRUCTIONS_LIMITED_WEIGHT: {
-    Limited: number;
-};
-export declare function getReceiverLocation(destinationChainInfo: _ChainInfo, toAddress: string, version?: string): Record<string, any>;
-export declare function getBeneficiary(destinationChainInfo: _ChainInfo, recipientAddress: string, version?: string): {
-    [x: string]: {
-        parents: number;
-        interior: {
-            X1: Record<string, any>;
-        };
-    };
-};
-export declare function getDestWeight(): string;
-export declare function getTokenLocation(tokenInfo: _ChainAsset, sendingValue: string, version?: string): {
-    [x: string]: {
-        id: Record<string, any>;
-        fun: {
-            Fungible: string;
-        };
-    }[];
-};
-export declare function getDestMultilocation(destinationChainInfo: _ChainInfo, recipient: string, version?: string): {
-    [x: string]: {
-        parents: number;
-        interior: {
-            X2: Record<string, any>[];
-        };
-    };
-} | {
-    [x: string]: {
-        parents: number;
-        interior: {
-            X1: Record<string, any>;
-        };
-    };
-};
-export declare function getDestinationChainLocation(originChainInfo: _ChainInfo, destinationChainInfo: _ChainInfo, version?: string): {
-    [x: string]: {
-        parents: number;
-        interior: string | {
-            X1: {
-                Parachain: number;
-            };
-        };
-    };
-};
+import { _ChainInfo } from '@subwallet/chain-list/types';
+export declare const STABLE_XCM_VERSION = 3;
+export declare function isUseTeleportProtocol(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;

package/koni/api/xcm/utils.js

@@ -1,118 +1,9 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
-import { _getSubstrateParaId, _getXcmAssetMultilocation, _isChainEvmCompatible, _isNativeToken, _isSubstrateParaChain, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
-import { decodeAddress, evmToAddress } from '@polkadot/util-crypto';
-export const FOUR_INSTRUCTIONS_WEIGHT = 5000000000;
-export const FOUR_INSTRUCTIONS_LIMITED_WEIGHT = {
-  Limited: 5000000000
-};
-
-// get multilocation for destination chain from a parachain
-
-export function getReceiverLocation(destinationChainInfo, toAddress, version) {
-  const network = version && version === 'V3' ? undefined : 'Any';
-  if (destinationChainInfo.slug === COMMON_CHAIN_SLUGS.ASTAR_EVM) {
-    const ss58Address = evmToAddress(toAddress, 2006); // TODO: shouldn't pass addressPrefix directly
-
-    return {
-      AccountId32: {
-        network,
-        id: decodeAddress(ss58Address)
-      }
-    };
-  }
-  if (_isChainEvmCompatible(destinationChainInfo)) {
-    return {
-      AccountKey20: {
-        network,
-        key: toAddress
-      }
-    };
-  }
-  return {
-    AccountId32: {
-      network,
-      id: decodeAddress(toAddress)
-    }
-  };
-}
-export function getBeneficiary(destinationChainInfo, recipientAddress, version = 'V1') {
-  const receiverLocation = getReceiverLocation(destinationChainInfo, recipientAddress, version);
-  return {
-    [version]: {
-      parents: 0,
-      interior: {
-        X1: receiverLocation
-      }
-    }
-  };
-}
-export function getDestWeight() {
-  return 'Unlimited';
-}
-export function getTokenLocation(tokenInfo, sendingValue, version = 'V1') {
-  if (!_isNativeToken(tokenInfo)) {
-    const multilocation = _getXcmAssetMultilocation(tokenInfo);
-    return {
-      [version]: [{
-        id: multilocation,
-        fun: {
-          Fungible: sendingValue
-        }
-      }]
-    };
-  }
-  return {
-    [version]: [{
-      id: {
-        Concrete: {
-          parents: 0,
-          interior: 'Here'
-        }
-      },
-      fun: {
-        Fungible: sendingValue
-      }
-    }]
-  };
-}
-export function getDestMultilocation(destinationChainInfo, recipient, version = 'V1') {
-  const receiverLocation = getReceiverLocation(destinationChainInfo, recipient, version);
-  if (_isSubstrateParaChain(destinationChainInfo)) {
-    const interior = {
-      X2: [{
-        Parachain: _getSubstrateParaId(destinationChainInfo)
-      }, receiverLocation]
-    };
-    return {
-      [version]: {
-        parents: 1,
-        interior
-      }
-    };
-  }
-  return {
-    [version]: {
-      parents: 1,
-      interior: {
-        X1: receiverLocation
-      }
-    }
-  };
-}
-export function getDestinationChainLocation(originChainInfo, destinationChainInfo, version = 'V1') {
-  const parents = _isSubstrateRelayChain(originChainInfo) ? 0 : 1;
-  const interior = _isSubstrateParaChain(destinationChainInfo) ? {
-    X1: {
-      Parachain: _getSubstrateParaId(destinationChainInfo)
-    }
-  } : 'Here';
-  return {
-    [version]: {
-      parents,
-      interior
-    }
-  };
+export const STABLE_XCM_VERSION = 3;
+export 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/koni/api/xcm/xTokens.js

@@ -1,24 +1,26 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { FOUR_INSTRUCTIONS_WEIGHT, getDestMultilocation, getDestWeight } from '@subwallet/extension-base/koni/api/xcm/utils';
-import { _getTokenOnChainAssetId, _getTokenOnChainInfo, _getXcmAssetId, _getXcmAssetMultilocation, _getXcmAssetType, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getXcmDestWeight, _getXcmMultiAssets, _getXcmMultiLocation } from '@subwallet/extension-base/core/substrate/xcm-parser';
+import { STABLE_XCM_VERSION } from '@subwallet/extension-base/koni/api/xcm/utils';
+import { _getTokenOnChainAssetId, _getTokenOnChainInfo, _getXcmAssetId, _getXcmAssetMultilocation, _getXcmAssetType } from '@subwallet/extension-base/services/chain-service/utils';
 function getCurrencyId(tokenInfo) {
-  if (['acala', 'karura'].includes(tokenInfo.originChain) && _isNativeToken(tokenInfo)) {
-    return _getXcmAssetMultilocation(tokenInfo);
-  } else if (['moonbeam', 'moonbase', 'moonriver'].includes(tokenInfo.originChain)) {
+  if (['moonbeam', 'moonbase', 'moonriver'].includes(tokenInfo.originChain)) {
     const tokenType = _getXcmAssetType(tokenInfo);
     const assetId = _getXcmAssetId(tokenInfo);
     return {
       [tokenType]: assetId
     };
-  } else if (['pioneer'].includes(tokenInfo.originChain)) {
-    return _getXcmAssetMultilocation(tokenInfo);
   }
   return _getTokenOnChainInfo(tokenInfo) || _getTokenOnChainAssetId(tokenInfo);
 }
 export function getExtrinsicByXtokensPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
-  const weightParam = ['pioneer'].includes(originChainInfo.slug) ? FOUR_INSTRUCTIONS_WEIGHT : 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, getDestMultilocation(destinationChainInfo, recipientAddress, destVersion), weightParam);
+  const version = STABLE_XCM_VERSION;
+  const destination = _getXcmMultiLocation(originChainInfo, destinationChainInfo, version, recipientAddress);
+  if (!_getXcmAssetMultilocation(tokenInfo)) {
+    const tokenCurrencyId = getCurrencyId(tokenInfo);
+    return api.tx.xTokens.transfer(tokenCurrencyId, value, destination, _getXcmDestWeight(originChainInfo));
+  }
+  const tokenMultiAsset = _getXcmMultiAssets(tokenInfo, value, version);
+  return api.tx.xTokens.transferMultiassets(tokenMultiAsset, 0, destination, _getXcmDestWeight(originChainInfo));
 }

package/koni/api/xcm/xcmPallet.js

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

package/koni/background/handlers/Extension.d.ts

@@ -143,9 +143,6 @@ export default class KoniExtension {
     private getXcmMaxTransferable;
     private getNativeTokenMaxTransferable;
     private subscribeAddressTransferableBalance;
-    private transferCheckReferenceCount;
-    private transferCheckSupporting;
-    private transferGetExistentialDeposit;
     private substrateNftSubmitTransaction;
     private enableChains;
     private getAccountMeta;
@@ -182,6 +179,7 @@ export default class KoniExtension {
     private keyringMigrateMasterPassword;
     private keyringUnlock;
     private keyringLock;
+    keyringLockSubscribe(cb: (state: boolean) => void): any;
     private keyringExportMnemonic;
     private resetWallet;
     private signingApprovePasswordV2;

package/koni/background/handlers/Extension.js

@@ -12,7 +12,7 @@ import { additionalValidateTransfer, additionalValidateXcmTransfer, validateTran
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
 import { resolveAzeroAddressToDomain, resolveAzeroDomainToAddress } from '@subwallet/extension-base/koni/api/dotsama/domain';
 import { parseSubstrateTransaction } from '@subwallet/extension-base/koni/api/dotsama/parseTransaction';
-import { checkReferenceCount, checkSupportTransfer, createTransferExtrinsic, getTransferMockTxFee } from '@subwallet/extension-base/koni/api/dotsama/transfer';
+import { createTransferExtrinsic, getTransferMockTxFee } from '@subwallet/extension-base/koni/api/dotsama/transfer';
 import { getNftTransferExtrinsic, isRecipientSelf } from '@subwallet/extension-base/koni/api/nft/transfer';
 import { getBondingExtrinsic, getCancelWithdrawalExtrinsic, getClaimRewardExtrinsic, getNominationPoolsInfo, getUnbondingExtrinsic, getValidatorsInfo, validateBondingCondition, validateUnbondingCondition } from '@subwallet/extension-base/koni/api/staking/bonding';
 import { getTuringCancelCompoundingExtrinsic, getTuringCompoundExtrinsic } from '@subwallet/extension-base/koni/api/staking/bonding/paraChain';
@@ -23,7 +23,7 @@ import { createXcmExtrinsic, getXcmMockTxFee } from '@subwallet/extension-base/k
 import { YIELD_EXTRINSIC_TYPES } from '@subwallet/extension-base/koni/api/yield/helper/utils';
 import { _API_OPTIONS_CHAIN_GROUP, _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
-import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getSubstrateGenesisHash, _getTokenMinAmount, _isAssetSmartContractNft, _isChainEvmCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isTokenEvmSmartContract, _isTokenTransferredByEvm } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getSubstrateGenesisHash, _isAssetSmartContractNft, _isChainEvmCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isTokenEvmSmartContract, _isTokenTransferredByEvm } from '@subwallet/extension-base/services/chain-service/utils';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
 import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setting-service/constants';
 import { WALLET_CONNECT_EIP155_NAMESPACE } from '@subwallet/extension-base/services/wallet-connect-service/constants';
@@ -38,6 +38,7 @@ import { keyring } from '@subwallet/ui-keyring';
 import { getSdkError } from '@walletconnect/utils';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
+import { Subject } from 'rxjs';
 import { TypeRegistry } from '@polkadot/types';
 import { assert, hexStripPrefix, hexToU8a, isAscii, isHex, u8aToHex, u8aToString } from '@polkadot/util';
 import { base64Decode, decodeAddress, isAddress, isEthereumAddress, jsonDecrypt, keyExtractSuri, mnemonicGenerate, mnemonicValidate } from '@polkadot/util-crypto';
@@ -74,6 +75,7 @@ export default class KoniExtension {
   #skipAutoLock = false;
   #firstTime = true;
   #alwaysLock = false;
+  #keyringLockSubject = new Subject();
   constructor(state) {
     this.#koniState = state;
     const updateTimeAutoLock = rs => {
@@ -1912,26 +1914,6 @@ export default class KoniExtension {
     });
     return convertData(currentFreeBalance);
   }
-  async transferCheckReferenceCount({
-    address,
-    networkKey
-  }) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-return
-    return await checkReferenceCount(networkKey, address, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
-  }
-  async transferCheckSupporting({
-    networkKey,
-    tokenSlug
-  }) {
-    const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
-    return await checkSupportTransfer(networkKey, tokenInfo, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
-  }
-  transferGetExistentialDeposit({
-    tokenSlug
-  }) {
-    const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
-    return _getTokenMinAmount(tokenInfo);
-  }
   async substrateNftSubmitTransaction(inputData) {
     const {
       params,
@@ -2816,8 +2798,12 @@ export default class KoniExtension {
 
   keyringLock() {
     this.#koniState.keyringService.lock();
+    this.#keyringLockSubject.next(true);
     clearTimeout(this.#lockTimeOut);
   }
+  keyringLockSubscribe(cb) {
+    this.#keyringLockSubject.subscribe(cb);
+  }
 
   // Export mnemonic
 
@@ -4297,12 +4283,6 @@ export default class KoniExtension {
         return this.subscribeAssetSetting(id, port);
       case 'pri(assetSetting.update)':
         return await this.updateAssetSetting(request);
-      case 'pri(transfer.checkReferenceCount)':
-        return await this.transferCheckReferenceCount(request);
-      case 'pri(transfer.checkSupporting)':
-        return await this.transferCheckSupporting(request);
-      case 'pri(transfer.getExistentialDeposit)':
-        return this.transferGetExistentialDeposit(request);
       case 'pri(transfer.getMaxTransferable)':
         return this.getMaxTransferable(request);
       case 'pri(transfer.subscribeMaxTransferable)':

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.2.3-1",
+  "version": "1.2.4-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -154,6 +154,11 @@
       "require": "./cjs/core/substrate/system-pallet.js",
       "default": "./core/substrate/system-pallet.js"
     },
+    "./core/substrate/xcm-parser": {
+      "types": "./core/substrate/xcm-parser.d.ts",
+      "require": "./cjs/core/substrate/xcm-parser.js",
+      "default": "./core/substrate/xcm-parser.js"
+    },
     "./defaults": {
       "types": "./defaults.d.ts",
       "require": "./cjs/defaults.js",
@@ -1916,11 +1921,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.66",
-    "@subwallet/extension-base": "^1.2.3-1",
-    "@subwallet/extension-chains": "^1.2.3-1",
-    "@subwallet/extension-dapp": "^1.2.3-1",
-    "@subwallet/extension-inject": "^1.2.3-1",
+    "@subwallet/chain-list": "0.2.67",
+    "@subwallet/extension-base": "^1.2.4-0",
+    "@subwallet/extension-chains": "^1.2.4-0",
+    "@subwallet/extension-dapp": "^1.2.4-0",
+    "@subwallet/extension-inject": "^1.2.4-0",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/keyvaluestorage": "^1.1.1",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.2.3-1'
+  version: '1.2.4-0'
 };

package/services/balance-service/helpers/subscribe/substrate/index.js

@@ -5,12 +5,12 @@ import { GearApi } from '@gear-js/api';
 import { _AssetType } from '@subwallet/chain-list/types';
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
 import { SUB_TOKEN_REFRESH_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
-import { _getActiveStakeInNominationPool } from '@subwallet/extension-base/core/substrate/nominationpools-pallet';
+import { _getTotalStakeInNominationPool } from '@subwallet/extension-base/core/substrate/nominationpools-pallet';
 import { _getSystemPalletTotalBalance, _getSystemPalletTransferable } from '@subwallet/extension-base/core/substrate/system-pallet';
 import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/tokens/wasm';
 import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
 import { _BALANCE_CHAIN_GROUP, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
-import { _checkSmartContractSupportByChain, _getChainExistentialDeposit, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getTokenTypesSupportedByChain, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _checkSmartContractSupportByChain, _getChainExistentialDeposit, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getTokenTypesSupportedByChain, _isBridgedToken, _isChainEvmCompatible, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { filterAssetsByChainAndType, getGRC20ContractPromise } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { combineLatest, Observable } from 'rxjs';
@@ -131,7 +131,7 @@ const subscribeWithSystemAccountPallet = async ({
     const items = balances.map((_balance, index) => {
       const balanceInfo = _balance.toPrimitive();
       const poolMemberInfo = poolMemberInfos[index].toPrimitive();
-      const nominationPoolBalance = poolMemberInfo ? _getActiveStakeInNominationPool(poolMemberInfo) : '0';
+      const nominationPoolBalance = poolMemberInfo ? _getTotalStakeInNominationPool(poolMemberInfo) : new BigN(0);
       const transferableBalance = _getSystemPalletTransferable(balanceInfo, _getChainExistentialDeposit(chainInfo), extrinsicType);
       const totalBalance = _getSystemPalletTotalBalance(balanceInfo);
       const totalLockedFromTransfer = new BigN(totalBalance).minus(transferableBalance).plus(nominationPoolBalance);
@@ -165,8 +165,8 @@ const subscribeBridgedBalance = async ({
     try {
       const isBridgedToken = _isBridgedToken(tokenInfo);
       if (isBridgedToken) {
-        const multiLocation = _getXcmAssetMultilocation(tokenInfo);
-        return await substrateApi.query.foreignAssets.account.multi(addresses.map(address => [multiLocation, address]), balances => {
+        const onChainInfo = _getTokenOnChainInfo(tokenInfo);
+        return await substrateApi.query.foreignAssets.account.multi(addresses.map(address => [onChainInfo, address]), balances => {
           const items = balances.map((balance, index) => {
             const bdata = balance === null || balance === void 0 ? void 0 : balance.toHuman();
             let frozen = BN_ZERO;
@@ -339,6 +339,9 @@ const subscribeAssetsAccountPallet = async ({
   const unsubList = await Promise.all(Object.values(tokenMap).map(async tokenInfo => {
     try {
       const assetIndex = _getTokenOnChainAssetId(tokenInfo);
+      if (assetIndex === '-1') {
+        return undefined;
+      }
 
       // Get Token Balance
       return await substrateApi.query.assets.account.multi(addresses.map(address => [assetIndex, address]), balances => {

package/services/chain-service/constants.js

@@ -34,7 +34,7 @@ export const _BALANCE_CHAIN_GROUP = {
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge'],
-  supportBridged: ['rococo_assethub']
+  supportBridged: ['rococo_assethub', 'statemint', 'statemine']
 };
 export const _BALANCE_TOKEN_GROUP = {
   crab: ['CKTON', 'PKTON'],
@@ -249,7 +249,7 @@ export const _DEFAULT_MANTA_ZK_CHAIN = 'calamari';
 // XCM------------------------------------------------------------------------------------------------------------------
 
 export const _XCM_CHAIN_GROUP = {
-  polkadotXcm: ['astar', 'shiden', 'statemine', 'statemint', 'equilibrium_parachain'],
+  polkadotXcm: ['astar', 'shiden', 'statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub'],
   xcmPallet: ['polkadot', 'kusama']
   // default is xTokens pallet
 };

package/services/chain-service/utils/index.d.ts

@@ -35,9 +35,9 @@ export declare function _isNativeToken(tokenInfo: _ChainAsset): boolean;
 export declare function _isNativeTokenBySlug(tokenSlug: string): boolean;
 export declare function _isSmartContractToken(tokenInfo: _ChainAsset): boolean;
 export declare function _isSubstrateChain(chainInfo: _ChainInfo): boolean;
-export declare function _getEvmChainId(chainInfo: _ChainInfo): number;
+export declare function _getEvmChainId(chainInfo: _ChainInfo): number | undefined;
 export declare function _getSubstrateParaId(chainInfo: _ChainInfo): number;
-export declare function _getSubstrateRelayParent(chainInfo: _ChainInfo): string;
+export declare function _getSubstrateRelayParent(chainInfo: _ChainInfo): string | null | undefined;
 export declare function _getSubstrateGenesisHash(chainInfo: _ChainInfo): string;
 export declare function _isChainSupportSubstrateStaking(chainInfo: _ChainInfo): boolean;
 export declare function _isChainEnabled(chainState: _ChainState): boolean;
@@ -64,6 +64,7 @@ export declare function _getXcmAssetType(tokenInfo: _ChainAsset): string;
 export declare function _getXcmAssetId(tokenInfo: _ChainAsset): string;
 export declare function _getXcmAssetMultilocation(tokenInfo: _ChainAsset): Record<string, any>;
 export declare function _getXcmTransferType(originChainInfo: _ChainInfo, destinationChainInfo: _ChainInfo): string;
+export declare function _isRelayChain(chainInfo: _ChainInfo): boolean;
 export declare function _isSubstrateRelayChain(chainInfo: _ChainInfo): boolean;
 export declare function _isSubstrateParaChain(chainInfo: _ChainInfo): boolean;
 export declare function _getEvmAbiExplorer(chainInfo: _ChainInfo): string;

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

@@ -131,7 +131,7 @@ export function _isSubstrateChain(chainInfo) {
 
 export 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
 }
 
 export function _getSubstrateParaId(chainInfo) {
@@ -140,7 +140,7 @@ export function _getSubstrateParaId(chainInfo) {
 }
 export 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;
 }
 export function _getSubstrateGenesisHash(chainInfo) {
   var _chainInfo$substrateI3;
@@ -292,6 +292,9 @@ export 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) || ''}`;
 }
+export function _isRelayChain(chainInfo) {
+  return _isSubstrateRelayChain(chainInfo) || _isPureEvmChain(chainInfo);
+}
 export function _isSubstrateRelayChain(chainInfo) {
   var _chainInfo$substrateI14;
   return ((_chainInfo$substrateI14 = chainInfo.substrateInfo) === null || _chainInfo$substrateI14 === void 0 ? void 0 : _chainInfo$substrateI14.chainType) === _SubstrateChainType.RELAYCHAIN;

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

@@ -277,11 +277,11 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
     const xcmFee = new BN(path.totalFee[1].amount || '0');
     const xcmAmount = missingAmount.add(xcmFee);
     const bnAltInputTokenBalance = new BN(altInputTokenBalance.value || '0');
-    if (!bnAltInputTokenBalance.sub(xcmAmount).gt(BN_ZERO)) {
+    if (!bnAltInputTokenBalance.sub(xcmAmount).sub(xcmFee).gt(BN_ZERO)) {
       processValidation.failedStep = path.steps[1];
       processValidation.ok = false;
       processValidation.status = YieldValidationStatus.NOT_ENOUGH_BALANCE;
-      const maxBn = bnInputTokenBalance.add(new BN(altInputTokenBalance.value)).sub(xcmFee);
+      const maxBn = bnInputTokenBalance.add(new BN(altInputTokenBalance.value)).sub(xcmFee).sub(xcmFee);
       const maxValue = formatNumber(maxBn.toString(), inputTokenInfo.decimals || 0);
       const altInputTokenInfo = this.state.getAssetBySlug(altInputTokenSlug);
       const symbol = altInputTokenInfo.symbol;
@@ -289,7 +289,7 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
       const inputNetworkName = this.chainInfo.name;
       const altNetworkName = altNetwork.name;
       const currentValue = formatNumber(bnInputTokenBalance.toString(), inputTokenInfo.decimals || 0);
-      const bnMaxXCM = new BN(altInputTokenBalance.value).sub(xcmFee);
+      const bnMaxXCM = new BN(altInputTokenBalance.value).sub(xcmFee).sub(xcmFee);
       const maxXCMValue = formatNumber(bnMaxXCM.toString(), inputTokenInfo.decimals || 0);
       processValidation.message = 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/services/migration-service/scripts/MigrateTransactionHistoryBySymbol.js

@@ -7,7 +7,8 @@ export default class MigrateTransactionHistoryBySymbol extends BaseMigrationJob
     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 ([oldSlug, newSlug], i) => {

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

@@ -6,7 +6,8 @@ export default class MigrateAssetSetting extends BaseMigrationJob {
   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/services/migration-service/scripts/index.js

@@ -49,8 +49,8 @@ export default {
   '1.1.28-01': MigrateEarningVersion,
   '1.1.41-01': DeleteChainStaking,
   '1.1.46-01': AutoEnableSomeTokens,
-  '1.1.62-01': MigrateAssetSetting,
-  '1.1.62-02': MigrateTransactionHistoryBySymbol,
+  '1.1.69-03': MigrateAssetSetting,
+  '1.1.69-02': MigrateTransactionHistoryBySymbol,
   '1.2.69-01': MigrateRemoveGenesisHash
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens

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

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