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

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

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -17,6 +18,7 @@ var _handlers = require("@subwallet/extension-base/koni/background/handlers");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils3 = require("@subwallet/extension-base/utils");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -241,7 +243,7 @@ async function subscribeEquilibriumTokenBalance(addresses, chain, api, callBack,
 
         // @ts-ignore
         const freeTokenBalance = balanceList.find(data => data[0] === parseInt(assetId));
-        const bnFreeTokenBalance = freeTokenBalance ? new _util.BN(freeTokenBalance[1].positive.toString()) : _util.BN_ZERO;
+        const bnFreeTokenBalance = freeTokenBalance ? new _util.BN(new _bignumber.default(freeTokenBalance[1].positive).toString()) : _util.BN_ZERO;
         tokenFreeBalance = tokenFreeBalance.add(bnFreeTokenBalance);
       }
       const tokenBalance = {

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

@@ -90,7 +90,14 @@ async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMap, chai
   } else if (_constants._TRANSFER_CHAIN_GROUP.statemine.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo)) {
     result.supportTransfer = true;
     result.supportTransferAll = true;
+  } else if (_constants._TRANSFER_CHAIN_GROUP.sora_substrate.includes(networkKey)) {
+    result.supportTransfer = true;
+    result.supportTransferAll = true;
+    // } else if (_TRANSFER_CHAIN_GROUP.riochain.includes(networkKey) && _isNativeToken(tokenInfo)) {
+    //   result.supportTransfer = true;
+    //   result.supportTransferAll = true;
   }
+
   return result;
 }
 const createTransferExtrinsic = async _ref => {
@@ -111,6 +118,7 @@ const createTransferExtrinsic = async _ref => {
   const isTxBalancesSupported = !!api && !!api.tx && !!api.tx.balances;
   const isTxTokensSupported = !!api && !!api.tx && !!api.tx.tokens;
   const isTxEqBalancesSupported = !!api && !!api.tx && !!api.tx.eqBalances;
+  const isTxAssetsSupported = !!api && !!api.tx && !!api.tx.assets;
   let transferAmount; // for PSP-22 tokens, might be deprecated in the future
 
   if ((0, _utils2._isTokenWasmSmartContract)(tokenInfo) && api.query.contracts) {
@@ -125,14 +133,14 @@ const createTransferExtrinsic = async _ref => {
     transferAmount = value;
   } else if (_constants._TRANSFER_CHAIN_GROUP.acala.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo) && isTxCurrenciesSupported) {
     transfer = api.tx.currencies.transfer(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo), value);
-  } else if (_constants._TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo) && isTxTokensSupported) {
+  } else if (_constants._TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && isTxTokensSupported) {
     if (transferAll) {
       transfer = api.tx.tokens.transferAll(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo) || (0, _utils2._getTokenOnChainAssetId)(tokenInfo), false);
     } else if (value) {
       transfer = api.tx.tokens.transfer(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo) || (0, _utils2._getTokenOnChainAssetId)(tokenInfo), new _util.BN(value));
     }
-  } else if (_constants._TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo) && isTxEqBalancesSupported) {
-    transfer = api.tx.eqBalances.transfer([(0, _utils2._getTokenOnChainAssetId)(tokenInfo)], to, value);
+  } else if (_constants._TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && isTxEqBalancesSupported) {
+    transfer = api.tx.eqBalances.transfer((0, _utils2._getTokenOnChainAssetId)(tokenInfo), to, value);
   } else if (!(0, _utils2._isNativeToken)(tokenInfo) && (_constants._TRANSFER_CHAIN_GROUP.crab.includes(networkKey) || _constants._BALANCE_TOKEN_GROUP.crab.includes(tokenInfo.symbol))) {
     if (transferAll) {
       transfer = api.tx.kton.transferAll(to, false);
@@ -143,6 +151,12 @@ const createTransferExtrinsic = async _ref => {
     transfer = api.tx.currencies.transfer(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo), value);
   } else if (_constants._TRANSFER_CHAIN_GROUP.statemine.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo)) {
     transfer = api.tx.assets.transfer((0, _utils2._getTokenOnChainAssetId)(tokenInfo), to, value);
+    // } else if (_TRANSFER_CHAIN_GROUP.riochain.includes(networkKey)) {
+    //   if (_isNativeToken(tokenInfo)) {
+    //     transfer = api.tx.currencies.transferNativeCurrency(to, value);
+    //   }
+  } else if (_constants._TRANSFER_CHAIN_GROUP.sora_substrate.includes(networkKey) && isTxAssetsSupported) {
+    transfer = api.tx.assets.transfer((0, _utils2._getTokenOnChainAssetId)(tokenInfo), to, value);
   } else if (isTxBalancesSupported && (0, _utils2._isNativeToken)(tokenInfo)) {
     if (transferAll) {
       transfer = api.tx.balances.transferAll(to, false);

package/cjs/koni/api/tokens/wasm/index.js

@@ -18,9 +18,15 @@ function getPSP22ContractPromise(apiPromise, contractAddress) {
 function getPSP34ContractPromise(apiPromise, contractAddress) {
   return new _apiContract.ContractPromise(apiPromise, _helper._PSP34_ABI, contractAddress);
 }
+const mustFormatNumberReg = /^-?[0-9][0-9,.]+$/;
 async function getPSP34TransferExtrinsic(networkKey, substrateApi, senderAddress, recipientAddress, params) {
   const contractAddress = params.contractAddress;
   const onChainOption = params.onChainOption;
+  for (const [key, value] of Object.entries(onChainOption)) {
+    if (mustFormatNumberReg.test(value)) {
+      onChainOption[key] = value.replaceAll(',', '');
+    }
+  }
   try {
     const contractPromise = getPSP34ContractPromise(substrateApi.api, contractAddress);
     // @ts-ignore
@@ -31,6 +37,7 @@ async function getPSP34TransferExtrinsic(networkKey, substrateApi, senderAddress
       gasLimit
     }, recipientAddress, onChainOption, {});
   } catch (e) {
+    console.debug(e);
     return null;
   }
 }

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.0.8-0'
+  version: '1.0.9-1'
 };
 exports.packageInfo = packageInfo;

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

@@ -32,7 +32,7 @@ const _PURE_EVM_CHAINS = ['binance', 'binance_test', 'ethereum', 'ethereum_goerl
 // Get balance----------------------------------------------------------------------------------------------------------
 exports._PURE_EVM_CHAINS = _PURE_EVM_CHAINS;
 const _BALANCE_CHAIN_GROUP = {
-  kintsugi: ['kintsugi', 'interlay', 'kintsugi_test'],
+  kintsugi: ['kintsugi', 'interlay', 'kintsugi_test', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main'],
@@ -192,11 +192,13 @@ 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', 'bifrost_dot', 'hydradx_main'],
+  kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'hydradx_main', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   crab: ['crab', 'pangolin'],
-  bitcountry: ['pioneer', 'bitcountry'],
-  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'parallel']
+  bitcountry: ['pioneer', 'bitcountry', 'bifrost', 'bifrost_dot'],
+  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel'],
+  riochain: ['riochain'],
+  sora_substrate: ['sora_substrate']
 };
 exports._TRANSFER_CHAIN_GROUP = _TRANSFER_CHAIN_GROUP;
 const _BALANCE_PARSING_CHAIN_GROUP = {

package/cjs/services/history-service/constants/index.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MIN__NUM_HISTORY_PER_ACCOUNT = exports.MAX_FETCH_PAGE_PER_SESSION = void 0;
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const MAX_FETCH_PAGE_PER_SESSION = 25;
+exports.MAX_FETCH_PAGE_PER_SESSION = MAX_FETCH_PAGE_PER_SESSION;
+const MIN__NUM_HISTORY_PER_ACCOUNT = 50;
+exports.MIN__NUM_HISTORY_PER_ACCOUNT = MIN__NUM_HISTORY_PER_ACCOUNT;

package/cjs/services/history-service/subsquid-multi-chain-history.js

@@ -9,7 +9,9 @@ exports.fetchMultiChainHistories = fetchMultiChainHistories;
 exports.parseSubsquidTransactionData = parseSubsquidTransactionData;
 var _client = require("@apollo/client");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _constants = require("@subwallet/extension-base/services/history-service/constants");
 var _crossFetch = _interopRequireDefault(require("cross-fetch"));
+var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -81,6 +83,17 @@ function generateSignature(input) {
   const vHex = parseInt(v).toString(16);
   return `0x${rHex}${sHex}${vHex}`;
 }
+const parseArgs = args => {
+  if ((0, _util.isArray)(args)) {
+    return {
+      from: args[0],
+      to: args[1],
+      amount: args[2]
+    };
+  } else {
+    return args;
+  }
+};
 function parseSubsquidTransactionData(address, type, historyItem, chainInfo, args, data) {
   var _chainInfo$substrateI, _chainInfo$evmInfo, _chainInfo$substrateI2, _chainInfo$evmInfo2;
   const chainType = chainInfo.substrateInfo ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM;
@@ -101,7 +114,7 @@ function parseSubsquidTransactionData(address, type, historyItem, chainInfo, arg
       {
         transactionType = _KoniTypes.ExtrinsicType.TRANSFER_BALANCE;
         const extrinsic = data.extrinsic;
-        const parsedArgs = args;
+        const parsedArgs = parseArgs(args);
         to = autoFormatAddress(parsedArgs.to);
         from = autoFormatAddress(parsedArgs.from);
         amount = parsedArgs.amount;
@@ -207,10 +220,12 @@ function parseSubsquidTransactionData(address, type, historyItem, chainInfo, arg
   };
 }
 async function fetchMultiChainHistories(addresses, chainMap) {
-  let maxPage = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 25;
+  let maxPage = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _constants.MAX_FETCH_PAGE_PER_SESSION;
+  let countMap = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  let _lastId = arguments.length > 4 ? arguments[4] : undefined;
   const responseData = [];
   let currentPage = 0;
-  let lastId;
+  let lastId = _lastId;
   while (true) {
     try {
       if (maxPage) {
@@ -239,6 +254,9 @@ async function fetchMultiChainHistories(addresses, chainMap) {
   }
   const histories = [];
   const lowerAddresses = addresses.map(a => a.toLowerCase());
+  for (const lowerAddress of lowerAddresses) {
+    countMap[lowerAddress] = countMap[lowerAddress] || 0;
+  }
   responseData.forEach(historyItem => {
     const {
       _data,
@@ -259,6 +277,10 @@ async function fetchMultiChainHistories(addresses, chainMap) {
 
       return;
     }
+    usedAddresses.forEach(address => {
+      const adr = address.toLowerCase();
+      countMap[adr] = (countMap[adr] || 0) + 1;
+    });
     usedAddresses.forEach(address => {
       try {
         const transactionData = parseSubsquidTransactionData(address, name, historyItem, chainInfo, parseData(args), parseData(_data));
@@ -268,5 +290,18 @@ async function fetchMultiChainHistories(addresses, chainMap) {
       }
     });
   });
+  if (currentPage > 1) {
+    const retryAddresses = [];
+    for (const [address, number] of Object.entries(countMap)) {
+      if (number < _constants.MIN__NUM_HISTORY_PER_ACCOUNT) {
+        retryAddresses.push(address);
+      }
+    }
+    const _addresses = addresses.filter(add => retryAddresses.includes(add.toLowerCase()));
+    if (_addresses.length > 0) {
+      const retryHistories = await fetchMultiChainHistories(_addresses, chainMap, maxPage, countMap, lastId);
+      histories.push(...retryHistories);
+    }
+  }
   return histories;
 }

package/cjs/utils/eth/parseTransaction/index.js

@@ -107,44 +107,59 @@ const isContractAddress = async (address, evmApi) => {
   }
 };
 exports.isContractAddress = isContractAddress;
+const parseInputWithAbi = (input, abi) => {
+  const decoder = new _base.InputDataDecoder(abi);
+  const raw = decoder.decodeData(input);
+  if (raw.method && raw.methodName) {
+    const temp = {
+      method: raw.method,
+      methodName: raw.methodName,
+      args: []
+    };
+    raw.types.forEach((type, index) => {
+      temp.args.push(parseResult(type, raw.inputs[index], raw.names[index]));
+    });
+    return temp;
+  } else {
+    return null;
+  }
+};
 const parseContractInput = async (input, contractAddress, network) => {
-  let result = input;
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  const _ABIs = [...ABIs];
+  for (const abi of ABIs) {
+    const temp = parseInputWithAbi(input, abi);
+    if (temp) {
+      return {
+        result: temp
+      };
+    }
+  }
   if (contractAddress && network) {
+    console.log('parseOnline');
     if ((0, _utils._getEvmAbiExplorer)(network)) {
-      const res = await _axios.default.get((0, _utils._getEvmAbiExplorer)(network), {
-        params: {
-          address: contractAddress
-        }
-      });
+      try {
+        const res = await _axios.default.get((0, _utils._getEvmAbiExplorer)(network), {
+          params: {
+            address: contractAddress
+          },
+          timeout: 3000
+        });
 
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      if (res.status === 200 && res.data.status === '1') {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        _ABIs.unshift(res.data.result);
-      }
-    }
-  }
-  for (const abi of _ABIs) {
-    const decoder = new _base.InputDataDecoder(abi);
-    const raw = decoder.decodeData(input);
-    if (raw.method && raw.methodName) {
-      const temp = {
-        method: raw.method,
-        methodName: raw.methodName,
-        args: []
-      };
-      raw.types.forEach((type, index) => {
-        temp.args.push(parseResult(type, raw.inputs[index], raw.names[index]));
-      });
-      result = temp;
-      break;
+        if (res.status === 200 && res.data.status === '1') {
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+          const abi = res.data.result;
+          const temp = parseInputWithAbi(input, abi);
+          if (temp) {
+            return {
+              result: temp
+            };
+          }
+        }
+      } catch (e) {}
     }
   }
   return {
-    result
+    result: input
   };
 };
 exports.parseContractInput = parseContractInput;
@@ -187,43 +202,38 @@ const parseEvmRlp = async (data, networkMap, evmApiMap) => {
     nonce: new _bignumber.default(tx.nonce).toNumber()
   };
   const network = getChainInfoByChainId(networkMap, parseInt(tx.ethereumChainId));
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  const _ABIs = [...ABIs];
+  for (const abi of ABIs) {
+    const temp = parseInputWithAbi(tx.data, abi);
+    if (temp) {
+      result.data = temp;
+      return result;
+    }
+  }
   if (tx.action && network) {
     if (await isContractAddress(tx.action, evmApiMap[network.slug])) {
       if ((0, _utils._getEvmAbiExplorer)(network) !== '') {
-        const res = await _axios.default.get((0, _utils._getEvmAbiExplorer)(network), {
-          params: {
-            address: tx.action
-          }
-        });
+        try {
+          const res = await _axios.default.get((0, _utils._getEvmAbiExplorer)(network), {
+            params: {
+              address: tx.action
+            },
+            timeout: 2000
+          });
 
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        if (res.status === 200 && res.data.status === '1') {
           // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-          _ABIs.unshift(res.data.result);
-        }
+          if (res.status === 200 && res.data.status === '1') {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+            const abi = res.data.result;
+            const temp = parseInputWithAbi(tx.data, abi);
+            if (temp) {
+              result.data = temp;
+              return result;
+            }
+          }
+        } catch (e) {}
       }
     }
   }
-  for (const abi of _ABIs) {
-    const decoder = new _base.InputDataDecoder(abi);
-    const raw = decoder.decodeData(tx.data);
-    if (raw.method && raw.methodName) {
-      const temp = {
-        method: raw.method,
-        methodName: raw.methodName,
-        args: []
-      };
-      raw.types.forEach((type, index) => {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-        temp.args.push(parseResult(type, raw.inputs[index], raw.names[index]));
-      });
-      result.data = temp;
-      break;
-    }
-  }
   return result;
 };
 exports.parseEvmRlp = parseEvmRlp;

package/koni/api/dotsama/balance.js

@@ -12,6 +12,7 @@ import { state } from '@subwallet/extension-base/koni/background/handlers';
 import { _BALANCE_CHAIN_GROUP, _PURE_EVM_CHAINS } from '@subwallet/extension-base/services/chain-service/constants';
 import { _checkSmartContractSupportByChain, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _isChainEvmCompatible, _isPureEvmChain, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { categoryAddresses, sumBN } from '@subwallet/extension-base/utils';
+import BigN from 'bignumber.js';
 import { BN, BN_ZERO } from '@polkadot/util';
 // main subscription
 export function subscribeBalance(addresses, chainInfoMap, substrateApiMap, evmApiMap, callback) {
@@ -229,7 +230,7 @@ async function subscribeEquilibriumTokenBalance(addresses, chain, api, callBack,
 
         // @ts-ignore
         const freeTokenBalance = balanceList.find(data => data[0] === parseInt(assetId));
-        const bnFreeTokenBalance = freeTokenBalance ? new BN(freeTokenBalance[1].positive.toString()) : BN_ZERO;
+        const bnFreeTokenBalance = freeTokenBalance ? new BN(new BigN(freeTokenBalance[1].positive).toString()) : BN_ZERO;
         tokenFreeBalance = tokenFreeBalance.add(bnFreeTokenBalance);
       }
       const tokenBalance = {

package/koni/api/dotsama/transfer.js

@@ -82,7 +82,14 @@ export async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMa
   } 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;
   }
+
   return result;
 }
 export const createTransferExtrinsic = async ({
@@ -102,6 +109,7 @@ export const createTransferExtrinsic = async ({
   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) {
@@ -116,14 +124,14 @@ export const createTransferExtrinsic = async ({
     transferAmount = value;
   } else if (_TRANSFER_CHAIN_GROUP.acala.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxCurrenciesSupported) {
     transfer = api.tx.currencies.transfer(to, _getTokenOnChainInfo(tokenInfo), value);
-  } else if (_TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxTokensSupported) {
+  } else if (_TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && isTxTokensSupported) {
     if (transferAll) {
       transfer = api.tx.tokens.transferAll(to, _getTokenOnChainInfo(tokenInfo) || _getTokenOnChainAssetId(tokenInfo), false);
     } else if (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);
+  } else if (_TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && isTxEqBalancesSupported) {
+    transfer = api.tx.eqBalances.transfer(_getTokenOnChainAssetId(tokenInfo), to, value);
   } 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);
@@ -134,6 +142,12 @@ export const createTransferExtrinsic = async ({
     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)) {
     if (transferAll) {
       transfer = api.tx.balances.transferAll(to, false);

package/koni/api/tokens/wasm/index.js

@@ -10,9 +10,15 @@ export function getPSP22ContractPromise(apiPromise, contractAddress) {
 export function getPSP34ContractPromise(apiPromise, contractAddress) {
   return new ContractPromise(apiPromise, _PSP34_ABI, contractAddress);
 }
+const mustFormatNumberReg = /^-?[0-9][0-9,.]+$/;
 export async function getPSP34TransferExtrinsic(networkKey, substrateApi, senderAddress, recipientAddress, params) {
   const contractAddress = params.contractAddress;
   const onChainOption = params.onChainOption;
+  for (const [key, value] of Object.entries(onChainOption)) {
+    if (mustFormatNumberReg.test(value)) {
+      onChainOption[key] = value.replaceAll(',', '');
+    }
+  }
   try {
     const contractPromise = getPSP34ContractPromise(substrateApi.api, contractAddress);
     // @ts-ignore
@@ -23,6 +29,7 @@ export async function getPSP34TransferExtrinsic(networkKey, substrateApi, sender
       gasLimit
     }, recipientAddress, onChainOption, {});
   } catch (e) {
+    console.debug(e);
     return null;
   }
 }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.8-0",
+  "version": "1.0.9-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1190,6 +1190,11 @@
       "require": "./cjs/services/history-service/index.js",
       "default": "./services/history-service/index.js"
     },
+    "./services/history-service/constants": {
+      "types": "./services/history-service/constants/index.d.ts",
+      "require": "./cjs/services/history-service/constants/index.js",
+      "default": "./services/history-service/constants/index.js"
+    },
     "./services/history-service/helpers/recoverHistoryStatus": {
       "types": "./services/history-service/helpers/recoverHistoryStatus.d.ts",
       "require": "./cjs/services/history-service/helpers/recoverHistoryStatus.js",
@@ -1702,11 +1707,11 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.1.10",
-    "@subwallet/extension-base": "^1.0.8-0",
-    "@subwallet/extension-chains": "^1.0.8-0",
-    "@subwallet/extension-dapp": "^1.0.8-0",
-    "@subwallet/extension-inject": "^1.0.8-0",
+    "@subwallet/chain-list": "0.1.11-beta.1",
+    "@subwallet/extension-base": "^1.0.9-1",
+    "@subwallet/extension-chains": "^1.0.9-1",
+    "@subwallet/extension-dapp": "^1.0.9-1",
+    "@subwallet/extension-inject": "^1.0.9-1",
     "@subwallet/keyring": "^0.0.10",
     "@subwallet/ui-keyring": "^0.0.10",
     "@unique-nft/types": "^0.6.0-4",

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.0.8-0'
+  version: '1.0.9-1'
 };

package/services/chain-service/constants.d.ts

@@ -62,6 +62,8 @@ export declare const _TRANSFER_CHAIN_GROUP: {
     crab: string[];
     bitcountry: string[];
     statemine: string[];
+    riochain: string[];
+    sora_substrate: string[];
 };
 export declare const _BALANCE_PARSING_CHAIN_GROUP: {
     bobabeam: string[];

package/services/chain-service/constants.js

@@ -22,7 +22,7 @@ export const _PURE_EVM_CHAINS = ['binance', 'binance_test', 'ethereum', 'ethereu
 // Get balance----------------------------------------------------------------------------------------------------------
 
 export const _BALANCE_CHAIN_GROUP = {
-  kintsugi: ['kintsugi', 'interlay', 'kintsugi_test'],
+  kintsugi: ['kintsugi', 'interlay', 'kintsugi_test', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main'],
@@ -176,11 +176,13 @@ export const _KNOWN_CHAIN_INFLATION_PARAMS = {
 export const _TRANSFER_NOT_SUPPORTED_CHAINS = ['subspace_gemini_3a', 'kulupu', 'joystream', 'equilibrium_parachain', 'genshiro_testnet', 'genshiro'];
 export const _TRANSFER_CHAIN_GROUP = {
   acala: ['karura', 'acala', 'acala_testnet'],
-  kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'bifrost_dot', 'hydradx_main'],
+  kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'hydradx_main', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   crab: ['crab', 'pangolin'],
-  bitcountry: ['pioneer', 'bitcountry'],
-  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'parallel']
+  bitcountry: ['pioneer', 'bitcountry', 'bifrost', 'bifrost_dot'],
+  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel'],
+  riochain: ['riochain'],
+  sora_substrate: ['sora_substrate']
 };
 export const _BALANCE_PARSING_CHAIN_GROUP = {
   bobabeam: ['bobabeam', 'bobabase']

package/services/history-service/constants/index.d.ts

@@ -0,0 +1,2 @@
+export declare const MAX_FETCH_PAGE_PER_SESSION = 25;
+export declare const MIN__NUM_HISTORY_PER_ACCOUNT = 50;

package/services/history-service/constants/index.js

@@ -0,0 +1,5 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export const MAX_FETCH_PAGE_PER_SESSION = 25;
+export const MIN__NUM_HISTORY_PER_ACCOUNT = 50;

package/services/history-service/subsquid-multi-chain-history.d.ts

@@ -27,4 +27,4 @@ export interface ParseInputType {
 export declare type TransactionBasicData = Pick<TransactionHistoryItem, 'address' | 'origin' | 'time' | 'chainType' | 'from' | 'direction' | 'blockNumber' | 'blockHash' | 'chain' | 'data'>;
 export declare type TransactionSpecifyType = Pick<TransactionHistoryItem, 'to' | 'type' | 'status' | 'fee' | 'amount' | 'tip' | 'signature' | 'extrinsicHash'>;
 export declare function parseSubsquidTransactionData(address: string, type: SubsquidTransactionType, historyItem: MultiHistoryData, chainInfo: _ChainInfo, args: any, data: any): TransactionHistoryItem;
-export declare function fetchMultiChainHistories(addresses: string[], chainMap: Record<string, _ChainInfo>, maxPage?: number): Promise<TransactionHistoryItem<ExtrinsicType.TRANSFER_BALANCE>[]>;
+export declare function fetchMultiChainHistories(addresses: string[], chainMap: Record<string, _ChainInfo>, maxPage?: number, countMap?: Record<string, number>, _lastId?: string): Promise<TransactionHistoryItem<ExtrinsicType.TRANSFER_BALANCE>[]>;

package/services/history-service/subsquid-multi-chain-history.js

@@ -3,7 +3,9 @@
 
 import { ApolloClient, createHttpLink, gql, InMemoryCache } from '@apollo/client';
 import { ChainType, ExtrinsicStatus, ExtrinsicType, TransactionDirection } from '@subwallet/extension-base/background/KoniTypes';
+import { MAX_FETCH_PAGE_PER_SESSION, MIN__NUM_HISTORY_PER_ACCOUNT } from '@subwallet/extension-base/services/history-service/constants';
 import fetch from 'cross-fetch';
+import { isArray } from '@polkadot/util';
 import { decodeAddress, encodeAddress, isEthereumAddress } from '@polkadot/util-crypto';
 const MULTI_CHAIN_URL = 'https://squid.subsquid.io/multi-chain-tx/v/v1/graphql';
 const MultiChainTxClient = new ApolloClient({
@@ -71,6 +73,17 @@ function generateSignature(input) {
   const vHex = parseInt(v).toString(16);
   return `0x${rHex}${sHex}${vHex}`;
 }
+const parseArgs = args => {
+  if (isArray(args)) {
+    return {
+      from: args[0],
+      to: args[1],
+      amount: args[2]
+    };
+  } else {
+    return args;
+  }
+};
 export function parseSubsquidTransactionData(address, type, historyItem, chainInfo, args, data) {
   var _chainInfo$substrateI, _chainInfo$evmInfo, _chainInfo$substrateI2, _chainInfo$evmInfo2;
   const chainType = chainInfo.substrateInfo ? ChainType.SUBSTRATE : ChainType.EVM;
@@ -91,7 +104,7 @@ export function parseSubsquidTransactionData(address, type, historyItem, chainIn
       {
         transactionType = ExtrinsicType.TRANSFER_BALANCE;
         const extrinsic = data.extrinsic;
-        const parsedArgs = args;
+        const parsedArgs = parseArgs(args);
         to = autoFormatAddress(parsedArgs.to);
         from = autoFormatAddress(parsedArgs.from);
         amount = parsedArgs.amount;
@@ -196,10 +209,10 @@ export function parseSubsquidTransactionData(address, type, historyItem, chainIn
     status: success ? ExtrinsicStatus.SUCCESS : ExtrinsicStatus.FAIL
   };
 }
-export async function fetchMultiChainHistories(addresses, chainMap, maxPage = 25) {
+export async function fetchMultiChainHistories(addresses, chainMap, maxPage = MAX_FETCH_PAGE_PER_SESSION, countMap = {}, _lastId) {
   const responseData = [];
   let currentPage = 0;
-  let lastId;
+  let lastId = _lastId;
   while (true) {
     try {
       if (maxPage) {
@@ -228,6 +241,9 @@ export async function fetchMultiChainHistories(addresses, chainMap, maxPage = 25
   }
   const histories = [];
   const lowerAddresses = addresses.map(a => a.toLowerCase());
+  for (const lowerAddress of lowerAddresses) {
+    countMap[lowerAddress] = countMap[lowerAddress] || 0;
+  }
   responseData.forEach(historyItem => {
     const {
       _data,
@@ -248,6 +264,10 @@ export async function fetchMultiChainHistories(addresses, chainMap, maxPage = 25
 
       return;
     }
+    usedAddresses.forEach(address => {
+      const adr = address.toLowerCase();
+      countMap[adr] = (countMap[adr] || 0) + 1;
+    });
     usedAddresses.forEach(address => {
       try {
         const transactionData = parseSubsquidTransactionData(address, name, historyItem, chainInfo, parseData(args), parseData(_data));
@@ -257,5 +277,18 @@ export async function fetchMultiChainHistories(addresses, chainMap, maxPage = 25
       }
     });
   });
+  if (currentPage > 1) {
+    const retryAddresses = [];
+    for (const [address, number] of Object.entries(countMap)) {
+      if (number < MIN__NUM_HISTORY_PER_ACCOUNT) {
+        retryAddresses.push(address);
+      }
+    }
+    const _addresses = addresses.filter(add => retryAddresses.includes(add.toLowerCase()));
+    if (_addresses.length > 0) {
+      const retryHistories = await fetchMultiChainHistories(_addresses, chainMap, maxPage, countMap, lastId);
+      histories.push(...retryHistories);
+    }
+  }
   return histories;
 }

package/utils/eth/parseTransaction/index.js

@@ -100,44 +100,59 @@ export const isContractAddress = async (address, evmApi) => {
     return code !== '0x';
   }
 };
+const parseInputWithAbi = (input, abi) => {
+  const decoder = new InputDataDecoder(abi);
+  const raw = decoder.decodeData(input);
+  if (raw.method && raw.methodName) {
+    const temp = {
+      method: raw.method,
+      methodName: raw.methodName,
+      args: []
+    };
+    raw.types.forEach((type, index) => {
+      temp.args.push(parseResult(type, raw.inputs[index], raw.names[index]));
+    });
+    return temp;
+  } else {
+    return null;
+  }
+};
 export const parseContractInput = async (input, contractAddress, network) => {
-  let result = input;
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  const _ABIs = [...ABIs];
+  for (const abi of ABIs) {
+    const temp = parseInputWithAbi(input, abi);
+    if (temp) {
+      return {
+        result: temp
+      };
+    }
+  }
   if (contractAddress && network) {
+    console.log('parseOnline');
     if (_getEvmAbiExplorer(network)) {
-      const res = await axios.get(_getEvmAbiExplorer(network), {
-        params: {
-          address: contractAddress
-        }
-      });
+      try {
+        const res = await axios.get(_getEvmAbiExplorer(network), {
+          params: {
+            address: contractAddress
+          },
+          timeout: 3000
+        });
 
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      if (res.status === 200 && res.data.status === '1') {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        _ABIs.unshift(res.data.result);
-      }
-    }
-  }
-  for (const abi of _ABIs) {
-    const decoder = new InputDataDecoder(abi);
-    const raw = decoder.decodeData(input);
-    if (raw.method && raw.methodName) {
-      const temp = {
-        method: raw.method,
-        methodName: raw.methodName,
-        args: []
-      };
-      raw.types.forEach((type, index) => {
-        temp.args.push(parseResult(type, raw.inputs[index], raw.names[index]));
-      });
-      result = temp;
-      break;
+        if (res.status === 200 && res.data.status === '1') {
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+          const abi = res.data.result;
+          const temp = parseInputWithAbi(input, abi);
+          if (temp) {
+            return {
+              result: temp
+            };
+          }
+        }
+      } catch (e) {}
     }
   }
   return {
-    result
+    result: input
   };
 };
 const getChainInfoByChainId = (networkMap, chainId) => {
@@ -179,42 +194,37 @@ export const parseEvmRlp = async (data, networkMap, evmApiMap) => {
     nonce: new BigN(tx.nonce).toNumber()
   };
   const network = getChainInfoByChainId(networkMap, parseInt(tx.ethereumChainId));
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  const _ABIs = [...ABIs];
+  for (const abi of ABIs) {
+    const temp = parseInputWithAbi(tx.data, abi);
+    if (temp) {
+      result.data = temp;
+      return result;
+    }
+  }
   if (tx.action && network) {
     if (await isContractAddress(tx.action, evmApiMap[network.slug])) {
       if (_getEvmAbiExplorer(network) !== '') {
-        const res = await axios.get(_getEvmAbiExplorer(network), {
-          params: {
-            address: tx.action
-          }
-        });
+        try {
+          const res = await axios.get(_getEvmAbiExplorer(network), {
+            params: {
+              address: tx.action
+            },
+            timeout: 2000
+          });
 
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        if (res.status === 200 && res.data.status === '1') {
           // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-          _ABIs.unshift(res.data.result);
-        }
+          if (res.status === 200 && res.data.status === '1') {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+            const abi = res.data.result;
+            const temp = parseInputWithAbi(tx.data, abi);
+            if (temp) {
+              result.data = temp;
+              return result;
+            }
+          }
+        } catch (e) {}
       }
     }
   }
-  for (const abi of _ABIs) {
-    const decoder = new InputDataDecoder(abi);
-    const raw = decoder.decodeData(tx.data);
-    if (raw.method && raw.methodName) {
-      const temp = {
-        method: raw.method,
-        methodName: raw.methodName,
-        args: []
-      };
-      raw.types.forEach((type, index) => {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-        temp.args.push(parseResult(type, raw.inputs[index], raw.names[index]));
-      });
-      result.data = temp;
-      break;
-    }
-  }
   return result;
 };