@subwallet/extension-base 1.3.2-0 → 1.3.4-0

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

@@ -19,9 +19,7 @@ var _wasm = require("@subwallet/extension-base/koni/api/contract-handler/wasm");
 var _utils = require("@subwallet/extension-base/koni/api/contract-handler/wasm/utils");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
-var _tao = require("@subwallet/extension-base/services/earning-service/handlers/native-staking/tao");
-var _utils3 = require("@subwallet/extension-base/services/earning-service/utils");
-var _utils4 = require("@subwallet/extension-base/utils");
+var _utils3 = require("@subwallet/extension-base/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _evm = require("../evm");
 var _equilibrium = require("./equilibrium");
@@ -140,11 +138,11 @@ const subscribeWithSystemAccountPallet = async _ref => {
       args: addresses
     });
   }
-  let bittensorStakingBalances = new Array(addresses.length).fill(BigInt(0));
+  let bittensorStakingBalances = new Array(addresses.length).fill(new _bignumber.default(0));
   if (['bittensor'].includes(chainInfo.slug)) {
     bittensorStakingBalances = await Promise.all(addresses.map(async address => {
-      const rawDelegateState = await (0, _tao.fetchTaoDelegateState)(address);
-      return (0, _utils3.getTaoTotalStake)(rawDelegateState);
+      const TaoTotalStake = await substrateApi.api.query.subtensorModule.totalColdkeyStake(address);
+      return new _bignumber.default(TaoTotalStake.toString());
     }));
   }
   const subscription = substrateApi.subscribeDataWithMulti(params, rs => {
@@ -160,7 +158,8 @@ const subscribeWithSystemAccountPallet = async _ref => {
         const nominationPoolBalance = poolMemberInfo ? (0, _nominationpoolsPallet._getTotalStakeInNominationPool)(poolMemberInfo) : BigInt(0);
         totalLockedFromTransfer += nominationPoolBalance;
       }
-      totalLockedFromTransfer += bittensorStakingBalances[index];
+      const stakeValue = BigInt(bittensorStakingBalances[index].toString());
+      totalLockedFromTransfer += stakeValue;
       return {
         address: addresses[index],
         tokenSlug: (0, _utils2._getChainNativeTokenSlug)(chainInfo),
@@ -199,7 +198,7 @@ const subscribeForeignAssetBalance = async _ref2 => {
     substrateApi
   } = _ref2;
   const foreignAssetsAccountKey = 'query_foreignAssets_account';
-  const tokenMap = (0, _utils4.filterAssetsByChainAndType)(assetMap, chainInfo.slug, [_types._AssetType.LOCAL]);
+  const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chainInfo.slug, [_types._AssetType.LOCAL]);
   const unsubList = await Promise.all(Object.values(tokenMap).map(tokenInfo => {
     try {
       if ((0, _utils2._isBridgedToken)(tokenInfo)) {
@@ -266,7 +265,7 @@ const subscribePSP22Balance = _ref3 => {
   } = _ref3;
   const chain = chainInfo.slug;
   const psp22ContractMap = {};
-  const tokenList = (0, _utils4.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.PSP22]);
+  const tokenList = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.PSP22]);
   Object.entries(tokenList).forEach(_ref4 => {
     let [slug, tokenInfo] = _ref4;
     psp22ContractMap[slug] = (0, _wasm.getPSP22ContractPromise)(substrateApi.api, (0, _utils2._getContractAddressOfToken)(tokenInfo));
@@ -327,7 +326,7 @@ const subscribeTokensAccountsPallet = async _ref5 => {
   } = _ref5;
   const tokensAccountsKey = 'query_tokens_accounts';
   const tokenTypes = includeNativeToken ? [_types._AssetType.NATIVE, _types._AssetType.LOCAL] : [_types._AssetType.LOCAL];
-  const tokenMap = (0, _utils4.filterAssetsByChainAndType)(assetMap, chainInfo.slug, tokenTypes);
+  const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chainInfo.slug, tokenTypes);
   const unsubList = await Promise.all(Object.values(tokenMap).map(tokenInfo => {
     try {
       const params = [{
@@ -373,7 +372,7 @@ const subscribeAssetsAccountPallet = async _ref6 => {
     substrateApi
   } = _ref6;
   const assetsAccountKey = 'query_assets_account';
-  const tokenMap = (0, _utils4.filterAssetsByChainAndType)(assetMap, chainInfo.slug, [_types._AssetType.LOCAL]);
+  const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chainInfo.slug, [_types._AssetType.LOCAL]);
   Object.values(tokenMap).forEach(token => {
     if (_constants2._MANTA_ZK_CHAIN_GROUP.includes(token.originChain) && token.symbol.startsWith(_constants2._ZK_ASSET_PREFIX)) {
       delete tokenMap[token.slug];
@@ -442,7 +441,7 @@ const subscribeOrmlTokensPallet = async _ref7 => {
     substrateApi
   } = _ref7;
   const ormlTokensAccountsKey = 'query_ormlTokens_accounts';
-  const tokenMap = (0, _utils4.filterAssetsByChainAndType)(assetMap, chainInfo.slug, [_types._AssetType.LOCAL]);
+  const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chainInfo.slug, [_types._AssetType.LOCAL]);
   const unsubList = Object.values(tokenMap).map(tokenInfo => {
     try {
       const params = [{

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

@@ -0,0 +1,198 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AvailBridgeConfig = void 0;
+exports.getAvailBridgeExtrinsicFromAvail = getAvailBridgeExtrinsicFromAvail;
+exports.getAvailBridgeTxFromEth = getAvailBridgeTxFromEth;
+exports.getClaimTxOnAvail = getClaimTxOnAvail;
+exports.getClaimTxOnEthereum = getClaimTxOnEthereum;
+exports.isAvailChainBridge = isAvailChainBridge;
+var _chainList = require("@subwallet/chain-list");
+var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
+var _utils = require("@subwallet/extension-base/koni/api/contract-handler/utils");
+var _utils2 = require("@subwallet/extension-base/services/fee-service/utils");
+var _utils3 = require("@subwallet/extension-base/services/inapp-notification-service/utils");
+var _keyring = require("@subwallet/keyring");
+var _util = require("@polkadot/util");
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+const AvailBridgeConfig = {
+  ASSET_ID: '0x0000000000000000000000000000000000000000000000000000000000000000',
+  ETHEREUM_DOMAIN: 2,
+  // todo: check if these config can change later
+  AVAIL_DOMAIN: 1
+};
+exports.AvailBridgeConfig = AvailBridgeConfig;
+async function getAvailBridgeTxFromEth(originChainInfo, sender, recipient, value, evmApi) {
+  var _priority$maxFeePerGa, _priority$maxPriority;
+  const availBridgeContractAddress = (0, _utils.getAvailBridgeGatewayContract)(originChainInfo.slug);
+  const ABI = getAvailBridgeAbi(originChainInfo.slug);
+  const availBridgeContract = (0, _web.getWeb3Contract)(availBridgeContractAddress, evmApi, ABI);
+  const _address = (0, _util.u8aToHex)((0, _keyring.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 (0, _utils2.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
+  };
+}
+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);
+}
+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 === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM) {
+    // todo: add COMMON_CHAIN_SLUGS for AVAIL, AVAIL TURING
+    return _utils3.AVAIL_BRIDGE_API.AVAIL_MAINNET;
+  }
+  return _utils3.AVAIL_BRIDGE_API.AVAIL_TESTNET;
+}
+async function getClaimTxOnEthereum(chainSlug, notification, evmApi) {
+  var _priority$maxFeePerGa2, _priority$maxPriority2;
+  const availBridgeContractAddress = (0, _utils.getAvailBridgeGatewayContract)(chainSlug);
+  const ABI = getAvailBridgeAbi(chainSlug);
+  const availBridgeContract = (0, _web.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 (0, _utils2.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: (0, _util.u8aToHex)((0, _keyring.decodeAddress)(metadata.receiverAddress)),
+    originDomain: AvailBridgeConfig.ETHEREUM_DOMAIN,
+    destinationDomain: AvailBridgeConfig.AVAIL_DOMAIN,
+    id: metadata.messageId
+  };
+}
+function getAvailBridgeAbi(chainSlug) {
+  if (chainSlug === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA) {
+    return _utils._AVAIL_TEST_BRIDGE_GATEWAY_ABI;
+  }
+  return _utils._AVAIL_BRIDGE_GATEWAY_ABI;
+}
+function isAvailChainBridge(chainSlug) {
+  return ['avail_mainnet', 'availTuringTest'].includes(chainSlug);
+}

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

@@ -4,8 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getXcmMockTxFee = exports.createXcmExtrinsic = exports.createSnowBridgeExtrinsic = void 0;
+exports.getXcmMockTxFee = exports.createXcmExtrinsic = exports.createSnowBridgeExtrinsic = exports.createAvailBridgeTxFromEth = exports.createAvailBridgeExtrinsicFromAvail = void 0;
 var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
+var _availBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge");
 var _polkadotXcm = require("@subwallet/extension-base/services/balance-service/transfer/xcm/polkadotXcm");
 var _snowBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/snowBridge");
 var _xcmPallet = require("@subwallet/extension-base/services/balance-service/transfer/xcm/xcmPallet");
@@ -33,6 +34,12 @@ const createSnowBridgeExtrinsic = async _ref => {
   if (!(0, _xcmParser._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 (0, _snowBridge.getSnowBridgeEvmTransfer)(originTokenInfo, originChainInfo, destinationChainInfo, sender, recipient, sendingValue, evmApi);
 };
 exports.createSnowBridgeExtrinsic = createSnowBridgeExtrinsic;
@@ -47,6 +54,9 @@ const createXcmExtrinsic = async _ref2 => {
   } = _ref2;
   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 = _constants._XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChainInfo.slug) && (0, _utils._isNativeToken)(originTokenInfo);
@@ -59,24 +69,59 @@ const createXcmExtrinsic = async _ref2 => {
   return (0, _xTokens.getExtrinsicByXtokensPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
 };
 exports.createXcmExtrinsic = createXcmExtrinsic;
+const createAvailBridgeTxFromEth = _ref3 => {
+  let {
+    chainInfoMap,
+    evmApi,
+    originTokenInfo,
+    recipient,
+    sender,
+    sendingValue
+  } = _ref3;
+  const originChainInfo = chainInfoMap[originTokenInfo.originChain];
+  if (!evmApi) {
+    throw Error('Evm API is not available');
+  }
+  if (!sender) {
+    throw Error('Sender is required');
+  }
+  return (0, _availBridge.getAvailBridgeTxFromEth)(originChainInfo, sender, recipient, sendingValue, evmApi);
+};
+exports.createAvailBridgeTxFromEth = createAvailBridgeTxFromEth;
+const createAvailBridgeExtrinsicFromAvail = async _ref4 => {
+  let {
+    recipient,
+    sendingValue,
+    substrateApi
+  } = _ref4;
+  if (!substrateApi) {
+    throw Error('Substrate API is not available');
+  }
+  return await (0, _availBridge.getAvailBridgeExtrinsicFromAvail)(recipient, sendingValue, substrateApi);
+};
+exports.createAvailBridgeExtrinsicFromAvail = createAvailBridgeExtrinsicFromAvail;
 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 = (0, _util.u8aToHex)((0, _utilCrypto.addressToEvm)(fakeAddress)); // todo: move this
 
     // mock receiving account from sender
-    const recipient = !(0, _utilCrypto.isEthereumAddress)(address) && (0, _utils._isChainEvmCompatible)(destChainInfo) && !(0, _utils._isChainEvmCompatible)(originChainInfo) ? (0, _util.u8aToHex)((0, _utilCrypto.addressToEvm)(address)) : address;
+    const sender = (0, _utils._isChainEvmCompatible)(originChainInfo) ? evmAddress : substrateAddress;
+    const recipient = (0, _utils._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 _bignumber.default((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/cjs/services/chain-service/handler/EvmApi.js

@@ -80,15 +80,11 @@ 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() {
@@ -101,21 +97,16 @@ class EvmApi {
     this.updateConnectionStatus(_types._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(_types._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(_types._ChainConnectionStatus.DISCONNECTED);
+      console.warn(`Can not connect to ${this.chainSlug} (EVM) at ${this.apiUrl}`);
+    });
 
     // Interval to check connecting status
     this.intervalCheckApi = this.createIntervalCheckApi();

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

@@ -186,6 +186,15 @@ class SubstrateChainHandler extends _AbstractChainHandler.AbstractChainHandler {
     }
     return [nameRes, decimals, symbolRes, contractError];
   }
+  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;
+    }
+    return [metadata.name, metadata.decimals, metadata.symbol, idError];
+  }
   async getSubstrateContractTokenInfo(contractAddress, tokenType, originChain, contractCaller) {
     // todo: improve this funtion later
 
@@ -225,6 +234,26 @@ class SubstrateChainHandler extends _AbstractChainHandler.AbstractChainHandler {
       };
     }
   }
+  async getSubstrateAssetIdTokenInfo(assetId, originChain) {
+    const apiPromise = this.getSubstrateApiByChain(originChain).api;
+    try {
+      const [name, decimals, symbol, contractError] = await this.getLocalTokenInfo(apiPromise, assetId);
+      return {
+        name,
+        decimals,
+        symbol,
+        contractError
+      };
+    } catch (e) {
+      this.logger.error(e);
+      return {
+        name: '',
+        decimals: -1,
+        symbol: '',
+        contractError: true
+      };
+    }
+  }
   setSubstrateApi(chainSlug, substrateApi) {
     this.substrateApiMap[chainSlug] = substrateApi;
   }

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

@@ -201,6 +201,15 @@ class ChainService {
     });
     return filteredAssetRegistry;
   }
+  getAssetHubToken() {
+    const assetHubToken = {};
+    Object.values(this.getAssetRegistry()).forEach(asset => {
+      if (['statemint', 'statemine'].includes(asset.originChain)) {
+        assetHubToken[asset.slug] = asset;
+      }
+    });
+    return assetHubToken;
+  }
   getChainInfoMap() {
     return this.dataMap.chainInfoMap;
   }
@@ -458,7 +467,7 @@ class ChainService {
   upsertCustomToken(token) {
     if (token.slug.length === 0) {
       // new token
-      if (token.assetType === _types._AssetType.NATIVE) {
+      if (token.assetType === _types._AssetType.NATIVE || token.assetType === _types._AssetType.LOCAL) {
         const defaultSlug = this.generateSlugForNativeToken(token.originChain, token.assetType, token.symbol);
         token.slug = `${_types3._CUSTOM_PREFIX}${defaultSlug}`;
       } else {
@@ -467,7 +476,7 @@ class ChainService {
         token.slug = `${_types3._CUSTOM_PREFIX}${defaultSlug}`;
       }
     }
-    if (token.originChain && (0, _utils._isAssetFungibleToken)(token)) {
+    if (token.originChain && ((0, _utils._isAssetFungibleToken)(token) || (0, _utils._isLocalToken)(token))) {
       var _this$getChainInfoByK;
       token.hasValue = !((_this$getChainInfoByK = this.getChainInfoByKey(token.originChain)) !== null && _this$getChainInfoByK !== void 0 && _this$getChainInfoByK.isTestnet);
     }
@@ -1540,13 +1549,35 @@ class ChainService {
       contractError: false
     };
   }
+  async getAssetIdTokenInfo(assetId, tokenType, chain) {
+    if ([_types._AssetType.LOCAL].includes(tokenType) && assetId) {
+      return await this.substrateChainHandler.getSubstrateAssetIdTokenInfo(assetId, chain);
+    }
+    return {
+      decimals: -1,
+      name: '',
+      symbol: '',
+      contractError: false
+    };
+  }
   async validateCustomToken(data) {
     const assetRegistry = this.getSmartContractTokens();
+    const asset = this.getAssetHubToken();
     let existedToken;
     for (const token of Object.values(assetRegistry)) {
       var _token$metadata2;
       const contractAddress = token === null || token === void 0 ? void 0 : (_token$metadata2 = token.metadata) === null || _token$metadata2 === void 0 ? void 0 : _token$metadata2.contractAddress;
-      if ((0, _utils._isEqualContractAddress)(contractAddress, data.contractAddress) && token.assetType === data.type && token.originChain === data.originChain) {
+      if (data.contractAddress) {
+        if ((0, _utils._isEqualContractAddress)(contractAddress, data.contractAddress) && token.assetType === data.type && token.originChain === data.originChain) {
+          existedToken = token;
+          break;
+        }
+      }
+    }
+    for (const token of Object.values(asset)) {
+      var _token$metadata3;
+      const assetId = token === null || token === void 0 ? void 0 : (_token$metadata3 = token.metadata) === null || _token$metadata3 === void 0 ? void 0 : _token$metadata3.assetId;
+      if (assetId === data.assetId && token.assetType === data.type && token.originChain === data.originChain) {
         existedToken = token;
         break;
       }
@@ -1562,18 +1593,18 @@ class ChainService {
         contractError: false
       };
     }
-    const {
-      contractError,
-      decimals,
-      name,
-      symbol
-    } = await this.getSmartContractTokenInfo(data.contractAddress, data.type, data.originChain, data.contractCaller);
+    let info;
+    if (data.contractAddress) {
+      info = await this.getSmartContractTokenInfo(data.contractAddress, data.type, data.originChain, data.contractCaller);
+    } else {
+      info = await this.getAssetIdTokenInfo(data.assetId, data.type, data.originChain);
+    }
     return {
-      name,
-      decimals,
-      symbol,
+      name: info.name,
+      decimals: info.decimals,
+      symbol: info.symbol,
       isExist: !!existedToken,
-      contractError
+      contractError: info.contractError
     };
   }
   generateSlugForSmartContractAsset(originChain, assetType, symbol, contractAddress) {

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

@@ -42,6 +42,8 @@ var _exportNames = {
   _isChainSupportWasmNft: true,
   _isChainSupportEvmERC20: true,
   _isChainSupportWasmPSP22: true,
+  _isAssetHubChain: true,
+  _isAssetHubToken: true,
   _isChainSupportGRC20: true,
   _isChainSupportVFT: true,
   _isSupportOrdinal: true,
@@ -77,6 +79,7 @@ var _exportNames = {
   _getAssetDecimals: true,
   _getBlockExplorerFromChain: true,
   _parseMetadataForSmartContractAsset: true,
+  _parseMetadataForAssetId: true,
   _isChainTestNet: true,
   _isAssetFungibleToken: true,
   _isAssetAutoEnable: true,
@@ -132,6 +135,8 @@ exports._getXcmTransferType = _getXcmTransferType;
 exports._isAssetAutoEnable = void 0;
 exports._isAssetCanPayTxFee = _isAssetCanPayTxFee;
 exports._isAssetFungibleToken = _isAssetFungibleToken;
+exports._isAssetHubChain = _isAssetHubChain;
+exports._isAssetHubToken = _isAssetHubToken;
 exports._isAssetSmartContractNft = _isAssetSmartContractNft;
 exports._isAssetValuable = _isAssetValuable;
 exports._isBridgedToken = _isBridgedToken;
@@ -176,6 +181,7 @@ exports._isTokenTransferredByTon = _isTokenTransferredByTon;
 exports._isTokenWasmSmartContract = _isTokenWasmSmartContract;
 exports._isXcmPathSupported = _isXcmPathSupported;
 exports._parseAssetRefKey = _parseAssetRefKey;
+exports._parseMetadataForAssetId = _parseMetadataForAssetId;
 exports._parseMetadataForSmartContractAsset = _parseMetadataForSmartContractAsset;
 exports.findChainInfoByHalfGenesisHash = exports.findChainInfoByChainId = void 0;
 exports.randomizeProvider = randomizeProvider;
@@ -388,6 +394,12 @@ 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(_types._AssetType.PSP22)) || false;
 }
+function _isAssetHubChain(chainInfo) {
+  return ['statemint', 'statemine'].includes(chainInfo.slug);
+}
+function _isAssetHubToken(token) {
+  return ['statemint', 'statemine'].includes(token.originChain);
+}
 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(_types._AssetType.GRC20)) || false;
@@ -435,6 +447,9 @@ function _getTokenTypesSupportedByChain(chainInfo) {
       }
     });
   }
+  if (['statemint', 'statemine'].includes(chainInfo.slug)) {
+    result.push(_types._AssetType.LOCAL);
+  }
   return result;
 }
 function _getChainNativeTokenBasicInfo(chainInfo) {
@@ -588,6 +603,11 @@ function _parseMetadataForSmartContractAsset(contractAddress) {
     contractAddress
   };
 }
+function _parseMetadataForAssetId(assetId) {
+  return {
+    assetId
+  };
+}
 function _isChainTestNet(chainInfo) {
   return chainInfo.isTestnet || false;
 }