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

package/cjs/services/chain-service/constants.js

@@ -35,8 +35,8 @@ const _BALANCE_CHAIN_GROUP = {
   kintsugi: ['kintsugi', 'interlay', 'kintsugi_test'],
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
-  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2'],
+  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'] // perhaps there are some runtime updates
 };
 exports._BALANCE_CHAIN_GROUP = _BALANCE_CHAIN_GROUP;
@@ -192,11 +192,11 @@ const _TRANSFER_NOT_SUPPORTED_CHAINS = ['subspace_gemini_3a', 'kulupu', 'joystre
 exports._TRANSFER_NOT_SUPPORTED_CHAINS = _TRANSFER_NOT_SUPPORTED_CHAINS;
 const _TRANSFER_CHAIN_GROUP = {
   acala: ['karura', 'acala', 'acala_testnet'],
-  kintsugi: ['kintsugi', 'kintsugi_test', 'interlay'],
+  kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'bifrost_dot', 'hydradx_main'],
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   crab: ['crab', 'pangolin'],
   bitcountry: ['pioneer', 'bitcountry'],
-  statemine: ['statemint', 'statemine', 'darwinia2']
+  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'parallel']
 };
 exports._TRANSFER_CHAIN_GROUP = _TRANSFER_CHAIN_GROUP;
 const _BALANCE_PARSING_CHAIN_GROUP = {
@@ -206,7 +206,7 @@ const _BALANCE_PARSING_CHAIN_GROUP = {
 // XCM------------------------------------------------------------------------------------------------------------------
 exports._BALANCE_PARSING_CHAIN_GROUP = _BALANCE_PARSING_CHAIN_GROUP;
 const _XCM_CHAIN_GROUP = {
-  polkadotXcm: ['astar', 'shiden', 'statemine', 'statemint'],
+  polkadotXcm: ['astar', 'shiden', 'statemine', 'statemint', 'equilibrium_parachain'],
   xcmPallet: ['polkadot', 'kusama']
   // default is xTokens pallet
 };

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

@@ -47,22 +47,25 @@ class ChainService {
     this.chainInfoMapSubject.next(this.dataMap.chainInfoMap);
     this.chainStateMapSubject.next(this.dataMap.chainStateMap);
     this.assetRegistrySubject.next(this.dataMap.assetRegistry);
-    this.xcmRefMapSubject.next(this.getXcmRefMap());
+    this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
     this.logger = (0, _logger.logger)('chain-service');
     this.refreshChainStateInterval(3000, 6);
   }
 
   // Getter
   getXcmRefMap() {
-    const result = {};
-    Object.entries(_chainList.AssetRefMap).forEach(_ref => {
-      let [key, assetRef] = _ref;
-      if (assetRef.path === _types._AssetRefPath.XCM) {
-        result[key] = assetRef;
-      }
-    });
-    return result;
+    return this.dataMap.assetRefMap;
+    // const result: Record<string, _AssetRef> = {};
+    //
+    // Object.entries(AssetRefMap).forEach(([key, assetRef]) => {
+    //   if (assetRef.path === _AssetRefPath.XCM) {
+    //     result[key] = assetRef;
+    //   }
+    // });
+    //
+    // return result;
   }
+
   getEvmApi(slug) {
     return this.evmChainHandler.getEvmApiByChain(slug);
   }
@@ -365,13 +368,14 @@ class ChainService {
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.chainStateMapSubject.next(this.getChainStateMap());
     this.assetRegistrySubject.next(this.getAssetRegistry());
+    this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
     this.initApis();
     await this.initAssetSettings();
   }
   initApis() {
     // TODO: this might be async
-    Object.entries(this.getChainInfoMap()).forEach(_ref2 => {
-      let [slug, chainInfo] = _ref2;
+    Object.entries(this.getChainInfoMap()).forEach(_ref => {
+      let [slug, chainInfo] = _ref;
       if (this.getChainStateByKey(slug).active) {
         this.initApiForChain(chainInfo);
       }
@@ -617,8 +621,8 @@ class ChainService {
       }
 
       // Fill in the missing chainState and storageData (new chains never before seen)
-      Object.entries(mergedChainInfoMap).forEach(_ref3 => {
-        let [slug, chainInfo] = _ref3;
+      Object.entries(mergedChainInfoMap).forEach(_ref2 => {
+        let [slug, chainInfo] = _ref2;
         if (!(slug in this.dataMap.chainStateMap)) {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],
@@ -1136,8 +1140,8 @@ class ChainService {
         update = true;
       }
     }
-    const promiseList = Object.entries(chainStateMap).map(async _ref4 => {
-      let [chain, chainState] = _ref4;
+    const promiseList = Object.entries(chainStateMap).map(async _ref3 => {
+      let [chain, chainState] = _ref3;
       try {
         if (chainState.active) {
           if (substrateApiMap[chain]) {

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

@@ -58,7 +58,6 @@ exports._isPureSubstrateChain = _isPureSubstrateChain;
 exports._isSmartContractToken = _isSmartContractToken;
 exports._isSubstrateChain = _isSubstrateChain;
 exports._isSubstrateParaChain = _isSubstrateParaChain;
-exports._isSubstrateParachain = _isSubstrateParachain;
 exports._isSubstrateRelayChain = _isSubstrateRelayChain;
 exports._isTokenEvmSmartContract = _isTokenEvmSmartContract;
 exports._isTokenTransferredByEvm = _isTokenTransferredByEvm;
@@ -198,9 +197,6 @@ function _isChainSupportSubstrateStaking(chainInfo) {
 function _isChainEnabled(chainState) {
   return chainState.active;
 }
-function _isSubstrateParachain(chainInfo) {
-  return chainInfo.substrateInfo !== null && chainInfo.substrateInfo.paraId !== null;
-}
 function _getChainSubstrateAddressPrefix(chainInfo) {
   var _chainInfo$substrateI5, _chainInfo$substrateI6;
   return (_chainInfo$substrateI5 = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI6 = chainInfo.substrateInfo) === null || _chainInfo$substrateI6 === void 0 ? void 0 : _chainInfo$substrateI6.addressPrefix) !== null && _chainInfo$substrateI5 !== void 0 ? _chainInfo$substrateI5 : -1;
@@ -327,7 +323,7 @@ function _isSubstrateRelayChain(chainInfo) {
 }
 function _isSubstrateParaChain(chainInfo) {
   var _chainInfo$substrateI11;
-  return ((_chainInfo$substrateI11 = chainInfo.substrateInfo) === null || _chainInfo$substrateI11 === void 0 ? void 0 : _chainInfo$substrateI11.chainType) === _types._SubstrateChainType.PARACHAIN;
+  return chainInfo.substrateInfo !== null && chainInfo.substrateInfo.paraId !== null && ((_chainInfo$substrateI11 = chainInfo.substrateInfo) === null || _chainInfo$substrateI11 === void 0 ? void 0 : _chainInfo$substrateI11.chainType) === _types._SubstrateChainType.PARACHAIN;
 }
 function _getEvmAbiExplorer(chainInfo) {
   var _chainInfo$evmInfo3;

package/cjs/services/transaction-service/helpers/index.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isSubstrateTransaction = exports.getValidationId = exports.getTransactionId = void 0;
+exports.isSubstrateTransaction = exports.getValidationId = exports.getTransactionId = exports.getBaseTransactionInfo = void 0;
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -20,4 +21,46 @@ exports.getValidationId = getValidationId;
 const isSubstrateTransaction = tx => {
   return !!tx.send;
 };
-exports.isSubstrateTransaction = isSubstrateTransaction;
+exports.isSubstrateTransaction = isSubstrateTransaction;
+const typeName = type => {
+  switch (type) {
+    case _KoniTypes.ExtrinsicType.TRANSFER_BALANCE:
+    case _KoniTypes.ExtrinsicType.TRANSFER_TOKEN:
+    case _KoniTypes.ExtrinsicType.TRANSFER_XCM:
+      return 'Transfer';
+    case _KoniTypes.ExtrinsicType.SEND_NFT:
+      return 'Send NFT';
+    case _KoniTypes.ExtrinsicType.CROWDLOAN:
+      return 'Crowdloan contribution';
+    case _KoniTypes.ExtrinsicType.STAKING_JOIN_POOL:
+      return 'Join pool';
+    case _KoniTypes.ExtrinsicType.STAKING_LEAVE_POOL:
+      return 'Leave pool';
+    case _KoniTypes.ExtrinsicType.STAKING_BOND:
+      return 'Bond';
+    case _KoniTypes.ExtrinsicType.STAKING_UNBOND:
+      return 'Unbond';
+    case _KoniTypes.ExtrinsicType.STAKING_CLAIM_REWARD:
+      return 'Claim reward';
+    case _KoniTypes.ExtrinsicType.STAKING_WITHDRAW:
+      return 'Withdraw';
+    case _KoniTypes.ExtrinsicType.STAKING_CANCEL_UNSTAKE:
+      return 'Cancel unstake';
+    case _KoniTypes.ExtrinsicType.STAKING_COMPOUNDING:
+      return 'Stake compound';
+    case _KoniTypes.ExtrinsicType.EVM_EXECUTE:
+      return 'EVM execute';
+    case _KoniTypes.ExtrinsicType.STAKING_CANCEL_COMPOUNDING:
+      return 'Cancel compounding';
+    case _KoniTypes.ExtrinsicType.STAKING_POOL_WITHDRAW:
+      return 'Withdraw pool';
+    case _KoniTypes.ExtrinsicType.UNKNOWN:
+    default:
+      return 'unknown';
+  }
+};
+const getBaseTransactionInfo = (transaction, chainInfoMap) => {
+  var _chainInfoMap$transac;
+  return `${typeName(transaction.extrinsicType)} on ${((_chainInfoMap$transac = chainInfoMap[transaction.chain]) === null || _chainInfoMap$transac === void 0 ? void 0 : _chainInfoMap$transac.name) || 'unknown network'}`;
+};
+exports.getBaseTransactionInfo = getBaseTransactionInfo;

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

@@ -10,9 +10,10 @@ var _TransactionError = require("@subwallet/extension-base/background/errors/Tra
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _TransactionWarning = require("@subwallet/extension-base/background/warnings/TransactionWarning");
 var _constants = require("@subwallet/extension-base/constants");
+var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _constants2 = require("@subwallet/extension-base/services/request-service/constants");
-var _constants3 = require("@subwallet/extension-base/services/transaction-service/constants");
+var _constants3 = require("@subwallet/extension-base/services/request-service/constants");
+var _constants4 = require("@subwallet/extension-base/services/transaction-service/constants");
 var _eventParser = require("@subwallet/extension-base/services/transaction-service/event-parser");
 var _helpers = require("@subwallet/extension-base/services/transaction-service/helpers");
 var _utils2 = require("@subwallet/extension-base/services/transaction-service/utils");
@@ -116,6 +117,10 @@ class TransactionService {
             }
           }
         } catch (e) {
+          const error = e;
+          if (error.message.includes('gas required exceeds allowance')) {
+            validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_BALANCE));
+          }
           estimateFee.value = '0';
         }
       }
@@ -142,16 +147,22 @@ class TransactionService {
     const balanceNum = parseInt(balance.value);
     const edNum = parseInt(existentialDeposit);
     const transferNativeNum = parseInt(transferNative);
-    if (!isTransferAll) {
-      if (transferNativeNum + feeNum > balanceNum) {
+    if (transferNativeNum + feeNum > balanceNum) {
+      if (!isTransferAll) {
         validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_BALANCE));
       } else {
-        if (balanceNum - (transferNativeNum + feeNum) <= edNum) {
-          if (edAsWarning) {
-            validationResponse.warnings.push(new _TransactionWarning.TransactionWarning(_KoniTypes.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
-          } else {
-            validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
-          }
+        if ([..._constants2._TRANSFER_CHAIN_GROUP.acala, ..._constants2._TRANSFER_CHAIN_GROUP.genshiro, ..._constants2._TRANSFER_CHAIN_GROUP.bitcountry, ..._constants2._TRANSFER_CHAIN_GROUP.statemine].includes(chain)) {
+          // Chain not have transfer all function
+          validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_BALANCE));
+        }
+      }
+    }
+    if (!isTransferAll) {
+      if (balanceNum - (transferNativeNum + feeNum) < edNum) {
+        if (edAsWarning) {
+          validationResponse.warnings.push(new _TransactionWarning.TransactionWarning(_KoniTypes.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
+        } else {
+          validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
         }
       }
     }
@@ -172,7 +183,7 @@ class TransactionService {
       updatedAt: new Date().getTime(),
       errors: transaction.errors || [],
       warnings: transaction.warnings || [],
-      url: transaction.url || _constants2.EXTENSION_REQUEST_URL,
+      url: transaction.url || _constants3.EXTENSION_REQUEST_URL,
       status: _KoniTypes.ExtrinsicStatus.QUEUED,
       isInternal,
       id: transactionId,
@@ -213,6 +224,7 @@ class TransactionService {
       // @ts-ignore
       'transaction' in validatedTransaction && delete validatedTransaction.transaction;
       'additionalValidator' in validatedTransaction && delete validatedTransaction.additionalValidator;
+      'eventsHandler' in validatedTransaction && delete validatedTransaction.eventsHandler;
       return validatedTransaction;
     }
     validatedTransaction.warnings = [];
@@ -234,11 +246,15 @@ class TransactionService {
     // @ts-ignore
     'transaction' in validatedTransaction && delete validatedTransaction.transaction;
     'additionalValidator' in validatedTransaction && delete validatedTransaction.additionalValidator;
+    'eventsHandler' in validatedTransaction && delete validatedTransaction.eventsHandler;
     return validatedTransaction;
   }
   async sendTransaction(transaction) {
     // Send Transaction
     const emitter = transaction.chainType === 'substrate' ? this.signAndSendSubstrateTransaction(transaction) : await this.signAndSendEvmTransaction(transaction);
+    const {
+      eventsHandler
+    } = transaction;
     emitter.on('signed', data => {
       this.onSigned(data);
     });
@@ -262,6 +278,7 @@ class TransactionService {
 
     // Todo: handle any event with transaction.eventsHandler
 
+    eventsHandler === null || eventsHandler === void 0 ? void 0 : eventsHandler(emitter);
     return emitter;
   }
   removeTransaction(id) {
@@ -288,6 +305,7 @@ class TransactionService {
   }
   transactionToHistories(id, startBlock, nonce, eventLogs) {
     const transaction = this.getTransaction(id);
+    const extrinsicType = transaction.extrinsicType;
     const historyItem = {
       origin: 'app',
       chain: transaction.chain,
@@ -318,7 +336,7 @@ class TransactionService {
     };
 
     // Fill data by extrinsicType
-    switch (transaction.extrinsicType) {
+    switch (extrinsicType) {
       case _KoniTypes.ExtrinsicType.TRANSFER_BALANCE:
         {
           const inputData = (0, _utils2.parseTransactionData)(transaction.data);
@@ -357,9 +375,10 @@ class TransactionService {
           };
 
           // @ts-ignore
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
           historyItem.additionalInfo = {
-            destinationChain: (inputData === null || inputData === void 0 ? void 0 : inputData.destinationNetworkKey) || ''
+            destinationChain: (inputData === null || inputData === void 0 ? void 0 : inputData.destinationNetworkKey) || '',
+            originalChain: inputData.originNetworkKey || '',
+            fee: transaction.estimateFee
           };
           eventLogs && (0, _eventParser.parseXcmEventLogs)(historyItem, eventLogs, transaction.chain, sendingTokenInfo, chainInfo);
         }
@@ -458,11 +477,22 @@ class TransactionService {
       // Return one more history record if transaction send to account in the wallets
       const toAccount = (historyItem === null || historyItem === void 0 ? void 0 : historyItem.to) && _uiKeyring.default.getPair(historyItem.to);
       if (toAccount) {
-        return [historyItem, {
+        const receiverHistory = {
           ...historyItem,
           address: toAccount.address,
           direction: _KoniTypes.TransactionDirection.RECEIVED
-        }];
+        };
+        switch (extrinsicType) {
+          case _KoniTypes.ExtrinsicType.TRANSFER_XCM:
+            {
+              const inputData = (0, _utils2.parseTransactionData)(transaction.data);
+              receiverHistory.chain = inputData.destinationNetworkKey;
+              break;
+            }
+          default:
+            break;
+        }
+        return [historyItem, receiverHistory];
       }
     } catch (e) {
       console.warn(e);
@@ -554,10 +584,11 @@ class TransactionService {
       blockNumber: blockNumber || 0,
       blockHash: blockHash || ''
     }).catch(console.error);
+    const info = (0, _util.isHex)(extrinsicHash) ? extrinsicHash : (0, _helpers.getBaseTransactionInfo)(transaction, this.chainService.getChainInfoMap());
     this.notificationService.notify({
       type: _KoniTypes.NotificationType.SUCCESS,
       title: 'Transaction completed',
-      message: `Transaction ${transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash} completed`,
+      message: `Transaction ${info} completed`,
       action: {
         url: this.getTransactionLink(id)
       },
@@ -589,10 +620,11 @@ class TransactionService {
         blockNumber: blockNumber || 0,
         blockHash: blockHash || ''
       }).catch(console.error);
+      const info = (0, _util.isHex)(transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash) ? transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash : (0, _helpers.getBaseTransactionInfo)(transaction, this.chainService.getChainInfoMap());
       this.notificationService.notify({
         type: _KoniTypes.NotificationType.ERROR,
         title: 'Transaction failed',
-        message: `Transaction ${transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash} failed`,
+        message: `Transaction ${info} failed`,
         action: {
           url: this.getTransactionLink(id)
         },
@@ -687,9 +719,10 @@ class TransactionService {
     const eventData = {
       id,
       errors: [],
-      warnings: []
+      warnings: [],
+      extrinsicHash: id
     };
-    this.requestService.addConfirmation(id, url || _constants2.EXTENSION_REQUEST_URL, 'evmSendTransactionRequest', payload, {}).then(async _ref7 => {
+    this.requestService.addConfirmation(id, url || _constants3.EXTENSION_REQUEST_URL, 'evmSendTransactionRequest', payload, {}).then(async _ref7 => {
       let {
         isApproved,
         payload
@@ -760,12 +793,13 @@ class TransactionService {
     const eventData = {
       id,
       errors: [],
-      warnings: []
+      warnings: [],
+      extrinsicHash: id
     };
     transaction.signAsync(address, {
       signer: {
         signPayload: async payload => {
-          const signing = await this.requestService.signInternalTransaction(id, address, url || _constants2.EXTENSION_REQUEST_URL, payload);
+          const signing = await this.requestService.signInternalTransaction(id, address, url || _constants3.EXTENSION_REQUEST_URL, payload);
           return {
             id: new Date().getTime(),
             signature: signing.signature
@@ -790,7 +824,7 @@ class TransactionService {
         }
         if (txState.status.isInBlock) {
           eventData.eventLogs = txState.events;
-          if (!eventData.extrinsicHash || eventData.extrinsicHash === '') {
+          if (!eventData.extrinsicHash || eventData.extrinsicHash === '' || !(0, _util.isHex)(eventData.extrinsicHash)) {
             eventData.extrinsicHash = txState.txHash.toHex();
             eventData.blockHash = txState.status.asInBlock.toHex();
             emitter.emit('extrinsicHash', eventData);
@@ -841,7 +875,7 @@ class TransactionService {
         emitter.emit('error', eventData);
         clearTimeout(timeout);
       }
-    }, _constants3.TRANSACTION_TIMEOUT);
+    }, _constants4.TRANSACTION_TIMEOUT);
     emitter.once('success', () => {
       clearTimeout(timeout);
     });

package/cjs/utils/number.js

@@ -0,0 +1,112 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.toBNString = exports.formatNumber = exports.balanceFormatter = exports.PREDEFINED_FORMATTER = exports.BN_TEN = void 0;
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const BN_TEN = new _bignumber.default(10);
+exports.BN_TEN = BN_TEN;
+// Clear zero from end, use with decimal only
+const clearZero = result => {
+  let index = result.length - 1;
+  while (result[index] === '0') {
+    result = result.slice(0, index);
+    index--;
+  }
+  return result;
+};
+const NUM_1T = new _bignumber.default(1e12);
+const TLIM = new _bignumber.default(1e17);
+const NUM_1B = new _bignumber.default(1e9);
+const BLIM = new _bignumber.default(1e14);
+const NUM_1M = new _bignumber.default(1e6);
+const NUM_100M = new _bignumber.default(1e8);
+const balanceFormatter = (input, metadata) => {
+  const absGteOne = new _bignumber.default(input).abs().gte(1);
+  const minNumberFormat = (metadata === null || metadata === void 0 ? void 0 : metadata.minNumberFormat) || 2;
+  const maxNumberFormat = (metadata === null || metadata === void 0 ? void 0 : metadata.maxNumberFormat) || 6;
+  const [int, decimal = '0'] = input.split('.');
+  let _decimal = '';
+  if (absGteOne) {
+    const intNumber = new _bignumber.default(int);
+    const max = BN_TEN.pow(maxNumberFormat);
+
+    // If count of number in integer part greater or equal maxNumberFormat, do not show decimal
+    if (intNumber.gte(max)) {
+      if (intNumber.gte(NUM_100M)) {
+        if (intNumber.gte(BLIM)) {
+          if (intNumber.gte(TLIM)) {
+            return `${intNumber.dividedBy(NUM_1T).toFixed(2)} T`;
+          }
+          return `${intNumber.dividedBy(NUM_1B).toFixed(2)} B`;
+        }
+        return `${intNumber.dividedBy(NUM_1M).toFixed(2)} M`;
+      }
+      return int;
+    }
+
+    // Get only minNumberFormat number at decimal
+    if (decimal.length <= minNumberFormat) {
+      _decimal = decimal;
+    } else {
+      _decimal = decimal.slice(0, minNumberFormat);
+    }
+
+    // Clear zero number for decimal
+    _decimal = clearZero(_decimal);
+  } else {
+    // Index of cursor
+    let index = 0;
+
+    // Count of not zero number in decimal
+    let current = 0;
+
+    // Find a not zero number in decimal
+    let metNotZero = false;
+
+    // Get at least minNumberFormat number not 0 from index 0
+    // If count of 0 number at prefix greater or equal maxNumberFormat should stop and return 0
+
+    // current === minNumberFormat: get enough number
+    // index === decimal.length: end of decimal
+    // index === maxNumberFormat: reach limit of 0 number at prefix
+    while (current < minNumberFormat && index < decimal.length && (index < maxNumberFormat || metNotZero)) {
+      const _char = decimal[index];
+      _decimal += _char;
+      index++;
+      if (_char !== '0') {
+        metNotZero = true;
+      }
+      if (metNotZero) {
+        current++;
+      }
+    }
+
+    // Clear zero number for decimal
+    _decimal = clearZero(_decimal);
+  }
+  if (_decimal) {
+    return `${int}.${_decimal}`;
+  }
+  return int;
+};
+exports.balanceFormatter = balanceFormatter;
+const PREDEFINED_FORMATTER = {
+  balance: balanceFormatter
+};
+exports.PREDEFINED_FORMATTER = PREDEFINED_FORMATTER;
+const toBNString = (input, decimal) => {
+  const raw = new _bignumber.default(input);
+  return raw.multipliedBy(BN_TEN.pow(decimal)).toFixed();
+};
+exports.toBNString = toBNString;
+const formatNumber = (input, decimal, formatter, metadata) => {
+  const raw = new _bignumber.default(input).dividedBy(BN_TEN.pow(decimal)).toFixed();
+  return formatter(raw, metadata);
+};
+exports.formatNumber = formatNumber;

package/constants/index.d.ts

@@ -17,4 +17,5 @@ export declare const ALL_NETWORK_KEY = "all";
 export declare const ALL_GENESIS_HASH: null;
 export declare const IGNORE_GET_SUBSTRATE_FEATURES_LIST: string[];
 export declare const IGNORE_QR_SIGNER: string[];
+export declare const XCM_MIN_AMOUNT_RATIO = 1.2;
 export * from './staking';

package/constants/index.js

@@ -20,4 +20,5 @@ export const ALL_NETWORK_KEY = 'all';
 export const ALL_GENESIS_HASH = null;
 export const IGNORE_GET_SUBSTRATE_FEATURES_LIST = ['astarEvm', 'ethereum', 'ethereum_goerli', 'binance', 'binance_test', 'boba_rinkeby', 'boba', 'bobabase', 'bobabeam'];
 export const IGNORE_QR_SIGNER = [];
+export const XCM_MIN_AMOUNT_RATIO = 1.2;
 export * from "./staking.js";

package/koni/api/dotsama/balance.js

@@ -284,10 +284,11 @@ async function subscribeTokensAccountsPallet(addresses, chain, api, callBack, in
   const unsubList = await Promise.all(Object.values(tokenMap).map(async tokenInfo => {
     try {
       const onChainInfo = _getTokenOnChainInfo(tokenInfo);
+      const assetId = _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: sumBN(balances.map(b => b.reserved || new BN(0))),
           frozen: sumBN(balances.map(b => b.frozen || new BN(0))),

package/koni/api/dotsama/crowdloan.js

@@ -5,7 +5,7 @@ import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { APIItemState, CrowdloanParaState } from '@subwallet/extension-base/background/KoniTypes';
 import { ACALA_REFRESH_CROWDLOAN_INTERVAL } from '@subwallet/extension-base/constants';
 import registry from '@subwallet/extension-base/koni/api/dotsama/typeRegistry';
-import { _getChainSubstrateAddressPrefix, _getSubstrateParaId, _getSubstrateRelayParent, _isChainEvmCompatible, _isSubstrateParachain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getChainSubstrateAddressPrefix, _getSubstrateParaId, _getSubstrateRelayParent, _isChainEvmCompatible, _isSubstrateParaChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { categoryAddresses, reformatAddress } from '@subwallet/extension-base/utils';
 import axios from 'axios';
 import { BN } from '@polkadot/util';
@@ -97,7 +97,7 @@ export async function subscribeCrowdloan(addresses, substrateApiMap, callback, c
       return registry.createType('AccountId', address).toHex();
     });
     Object.entries(chainInfoMap).forEach(([networkKey, chainInfo]) => {
-      if (_isSubstrateParachain(chainInfo)) {
+      if (_isSubstrateParaChain(chainInfo)) {
         const parentChain = _getSubstrateRelayParent(chainInfo);
         const crowdloanCb = rs => {
           callback(networkKey, rs);

package/koni/api/dotsama/transfer.js

@@ -118,9 +118,9 @@ export const createTransferExtrinsic = async ({
     transfer = api.tx.currencies.transfer(to, _getTokenOnChainInfo(tokenInfo), value);
   } else if (_TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxTokensSupported) {
     if (transferAll) {
-      transfer = api.tx.tokens.transferAll(to, _getTokenOnChainInfo(tokenInfo), false);
+      transfer = api.tx.tokens.transferAll(to, _getTokenOnChainInfo(tokenInfo) || _getTokenOnChainAssetId(tokenInfo), false);
     } else if (value) {
-      transfer = api.tx.tokens.transfer(to, _getTokenOnChainInfo(tokenInfo), new BN(value));
+      transfer = api.tx.tokens.transfer(to, _getTokenOnChainInfo(tokenInfo) || _getTokenOnChainAssetId(tokenInfo), new BN(value));
     }
   } else if (_TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxEqBalancesSupported) {
     transfer = api.tx.eqBalances.transfer([_getTokenOnChainAssetId(tokenInfo)], to, value);

package/koni/api/xcm/polkadotXcm.js

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