Support Rune and BRC-20

local-libs/chain-list/cjs/types.js

@@ -30,6 +30,8 @@ exports._AssetType = _AssetType;
   _AssetType["PSP22"] = "PSP22";
   _AssetType["PSP34"] = "PSP34";
   _AssetType["UNKNOWN"] = "UNKNOWN";
+  _AssetType["RUNE"] = "RUNE";
+  _AssetType["BRC20"] = "BRC20";
 })(_AssetType || (exports._AssetType = _AssetType = {}));
 let _SubstrateChainType;
 exports._SubstrateChainType = _SubstrateChainType;
@@ -51,4 +53,4 @@ exports._AssetRefPath = _AssetRefPath;
   _AssetRefPath["XCM"] = "XCM";
   _AssetRefPath["MANTA_ZK"] = "MANTA_ZK";
   _AssetRefPath["SWAP"] = "SWAP";
-})(_AssetRefPath || (exports._AssetRefPath = _AssetRefPath = {}));
+})(_AssetRefPath || (exports._AssetRefPath = _AssetRefPath = {}));

local-libs/chain-list/data/ChainAsset.json

@@ -9235,5 +9235,95 @@
     "multiChainAsset": null,
     "hasValue": false,
     "icon": "https://dev.sw-chain-list-assets.pages.dev/assets/chain-assets/botanixevmtest-native-btc.png"
+  },
+  "bitcoin-RUNE-RUNING*BITCOIN-841052:1863": {
+    "originChain": "bitcoin",
+    "slug": "bitcoin-RUNE-RUNING*BITCOIN-841052:1863",
+    "name": "RUNING BITCOIN",
+    "symbol": "RUNING*BITCOIN",
+    "decimals": 8,
+    "priceId": null,
+    "minAmount": "0",
+    "assetType": "RUNE",
+    "metadata": {
+      "runeId": "841052:1863"
+    },
+    "multiChainAsset": null,
+    "hasValue": true,
+    "icon": "https://dev.sw-chain-list-assets.pages.dev/assets/chain-assets/botanixevmtest-native-btc.png"
+  },
+  "bitcoin-RUNE-RUNES*X*BITCOIN-840000:142": {
+    "originChain": "bitcoin",
+    "slug": "bitcoin-RUNE-RUNES*X*BITCOIN-840000:142",
+    "name": "RUNES X BITCOIN",
+    "symbol": "RUNES*X*BITCOIN",
+    "decimals": 0,
+    "priceId": null,
+    "minAmount": "0",
+    "assetType": "RUNE",
+    "metadata": {
+      "runeId": "840000:142"
+    },
+    "multiChainAsset": null,
+    "hasValue": true,
+    "icon": "https://dev.sw-chain-list-assets.pages.dev/assets/chain-assets/botanixevmtest-native-btc.png"
+  },
+  "bitcoin-RUNE-KERNEL*BITCORN-840015:9": {
+    "originChain": "bitcoin",
+    "slug": "bitcoin-RUNE-KERNEL*BITCORN-840015:9",
+    "name": "KERNEL BITCORN",
+    "symbol": "KERNEL*BITCORN",
+    "decimals": 0,
+    "priceId": null,
+    "minAmount": "0",
+    "assetType": "RUNE",
+    "metadata": {
+      "runeId": "840015:9"
+    },
+    "multiChainAsset": null,
+    "hasValue": true,
+    "icon": "https://dev.sw-chain-list-assets.pages.dev/assets/chain-assets/kernal_bitcorn.png"
+  },
+  "bitcoin-BRC20-cPen": {
+    "originChain": "bitcoin",
+    "slug": "bitcoin-BRC20-cPen",
+    "name": "cPen",
+    "symbol": "cPen",
+    "decimals": 18,
+    "priceId": null,
+    "minAmount": "0",
+    "assetType": "BRC20",
+    "metadata": null,
+    "multiChainAsset": null,
+    "hasValue": true,
+    "icon": "https://dev.sw-chain-list-assets.pages.dev/assets/chain-assets/kernal_bitcorn.png"
+  },
+  "bitcoin-BRC20-PGCH": {
+    "originChain": "bitcoin",
+    "slug": "bitcoin-BRC20-PGCH",
+    "name": "PGCH",
+    "symbol": "PGCH",
+    "decimals": 18,
+    "priceId": null,
+    "minAmount": "0",
+    "assetType": "BRC20",
+    "metadata": null,
+    "multiChainAsset": null,
+    "hasValue": true,
+    "icon": "https://dev.sw-chain-list-assets.pages.dev/assets/chain-assets/kernal_bitcorn.png"
+  },
+  "bitcoin-BRC20-\uD83D\uDF0A": {
+    "originChain": "bitcoin",
+    "slug": "bitcoin-BRC20-\uD83D\uDF0A",
+    "name": "\uD83D\uDF0A",
+    "symbol": "\uD83D\uDF0A",
+    "decimals": 18,
+    "priceId": null,
+    "minAmount": "0",
+    "assetType": "BRC20",
+    "metadata": null,
+    "multiChainAsset": null,
+    "hasValue": true,
+    "icon": "https://dev.sw-chain-list-assets.pages.dev/assets/chain-assets/kernal_bitcorn.png"
   }
 }

local-libs/chain-list/types.d.ts

@@ -23,7 +23,9 @@ export declare enum _AssetType {
     ERC721 = "ERC721",
     PSP22 = "PSP22",
     PSP34 = "PSP34",
-    UNKNOWN = "UNKNOWN"
+    UNKNOWN = "UNKNOWN",
+    RUNE = "RUNE",
+    BRC20 = "BRC20"
 }
 export declare enum _SubstrateChainType {
     RELAYCHAIN = "RELAYCHAIN",

local-libs/chain-list/types.js

@@ -22,6 +22,8 @@ export let _AssetType;
   _AssetType["PSP22"] = "PSP22";
   _AssetType["PSP34"] = "PSP34";
   _AssetType["UNKNOWN"] = "UNKNOWN";
+  _AssetType["RUNE"] = "RUNE";
+  _AssetType["BRC20"] = "BRC20";
 })(_AssetType || (_AssetType = {}));
 export let _SubstrateChainType;
 (function (_SubstrateChainType) {
@@ -40,4 +42,4 @@ export let _AssetRefPath;
   _AssetRefPath["XCM"] = "XCM";
   _AssetRefPath["MANTA_ZK"] = "MANTA_ZK";
   _AssetRefPath["SWAP"] = "SWAP";
-})(_AssetRefPath || (_AssetRefPath = {}));
+})(_AssetRefPath || (_AssetRefPath = {}));

packages/extension-base/src/background/KoniTypes.ts

@@ -6,7 +6,7 @@
 import { AuthUrls, Resolver } from '@subwallet/extension-base/background/handlers/State';
 import { AccountAuthType, AccountJson, AccountProxy, AddressJson, AuthorizeRequest, ConfirmationRequestBase, RequestAccountList, RequestAccountProxy, RequestAccountSubscribe, RequestAccountUnsubscribe, RequestAuthorizeCancel, RequestAuthorizeReject, RequestAuthorizeSubscribe, RequestAuthorizeTab, RequestCurrentAccountAddress, ResponseAuthorizeList, ResponseJsonGetAccountInfo, SeedLengths } from '@subwallet/extension-base/background/types';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
-import { _BitcoinApi, _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse, EnableChainParams, EnableMultiChainParams } from '@subwallet/extension-base/services/chain-service/types';
+import { _BitcoinApi, _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse, _ValidateCustomBrc20Request, _ValidateCustomBrc20Response, _ValidateCustomRuneRequest, _ValidateCustomRuneResponse, EnableChainParams, EnableMultiChainParams } from '@subwallet/extension-base/services/chain-service/types';
 import { CrowdloanContributionsResponse } from '@subwallet/extension-base/services/subscan-service/types';
 import { SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
 import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
@@ -228,10 +228,10 @@
   externalUrl?: string;
   rarity?: string;
   description?: string;
   properties?: Record<any, any> | null;
   type?: _AssetType.ERC721 | _AssetType.PSP34 | RMRK_VER; // for sending
   rmrk_ver?: RMRK_VER;
   onChainOption?: any; // for sending PSP-34 tokens, should be done better
 }
 
 export interface NftCollection {
@@ -537,7 +537,7 @@
   [ExtrinsicType.STAKING_COMPOUNDING]: RequestTuringStakeCompound,
   [ExtrinsicType.STAKING_CANCEL_COMPOUNDING]: RequestTuringCancelStakeCompound,
   [ExtrinsicType.STAKING_CANCEL_UNSTAKE]: RequestStakeCancelWithdrawal,
   [ExtrinsicType.STAKING_POOL_WITHDRAW]: any,
 
   // Yield
   [ExtrinsicType.JOIN_YIELD_POOL]: RequestYieldStepSubmit,
@@ -566,8 +566,8 @@
   [ExtrinsicType.TOKEN_APPROVE]: TokenApproveData,
 
   [ExtrinsicType.EVM_EXECUTE]: TransactionConfig,
   [ExtrinsicType.CROWDLOAN]: any,
   [ExtrinsicType.UNKNOWN]: any
 }
 
 export enum ExtrinsicStatus {
@@ -662,7 +662,7 @@
 //     : T extends ExtrinsicType.MINT_VDOT
 //       ? Pick<SubmitBifrostLiquidStaking, 'rewardTokenSlug' | 'estimatedAmountReceived'>
 //       : undefined;
 export interface TransactionHistoryItem<ET extends ExtrinsicType = ExtrinsicType.TRANSFER_BALANCE> {
   origin?: 'app' | 'migration' | 'subsquid' | 'subscan' | 'blockstream', // 'app' or history source
   callhash?: string,
   signature?: string,
@@ -690,7 +690,7 @@
   tip?: AmountData,
   fee?: AmountData,
   explorerUrl?: string,
   additionalInfo?: any,
   startBlock?: number,
   nonce?: number,
 }
@@ -1135,12 +1135,12 @@
   recipientAddress: string,
 
   nftItemName?: string, // Use for confirmation view only
   params: Record<string, any>,
   nftItem: NftItem
 }
 
 export interface EvmNftTransaction extends ValidateTransactionResponse {
   tx: Record<string, any> | null;
 }
 
 export interface EvmNftSubmitTransaction extends BaseRequestSign {
@@ -2266,7 +2266,9 @@
   'pri(chainService.removeChain)': [string, boolean];
   'pri(chainService.deleteCustomAsset)': [string, boolean];
   'pri(chainService.upsertCustomAsset)': [Record<string, any>, boolean];
+  'pri(chainService.validateCustomBrc20)': [_ValidateCustomBrc20Request, _ValidateCustomBrc20Response]
   'pri(chainService.validateCustomAsset)': [_ValidateCustomAssetRequest, _ValidateCustomAssetResponse];
+  'pri(chainService.validateCustomRune)': [_ValidateCustomRuneRequest, _ValidateCustomRuneResponse];
   'pri(chainService.resetDefaultChains)': [null, boolean];
   'pri(chainService.getSupportedContractTypes)': [null, string[]];
   'pri(chainService.validateCustomChain)': [ValidateNetworkRequest, ValidateNetworkResponse];

packages/extension-base/src/koni/api/nft/inscription/constants/api.ts

@@ -2,24 +2,24 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export const HIRO_API = {
-  api_status: 'https://api.hiro.so/ordinals/v1/',
+  api_status: 'https://ordinals-api.openbit.app/ordinals/v1/',
 
-  list_of_incriptions: 'https://api.hiro.so/ordinals/v1/inscriptions',
-  transfers_per_block: 'https://api.hiro.so/ordinals/v1/inscriptions/transfers',
-  specific_inscription: 'https://api.hiro.so/ordinals/v1/inscriptions/:id',
-  inscription_content: 'https://api.hiro.so/ordinals/v1/inscriptions/:id/content',
-  inscription_transfers: 'https://api.hiro.so/ordinals/v1/inscriptions/:id/transfers',
+  list_of_incriptions: 'https://ordinals-api.openbit.app/ordinals/v1/inscriptions',
+  transfers_per_block: 'https://ordinals-api.openbit.app/ordinals/v1/inscriptions/transfers',
+  specific_inscription: 'https://ordinals-api.openbit.app/ordinals/v1/inscriptions/:id',
+  inscription_content: 'https://ordinals-api.openbit.app/ordinals/v1/inscriptions/:id/content',
+  inscription_transfers: 'https://ordinals-api.openbit.app/ordinals/v1/inscriptions/:id/transfers',
 
-  satoshi_ordinal: 'https://api.hiro.so/ordinals/v1/sats/:ordinal',
-  satoshi_inscriptions: 'https://api.hiro.so/ordinals/v1/sats/:ordinal/inscriptions',
+  satoshi_ordinal: 'https://ordinals-api.openbit.app/ordinals/v1/sats/:ordinal',
+  satoshi_inscriptions: 'https://ordinals-api.openbit.app/ordinals/v1/sats/:ordinal/inscriptions',
 
-  inscription_count_per_block: 'https://api.hiro.so/ordinals/v1/stats/inscriptions',
+  inscription_count_per_block: 'https://ordinals-api.openbit.app/ordinals/v1/stats/inscriptions',
 
-  brc20_tokens: 'https://api.hiro.so/ordinals/v1/brc-20/tokens',
-  brc20_token_details: 'https://api.hiro.so/ordinals/v1/brc-20/tokens/:ticker',
-  brc20_token_holders: 'https://api.hiro.so/ordinals/v1/brc-20/tokens/:ticker/holders',
-  brc20_balances: 'https://api.hiro.so/ordinals/v1/brc-20/balances/:address',
-  brc20_activity: 'https://api.hiro.so/ordinals/v1/brc-20/activity'
+  brc20_tokens: 'https://ordinals-api.openbit.app/ordinals/v1/brc-20/tokens',
+  brc20_token_details: 'https://ordinals-api.openbit.app/ordinals/v1/brc-20/tokens/:ticker',
+  brc20_token_holders: 'https://ordinals-api.openbit.app/ordinals/v1/brc-20/tokens/:ticker/holders',
+  brc20_balances: 'https://ordinals-api.openbit.app/ordinals/v1/brc-20/balances/:address',
+  brc20_activity: 'https://ordinals-api.openbit.app/ordinals/v1/brc-20/activity'
 };
 
 export const ORD_IO_URL = {

packages/extension-base/src/koni/background/handlers/Extension.ts

@@ -27,7 +27,7 @@ import { YIELD_EXTRINSIC_TYPES } from '@subwallet/extension-base/koni/api/yield/
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { getBitcoinTransactionObject } from '@subwallet/extension-base/services/balance-service/helpers/transfer/bitcoin';
 import { _API_OPTIONS_CHAIN_GROUP, _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
-import { _ChainApiStatus, _ChainConnectionStatus, _ChainState, _NetworkUpsertParams, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse, EnableChainParams, EnableMultiChainParams } from '@subwallet/extension-base/services/chain-service/types';
+import { _ChainApiStatus, _ChainConnectionStatus, _ChainState, _NetworkUpsertParams, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse, _ValidateCustomBrc20Request, _ValidateCustomBrc20Response, _ValidateCustomRuneRequest, _ValidateCustomRuneResponse, EnableChainParams, EnableMultiChainParams } from '@subwallet/extension-base/services/chain-service/types';
 import { _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getSubstrateGenesisHash, _getTokenMinAmount, _isAssetSmartContractNft, _isChainBitcoinCompatible, _isChainEvmCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isTokenEvmSmartContract, _isTokenTransferredByEvm } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
@@ -2219,10 +2219,18 @@ export default class KoniExtension {
     return false;
   }
 
+  private async validateCustomBrc20 (data: _ValidateCustomBrc20Request): Promise<_ValidateCustomBrc20Response> {
+    return await this.#koniState.validateCustomBrc20(data);
+  }
+
   private async validateCustomAsset (data: _ValidateCustomAssetRequest): Promise<_ValidateCustomAssetResponse> {
     return await this.#koniState.validateCustomAsset(data);
   }
 
+  private async validateCustomRune (data: _ValidateCustomRuneRequest): Promise<_ValidateCustomRuneResponse> {
+    return await this.#koniState.validateCustomRune(data);
+  }
+
   private async getAddressFreeBalance ({ address, networkKey, token }: RequestFreeBalance): Promise<AmountData> {
     if (token && _MANTA_ZK_CHAIN_GROUP.includes(networkKey)) {
       const tokenInfo = this.#koniState.chainService.getAssetBySlug(token);
@@ -5258,8 +5266,12 @@ export default class KoniExtension {
         return await this.upsertCustomToken(request as _ChainAsset);
       case 'pri(chainService.deleteCustomAsset)':
         return this.deleteCustomAsset(request as string);
+      case 'pri(chainService.validateCustomBrc20)':
+        return await this.validateCustomBrc20(request as _ValidateCustomBrc20Request);
       case 'pri(chainService.validateCustomAsset)':
         return await this.validateCustomAsset(request as _ValidateCustomAssetRequest);
+      case 'pri(chainService.validateCustomRune)':
+        return await this.validateCustomRune(request as _ValidateCustomRuneRequest);
       case 'pri(assetSetting.getSubscription)':
         return this.subscribeAssetSetting(id, port);
       case 'pri(assetSetting.update)':

packages/extension-base/src/koni/background/handlers/State.ts

@@ -14,7 +14,7 @@ import BuyService from '@subwallet/extension-base/services/buy-service';
 import CampaignService from '@subwallet/extension-base/services/campaign-service';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _PREDEFINED_SINGLE_MODES } from '@subwallet/extension-base/services/chain-service/constants';
-import { _ChainState, _NetworkUpsertParams, _ValidateCustomAssetRequest } from '@subwallet/extension-base/services/chain-service/types';
+import { _ChainState, _NetworkUpsertParams, _ValidateCustomAssetRequest, _ValidateCustomBrc20Request, _ValidateCustomRuneRequest } from '@subwallet/extension-base/services/chain-service/types';
 import { _getEvmChainId, _getSubstrateGenesisHash, _getTokenOnChainAssetId, _isAssetFungibleToken, _isChainEnabled, _isChainTestNet, _parseMetadataForSmartContractAsset } from '@subwallet/extension-base/services/chain-service/utils';
 import EarningService from '@subwallet/extension-base/services/earning-service/service';
 import { EventService } from '@subwallet/extension-base/services/event-service';
@@ -1040,10 +1040,18 @@ export default class KoniState {
     return this.chainService.getSupportedSmartContractTypes();
   }
 
+  public async validateCustomBrc20 (data: _ValidateCustomBrc20Request) {
+    return await this.chainService.validateCustomBrc20(data);
+  }
+
   public async validateCustomAsset (data: _ValidateCustomAssetRequest) {
     return await this.chainService.validateCustomToken(data);
   }
 
+  public async validateCustomRune (data: _ValidateCustomRuneRequest) {
+    return await this.chainService.validateCustomRune(data);
+  }
+
   // ------------------------------------------------
 
   public getActiveChainInfoMap () {

packages/extension-base/src/services/balance-service/helpers/subscribe/index.ts

@@ -5,8 +5,9 @@ import { _AssetType, _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
 import { AccountJson } from '@subwallet/extension-base/background/types';
 import { COMMON_REFRESH_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
+import { Brc20BalanceItem } from '@subwallet/extension-base/services/chain-service/handler/bitcoin/strategy/BlockStream/types';
 import { _BitcoinApi, _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-import { _getChainNativeTokenSlug, _getRuneId, _isPureBitcoinChain, _isPureEvmChain, _isSupportRuneChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getChainNativeTokenSlug, _getRuneId, _isPureBitcoinChain, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { BalanceItem } from '@subwallet/extension-base/types';
 import { filterAssetsByChainAndType, filteredOutTxsUtxos, filterOutPendingTxsUtxos, getInscriptionUtxos, getRuneTxsUtxos } from '@subwallet/extension-base/utils';
 import { getKeypairTypeByAddress, isBitcoinAddress } from '@subwallet/keyring';
@@ -76,10 +77,9 @@ const filterAddress = (addresses: string[], chainInfo: _ChainInfo): [string[], s
 };
 
 // todo: update bitcoin params
-function subscribeAddressesRuneInfo (bitcoinApi: _BitcoinApi, addresses: string[], assetMap: Record<string, _ChainAsset>, chainInfo: _ChainInfo, callback: (rs: BalanceItem[]) => void) {
-  // todo: currently set decimal of runes on chain list to zero because the amount api return is after decimal
+function subscribeRuneBalance (bitcoinApi: _BitcoinApi, addresses: string[], assetMap: Record<string, _ChainAsset>, chainInfo: _ChainInfo, callback: (rs: BalanceItem[]) => void) {
   const chain = chainInfo.slug;
-  const tokenList = filterAssetsByChainAndType(assetMap, chain, [_AssetType.LOCAL]);
+  const tokenList = filterAssetsByChainAndType(assetMap, chain, [_AssetType.RUNE]);
 
   // todo: check await asset ready before subscribe
   if (Object.keys(tokenList).length === 0) {
@@ -104,6 +104,10 @@ function subscribeAddressesRuneInfo (bitcoinApi: _BitcoinApi, addresses: string[
         runes.forEach((rune) => {
           const runeId = rune.rune_id;
 
+          if (!Object.keys(runeIdToSlugMap).includes(runeId)) {
+            return;
+          }
+
           const item = {
             address: address,
             tokenSlug: runeIdToSlugMap[runeId],
@@ -141,6 +145,53 @@ function subscribeAddressesRuneInfo (bitcoinApi: _BitcoinApi, addresses: string[
   };
 }
 
+function subscribeBRC20Balance (bitcoinApi: _BitcoinApi, addresses: string[], assetMap: Record<string, _ChainAsset>, chainInfo: _ChainInfo, callback: (rs: BalanceItem[]) => void) {
+  const chain = chainInfo.slug;
+  const tokenList = filterAssetsByChainAndType(assetMap, chain, [_AssetType.BRC20]);
+
+  const getBRC20Balance = () => {
+    Object.values(tokenList).map(async (token) => {
+      try {
+        const ticker = token.symbol;
+        const balances: Brc20BalanceItem[] = await Promise.all(addresses.map(async (address) => {
+          try {
+            return await bitcoinApi.api.getAddressBRC20FreeLockedBalance(address, ticker);
+          } catch (error) {
+            console.error(`Error on get BRC balance of account ${address} for token ${token.slug}`, error);
+
+            return {
+              free: '0',
+              locked: '0'
+            };
+          }
+        }));
+
+        const items: BalanceItem[] = balances.map((balance, index): BalanceItem => {
+          return {
+            address: addresses[index],
+            tokenSlug: token.slug,
+            free: balance.free || '0',
+            locked: balance.locked || '0',
+            state: APIItemState.READY
+          };
+        });
+
+        callback(items);
+      } catch (error) {
+        console.log(token.slug, error);
+      }
+    });
+  };
+
+  getBRC20Balance();
+
+  const interval = setInterval(getBRC20Balance, COMMON_REFRESH_BALANCE_INTERVAL);
+
+  return () => {
+    clearInterval(interval);
+  };
+}
+
 async function getBitcoinBalance (bitcoinApi: _BitcoinApi, addresses: string[]) {
   return await Promise.all(addresses.map(async (address) => {
     try {
@@ -211,20 +262,17 @@ function subscribeBitcoinBalance (addresses: string[], chainInfo: _ChainInfo, as
   };
 
   getBalance();
+
   const interval = setInterval(getBalance, COMMON_REFRESH_BALANCE_INTERVAL);
 
-  if (_isSupportRuneChain(chainInfo.slug)) {
-    const unsub = subscribeAddressesRuneInfo(bitcoinApi, addresses, assetMap, chainInfo, callback);
+  const unsub = subscribeRuneBalance(bitcoinApi, addresses, assetMap, chainInfo, callback);
+  const unsub2 = subscribeBRC20Balance(bitcoinApi, addresses, assetMap, chainInfo, callback);
 
-    return () => {
-      clearInterval(interval);
-      unsub && unsub();
-    };
-  } else {
-    return () => {
-      clearInterval(interval);
-    };
-  }
+  return () => {
+    clearInterval(interval);
+    unsub && unsub();
+    unsub2 && unsub2();
+  };
 }
 
 // main subscription, use for multiple chains, multiple addresses and multiple tokens