@subwallet/extension-base 1.3.3-0 → 1.3.5-0

package/services/balance-service/index.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { BalanceError } from '@subwallet/extension-base/background/errors/BalanceError';
-import { BalanceErrorType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { APIItemState, BalanceErrorType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
 import { _isXcmWithinSameConsensus } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { getDefaultTransferProcess, getSnowbridgeTransferProcessFromEvm } from '@subwallet/extension-base/services/balance-service/helpers/process';
@@ -193,7 +193,7 @@ export class BalanceService {
       let unsub = noop;
       unsub = subscribeBalance([address], [chain], [tSlug], assetMap, chainInfoMap, substrateApiMap, evmApiMap, tonApiMap, result => {
         const rs = result[0];
-        if (rs.tokenSlug === tSlug) {
+        if (rs.tokenSlug === tSlug && rs.state !== APIItemState.PENDING) {
           hasError = false;
           const balance = {
             value: rs.free,

package/services/balance-service/transfer/xcm/availBridge.d.ts

@@ -0,0 +1,45 @@
+import { _ChainInfo } from '@subwallet/chain-list/types';
+import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
+import { _NotificationInfo } from '@subwallet/extension-base/services/inapp-notification-service/interfaces';
+import { TransactionConfig } from 'web3-core';
+export declare const AvailBridgeConfig: {
+    ASSET_ID: string;
+    ETHEREUM_DOMAIN: number;
+    AVAIL_DOMAIN: number;
+};
+export interface merkleProof {
+    blobRoot: string;
+    blockHash: string;
+    bridgeRoot: string;
+    dataRoot: string;
+    dataRootCommitment: string;
+    dataRootIndex: number;
+    dataRootProof: DataRootProof;
+    leaf: string;
+    leafIndex: number;
+    leafProof: LeafProof;
+    message: Message;
+    rangeHash: string;
+}
+declare type DataRootProof = `0x${string}`[];
+declare type LeafProof = `0x${string}`[];
+declare type Message = {
+    destinationDomain: number;
+    from: string;
+    id: number;
+    message: {
+        fungibleToken: {
+            amount: bigint;
+            asset_id: `0x${string}`;
+        };
+    };
+    originDomain: number;
+    to: string;
+    messageType: string;
+};
+export declare function getAvailBridgeTxFromEth(originChainInfo: _ChainInfo, sender: string, recipient: string, value: string, evmApi: _EvmApi): Promise<TransactionConfig>;
+export declare function getAvailBridgeExtrinsicFromAvail(recipient: string, sendingValue: string, substrateApi: _SubstrateApi): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
+export declare function getClaimTxOnAvail(notification: _NotificationInfo, substrateApi: _SubstrateApi): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
+export declare function getClaimTxOnEthereum(chainSlug: string, notification: _NotificationInfo, evmApi: _EvmApi): Promise<TransactionConfig>;
+export declare function isAvailChainBridge(chainSlug: string): boolean;
+export {};

package/services/balance-service/transfer/xcm/availBridge.js

@@ -0,0 +1,186 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
+import { getWeb3Contract } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
+import { _AVAIL_BRIDGE_GATEWAY_ABI, _AVAIL_TEST_BRIDGE_GATEWAY_ABI, getAvailBridgeGatewayContract } from '@subwallet/extension-base/koni/api/contract-handler/utils';
+import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
+import { AVAIL_BRIDGE_API } from '@subwallet/extension-base/services/inapp-notification-service/utils';
+import { decodeAddress } from '@subwallet/keyring';
+import { u8aToHex } from '@polkadot/util';
+export const AvailBridgeConfig = {
+  ASSET_ID: '0x0000000000000000000000000000000000000000000000000000000000000000',
+  ETHEREUM_DOMAIN: 2,
+  // todo: check if these config can change later
+  AVAIL_DOMAIN: 1
+};
+export async function getAvailBridgeTxFromEth(originChainInfo, sender, recipient, value, evmApi) {
+  var _priority$maxFeePerGa, _priority$maxPriority;
+  const availBridgeContractAddress = getAvailBridgeGatewayContract(originChainInfo.slug);
+  const ABI = getAvailBridgeAbi(originChainInfo.slug);
+  const availBridgeContract = getWeb3Contract(availBridgeContractAddress, evmApi, ABI);
+  const _address = u8aToHex(decodeAddress(recipient));
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+  const sendAvail = availBridgeContract.methods.sendAVAIL(_address, value);
+  const transferData = sendAvail.encodeABI();
+  const priority = await calculateGasFeeParams(evmApi, evmApi.chainSlug);
+  const gasLimit = await sendAvail.estimateGas({
+    from: sender
+  });
+  return {
+    from: sender,
+    to: availBridgeContractAddress,
+    value: '0',
+    data: transferData,
+    gasPrice: priority.gasPrice,
+    maxFeePerGas: (_priority$maxFeePerGa = priority.maxFeePerGas) === null || _priority$maxFeePerGa === void 0 ? void 0 : _priority$maxFeePerGa.toString(),
+    maxPriorityFeePerGas: (_priority$maxPriority = priority.maxPriorityFeePerGas) === null || _priority$maxPriority === void 0 ? void 0 : _priority$maxPriority.toString(),
+    gas: gasLimit
+  };
+}
+export async function getAvailBridgeExtrinsicFromAvail(recipient, sendingValue, substrateApi) {
+  const data = {
+    message: {
+      FungibleToken: {
+        assetId: AvailBridgeConfig.ASSET_ID,
+        amount: BigInt(sendingValue)
+      }
+    },
+    to: `${recipient.padEnd(66, '0')}`,
+    domain: AvailBridgeConfig.ETHEREUM_DOMAIN
+  };
+  const chainApi = await substrateApi.isReady;
+  return chainApi.api.tx.vector.sendMessage(data.message, data.to, data.domain);
+}
+export async function getClaimTxOnAvail(notification, substrateApi) {
+  const chainApi = await substrateApi.isReady;
+  const chainSlug = chainApi.chainSlug;
+  const metadata = notification.metadata;
+  const lastestEthHeadSlot = await getLastestEthHeadSlot(chainSlug);
+  const lastestBlockHash = await getLastestBlockHash(chainSlug, lastestEthHeadSlot);
+  const proof = await getClaimProofOnAvail(chainSlug, lastestBlockHash, metadata.messageId);
+  return chainApi.api.tx.vector.execute(lastestEthHeadSlot, getAddressMessage(notification), proof.accountProof, proof.storageProof);
+}
+async function getLastestEthHeadSlot(chainSlug) {
+  try {
+    const api = getAvailBridgeApi(chainSlug);
+    const rawResponse = await fetch(`${api}/eth/head`);
+    const response = await rawResponse.json();
+    return response.slot;
+  } catch (e) {
+    console.error(e);
+    throw e;
+  }
+}
+async function getLastestBlockHash(chainSlug, slot) {
+  try {
+    const api = getAvailBridgeApi(chainSlug);
+    const rawResponse = await fetch(`${api}/beacon/slot/${slot}`);
+    const response = await rawResponse.json();
+    return response.blockHash;
+  } catch (e) {
+    console.error(e);
+    throw e;
+  }
+}
+async function getClaimProofOnAvail(chainSlug, blockHash, messageId) {
+  try {
+    const api = getAvailBridgeApi(chainSlug);
+    const rawResponse = await fetch(`${api}/avl/proof/${blockHash}/${messageId}`);
+    return await rawResponse.json();
+  } catch (e) {
+    console.error(e);
+    throw e;
+  }
+}
+async function getClaimProofOnEthereum(chainSlug, blockHash, transactionIndex) {
+  try {
+    const api = getAvailBridgeApi(chainSlug);
+    const rawResponse = await fetch(`${api}/eth/proof/${blockHash}?index=${transactionIndex}`);
+    return await rawResponse.json();
+  } catch (e) {
+    console.error(e);
+    throw e;
+  }
+}
+function getAvailBridgeApi(chainSlug) {
+  if (chainSlug === 'avail_mainnet' || chainSlug === COMMON_CHAIN_SLUGS.ETHEREUM) {
+    // todo: add COMMON_CHAIN_SLUGS for AVAIL, AVAIL TURING
+    return AVAIL_BRIDGE_API.AVAIL_MAINNET;
+  }
+  return AVAIL_BRIDGE_API.AVAIL_TESTNET;
+}
+export async function getClaimTxOnEthereum(chainSlug, notification, evmApi) {
+  var _priority$maxFeePerGa2, _priority$maxPriority2;
+  const availBridgeContractAddress = getAvailBridgeGatewayContract(chainSlug);
+  const ABI = getAvailBridgeAbi(chainSlug);
+  const availBridgeContract = getWeb3Contract(availBridgeContractAddress, evmApi, ABI);
+  const metadata = notification.metadata;
+  const merkleProof = await getClaimProofOnEthereum(chainSlug, metadata.sourceBlockHash, metadata.sourceTransactionIndex);
+
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+  const transfer = availBridgeContract.methods.receiveAVAIL({
+    messageType: '0x02',
+    from: merkleProof.message.from,
+    to: merkleProof.message.to,
+    originDomain: merkleProof.message.originDomain,
+    destinationDomain: merkleProof.message.destinationDomain,
+    data: evmApi.api.eth.abi.encodeParameters([{
+      name: 'assetId',
+      type: 'bytes32'
+    }, {
+      name: 'amount',
+      type: 'uint256'
+    }], [merkleProof.message.message.fungibleToken.asset_id, BigInt(merkleProof.message.message.fungibleToken.amount)]),
+    messageId: merkleProof.message.id
+  }, {
+    dataRootProof: merkleProof.dataRootProof,
+    leafProof: merkleProof.leafProof,
+    rangeHash: merkleProof.rangeHash,
+    dataRootIndex: merkleProof.dataRootIndex,
+    blobRoot: merkleProof.blobRoot,
+    bridgeRoot: merkleProof.bridgeRoot,
+    leaf: merkleProof.leaf,
+    leafIndex: merkleProof.leafIndex
+  });
+  const transferData = transfer.encodeABI();
+  const gasLimit = await transfer.estimateGas({
+    from: metadata.receiverAddress
+  });
+  const priority = await calculateGasFeeParams(evmApi, evmApi.chainSlug);
+  return {
+    from: metadata.receiverAddress,
+    to: availBridgeContractAddress,
+    value: '0',
+    data: transferData,
+    gasPrice: priority.gasPrice,
+    maxFeePerGas: (_priority$maxFeePerGa2 = priority.maxFeePerGas) === null || _priority$maxFeePerGa2 === void 0 ? void 0 : _priority$maxFeePerGa2.toString(),
+    maxPriorityFeePerGas: (_priority$maxPriority2 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority2 === void 0 ? void 0 : _priority$maxPriority2.toString(),
+    gas: gasLimit
+  };
+}
+function getAddressMessage(notification) {
+  const metadata = notification.metadata;
+  return {
+    message: {
+      FungibleToken: {
+        assetId: AvailBridgeConfig.ASSET_ID,
+        amount: metadata.amount
+      }
+    },
+    from: `${metadata.depositorAddress.padEnd(66, '0')}`,
+    to: u8aToHex(decodeAddress(metadata.receiverAddress)),
+    originDomain: AvailBridgeConfig.ETHEREUM_DOMAIN,
+    destinationDomain: AvailBridgeConfig.AVAIL_DOMAIN,
+    id: metadata.messageId
+  };
+}
+function getAvailBridgeAbi(chainSlug) {
+  if (chainSlug === COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA) {
+    return _AVAIL_TEST_BRIDGE_GATEWAY_ABI;
+  }
+  return _AVAIL_BRIDGE_GATEWAY_ABI;
+}
+export function isAvailChainBridge(chainSlug) {
+  return ['avail_mainnet', 'availTuringTest'].includes(chainSlug);
+}

package/services/balance-service/transfer/xcm/index.d.ts

@@ -3,19 +3,19 @@ import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain
 import BigN from 'bignumber.js';
 import { TransactionConfig } from 'web3-core';
 import { SubmittableExtrinsic } from '@polkadot/api/types';
-declare type CreateXcmExtrinsicProps = {
+export declare type CreateXcmExtrinsicProps = {
     originTokenInfo: _ChainAsset;
     destinationTokenInfo: _ChainAsset;
     recipient: string;
     sendingValue: string;
-    substrateApi: _SubstrateApi;
+    evmApi?: _EvmApi;
+    substrateApi?: _SubstrateApi;
     chainInfoMap: Record<string, _ChainInfo>;
+    sender?: string;
 };
-declare type CreateSnowBridgeExtrinsicProps = Omit<CreateXcmExtrinsicProps, 'substrateApi'> & {
-    evmApi: _EvmApi;
-    sender: string;
-};
-export declare const createSnowBridgeExtrinsic: ({ chainInfoMap, destinationTokenInfo, evmApi, originTokenInfo, recipient, sender, sendingValue }: CreateSnowBridgeExtrinsicProps) => Promise<TransactionConfig>;
+export declare type FunctionCreateXcmExtrinsic = (props: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'> | TransactionConfig>;
+export declare const createSnowBridgeExtrinsic: ({ chainInfoMap, destinationTokenInfo, evmApi, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;
 export declare const createXcmExtrinsic: ({ chainInfoMap, destinationTokenInfo, originTokenInfo, recipient, sendingValue, substrateApi }: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'>>;
+export declare const createAvailBridgeTxFromEth: ({ chainInfoMap, evmApi, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;
+export declare const createAvailBridgeExtrinsicFromAvail: ({ recipient, sendingValue, substrateApi }: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'>>;
 export declare const getXcmMockTxFee: (substrateApi: _SubstrateApi, chainInfoMap: Record<string, _ChainInfo>, originTokenInfo: _ChainAsset, destinationTokenInfo: _ChainAsset) => Promise<BigN>;
-export {};

package/services/balance-service/transfer/xcm/index.js

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
+import { getAvailBridgeExtrinsicFromAvail, getAvailBridgeTxFromEth } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { getExtrinsicByPolkadotXcmPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polkadotXcm';
 import { getSnowBridgeEvmTransfer } from '@subwallet/extension-base/services/balance-service/transfer/xcm/snowBridge';
 import { getExtrinsicByXcmPalletPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/xcmPallet';
@@ -10,7 +11,7 @@ import { _XCM_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-servi
 import { _isChainEvmCompatible, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 import BigN from 'bignumber.js';
 import { u8aToHex } from '@polkadot/util';
-import { addressToEvm, isEthereumAddress } from '@polkadot/util-crypto';
+import { addressToEvm } from '@polkadot/util-crypto';
 export const createSnowBridgeExtrinsic = async ({
   chainInfoMap,
   destinationTokenInfo,
@@ -25,6 +26,12 @@ export const createSnowBridgeExtrinsic = async ({
   if (!_isSnowBridgeXcm(originChainInfo, destinationChainInfo)) {
     throw new Error('This is not a valid SnowBridge transfer');
   }
+  if (!evmApi) {
+    throw Error('Evm API is not available');
+  }
+  if (!sender) {
+    throw Error('Sender is required');
+  }
   return getSnowBridgeEvmTransfer(originTokenInfo, originChainInfo, destinationChainInfo, sender, recipient, sendingValue, evmApi);
 };
 export const createXcmExtrinsic = async ({
@@ -37,6 +44,9 @@ export const createXcmExtrinsic = async ({
 }) => {
   const originChainInfo = chainInfoMap[originTokenInfo.originChain];
   const destinationChainInfo = chainInfoMap[destinationTokenInfo.originChain];
+  if (!substrateApi) {
+    throw Error('Substrate API is not available');
+  }
   const chainApi = await substrateApi.isReady;
   const api = chainApi.api;
   const polkadotXcmSpecialCases = _XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChainInfo.slug) && _isNativeToken(originTokenInfo);
@@ -48,24 +58,55 @@ export const createXcmExtrinsic = async ({
   }
   return getExtrinsicByXtokensPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
 };
+export const createAvailBridgeTxFromEth = ({
+  chainInfoMap,
+  evmApi,
+  originTokenInfo,
+  recipient,
+  sender,
+  sendingValue
+}) => {
+  const originChainInfo = chainInfoMap[originTokenInfo.originChain];
+  if (!evmApi) {
+    throw Error('Evm API is not available');
+  }
+  if (!sender) {
+    throw Error('Sender is required');
+  }
+  return getAvailBridgeTxFromEth(originChainInfo, sender, recipient, sendingValue, evmApi);
+};
+export const createAvailBridgeExtrinsicFromAvail = async ({
+  recipient,
+  sendingValue,
+  substrateApi
+}) => {
+  if (!substrateApi) {
+    throw Error('Substrate API is not available');
+  }
+  return await getAvailBridgeExtrinsicFromAvail(recipient, sendingValue, substrateApi);
+};
 export const getXcmMockTxFee = async (substrateApi, chainInfoMap, originTokenInfo, destinationTokenInfo) => {
   try {
     var _paymentInfo$partialF;
     const destChainInfo = chainInfoMap[destinationTokenInfo.originChain];
     const originChainInfo = chainInfoMap[originTokenInfo.originChain];
-    const address = '5DRewsYzhJqZXU3SRaWy1FSt5iDr875ao91aw5fjrJmDG4Ap'; // todo: move this
+    const fakeAddress = '5DRewsYzhJqZXU3SRaWy1FSt5iDr875ao91aw5fjrJmDG4Ap'; // todo: move this
+    const substrateAddress = fakeAddress; // todo: move this
+    const evmAddress = u8aToHex(addressToEvm(fakeAddress)); // todo: move this
 
     // mock receiving account from sender
-    const recipient = !isEthereumAddress(address) && _isChainEvmCompatible(destChainInfo) && !_isChainEvmCompatible(originChainInfo) ? u8aToHex(addressToEvm(address)) : address;
+    const sender = _isChainEvmCompatible(originChainInfo) ? evmAddress : substrateAddress;
+    const recipient = _isChainEvmCompatible(destChainInfo) ? evmAddress : substrateAddress;
     const mockTx = await createXcmExtrinsic({
       chainInfoMap,
       destinationTokenInfo,
       originTokenInfo,
-      recipient: recipient,
+      sender,
+      recipient,
       sendingValue: '1000000000000000000',
       substrateApi
     });
-    const paymentInfo = await mockTx.paymentInfo(address);
+    const paymentInfo = await mockTx.paymentInfo(fakeAddress);
     return new BigN((paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF = paymentInfo.partialFee) === null || _paymentInfo$partialF === void 0 ? void 0 : _paymentInfo$partialF.toString()) || '0');
   } catch (e) {
     console.error('error mocking xcm tx fee', e);

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

@@ -37,6 +37,7 @@ export declare const _NFT_CHAIN_GROUP: {
     vara: string[];
     avail: string[];
     ternoa: string[];
+    rari: string[];
 };
 export declare const _STAKING_ERA_LENGTH_MAP: Record<string, number>;
 export declare const _EXPECTED_BLOCK_TIME: Record<string, number>;

package/services/chain-service/constants.js

@@ -52,7 +52,8 @@ export const _NFT_CHAIN_GROUP = {
   bitcountry: ['bitcountry', 'pioneer', 'continuum_network'],
   vara: ['vara_network'],
   avail: ['avail_mainnet'],
-  ternoa: ['ternoa', 'ternoa_alphanet']
+  ternoa: ['ternoa', 'ternoa_alphanet'],
+  rari: ['rari']
 };
 
 // Staking--------------------------------------------------------------------------------------------------------------

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

@@ -72,15 +72,11 @@ export class EvmApi {
   createIntervalCheckApi() {
     this.clearIntervalCheckApi();
     return setInterval(() => {
-      if (!this.ignoreNetListen) {
-        this.api.eth.net.isListening().then(() => {
-          this.onConnect();
-        }).catch(() => {
-          this.onDisconnect();
-        });
-      } else {
+      this.api.eth.getChainId().then(() => {
         this.onConnect();
-      }
+      }).catch(() => {
+        this.onDisconnect();
+      });
     }, 10000);
   }
   clearIntervalCheckApi() {
@@ -93,21 +89,16 @@ export class EvmApi {
     this.updateConnectionStatus(_ChainConnectionStatus.CONNECTING);
 
     // Check if api is ready
-    if (!this.ignoreNetListen) {
-      this.api.eth.net.isListening().then(() => {
-        this.isApiReadyOnce = true;
-        this.onConnect();
-      }).catch(error => {
-        this.isApiReadyOnce = false;
-        this.isApiReady = false;
-        this.isReadyHandler.reject(error);
-        this.updateConnectionStatus(_ChainConnectionStatus.DISCONNECTED);
-        console.warn(`Can not connect to ${this.chainSlug} (EVM) at ${this.apiUrl}`);
-      });
-    } else {
+    this.api.eth.getChainId().then(() => {
       this.isApiReadyOnce = true;
       this.onConnect();
-    }
+    }).catch(error => {
+      this.isApiReadyOnce = false;
+      this.isApiReady = false;
+      this.isReadyHandler.reject(error);
+      this.updateConnectionStatus(_ChainConnectionStatus.DISCONNECTED);
+      console.warn(`Can not connect to ${this.chainSlug} (EVM) at ${this.apiUrl}`);
+    });
 
     // Interval to check connecting status
     this.intervalCheckApi = this.createIntervalCheckApi();

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

@@ -110,7 +110,6 @@ export class EvmChainHandler extends AbstractChainHandler {
     const evmApi = this.getEvmApiByChain(originChain);
     try {
       if (tokenType === _AssetType.ERC721) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
         tokenContract = new evmApi.api.eth.Contract(_ERC721_ABI, contractAddress);
         const [_name, _symbol] = await Promise.all([
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
@@ -120,7 +119,6 @@ export class EvmChainHandler extends AbstractChainHandler {
         name = _name;
         symbol = _symbol;
       } else {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
         tokenContract = new evmApi.api.eth.Contract(_ERC20_ABI, contractAddress);
         const [_decimals, _symbol, _name] = await Promise.all([
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access

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

@@ -17,9 +17,10 @@ export declare class SubstrateChainHandler extends AbstractChainHandler {
     getChainSpec(substrateApi: _SubstrateApi): Promise<_SubstrateChainSpec>;
     private getPsp22TokenInfo;
     private getPsp34TokenInfo;
-    private getGrc20TokenInfo;
-    private getVftTokenInfo;
+    private getVaraFungibleTokenInfo;
+    private getLocalTokenInfo;
     getSubstrateContractTokenInfo(contractAddress: string, tokenType: _AssetType, originChain: string, contractCaller?: string): Promise<_SmartContractTokenInfo>;
+    getSubstrateAssetIdTokenInfo(assetId: string, originChain: 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

@@ -107,6 +107,12 @@ export class SubstrateChainHandler extends AbstractChainHandler {
   }
   async getPsp22TokenInfo(apiPromise, contractAddress, contractCaller) {
     const tokenContract = new ContractPromise(apiPromise, _PSP22_ABI, contractAddress);
+    const tokenSmartContract = {
+      name: '',
+      decimals: -1,
+      symbol: '',
+      contractError: false
+    };
     const [nameResp, symbolResp, decimalsResp] = await Promise.all([tokenContract.query['psp22Metadata::tokenName'](contractCaller || contractAddress, {
       gasLimit: getDefaultWeightV2(apiPromise)
     }),
@@ -117,91 +123,118 @@ export class SubstrateChainHandler extends AbstractChainHandler {
       gasLimit: getDefaultWeightV2(apiPromise)
     })]);
     if (!(nameResp.result.isOk && symbolResp.result.isOk && decimalsResp.result.isOk) || !nameResp.output || !decimalsResp.output || !symbolResp.output) {
-      return ['', 1, '', true];
+      tokenSmartContract.contractError = true;
+      return tokenSmartContract;
     } 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;
+      tokenSmartContract.name = nameResp.output ? nameObj.Ok || nameObj.ok : '';
+      tokenSmartContract.decimals = decimalsResp.output ? new BN(decimalsObj.Ok || decimalsObj.ok).toNumber() : 0;
+      tokenSmartContract.symbol = decimalsResp.output ? symbolObj.Ok || symbolObj.ok : '';
+      if (!tokenSmartContract.name || !tokenSmartContract.symbol || typeof tokenSmartContract.name === 'object' || typeof tokenSmartContract.symbol === 'object') {
+        tokenSmartContract.contractError = true;
       }
-      return [name, decimals, symbol, contractError];
+      return tokenSmartContract;
     }
   }
   async getPsp34TokenInfo(apiPromise, contractAddress, contractCaller) {
     const tokenContract = new ContractPromise(apiPromise, _PSP34_ABI, contractAddress);
+    const tokenSmartContract = {
+      name: '',
+      decimals: -1,
+      symbol: '',
+      contractError: false
+    };
     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];
+      tokenSmartContract.contractError = true;
+      return tokenSmartContract;
     } 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;
+        tokenSmartContract.contractError = true;
       }
-      return ['', -1, '', contractError];
+      return tokenSmartContract;
     }
   }
-  async getGrc20TokenInfo(apiPromise, contractAddress) {
+  async getVaraFungibleTokenInfo(apiPromise, contractAddress, tokenType) {
+    const tokenSmartContract = {
+      name: '',
+      decimals: -1,
+      symbol: '',
+      contractError: false
+    };
     if (!(apiPromise instanceof GearApi)) {
-      console.warn('Cannot subscribe GRC20 balance without GearApi instance');
-      return ['', -1, '', true];
+      if (tokenType === _AssetType.GRC20) {
+        console.warn('Cannot subscribe GRC20 balance without GearApi instance');
+      } else if (tokenType === _AssetType.VFT) {
+        console.warn('Cannot subscribe VFT balance without GearApi instance');
+      }
+      tokenSmartContract.contractError = true;
+      return tokenSmartContract;
     }
-    let contractError = false;
-    const tokenContract = getGRC20ContractPromise(apiPromise, contractAddress);
+    const tokenContract = tokenType === _AssetType.GRC20 ? getGRC20ContractPromise(apiPromise, contractAddress) : getVFTContractPromise(apiPromise, contractAddress);
     const [nameRes, symbolRes, decimalsRes] = await Promise.all([tokenContract.service.name(GEAR_DEFAULT_ADDRESS), tokenContract.service.symbol(GEAR_DEFAULT_ADDRESS), tokenContract.service.decimals(GEAR_DEFAULT_ADDRESS)]);
-    const decimals = typeof decimalsRes === 'string' ? parseInt(decimalsRes) : decimalsRes;
+    const decimals = parseInt(decimalsRes.toString());
+    tokenSmartContract.name = nameRes;
+    tokenSmartContract.decimals = decimals;
+    tokenSmartContract.symbol = symbolRes;
     if (!nameRes || !symbolRes) {
-      contractError = true;
+      tokenSmartContract.contractError = true;
     }
-    return [nameRes, decimals, symbolRes, contractError];
+    return tokenSmartContract;
   }
-  async getVftTokenInfo(apiPromise, contractAddress) {
-    if (!(apiPromise instanceof GearApi)) {
-      console.warn('Cannot subscribe VFT balance without GearApi instance');
-      return ['', -1, '', true];
+  async getLocalTokenInfo(apiPromise, assetId) {
+    const _metadata = await apiPromise.query.assets.metadata(assetId);
+    const metadata = _metadata.toPrimitive();
+    let idError = false;
+    if (!metadata.name || !metadata.symbol) {
+      idError = true;
     }
-    let contractError = false;
-    const tokenContract = getVFTContractPromise(apiPromise, contractAddress);
-    const [nameRes, symbolRes, decimalsRes] = await Promise.all([tokenContract.service.name(GEAR_DEFAULT_ADDRESS), tokenContract.service.symbol(GEAR_DEFAULT_ADDRESS), tokenContract.service.decimals(GEAR_DEFAULT_ADDRESS)]);
-    const decimals = typeof decimalsRes === 'string' ? parseInt(decimalsRes) : decimalsRes;
-    if (!nameRes || !symbolRes) {
-      contractError = true;
-    }
-    return [nameRes, decimals, symbolRes, contractError];
+    return [metadata.name, metadata.decimals, metadata.symbol, idError];
   }
   async getSubstrateContractTokenInfo(contractAddress, tokenType, originChain, contractCaller) {
     // todo: improve this funtion later
 
-    let name = '';
-    let decimals = -1;
-    let symbol = '';
-    let contractError = false;
+    let tokenSmartContract = {
+      name: '',
+      decimals: -1,
+      symbol: '',
+      contractError: false
+    };
     const apiPromise = this.getSubstrateApiByChain(originChain).api;
     try {
       switch (tokenType) {
         case _AssetType.PSP22:
-          [name, decimals, symbol, contractError] = await this.getPsp22TokenInfo(apiPromise, contractAddress, contractCaller);
+          tokenSmartContract = await this.getPsp22TokenInfo(apiPromise, contractAddress, contractCaller);
           break;
         case _AssetType.PSP34:
-          [name, decimals, symbol, contractError] = await this.getPsp34TokenInfo(apiPromise, contractAddress, contractCaller);
+          tokenSmartContract = await this.getPsp34TokenInfo(apiPromise, contractAddress, contractCaller);
           break;
         case _AssetType.GRC20:
-          [name, decimals, symbol, contractError] = await this.getGrc20TokenInfo(apiPromise, contractAddress);
+          tokenSmartContract = await this.getVaraFungibleTokenInfo(apiPromise, contractAddress, tokenType);
           break;
         case _AssetType.VFT:
-          [name, decimals, symbol, contractError] = await this.getVftTokenInfo(apiPromise, contractAddress);
+          tokenSmartContract = await this.getVaraFungibleTokenInfo(apiPromise, contractAddress, tokenType);
           break;
       }
+      return tokenSmartContract;
+    } catch (e) {
+      this.logger.error(e);
+      tokenSmartContract.contractError = true;
+      return tokenSmartContract;
+    }
+  }
+  async getSubstrateAssetIdTokenInfo(assetId, originChain) {
+    const apiPromise = this.getSubstrateApiByChain(originChain).api;
+    try {
+      const [name, decimals, symbol, contractError] = await this.getLocalTokenInfo(apiPromise, assetId);
       return {
         name,
         decimals,