@subwallet/extension-base 1.1.65-0 → 1.1.67-0

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

@@ -1,6 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+import { GearApi } from '@gear-js/api';
 import { _AssetType } from '@subwallet/chain-list/types';
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
 import { SUB_TOKEN_REFRESH_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
@@ -8,10 +9,11 @@ import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/toke
 import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
 import { _BALANCE_CHAIN_GROUP, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _checkSmartContractSupportByChain, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getTokenTypesSupportedByChain, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
-import { filterAssetsByChainAndType } from '@subwallet/extension-base/utils';
+import { filterAssetsByChainAndType, getGRC20ContractPromise } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { combineLatest, Observable } from 'rxjs';
-import { BN, BN_ZERO } from '@polkadot/util';
+import { BN, BN_ZERO, noop, u8aToHex } from '@polkadot/util';
+import { decodeAddress } from '@polkadot/util-crypto';
 import { subscribeERC20Interval } from "../evm.js";
 import { subscribeEquilibriumTokenBalance } from "./equilibrium.js";
 export const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substrateApi, evmApi, callback) => {
@@ -20,6 +22,7 @@ export const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap,
   let unsubEvmContractToken;
   let unsubWasmContractToken;
   let unsubBridgedToken;
+  let unsubGrcToken;
   const chain = chainInfo.slug;
   const baseParams = {
     addresses,
@@ -71,15 +74,21 @@ export const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap,
       // Get sub-token for substrate-based chains
       unsubWasmContractToken = subscribePSP22Balance(substrateParams);
     }
+    if (_checkSmartContractSupportByChain(chainInfo, _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();
   };
 };
 
@@ -461,4 +470,60 @@ const subscribeOrmlTokensPallet = async ({
       }).catch(console.error);
     });
   };
+};
+const subscribeGRC20Balance = ({
+  addresses,
+  assetMap,
+  callback,
+  chainInfo,
+  substrateApi
+}) => {
+  if (!(substrateApi instanceof GearApi)) {
+    console.warn('Cannot subscribe GRC20 balance without GearApi instance');
+    return noop;
+  }
+  const chain = chainInfo.slug;
+  const psp22ContractMap = {};
+  const tokenList = filterAssetsByChainAndType(assetMap, chain, [_AssetType.GRC20]);
+  Object.entries(tokenList).forEach(([slug, tokenInfo]) => {
+    psp22ContractMap[slug] = getGRC20ContractPromise(substrateApi, _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 = u8aToHex(decodeAddress(address));
+            const _balanceOf = await contract.balanceOf(actor, address);
+            return {
+              address: address,
+              tokenSlug: tokenInfo.slug,
+              free: _balanceOf.toString(10),
+              locked: '0',
+              state: 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: APIItemState.READY
+            };
+          }
+        }));
+        callback(balances);
+      } catch (err) {
+        console.warn(tokenInfo.slug, err); // TODO: error createType
+      }
+    });
+  };
+
+  getTokenBalances();
+  const interval = setInterval(getTokenBalances, SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
+  return () => {
+    clearInterval(interval);
+  };
 };

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

@@ -7,6 +7,7 @@ export declare const _API_OPTIONS_CHAIN_GROUP: {
     turing: string[];
     avail: string[];
     goldberg: string[];
+    gear: string[];
 };
 export declare const _PREDEFINED_SINGLE_MODES: Record<string, SingleModeJson>;
 export declare const _PURE_EVM_CHAINS: string[];

package/services/chain-service/constants.js

@@ -11,7 +11,8 @@ export 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']
 };
 export const _PREDEFINED_SINGLE_MODES = {
   subspace: {
@@ -86,6 +87,7 @@ export const _STAKING_ERA_LENGTH_MAP = {
   kate: 6,
   creditcoin: 24,
   vara_network: 12,
+  vara_testnet: 12,
   goldberg_testnet: 24,
   manta_network: 6,
   krest_network: 4,
@@ -109,6 +111,7 @@ export const _EXPECTED_BLOCK_TIME = {
   edgeware: 6,
   creditcoin: 12,
   vara_network: 3,
+  vara_testnet: 3,
   goldberg_testnet: 20,
   polimec: 12,
   bifrost: 13,
@@ -212,6 +215,10 @@ export const _KNOWN_CHAIN_INFLATION_PARAMS = {
   vara_network: {
     ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
     stakeTarget: 0.8
+  },
+  vara_testnet: {
+    ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
+    stakeTarget: 0.8
   }
 };
 

package/services/chain-service/handler/EvmChainHandler.d.ts

@@ -18,5 +18,5 @@ export declare class EvmChainHandler extends AbstractChainHandler {
     sleep(): Promise<void>;
     wakeUp(): Promise<void>;
     getChainSpec(evmApi: _EvmApi): Promise<_EvmChainSpec>;
-    getSmartContractTokenInfo(contractAddress: string, tokenType: _AssetType, originChain: string): Promise<_SmartContractTokenInfo>;
+    getEvmContractTokenInfo(contractAddress: string, tokenType: _AssetType, originChain: string): Promise<_SmartContractTokenInfo>;
 }

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

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

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

@@ -3,6 +3,7 @@
 
 import '@polkadot/types-augment';
 import { options as acalaOptions } from '@acala-network/api';
+import { GearApi } from '@gear-js/api';
 import { rpc as oakRpc, types as oakTypes } from '@oak-foundation/types';
 import { _API_OPTIONS_CHAIN_GROUP, API_AUTO_CONNECT_MS, API_CONNECT_TIMEOUT } from '@subwallet/extension-base/services/chain-service/constants';
 import { getSubstrateConnectProvider } from '@subwallet/extension-base/services/chain-service/handler/light-client';
@@ -97,6 +98,11 @@ export class SubstrateApi {
         signedExtensions: availSpec.signedExtensions,
         noInitWarn: true
       });
+    } else if (_API_OPTIONS_CHAIN_GROUP.gear.includes(this.chainSlug)) {
+      api = new GearApi({
+        provider,
+        noInitWarn: true
+      });
     } else {
       api = new ApiPromise(apiOption);
     }

package/services/chain-service/handler/SubstrateChainHandler.d.ts

@@ -16,7 +16,10 @@ export declare class SubstrateChainHandler extends AbstractChainHandler {
     sleep(): Promise<void>;
     recoverApi(chainSlug: string): Promise<void>;
     getChainSpec(substrateApi: _SubstrateApi): Promise<_SubstrateChainSpec>;
-    getSmartContractTokenInfo(contractAddress: string, tokenType: _AssetType, originChain: string, contractCaller?: string): Promise<_SmartContractTokenInfo>;
+    private getPsp22TokenInfo;
+    private getPsp34TokenInfo;
+    private getGrc20TokenInfo;
+    getSubstrateContractTokenInfo(contractAddress: string, tokenType: _AssetType, originChain: string, contractCaller?: string): Promise<_SmartContractTokenInfo>;
     setSubstrateApi(chainSlug: string, substrateApi: SubstrateApi): void;
     destroySubstrateApi(chainSlug: string): void;
     initApi(chainSlug: string, apiUrl: string, { externalApiPromise, onUpdateStatus, providerName }?: Omit<_ApiOptions, 'metadata'>): Promise<SubstrateApi>;

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

@@ -1,10 +1,12 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { GearApi } from '@gear-js/api';
 import { _AssetType } from '@subwallet/chain-list/types';
 import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
 import { AbstractChainHandler } from '@subwallet/extension-base/services/chain-service/handler/AbstractChainHandler';
 import { SubstrateApi } from '@subwallet/extension-base/services/chain-service/handler/SubstrateApi';
+import { DEFAULT_GEAR_ADDRESS, getGRC20ContractPromise } from '@subwallet/extension-base/utils';
 import { ContractPromise } from '@polkadot/api-contract';
 import { BN } from '@polkadot/util';
 import { logger as createLogger } from '@polkadot/util/logger';
@@ -86,69 +88,86 @@ export class SubstrateChainHandler extends 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 ContractPromise(apiPromise, _PSP22_ABI, contractAddress);
+    const [nameResp, symbolResp, decimalsResp] = await Promise.all([tokenContract.query['psp22Metadata::tokenName'](contractCaller || contractAddress, {
+      gasLimit: getDefaultWeightV2(apiPromise)
+    }),
+    // read-only operation so no gas limit
+    tokenContract.query['psp22Metadata::tokenSymbol'](contractCaller || contractAddress, {
+      gasLimit: getDefaultWeightV2(apiPromise)
+    }), tokenContract.query['psp22Metadata::tokenDecimals'](contractCaller || contractAddress, {
+      gasLimit: 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 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 ContractPromise(apiPromise, _PSP34_ABI, contractAddress);
+    const collectionIdResp = await tokenContract.query['psp34::collectionId'](contractCaller || contractAddress, {
+      gasLimit: 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 GearApi)) {
+      console.warn('Cannot subscribe GRC20 balance without GearApi instance');
+      return ['', -1, '', true];
+    }
+    let contractError = false;
+    const tokenContract = getGRC20ContractPromise(apiPromise, contractAddress);
+    const [nameRes, symbolRes, decimalsRes] = await Promise.all([tokenContract.name(DEFAULT_GEAR_ADDRESS.ALICE), tokenContract.symbol(DEFAULT_GEAR_ADDRESS.ALICE), tokenContract.decimals(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 === _AssetType.PSP22) {
-        tokenContract = new ContractPromise(substrateApi.api, _PSP22_ABI, contractAddress);
-        const [nameResp, symbolResp, decimalsResp] = await Promise.all([tokenContract.query['psp22Metadata::tokenName'](contractCaller || contractAddress, {
-          gasLimit: getDefaultWeightV2(substrateApi.api)
-        }),
-        // read-only operation so no gas limit
-        tokenContract.query['psp22Metadata::tokenSymbol'](contractCaller || contractAddress, {
-          gasLimit: getDefaultWeightV2(substrateApi.api)
-        }), tokenContract.query['psp22Metadata::tokenDecimals'](contractCaller || contractAddress, {
-          gasLimit: 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 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 ContractPromise(substrateApi.api, _PSP34_ABI, contractAddress);
-        const collectionIdResp = await tokenContract.query['psp34::collectionId'](contractCaller || contractAddress, {
-          gasLimit: 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 _AssetType.PSP22:
+          [name, decimals, symbol, contractError] = await this.getPsp22TokenInfo(apiPromise, contractAddress, contractCaller);
+          break;
+        case _AssetType.PSP34:
+          [name, decimals, symbol, contractError] = await this.getPsp34TokenInfo(apiPromise, contractAddress, contractCaller);
+          break;
+        case _AssetType.GRC20:
+          [name, decimals, symbol, contractError] = await this.getGrc20TokenInfo(apiPromise, contractAddress);
+          break;
       }
-
       return {
         name,
         decimals,

package/services/chain-service/index.js

@@ -15,6 +15,12 @@ import { addLazy, fetchStaticData, filterAssetsByChainAndType, MODULE_SUPPORT }
 import { BehaviorSubject, Subject } from 'rxjs';
 import Web3 from 'web3';
 import { logger as createLogger } from '@polkadot/util/logger';
+const filterChainInfoMap = data => {
+  return Object.fromEntries(Object.entries(data).filter(([, info]) => !info.bitcoinInfo));
+};
+const filterAssetInfoMap = (chainInfo, assets) => {
+  return Object.fromEntries(Object.entries(assets).filter(([, info]) => chainInfo[info.originChain]));
+};
 export class ChainService {
   dataMap = {
     chainInfoMap: {},
@@ -209,7 +215,7 @@ export class ChainService {
     return Object.entries(this.dataMap.chainStateMap).filter(([, chainState]) => _isChainEnabled(chainState)).map(([key]) => key);
   }
   getSupportedSmartContractTypes() {
-    return [_AssetType.ERC20, _AssetType.ERC721, _AssetType.PSP22, _AssetType.PSP34];
+    return [_AssetType.ERC20, _AssetType.ERC721, _AssetType.PSP22, _AssetType.PSP34, _AssetType.GRC20, _AssetType.GRC721];
   }
   getActiveChainInfoMap() {
     const result = {};
@@ -517,10 +523,10 @@ export class ChainService {
       if (latestAssetInfo) {
         const latestAssetPatch = JSON.stringify(latestAssetInfo);
         if (this.assetMapPatch !== latestAssetPatch) {
-          const assetRegistry = {
+          const assetRegistry = filterAssetInfoMap(this.getChainInfoMap(), {
             ...ChainAssetMap,
             ...latestAssetInfo
-          };
+          });
           this.assetMapPatch = latestAssetPatch;
           this.dataMap.assetRegistry = assetRegistry;
           this.assetRegistrySubject.next(assetRegistry);
@@ -825,7 +831,7 @@ export class ChainService {
   }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
-    const defaultChainInfoMap = ChainInfoMap;
+    const defaultChainInfoMap = filterChainInfoMap(ChainInfoMap);
     const storedChainSettingMap = {};
     storedChainSettings.forEach(chainStoredSetting => {
       storedChainSettingMap[chainStoredSetting.slug] = chainStoredSetting;
@@ -935,6 +941,7 @@ export class ChainService {
             deprecatedChainMap[storedSlug] = duplicatedDefaultSlug;
             deprecatedChains.push(storedSlug);
           } else {
+            var _storedChainInfo$bitc;
             mergedChainInfoMap[storedSlug] = {
               slug: storedSlug,
               name: storedChainInfo.name,
@@ -942,6 +949,7 @@ export class ChainService {
               // TODO: review
               evmInfo: storedChainInfo.evmInfo,
               substrateInfo: storedChainInfo.substrateInfo,
+              bitcoinInfo: (_storedChainInfo$bitc = storedChainInfo.bitcoinInfo) !== null && _storedChainInfo$bitc !== void 0 ? _storedChainInfo$bitc : null,
               isTestnet: storedChainInfo.isTestnet,
               chainStatus: storedChainInfo.chainStatus,
               icon: storedChainInfo.icon,
@@ -994,7 +1002,7 @@ export class ChainService {
   }
   async initAssetRegistry(deprecatedCustomChainMap) {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
-    const latestAssetRegistry = ChainAssetMap;
+    const latestAssetRegistry = filterAssetInfoMap(this.getChainInfoMap(), ChainAssetMap);
     const availableChains = Object.values(this.dataMap.chainInfoMap).filter(info => info.chainStatus === _ChainStatus.ACTIVE).map(chainInfo => chainInfo.slug);
 
     // Fill out zk assets from latestAssetRegistry if not supported
@@ -1149,6 +1157,7 @@ export class ChainService {
       providers: params.chainEditInfo.providers,
       substrateInfo,
       evmInfo,
+      bitcoinInfo: null,
       isTestnet: false,
       chainStatus: _ChainStatus.ACTIVE,
       icon: '',
@@ -1393,9 +1402,9 @@ export class ChainService {
   }
   async getSmartContractTokenInfo(contractAddress, tokenType, originChain, contractCaller) {
     if ([_AssetType.ERC721, _AssetType.ERC20].includes(tokenType)) {
-      return await this.evmChainHandler.getSmartContractTokenInfo(contractAddress, tokenType, originChain);
-    } else if ([_AssetType.PSP34, _AssetType.PSP22].includes(tokenType)) {
-      return await this.substrateChainHandler.getSmartContractTokenInfo(contractAddress, tokenType, originChain, contractCaller);
+      return await this.evmChainHandler.getEvmContractTokenInfo(contractAddress, tokenType, originChain);
+    } else if ([_AssetType.PSP34, _AssetType.PSP22, _AssetType.GRC20].includes(tokenType)) {
+      return await this.substrateChainHandler.getSubstrateContractTokenInfo(contractAddress, tokenType, originChain, contractCaller);
     }
     return {
       decimals: -1,

package/services/chain-service/types.js

@@ -12,6 +12,6 @@ export let _ChainConnectionStatus;
   _ChainConnectionStatus["CONNECTING"] = "CONNECTING";
 })(_ChainConnectionStatus || (_ChainConnectionStatus = {}));
 export const _CUSTOM_PREFIX = 'custom-';
-export const _FUNGIBLE_CONTRACT_STANDARDS = [_AssetType.ERC20, _AssetType.PSP22];
+export const _FUNGIBLE_CONTRACT_STANDARDS = [_AssetType.ERC20, _AssetType.PSP22, _AssetType.GRC20];
 export const _NFT_CONTRACT_STANDARDS = [_AssetType.PSP34, _AssetType.ERC721];
 export const _SMART_CONTRACT_STANDARDS = [..._FUNGIBLE_CONTRACT_STANDARDS, ..._NFT_CONTRACT_STANDARDS];

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

@@ -45,6 +45,9 @@ export declare function _getChainSubstrateAddressPrefix(chainInfo: _ChainInfo):
 export declare function _isChainSupportNativeNft(chainInfo: _ChainInfo): boolean;
 export declare function _isChainSupportEvmNft(chainInfo: _ChainInfo): boolean;
 export declare function _isChainSupportWasmNft(chainInfo: _ChainInfo): boolean;
+export declare function _isChainSupportEvmERC20(chainInfo: _ChainInfo): boolean;
+export declare function _isChainSupportWasmPSP22(chainInfo: _ChainInfo): boolean;
+export declare function _isChainSupportGRC20(chainInfo: _ChainInfo): boolean;
 export declare const _isSupportOrdinal: (chain: string) => boolean;
 export declare function _getNftTypesSupportedByChain(chainInfo: _ChainInfo): _AssetType[];
 export declare function _getTokenTypesSupportedByChain(chainInfo: _ChainInfo): _AssetType[];
@@ -54,6 +57,7 @@ export declare function _isLocalToken(tokenInfo: _ChainAsset): boolean;
 export declare function _isTokenEvmSmartContract(tokenInfo: _ChainAsset): boolean;
 export declare function _isTokenWasmSmartContract(tokenInfo: _ChainAsset): boolean;
 export declare function _isAssetSmartContractNft(assetInfo: _ChainAsset): boolean;
+export declare function _isTokenGearSmartContract(tokenInfo: _ChainAsset): boolean;
 export declare function _parseAssetRefKey(originTokenSlug: string, destinationTokenSlug: string): string;
 export declare function _isXcmPathSupported(originTokenSlug: string, destinationTokenSlug: string, assetRefMap: Record<string, _AssetRef>): boolean;
 export declare function _getXcmAssetType(tokenInfo: _ChainAsset): string;

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

@@ -169,6 +169,18 @@ export function _isChainSupportWasmNft(chainInfo) {
   var _chainInfo$substrateI8, _chainInfo$substrateI9;
   return ((_chainInfo$substrateI8 = chainInfo.substrateInfo) === null || _chainInfo$substrateI8 === void 0 ? void 0 : (_chainInfo$substrateI9 = _chainInfo$substrateI8.supportSmartContract) === null || _chainInfo$substrateI9 === void 0 ? void 0 : _chainInfo$substrateI9.includes(_AssetType.PSP34)) || false;
 }
+export function _isChainSupportEvmERC20(chainInfo) {
+  var _chainInfo$evmInfo3, _chainInfo$evmInfo3$s;
+  return ((_chainInfo$evmInfo3 = chainInfo.evmInfo) === null || _chainInfo$evmInfo3 === void 0 ? void 0 : (_chainInfo$evmInfo3$s = _chainInfo$evmInfo3.supportSmartContract) === null || _chainInfo$evmInfo3$s === void 0 ? void 0 : _chainInfo$evmInfo3$s.includes(_AssetType.ERC20)) || false;
+}
+export function _isChainSupportWasmPSP22(chainInfo) {
+  var _chainInfo$substrateI10, _chainInfo$substrateI11;
+  return ((_chainInfo$substrateI10 = chainInfo.substrateInfo) === null || _chainInfo$substrateI10 === void 0 ? void 0 : (_chainInfo$substrateI11 = _chainInfo$substrateI10.supportSmartContract) === null || _chainInfo$substrateI11 === void 0 ? void 0 : _chainInfo$substrateI11.includes(_AssetType.PSP22)) || false;
+}
+export function _isChainSupportGRC20(chainInfo) {
+  var _chainInfo$substrateI12, _chainInfo$substrateI13;
+  return ((_chainInfo$substrateI12 = chainInfo.substrateInfo) === null || _chainInfo$substrateI12 === void 0 ? void 0 : (_chainInfo$substrateI13 = _chainInfo$substrateI12.supportSmartContract) === null || _chainInfo$substrateI13 === void 0 ? void 0 : _chainInfo$substrateI13.includes(_AssetType.GRC20)) || false;
+}
 export const _isSupportOrdinal = chain => {
   const chains = ['polkadot', 'astar', 'bifrost_dot', 'moonbeam'];
   return chains.includes(chain);
@@ -195,7 +207,7 @@ export function _getTokenTypesSupportedByChain(chainInfo) {
   const result = [];
   if (chainInfo.substrateInfo && chainInfo.substrateInfo.supportSmartContract) {
     chainInfo.substrateInfo.supportSmartContract.forEach(assetType => {
-      if ([_AssetType.PSP22].includes(assetType)) {
+      if ([_AssetType.PSP22, _AssetType.GRC20].includes(assetType)) {
         result.push(assetType);
       }
     });
@@ -251,6 +263,9 @@ export function _isTokenWasmSmartContract(tokenInfo) {
 export function _isAssetSmartContractNft(assetInfo) {
   return [_AssetType.PSP34, _AssetType.ERC721].includes(assetInfo.assetType);
 }
+export function _isTokenGearSmartContract(tokenInfo) {
+  return [_AssetType.GRC20, _AssetType.GRC721].includes(tokenInfo.assetType);
+}
 export function _parseAssetRefKey(originTokenSlug, destinationTokenSlug) {
   return `${originTokenSlug}___${destinationTokenSlug}`;
 }
@@ -278,16 +293,16 @@ export function _getXcmTransferType(originChainInfo, destinationChainInfo) {
   return `${((_originChainInfo$subs = originChainInfo.substrateInfo) === null || _originChainInfo$subs === void 0 ? void 0 : _originChainInfo$subs.chainType) || ''}-${((_destinationChainInfo = destinationChainInfo.substrateInfo) === null || _destinationChainInfo === void 0 ? void 0 : _destinationChainInfo.chainType) || ''}`;
 }
 export function _isSubstrateRelayChain(chainInfo) {
-  var _chainInfo$substrateI10;
-  return ((_chainInfo$substrateI10 = chainInfo.substrateInfo) === null || _chainInfo$substrateI10 === void 0 ? void 0 : _chainInfo$substrateI10.chainType) === _SubstrateChainType.RELAYCHAIN;
+  var _chainInfo$substrateI14;
+  return ((_chainInfo$substrateI14 = chainInfo.substrateInfo) === null || _chainInfo$substrateI14 === void 0 ? void 0 : _chainInfo$substrateI14.chainType) === _SubstrateChainType.RELAYCHAIN;
 }
 export function _isSubstrateParaChain(chainInfo) {
-  var _chainInfo$substrateI11;
-  return chainInfo.substrateInfo !== null && chainInfo.substrateInfo.paraId !== null && ((_chainInfo$substrateI11 = chainInfo.substrateInfo) === null || _chainInfo$substrateI11 === void 0 ? void 0 : _chainInfo$substrateI11.chainType) === _SubstrateChainType.PARACHAIN;
+  var _chainInfo$substrateI15;
+  return chainInfo.substrateInfo !== null && chainInfo.substrateInfo.paraId !== null && ((_chainInfo$substrateI15 = chainInfo.substrateInfo) === null || _chainInfo$substrateI15 === void 0 ? void 0 : _chainInfo$substrateI15.chainType) === _SubstrateChainType.PARACHAIN;
 }
 export function _getEvmAbiExplorer(chainInfo) {
-  var _chainInfo$evmInfo3;
-  return ((_chainInfo$evmInfo3 = chainInfo.evmInfo) === null || _chainInfo$evmInfo3 === void 0 ? void 0 : _chainInfo$evmInfo3.abiExplorer) || '';
+  var _chainInfo$evmInfo4;
+  return ((_chainInfo$evmInfo4 = chainInfo.evmInfo) === null || _chainInfo$evmInfo4 === void 0 ? void 0 : _chainInfo$evmInfo4.abiExplorer) || '';
 }
 export function _isAssetValuable(assetInfo) {
   return assetInfo.hasValue;
@@ -325,11 +340,11 @@ export function _getBlockExplorerFromChain(chainInfo) {
     return;
   }
   if (_isPureEvmChain(chainInfo)) {
-    var _chainInfo$evmInfo4;
-    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo4 = chainInfo.evmInfo) === null || _chainInfo$evmInfo4 === void 0 ? void 0 : _chainInfo$evmInfo4.blockExplorer;
+    var _chainInfo$evmInfo5;
+    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo5 = chainInfo.evmInfo) === null || _chainInfo$evmInfo5 === void 0 ? void 0 : _chainInfo$evmInfo5.blockExplorer;
   } else {
-    var _chainInfo$substrateI12;
-    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI12 = chainInfo.substrateInfo) === null || _chainInfo$substrateI12 === void 0 ? void 0 : _chainInfo$substrateI12.blockExplorer;
+    var _chainInfo$substrateI16;
+    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI16 = chainInfo.substrateInfo) === null || _chainInfo$substrateI16 === void 0 ? void 0 : _chainInfo$substrateI16.blockExplorer;
   }
   if (!blockExplorer) {
     return undefined;
@@ -355,8 +370,8 @@ export const _isAssetAutoEnable = chainAsset => {
   return chainAsset.metadata ? !!chainAsset.metadata.autoEnable : false;
 };
 export function _getCrowdloanUrlFromChain(chainInfo) {
-  var _chainInfo$substrateI13;
-  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI13 = chainInfo.substrateInfo) === null || _chainInfo$substrateI13 === void 0 ? void 0 : _chainInfo$substrateI13.crowdloanUrl) || '';
+  var _chainInfo$substrateI17;
+  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI17 = chainInfo.substrateInfo) === null || _chainInfo$substrateI17 === void 0 ? void 0 : _chainInfo$substrateI17.crowdloanUrl) || '';
 }
 export function _isCustomProvider(providerKey) {
   return providerKey.startsWith(_CUSTOM_PREFIX);
@@ -381,8 +396,8 @@ export const findChainInfoByChainId = (chainMap, chainId) => {
     return null;
   }
   for (const chainInfo of Object.values(chainMap)) {
-    var _chainInfo$evmInfo5;
-    if (((_chainInfo$evmInfo5 = chainInfo.evmInfo) === null || _chainInfo$evmInfo5 === void 0 ? void 0 : _chainInfo$evmInfo5.evmChainId) === chainId) {
+    var _chainInfo$evmInfo6;
+    if (((_chainInfo$evmInfo6 = chainInfo.evmInfo) === null || _chainInfo$evmInfo6 === void 0 ? void 0 : _chainInfo$evmInfo6.evmChainId) === chainId) {
       return chainInfo;
     }
   }

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

@@ -5,7 +5,7 @@ import fetch from 'cross-fetch';
 const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
-const ChainListVersion = '0.2.59';
+const ChainListVersion = '0.2.62';
 export async function fetchPatchData(slug) {
   try {
     const fetchPromise = fetch(`${fetchDomain}/patch/${ChainListVersion}/${slug}`);

package/services/earning-service/constants/chains.js

@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export const _STAKING_CHAIN_GROUP = {
-  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet'],
+  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet', 'vara_testnet'],
   para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari', 'manta_network', 'polimec'],
   astar: ['astar', 'shiden', 'shibuya'],
   amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum', 'krest_network'],
   // amplitude and kilt only share some common logic
   kilt: ['kilt', 'kilt_peregrine'],
-  nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet'],
+  nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet', 'vara_testnet'],
   bifrost: ['bifrost', 'bifrost_testnet'],
   aleph: ['aleph', 'alephTest'],
   // A0 has distinct tokenomics

package/services/earning-service/handlers/native-staking/relay-chain.js

@@ -502,6 +502,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       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);
@@ -512,6 +513,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       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);
@@ -619,6 +621,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       const slashingSpanCount = _slashingSpans !== null ? _slashingSpans.spanIndex : '0';
       return chainApi.api.tx.staking.withdrawUnbonded(slashingSpanCount);
     } else {
+      // @ts-ignore
       return chainApi.api.tx.staking.withdrawUnbonded();
     }
   }

package/services/earning-service/handlers/nomination-pool/index.js

@@ -565,6 +565,7 @@ export default class NominationPoolHandler extends BasePoolHandler {
         Id: address
       }, slashingSpanCount);
     } else {
+      // @ts-ignore
       return chainApi.api.tx.nominationPools.withdrawUnbonded({
         Id: address
       });