@subwallet/extension-base 1.1.64-0 → 1.1.66-0

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

@@ -6,11 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.checkReferenceCount = checkReferenceCount;
 exports.checkSupportTransfer = checkSupportTransfer;
 exports.createTransferExtrinsic = void 0;
+var _api = require("@gear-js/api");
 var _wasm = require("@subwallet/extension-base/koni/api/tokens/wasm");
 var _utils = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
 var _constants = 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 _util = require("@polkadot/util");
+var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -114,6 +117,7 @@ async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMap, chai
   return result;
 }
 const createTransferExtrinsic = async _ref => {
+  var _tokenInfo$metadata;
   let {
     from,
     networkKey,
@@ -124,6 +128,10 @@ const createTransferExtrinsic = async _ref => {
     value
   } = _ref;
   const api = substrateApi.api;
+  const isDisableTransfer = (_tokenInfo$metadata = tokenInfo.metadata) === null || _tokenInfo$metadata === void 0 ? void 0 : _tokenInfo$metadata.isDisableTransfer;
+  if (isDisableTransfer) {
+    return [null, value];
+  }
 
   // @ts-ignore
   let transfer = null;
@@ -144,6 +152,14 @@ const createTransferExtrinsic = async _ref => {
       gasLimit
     }, to, value, {});
     transferAmount = value;
+  } else if ((0, _utils2._isTokenGearSmartContract)(tokenInfo) && api instanceof _api.GearApi) {
+    const contractPromise = (0, _utils3.getGRC20ContractPromise)(api, (0, _utils2._getContractAddressOfToken)(tokenInfo));
+    const transaction = await contractPromise.transfer((0, _util.u8aToHex)((0, _utilCrypto.decodeAddress)(to)), BigInt(value)) // Create transfer transaction
+    .withAccount(from) // Set sender account
+    .calculateGas(); // Add account arg to extrinsic
+
+    transfer = transaction.tx;
+    transferAmount = value;
   } else if (_constants._TRANSFER_CHAIN_GROUP.acala.includes(networkKey)) {
     if (!(0, _utils2._isNativeToken)(tokenInfo)) {
       if (isTxCurrenciesSupported) {

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

@@ -708,6 +708,7 @@ async function getRelayBondingExtrinsic(substrateApi, amount, targetValidators,
     if (paramsCount === 2) {
       bondTx = chainApi.api.tx.staking.bond(binaryAmount, bondDest);
     } else {
+      // @ts-ignore
       bondTx = chainApi.api.tx.staking.bond(address, binaryAmount, bondDest);
     }
     nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
@@ -718,6 +719,7 @@ async function getRelayBondingExtrinsic(substrateApi, amount, targetValidators,
     if (paramsCount === 2) {
       bondTx = chainApi.api.tx.staking.bond(binaryAmount, bondDest);
     } else {
+      // @ts-ignore
       bondTx = chainApi.api.tx.staking.bond(nominatorMetadata.address, binaryAmount, bondDest);
     }
     nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
@@ -735,6 +737,8 @@ async function getRelayBondingExtrinsic(substrateApi, amount, targetValidators,
   } else if (nominateTx && !bondTx) {
     return nominateTx;
   }
+
+  // @ts-ignore
   return chainApi.api.tx.utility.batchAll([bondTx, nominateTx]);
 }
 async function getRelayUnbondingExtrinsic(substrateApi, amount, nominatorMetadata) {
@@ -755,6 +759,7 @@ async function getRelayWithdrawalExtrinsic(substrateApi, address) {
     const slashingSpanCount = _slashingSpans !== null ? _slashingSpans.spanIndex : '0';
     return chainApi.api.tx.staking.withdrawUnbonded(slashingSpanCount);
   } else {
+    // @ts-ignore
     return chainApi.api.tx.staking.withdrawUnbonded();
   }
 }
@@ -799,6 +804,7 @@ async function getPoolingWithdrawalExtrinsic(substrateApi, nominatorMetadata) {
       Id: nominatorMetadata.address
     }, slashingSpanCount);
   } else {
+    // @ts-ignore
     return chainApi.api.tx.nominationPools.withdrawUnbonded({
       Id: nominatorMetadata.address
     });

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

@@ -42,11 +42,13 @@ async function getWasmContractGasLimit(api, callerAddress, message, contract) {
       storageDepositLimit,
       value
     } = options;
-
-    // @ts-ignore
     const {
       gasRequired
-    } = await api.call.contractsApi.call(callerAddress, contract.address, value !== null && value !== void 0 ? value : new _util.BN(0), gasLimit !== null && gasLimit !== void 0 ? gasLimit : null, storageDepositLimit !== null && storageDepositLimit !== void 0 ? storageDepositLimit : null, abiMessage === null || abiMessage === void 0 ? void 0 : (_abiMessage$value = abiMessage.value) === null || _abiMessage$value === void 0 ? void 0 : _abiMessage$value.toU8a(args));
+    } = await api.call.contractsApi.call(callerAddress, contract.address, // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+    value !== null && value !== void 0 ? value : new _util.BN(0), // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+    gasLimit !== null && gasLimit !== void 0 ? gasLimit : null, // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+    storageDepositLimit !== null && storageDepositLimit !== void 0 ? storageDepositLimit : null, // @ts-ignore
+    abiMessage === null || abiMessage === void 0 ? void 0 : (_abiMessage$value = abiMessage.value) === null || _abiMessage$value === void 0 ? void 0 : _abiMessage$value.toU8a(args));
     return gasRequired;
   } catch {
     return getDefaultWeightV2(api, true);

package/cjs/koni/background/handlers/State.js

@@ -67,6 +67,7 @@ const generateDefaultCrowdloanMap = () => {
   const crowdloanMap = {};
   return crowdloanMap;
 };
+const DEFAULT_CURRENCY = 'USD';
 class KoniState {
   injectedProviders = new Map();
   unsubscriptionMap = {};
@@ -1570,6 +1571,7 @@ class KoniState {
     this.accountRefStore.set('refList', []);
     if (resetAll) {
       this.settingService.resetWallet();
+      await this.priceService.setPriceCurrency(DEFAULT_CURRENCY);
     }
     this.chainService.resetWallet(resetAll);
     await this.walletConnectService.resetWallet(resetAll);

package/cjs/packageInfo.js

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

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

@@ -102,7 +102,7 @@ function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoM
     const chainSlug = chainInfo.slug;
     const [useAddresses, notSupportAddresses] = filterAddress(addresses, chainInfo);
     if (notSupportAddresses.length) {
-      const tokens = (0, _utils2.filterAssetsByChainAndType)(chainAssetMap, chainSlug, [_types._AssetType.NATIVE, _types._AssetType.ERC20, _types._AssetType.PSP22, _types._AssetType.LOCAL]);
+      const tokens = (0, _utils2.filterAssetsByChainAndType)(chainAssetMap, chainSlug, [_types._AssetType.NATIVE, _types._AssetType.ERC20, _types._AssetType.PSP22, _types._AssetType.LOCAL, _types._AssetType.GRC20]);
       const now = new Date().getTime();
       Object.values(tokens).forEach(token => {
         const items = notSupportAddresses.map(address => ({

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

@@ -1,9 +1,11 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.subscribeSubstrateBalance = void 0;
+var _api = require("@gear-js/api");
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
@@ -12,8 +14,10 @@ var _utils = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
 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 _rxjs = require("rxjs");
 var _util = require("@polkadot/util");
+var _utilCrypto = require("@polkadot/util-crypto");
 var _evm = require("../evm");
 var _equilibrium = require("./equilibrium");
 // Copyright 2019-2022 @subwallet/extension-base
@@ -25,6 +29,7 @@ const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substra
   let unsubEvmContractToken;
   let unsubWasmContractToken;
   let unsubBridgedToken;
+  let unsubGrcToken;
   const chain = chainInfo.slug;
   const baseParams = {
     addresses,
@@ -76,15 +81,21 @@ const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substra
       // Get sub-token for substrate-based chains
       unsubWasmContractToken = subscribePSP22Balance(substrateParams);
     }
+    if ((0, _utils2._checkSmartContractSupportByChain)(chainInfo, _types._AssetType.GRC20)) {
+      // Get sub-token for substrate-based chains
+      unsubGrcToken = subscribeGRC20Balance(substrateParams);
+    }
   } catch (err) {
     console.warn(err);
   }
   return () => {
+    var _unsubGrcToken;
     unsubNativeToken && unsubNativeToken();
     unsubLocalToken && unsubLocalToken();
     unsubEvmContractToken && unsubEvmContractToken();
     unsubWasmContractToken && unsubWasmContractToken();
     unsubBridgedToken && unsubBridgedToken();
+    (_unsubGrcToken = unsubGrcToken) === null || _unsubGrcToken === void 0 ? void 0 : _unsubGrcToken();
   };
 };
 
@@ -233,6 +244,15 @@ const subscribeBridgedBalance = async _ref4 => {
     });
   };
 };
+function extractOkResponse(response) {
+  if ('ok' in response) {
+    return response.ok;
+  }
+  if ('Ok' in response) {
+    return response.Ok;
+  }
+  return undefined;
+}
 const subscribePSP22Balance = _ref5 => {
   let {
     addresses,
@@ -254,15 +274,17 @@ const subscribePSP22Balance = _ref5 => {
         const contract = psp22ContractMap[tokenInfo.slug];
         const balances = await Promise.all(addresses.map(async address => {
           try {
-            var _balanceOf$output, _ref7;
+            var _balanceOf$output;
             const _balanceOf = await contract.query['psp22::balanceOf'](address, {
               gasLimit: (0, _utils.getDefaultWeightV2)(substrateApi)
             }, address);
             const balanceObj = _balanceOf === null || _balanceOf === void 0 ? void 0 : (_balanceOf$output = _balanceOf.output) === null || _balanceOf$output === void 0 ? void 0 : _balanceOf$output.toPrimitive();
+            const freeResponse = extractOkResponse(balanceObj);
+            const free = freeResponse ? new _bignumber.default(freeResponse).toString() : '0';
             return {
               address: address,
               tokenSlug: tokenInfo.slug,
-              free: _balanceOf.output ? (_ref7 = balanceObj.ok) !== null && _ref7 !== void 0 ? _ref7 : balanceObj.Ok : '0',
+              free,
               locked: '0',
               state: _KoniTypes.APIItemState.READY
             };
@@ -290,7 +312,7 @@ const subscribePSP22Balance = _ref5 => {
     clearInterval(interval);
   };
 };
-const subscribeTokensAccountsPallet = async _ref8 => {
+const subscribeTokensAccountsPallet = async _ref7 => {
   let {
     addresses,
     assetMap,
@@ -298,7 +320,7 @@ const subscribeTokensAccountsPallet = async _ref8 => {
     chainInfo,
     includeNativeToken,
     substrateApi
-  } = _ref8;
+  } = _ref7;
   const chain = chainInfo.slug;
   const tokenTypes = includeNativeToken ? [_types._AssetType.NATIVE, _types._AssetType.LOCAL] : [_types._AssetType.LOCAL];
   const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, tokenTypes);
@@ -344,7 +366,7 @@ const subscribeTokensAccountsPallet = async _ref8 => {
     });
   };
 };
-const subscribeAssetsAccountPallet = async _ref9 => {
+const subscribeAssetsAccountPallet = async _ref8 => {
   let {
     addresses,
     assetMap,
@@ -352,7 +374,7 @@ const subscribeAssetsAccountPallet = async _ref9 => {
     chainInfo,
     includeNativeToken,
     substrateApi
-  } = _ref9;
+  } = _ref8;
   const chain = chainInfo.slug;
   const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.LOCAL]);
   Object.values(tokenMap).forEach(token => {
@@ -409,14 +431,14 @@ const subscribeAssetsAccountPallet = async _ref9 => {
 };
 
 // eslint-disable-next-line @typescript-eslint/require-await
-const subscribeOrmlTokensPallet = async _ref10 => {
+const subscribeOrmlTokensPallet = async _ref9 => {
   let {
     addresses,
     assetMap,
     callback,
     chainInfo,
     substrateApi
-  } = _ref10;
+  } = _ref9;
   const chain = chainInfo.slug;
   const tokenTypes = [_types._AssetType.LOCAL];
   const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, tokenTypes);
@@ -465,4 +487,62 @@ const subscribeOrmlTokensPallet = async _ref10 => {
       }).catch(console.error);
     });
   };
+};
+const subscribeGRC20Balance = _ref10 => {
+  let {
+    addresses,
+    assetMap,
+    callback,
+    chainInfo,
+    substrateApi
+  } = _ref10;
+  if (!(substrateApi instanceof _api.GearApi)) {
+    console.warn('Cannot subscribe GRC20 balance without GearApi instance');
+    return _util.noop;
+  }
+  const chain = chainInfo.slug;
+  const psp22ContractMap = {};
+  const tokenList = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.GRC20]);
+  Object.entries(tokenList).forEach(_ref11 => {
+    let [slug, tokenInfo] = _ref11;
+    psp22ContractMap[slug] = (0, _utils3.getGRC20ContractPromise)(substrateApi, (0, _utils2._getContractAddressOfToken)(tokenInfo));
+  });
+  const getTokenBalances = () => {
+    Object.values(tokenList).map(async tokenInfo => {
+      try {
+        const contract = psp22ContractMap[tokenInfo.slug];
+        const balances = await Promise.all(addresses.map(async address => {
+          try {
+            const actor = (0, _util.u8aToHex)((0, _utilCrypto.decodeAddress)(address));
+            const _balanceOf = await contract.balanceOf(actor, address);
+            return {
+              address: address,
+              tokenSlug: tokenInfo.slug,
+              free: _balanceOf.toString(10),
+              locked: '0',
+              state: _KoniTypes.APIItemState.READY
+            };
+          } catch (err) {
+            console.error(`Error on get balance of account ${address} for token ${tokenInfo.slug}`, err);
+            return {
+              address: address,
+              tokenSlug: tokenInfo.slug,
+              free: '0',
+              locked: '0',
+              state: _KoniTypes.APIItemState.READY
+            };
+          }
+        }));
+        callback(balances);
+      } catch (err) {
+        console.warn(tokenInfo.slug, err); // TODO: error createType
+      }
+    });
+  };
+
+  getTokenBalances();
+  const interval = setInterval(getTokenBalances, _constants.SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
+  return () => {
+    clearInterval(interval);
+  };
 };

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

@@ -20,7 +20,8 @@ const _API_OPTIONS_CHAIN_GROUP = {
   acala: ['acala', 'karura', 'origintrail', 'kintsugi'],
   turing: ['turingStaging', 'turing'],
   avail: ['kate', 'availTuringTest', 'avail_mainnet'],
-  goldberg: ['goldberg_testnet']
+  goldberg: ['goldberg_testnet'],
+  gear: ['vara_network', 'vara_testnet']
 };
 exports._API_OPTIONS_CHAIN_GROUP = _API_OPTIONS_CHAIN_GROUP;
 const _PREDEFINED_SINGLE_MODES = {
@@ -99,6 +100,7 @@ const _STAKING_ERA_LENGTH_MAP = {
   kate: 6,
   creditcoin: 24,
   vara_network: 12,
+  vara_testnet: 12,
   goldberg_testnet: 24,
   manta_network: 6,
   krest_network: 4,
@@ -123,6 +125,7 @@ const _EXPECTED_BLOCK_TIME = {
   edgeware: 6,
   creditcoin: 12,
   vara_network: 3,
+  vara_testnet: 3,
   goldberg_testnet: 20,
   polimec: 12,
   bifrost: 13,
@@ -229,6 +232,10 @@ const _KNOWN_CHAIN_INFLATION_PARAMS = {
   vara_network: {
     ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
     stakeTarget: 0.8
+  },
+  vara_testnet: {
+    ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
+    stakeTarget: 0.8
   }
 };
 

package/cjs/services/chain-service/handler/EvmChainHandler.js

@@ -109,7 +109,7 @@ class EvmChainHandler extends _AbstractChainHandler.AbstractChainHandler {
     }
     return result;
   }
-  async getSmartContractTokenInfo(contractAddress, tokenType, originChain) {
+  async getEvmContractTokenInfo(contractAddress, tokenType, originChain) {
     let tokenContract;
     let name = '';
     let decimals = -1;

package/cjs/services/chain-service/handler/SubstrateApi.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.SubstrateApi = void 0;
 require("@polkadot/types-augment");
 var _api = require("@acala-network/api");
+var _api2 = require("@gear-js/api");
 var _types = require("@oak-foundation/types");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _lightClient = require("@subwallet/extension-base/services/chain-service/handler/light-client");
@@ -14,8 +15,8 @@ var _types2 = require("@subwallet/extension-base/services/chain-service/types");
 var _promise = require("@subwallet/extension-base/utils/promise");
 var _availJsSdk = require("avail-js-sdk");
 var _rxjs = require("rxjs");
-var _api2 = require("@polkadot/api");
-var _api3 = require("@polkadot/apps-config/api");
+var _api3 = require("@polkadot/api");
+var _api4 = require("@polkadot/apps-config/api");
 var _create = require("@polkadot/types/create");
 var _util = require("@polkadot/util");
 var _defaults = require("@polkadot/util-crypto/address/defaults");
@@ -55,13 +56,13 @@ class SubstrateApi {
       return (0, _lightClient.getSubstrateConnectProvider)(apiUrl.replace('light://substrate-connect/', ''));
     } else {
       this.useLightClient = true;
-      return new _api2.WsProvider(apiUrl, _constants.API_AUTO_CONNECT_MS, {}, _constants.API_CONNECT_TIMEOUT);
+      return new _api3.WsProvider(apiUrl, _constants.API_AUTO_CONNECT_MS, {}, _constants.API_CONNECT_TIMEOUT);
     }
   }
   createApi(provider, externalApiPromise) {
     const apiOption = {
       provider,
-      typesBundle: _api3.typesBundle,
+      typesBundle: _api4.typesBundle,
       registry: this.registry,
       noInitWarn: true
     };
@@ -76,19 +77,19 @@ class SubstrateApi {
     if (externalApiPromise) {
       api = externalApiPromise;
     } else if (_constants._API_OPTIONS_CHAIN_GROUP.acala.includes(this.chainSlug)) {
-      api = new _api2.ApiPromise((0, _api.options)({
+      api = new _api3.ApiPromise((0, _api.options)({
         provider,
         noInitWarn: true
       }));
     } else if (_constants._API_OPTIONS_CHAIN_GROUP.turing.includes(this.chainSlug)) {
-      api = new _api2.ApiPromise({
+      api = new _api3.ApiPromise({
         provider,
         rpc: _types.rpc,
         types: _types.types,
         noInitWarn: true
       });
     } else if (_constants._API_OPTIONS_CHAIN_GROUP.avail.includes(this.chainSlug)) {
-      api = new _api2.ApiPromise({
+      api = new _api3.ApiPromise({
         provider,
         rpc: _availJsSdk.spec.rpc,
         types: _availJsSdk.spec.types,
@@ -96,15 +97,20 @@ class SubstrateApi {
         noInitWarn: true
       });
     } else if (_constants._API_OPTIONS_CHAIN_GROUP.goldberg.includes(this.chainSlug)) {
-      api = new _api2.ApiPromise({
+      api = new _api3.ApiPromise({
         provider,
         rpc: _availJsSdk.goldbergRpc,
         types: _availJsSdk.goldbergTypes,
         signedExtensions: _availJsSdk.spec.signedExtensions,
         noInitWarn: true
       });
+    } else if (_constants._API_OPTIONS_CHAIN_GROUP.gear.includes(this.chainSlug)) {
+      api = new _api2.GearApi({
+        provider,
+        noInitWarn: true
+      });
     } else {
-      api = new _api2.ApiPromise(apiOption);
+      api = new _api3.ApiPromise(apiOption);
     }
     api.on('ready', this.onReady.bind(this));
     api.on('connected', this.onConnect.bind(this));

package/cjs/services/chain-service/handler/SubstrateChainHandler.js

@@ -4,10 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SubstrateChainHandler = exports.DEFAULT_AUX = void 0;
+var _api = require("@gear-js/api");
 var _types = require("@subwallet/chain-list/types");
 var _utils = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
 var _AbstractChainHandler = require("@subwallet/extension-base/services/chain-service/handler/AbstractChainHandler");
 var _SubstrateApi2 = require("@subwallet/extension-base/services/chain-service/handler/SubstrateApi");
+var _utils2 = require("@subwallet/extension-base/utils");
 var _apiContract = require("@polkadot/api-contract");
 var _util = require("@polkadot/util");
 var _logger = require("@polkadot/util/logger");
@@ -93,69 +95,86 @@ class SubstrateChainHandler extends _AbstractChainHandler.AbstractChainHandler {
     result.existentialDeposit = substrateApi.api.consts.balances.existentialDeposit.toString();
     return result;
   }
-  async getSmartContractTokenInfo(contractAddress, tokenType, originChain, contractCaller) {
-    let tokenContract;
+  async getPsp22TokenInfo(apiPromise, contractAddress, contractCaller) {
+    const tokenContract = new _apiContract.ContractPromise(apiPromise, _helper._PSP22_ABI, contractAddress);
+    const [nameResp, symbolResp, decimalsResp] = await Promise.all([tokenContract.query['psp22Metadata::tokenName'](contractCaller || contractAddress, {
+      gasLimit: (0, _utils.getDefaultWeightV2)(apiPromise)
+    }),
+    // read-only operation so no gas limit
+    tokenContract.query['psp22Metadata::tokenSymbol'](contractCaller || contractAddress, {
+      gasLimit: (0, _utils.getDefaultWeightV2)(apiPromise)
+    }), tokenContract.query['psp22Metadata::tokenDecimals'](contractCaller || contractAddress, {
+      gasLimit: (0, _utils.getDefaultWeightV2)(apiPromise)
+    })]);
+    if (!(nameResp.result.isOk && symbolResp.result.isOk && decimalsResp.result.isOk) || !nameResp.output || !decimalsResp.output || !symbolResp.output) {
+      return ['', 1, '', true];
+    } else {
+      var _symbolResp$output, _decimalsResp$output, _nameResp$output;
+      let contractError = false;
+      const symbolObj = (_symbolResp$output = symbolResp.output) === null || _symbolResp$output === void 0 ? void 0 : _symbolResp$output.toHuman();
+      const decimalsObj = (_decimalsResp$output = decimalsResp.output) === null || _decimalsResp$output === void 0 ? void 0 : _decimalsResp$output.toHuman();
+      const nameObj = (_nameResp$output = nameResp.output) === null || _nameResp$output === void 0 ? void 0 : _nameResp$output.toHuman();
+      const name = nameResp.output ? nameObj.Ok || nameObj.ok : '';
+      const decimals = decimalsResp.output ? new _util.BN(decimalsObj.Ok || decimalsObj.ok).toNumber() : 0;
+      const symbol = decimalsResp.output ? symbolObj.Ok || symbolObj.ok : '';
+      if (!name || !symbol || typeof name === 'object' || typeof symbol === 'object') {
+        contractError = true;
+      }
+      return [name, decimals, symbol, contractError];
+    }
+  }
+  async getPsp34TokenInfo(apiPromise, contractAddress, contractCaller) {
+    const tokenContract = new _apiContract.ContractPromise(apiPromise, _helper._PSP34_ABI, contractAddress);
+    const collectionIdResp = await tokenContract.query['psp34::collectionId'](contractCaller || contractAddress, {
+      gasLimit: (0, _utils.getDefaultWeightV2)(apiPromise)
+    }); // read-only operation so no gas limit
+
+    if (!collectionIdResp.result.isOk || !collectionIdResp.output) {
+      return ['', -1, '', true];
+    } else {
+      var _collectionIdResp$out;
+      let contractError = false;
+      const collectionIdDict = (_collectionIdResp$out = collectionIdResp.output) === null || _collectionIdResp$out === void 0 ? void 0 : _collectionIdResp$out.toHuman();
+      if (collectionIdDict.Bytes === '') {
+        contractError = true;
+      }
+      return ['', -1, '', contractError];
+    }
+  }
+  async getGrc20TokenInfo(apiPromise, contractAddress) {
+    if (!(apiPromise instanceof _api.GearApi)) {
+      console.warn('Cannot subscribe GRC20 balance without GearApi instance');
+      return ['', -1, '', true];
+    }
+    let contractError = false;
+    const tokenContract = (0, _utils2.getGRC20ContractPromise)(apiPromise, contractAddress);
+    const [nameRes, symbolRes, decimalsRes] = await Promise.all([tokenContract.name(_utils2.DEFAULT_GEAR_ADDRESS.ALICE), tokenContract.symbol(_utils2.DEFAULT_GEAR_ADDRESS.ALICE), tokenContract.decimals(_utils2.DEFAULT_GEAR_ADDRESS.ALICE)]);
+    const decimals = typeof decimalsRes === 'string' ? parseInt(decimalsRes) : decimalsRes;
+    if (!nameRes || !symbolRes) {
+      contractError = true;
+    }
+    return [nameRes, decimals, symbolRes, contractError];
+  }
+  async getSubstrateContractTokenInfo(contractAddress, tokenType, originChain, contractCaller) {
+    // todo: improve this funtion later
+
     let name = '';
     let decimals = -1;
     let symbol = '';
     let contractError = false;
-    const substrateApi = this.getSubstrateApiByChain(originChain);
+    const apiPromise = this.getSubstrateApiByChain(originChain).api;
     try {
-      if (tokenType === _types._AssetType.PSP22) {
-        tokenContract = new _apiContract.ContractPromise(substrateApi.api, _helper._PSP22_ABI, contractAddress);
-        const [nameResp, symbolResp, decimalsResp] = await Promise.all([tokenContract.query['psp22Metadata::tokenName'](contractCaller || contractAddress, {
-          gasLimit: (0, _utils.getDefaultWeightV2)(substrateApi.api)
-        }),
-        // read-only operation so no gas limit
-        tokenContract.query['psp22Metadata::tokenSymbol'](contractCaller || contractAddress, {
-          gasLimit: (0, _utils.getDefaultWeightV2)(substrateApi.api)
-        }), tokenContract.query['psp22Metadata::tokenDecimals'](contractCaller || contractAddress, {
-          gasLimit: (0, _utils.getDefaultWeightV2)(substrateApi.api)
-        })]);
-        if (!(nameResp.result.isOk && symbolResp.result.isOk && decimalsResp.result.isOk) || !nameResp.output || !decimalsResp.output || !symbolResp.output) {
-          return {
-            name: '',
-            decimals: -1,
-            symbol: '',
-            contractError: true
-          };
-        } else {
-          var _symbolResp$output, _decimalsResp$output, _nameResp$output;
-          const symbolObj = (_symbolResp$output = symbolResp.output) === null || _symbolResp$output === void 0 ? void 0 : _symbolResp$output.toHuman();
-          const decimalsObj = (_decimalsResp$output = decimalsResp.output) === null || _decimalsResp$output === void 0 ? void 0 : _decimalsResp$output.toHuman();
-          const nameObj = (_nameResp$output = nameResp.output) === null || _nameResp$output === void 0 ? void 0 : _nameResp$output.toHuman();
-          name = nameResp.output ? nameObj.Ok || nameObj.ok : '';
-          decimals = decimalsResp.output ? new _util.BN(decimalsObj.Ok || decimalsObj.ok).toNumber() : 0;
-          symbol = decimalsResp.output ? symbolObj.Ok || symbolObj.ok : '';
-          if (!name || !symbol || typeof name === 'object' || typeof symbol === 'object') {
-            contractError = true;
-          }
-          console.log('validate PSP22', name, symbol, decimals);
-        }
-      } else {
-        tokenContract = new _apiContract.ContractPromise(substrateApi.api, _helper._PSP34_ABI, contractAddress);
-        const collectionIdResp = await tokenContract.query['psp34::collectionId'](contractCaller || contractAddress, {
-          gasLimit: (0, _utils.getDefaultWeightV2)(substrateApi.api)
-        }); // read-only operation so no gas limit
-
-        if (!collectionIdResp.result.isOk || !collectionIdResp.output) {
-          return {
-            name: '',
-            decimals: -1,
-            symbol: '',
-            contractError: true
-          };
-        } else {
-          var _collectionIdResp$out;
-          const collectionIdDict = (_collectionIdResp$out = collectionIdResp.output) === null || _collectionIdResp$out === void 0 ? void 0 : _collectionIdResp$out.toHuman();
-          if (collectionIdDict.Bytes === '') {
-            contractError = true;
-          } else {
-            name = ''; // no function to get collection name, let user manually put in the name
-          }
-        }
+      switch (tokenType) {
+        case _types._AssetType.PSP22:
+          [name, decimals, symbol, contractError] = await this.getPsp22TokenInfo(apiPromise, contractAddress, contractCaller);
+          break;
+        case _types._AssetType.PSP34:
+          [name, decimals, symbol, contractError] = await this.getPsp34TokenInfo(apiPromise, contractAddress, contractCaller);
+          break;
+        case _types._AssetType.GRC20:
+          [name, decimals, symbol, contractError] = await this.getGrc20TokenInfo(apiPromise, contractAddress);
+          break;
       }
-
       return {
         name,
         decimals,