@subwallet/extension-base 1.3.41-0 → 1.3.43-0

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.41-0",
+  "version": "1.3.43-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -34,6 +34,11 @@
       "require": "./cjs/background/errors/BalanceError.js",
       "default": "./background/errors/BalanceError.js"
     },
+    "./background/errors/BitcoinProviderError": {
+      "types": "./background/errors/BitcoinProviderError.d.ts",
+      "require": "./cjs/background/errors/BitcoinProviderError.js",
+      "default": "./background/errors/BitcoinProviderError.js"
+    },
     "./background/errors/CardanoProviderError": {
       "types": "./background/errors/CardanoProviderError.d.ts",
       "require": "./cjs/background/errors/CardanoProviderError.js",
@@ -119,6 +124,11 @@
       "require": "./cjs/constants/index.js",
       "default": "./constants/index.js"
     },
+    "./constants/bitcoin": {
+      "types": "./constants/bitcoin.d.ts",
+      "require": "./cjs/constants/bitcoin.js",
+      "default": "./constants/bitcoin.js"
+    },
     "./constants/blocked-actions": {
       "types": "./constants/blocked-actions.d.ts",
       "require": "./cjs/constants/blocked-actions.js",
@@ -599,6 +609,11 @@
       "require": "./cjs/page/index.js",
       "default": "./page/index.js"
     },
+    "./page/bitcoin": {
+      "types": "./page/bitcoin/index.d.ts",
+      "require": "./cjs/page/bitcoin/index.js",
+      "default": "./page/bitcoin/index.js"
+    },
     "./page/cardano": {
       "types": "./page/cardano/index.d.ts",
       "require": "./cjs/page/cardano/index.js",
@@ -679,6 +694,11 @@
       "require": "./cjs/services/balance-service/helpers/subscribe/index.js",
       "default": "./services/balance-service/helpers/subscribe/index.js"
     },
+    "./services/balance-service/helpers/subscribe/bitcoin": {
+      "types": "./services/balance-service/helpers/subscribe/bitcoin.d.ts",
+      "require": "./cjs/services/balance-service/helpers/subscribe/bitcoin.js",
+      "default": "./services/balance-service/helpers/subscribe/bitcoin.js"
+    },
     "./services/balance-service/helpers/subscribe/cardano": {
       "types": "./services/balance-service/helpers/subscribe/cardano/index.d.ts",
       "require": "./cjs/services/balance-service/helpers/subscribe/cardano/index.js",
@@ -739,6 +759,11 @@
       "require": "./cjs/services/balance-service/helpers/subscribe/ton/utils.js",
       "default": "./services/balance-service/helpers/subscribe/ton/utils.js"
     },
+    "./services/balance-service/transfer/bitcoin-transfer": {
+      "types": "./services/balance-service/transfer/bitcoin-transfer.d.ts",
+      "require": "./cjs/services/balance-service/transfer/bitcoin-transfer.js",
+      "default": "./services/balance-service/transfer/bitcoin-transfer.js"
+    },
     "./services/balance-service/transfer/cardano-transfer": {
       "types": "./services/balance-service/transfer/cardano-transfer.d.ts",
       "require": "./cjs/services/balance-service/transfer/cardano-transfer.js",
@@ -874,6 +899,41 @@
       "require": "./cjs/services/chain-service/handler/AbstractChainHandler.js",
       "default": "./services/chain-service/handler/AbstractChainHandler.js"
     },
+    "./services/chain-service/handler/bitcoin/BitcoinApi": {
+      "types": "./services/chain-service/handler/bitcoin/BitcoinApi.d.ts",
+      "require": "./cjs/services/chain-service/handler/bitcoin/BitcoinApi.js",
+      "default": "./services/chain-service/handler/bitcoin/BitcoinApi.js"
+    },
+    "./services/chain-service/handler/bitcoin/BitcoinChainHandler": {
+      "types": "./services/chain-service/handler/bitcoin/BitcoinChainHandler.d.ts",
+      "require": "./cjs/services/chain-service/handler/bitcoin/BitcoinChainHandler.js",
+      "default": "./services/chain-service/handler/bitcoin/BitcoinChainHandler.js"
+    },
+    "./services/chain-service/handler/bitcoin/strategy/BlockStreamTestnet": {
+      "types": "./services/chain-service/handler/bitcoin/strategy/BlockStreamTestnet/index.d.ts",
+      "require": "./cjs/services/chain-service/handler/bitcoin/strategy/BlockStreamTestnet/index.js",
+      "default": "./services/chain-service/handler/bitcoin/strategy/BlockStreamTestnet/index.js"
+    },
+    "./services/chain-service/handler/bitcoin/strategy/BlockStreamTestnet/blockstream-testnet-strategy": {
+      "types": "./services/chain-service/handler/bitcoin/strategy/BlockStreamTestnet/blockstream-testnet-strategy.d.ts",
+      "require": "./cjs/services/chain-service/handler/bitcoin/strategy/BlockStreamTestnet/blockstream-testnet-strategy.js",
+      "default": "./services/chain-service/handler/bitcoin/strategy/BlockStreamTestnet/blockstream-testnet-strategy.js"
+    },
+    "./services/chain-service/handler/bitcoin/strategy/BlockStreamTestnet/mempool-testnet-strategy": {
+      "types": "./services/chain-service/handler/bitcoin/strategy/BlockStreamTestnet/mempool-testnet-strategy.d.ts",
+      "require": "./cjs/services/chain-service/handler/bitcoin/strategy/BlockStreamTestnet/mempool-testnet-strategy.js",
+      "default": "./services/chain-service/handler/bitcoin/strategy/BlockStreamTestnet/mempool-testnet-strategy.js"
+    },
+    "./services/chain-service/handler/bitcoin/strategy/SubWalletMainnet": {
+      "types": "./services/chain-service/handler/bitcoin/strategy/SubWalletMainnet/index.d.ts",
+      "require": "./cjs/services/chain-service/handler/bitcoin/strategy/SubWalletMainnet/index.js",
+      "default": "./services/chain-service/handler/bitcoin/strategy/SubWalletMainnet/index.js"
+    },
+    "./services/chain-service/handler/bitcoin/strategy/types": {
+      "types": "./services/chain-service/handler/bitcoin/strategy/types.d.ts",
+      "require": "./cjs/services/chain-service/handler/bitcoin/strategy/types.js",
+      "default": "./services/chain-service/handler/bitcoin/strategy/types.js"
+    },
     "./services/chain-service/handler/CardanoApi": {
       "types": "./services/chain-service/handler/CardanoApi.d.ts",
       "require": "./cjs/services/chain-service/handler/CardanoApi.js",
@@ -1186,11 +1246,26 @@
       "require": "./cjs/services/fee-service/utils/tokenPayFee.js",
       "default": "./services/fee-service/utils/tokenPayFee.js"
     },
+    "./services/hiro-service": {
+      "types": "./services/hiro-service/index.d.ts",
+      "require": "./cjs/services/hiro-service/index.js",
+      "default": "./services/hiro-service/index.js"
+    },
+    "./services/hiro-service/utils": {
+      "types": "./services/hiro-service/utils/index.d.ts",
+      "require": "./cjs/services/hiro-service/utils/index.js",
+      "default": "./services/hiro-service/utils/index.js"
+    },
     "./services/history-service": {
       "types": "./services/history-service/index.d.ts",
       "require": "./cjs/services/history-service/index.js",
       "default": "./services/history-service/index.js"
     },
+    "./services/history-service/bitcoin-history": {
+      "types": "./services/history-service/bitcoin-history.d.ts",
+      "require": "./cjs/services/history-service/bitcoin-history.js",
+      "default": "./services/history-service/bitcoin-history.js"
+    },
     "./services/history-service/constants": {
       "types": "./services/history-service/constants/index.d.ts",
       "require": "./cjs/services/history-service/constants/index.js",
@@ -1496,6 +1571,11 @@
       "require": "./cjs/services/migration-service/scripts/MigrateNetworkSettings.js",
       "default": "./services/migration-service/scripts/MigrateNetworkSettings.js"
     },
+    "./services/migration-service/scripts/MigrateNewUnifiedAccount": {
+      "types": "./services/migration-service/scripts/MigrateNewUnifiedAccount.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateNewUnifiedAccount.js",
+      "default": "./services/migration-service/scripts/MigrateNewUnifiedAccount.js"
+    },
     "./services/migration-service/scripts/MigrateSettings": {
       "types": "./services/migration-service/scripts/MigrateSettings.d.ts",
       "require": "./cjs/services/migration-service/scripts/MigrateSettings.js",
@@ -1631,6 +1711,11 @@
       "require": "./cjs/services/request-service/handler/AuthRequestHandler.js",
       "default": "./services/request-service/handler/AuthRequestHandler.js"
     },
+    "./services/request-service/handler/BitcoinRequestHandler": {
+      "types": "./services/request-service/handler/BitcoinRequestHandler.d.ts",
+      "require": "./cjs/services/request-service/handler/BitcoinRequestHandler.js",
+      "default": "./services/request-service/handler/BitcoinRequestHandler.js"
+    },
     "./services/request-service/handler/CardanoRequestHandler": {
       "types": "./services/request-service/handler/CardanoRequestHandler.d.ts",
       "require": "./cjs/services/request-service/handler/CardanoRequestHandler.js",
@@ -1681,6 +1766,11 @@
       "require": "./cjs/services/request-service/types.js",
       "default": "./services/request-service/types.js"
     },
+    "./services/rune-service": {
+      "types": "./services/rune-service/index.d.ts",
+      "require": "./cjs/services/rune-service/index.js",
+      "default": "./services/rune-service/index.js"
+    },
     "./services/setting-service/constants": {
       "types": "./services/setting-service/constants.d.ts",
       "require": "./cjs/services/setting-service/constants.js",
@@ -2106,6 +2196,26 @@
       "require": "./cjs/stores/TransactionHistoryV3.js",
       "default": "./stores/TransactionHistoryV3.js"
     },
+    "./strategy/api-request-strategy": {
+      "types": "./strategy/api-request-strategy/index.d.ts",
+      "require": "./cjs/strategy/api-request-strategy/index.js",
+      "default": "./strategy/api-request-strategy/index.js"
+    },
+    "./strategy/api-request-strategy/context/base": {
+      "types": "./strategy/api-request-strategy/context/base.d.ts",
+      "require": "./cjs/strategy/api-request-strategy/context/base.js",
+      "default": "./strategy/api-request-strategy/context/base.js"
+    },
+    "./strategy/api-request-strategy/types": {
+      "types": "./strategy/api-request-strategy/types.d.ts",
+      "require": "./cjs/strategy/api-request-strategy/types.js",
+      "default": "./strategy/api-request-strategy/types.js"
+    },
+    "./strategy/api-request-strategy/utils": {
+      "types": "./strategy/api-request-strategy/utils/index.d.ts",
+      "require": "./cjs/strategy/api-request-strategy/utils/index.js",
+      "default": "./strategy/api-request-strategy/utils/index.js"
+    },
     "./types": {
       "types": "./types/index.d.ts",
       "require": "./cjs/types/index.js",
@@ -2211,6 +2321,11 @@
       "require": "./cjs/types/balance/transfer.js",
       "default": "./types/balance/transfer.js"
     },
+    "./types/bitcoin": {
+      "types": "./types/bitcoin.d.ts",
+      "require": "./cjs/types/bitcoin.js",
+      "default": "./types/bitcoin.js"
+    },
     "./types/bridge": {
       "types": "./types/bridge/index.d.ts",
       "require": "./cjs/types/bridge/index.js",
@@ -2261,6 +2376,11 @@
       "require": "./cjs/types/fee/base.js",
       "default": "./types/fee/base.js"
     },
+    "./types/fee/bitcoin": {
+      "types": "./types/fee/bitcoin.d.ts",
+      "require": "./cjs/types/fee/bitcoin.js",
+      "default": "./types/fee/bitcoin.js"
+    },
     "./types/fee/cardano": {
       "types": "./types/fee/cardano.d.ts",
       "require": "./cjs/types/fee/cardano.js",
@@ -2511,6 +2631,26 @@
       "require": "./cjs/utils/auth.js",
       "default": "./utils/auth.js"
     },
+    "./utils/bitcoin": {
+      "types": "./utils/bitcoin/index.d.ts",
+      "require": "./cjs/utils/bitcoin/index.js",
+      "default": "./utils/bitcoin/index.js"
+    },
+    "./utils/bitcoin/common": {
+      "types": "./utils/bitcoin/common.d.ts",
+      "require": "./cjs/utils/bitcoin/common.js",
+      "default": "./utils/bitcoin/common.js"
+    },
+    "./utils/bitcoin/fee": {
+      "types": "./utils/bitcoin/fee.d.ts",
+      "require": "./cjs/utils/bitcoin/fee.js",
+      "default": "./utils/bitcoin/fee.js"
+    },
+    "./utils/bitcoin/utxo-management": {
+      "types": "./utils/bitcoin/utxo-management.d.ts",
+      "require": "./cjs/utils/bitcoin/utxo-management.js",
+      "default": "./utils/bitcoin/utxo-management.js"
+    },
     "./utils/cardano": {
       "types": "./utils/cardano.d.ts",
       "require": "./cjs/utils/cardano.js",
@@ -2714,13 +2854,13 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.105",
-    "@subwallet/extension-base": "^1.3.41-0",
-    "@subwallet/extension-chains": "^1.3.41-0",
-    "@subwallet/extension-dapp": "^1.3.41-0",
-    "@subwallet/extension-inject": "^1.3.41-0",
+    "@subwallet/chain-list": "0.2.107",
+    "@subwallet/extension-base": "^1.3.43-0",
+    "@subwallet/extension-chains": "^1.3.43-0",
+    "@subwallet/extension-dapp": "^1.3.43-0",
+    "@subwallet/extension-inject": "^1.3.43-0",
     "@subwallet/keyring": "^0.1.12",
-    "@subwallet/subwallet-api-sdk": "^1.3.41-0",
+    "@subwallet/subwallet-api-sdk": "^1.3.43-0",
     "@subwallet/ui-keyring": "^0.1.12",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",
@@ -2732,11 +2872,12 @@
     "avail-js-sdk": "^0.2.12",
     "axios": "^1.6.2",
     "bignumber.js": "^9.1.1",
+    "bitcoinjs-lib": "6.1.5",
     "bn.js": "^5.2.1",
     "bowser": "^2.11.0",
     "browser-passworder": "^2.0.3",
     "buffer": "^6.0.3",
-    "cross-fetch": "^3.1.5",
+    "cross-fetch": "^4.1.0",
     "dexie": "^3.2.2",
     "dexie-export-import": "^4.0.7",
     "eth-simple-keyring": "^4.2.0",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.41-0'
+  version: '1.3.43-0'
 };

package/page/bitcoin/index.d.ts

@@ -0,0 +1,17 @@
+import { SendRequest } from '@subwallet/extension-base/page/types';
+import { BitcoinProvider } from '@subwallet/extension-inject/types';
+export default class SubWalletBitcoinProvider {
+    readonly name: string;
+    readonly version: string;
+    protected sendMessage: SendRequest;
+    private isSubWallet;
+    constructor(sendMessage: SendRequest);
+    private requestAccounts;
+    private getAccounts;
+    private signMessage;
+    private signPsbt;
+    private sendTransfer;
+    private request;
+    private getProductInfo;
+    get apis(): BitcoinProvider;
+}

package/page/bitcoin/index.js

@@ -0,0 +1,60 @@
+// Copyright 2019-2022 @subwallet/extension authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const WALLET_NAME = 'SubWallet';
+const WALLET_VERSION = process.env.PKG_VERSION;
+export default class SubWalletBitcoinProvider {
+  name = WALLET_NAME;
+  version = WALLET_VERSION;
+  isSubWallet = true;
+  constructor(sendMessage) {
+    this.sendMessage = sendMessage;
+  }
+  async requestAccounts() {
+    return await this.request('getAccounts');
+  }
+  async getAccounts() {
+    return await this.request('getAccounts');
+  }
+  async signMessage(params) {
+    return await this.request('signMessage', params);
+  }
+  async signPsbt(params) {
+    return await this.request('signPsbt', params);
+  }
+  async sendTransfer(params) {
+    return await this.request('sendTransfer', params);
+  }
+  request(method, params) {
+    // Implement this method
+    return new Promise((resolve, reject) => {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+      this.sendMessage('bitcoin(request)', {
+        method,
+        params
+      }).then(result => {
+        resolve(result);
+      }).catch(e => {
+        reject(e);
+      });
+    });
+  }
+  getProductInfo() {
+    return {
+      name: this.name,
+      version: this.version
+    };
+  }
+  get apis() {
+    return {
+      isSubWallet: this.isSubWallet,
+      request: (method, params) => this.request(method, params),
+      getAccounts: () => this.getAccounts(),
+      signMessage: params => this.signMessage(params),
+      signPsbt: params => this.signPsbt(params),
+      sendTransfer: params => this.sendTransfer(params),
+      requestAccounts: () => this.requestAccounts(),
+      getProductInfo: () => this.getProductInfo()
+    };
+  }
+}

package/page/index.d.ts

@@ -1,6 +1,6 @@
 import type { MessageTypes, MessageTypesWithNoSubscriptions, MessageTypesWithNullRequest, MessageTypesWithSubscriptions, RequestTypes, ResponseTypes, SubscriptionMessageTypes, TransportResponseMessage } from '../background/types';
 import Injected from '@subwallet/extension-base/page/substrate';
-import { AuthRequestOption, CardanoProvider, EvmProvider } from '@subwallet/extension-inject/types';
+import { AuthRequestOption, BitcoinProvider, CardanoProvider, EvmProvider } from '@subwallet/extension-inject/types';
 export interface Handler {
     resolve: (data?: any) => void;
     reject: (error: Error) => void;
@@ -16,3 +16,4 @@ export declare function handleResponse<TMessageType extends MessageTypes>(data:
 }): void;
 export declare function initEvmProvider(version: string): EvmProvider;
 export declare function initCardanoProvider(): CardanoProvider;
+export declare function initBitcoinProvider(): BitcoinProvider;

package/page/index.js

@@ -3,6 +3,7 @@
 
 import { ProviderError } from '@subwallet/extension-base/background/errors/ProviderError';
 import { ProviderErrorType } from '@subwallet/extension-base/background/KoniTypes';
+import SubWalletBitcoinProvider from '@subwallet/extension-base/page/bitcoin';
 import SubWalletCardanoProvider from '@subwallet/extension-base/page/cardano';
 import SubWalletEvmProvider from '@subwallet/extension-base/page/evm';
 import Injected from '@subwallet/extension-base/page/substrate';
@@ -72,4 +73,7 @@ export function initEvmProvider(version) {
 }
 export function initCardanoProvider() {
   return new SubWalletCardanoProvider(sendMessage);
+}
+export function initBitcoinProvider() {
+  return new SubWalletBitcoinProvider(sendMessage).apis;
 }

package/services/balance-service/helpers/subscribe/bitcoin.d.ts

@@ -0,0 +1,2 @@
+import { SusbcribeBitcoinPalletBalance } from '@subwallet/extension-base/types';
+export declare function subscribeBitcoinBalance(params: SusbcribeBitcoinPalletBalance): () => void;

package/services/balance-service/helpers/subscribe/bitcoin.js

@@ -0,0 +1,87 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { _AssetType } from '@subwallet/chain-list/types';
+import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
+import { BITCOIN_REFRESH_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
+import { filterAssetsByChainAndType } from '@subwallet/extension-base/utils';
+function getDefaultBalanceResult() {
+  return {
+    balance: '0',
+    bitcoinBalanceMetadata: {
+      inscriptionCount: 0,
+      runeBalance: '0',
+      inscriptionBalance: '0'
+    }
+  };
+}
+async function getBitcoinBalance(bitcoinApi, addresses) {
+  return await Promise.all(addresses.map(async address => {
+    try {
+      const [addressSummaryInfo] = await Promise.all([bitcoinApi.api.getAddressSummaryInfo(address)]);
+      if (Number(addressSummaryInfo.balance) < 0) {
+        return getDefaultBalanceResult();
+      }
+      const bitcoinBalanceMetadata = {
+        inscriptionCount: addressSummaryInfo.total_inscription,
+        runeBalance: addressSummaryInfo.balance_rune,
+        inscriptionBalance: addressSummaryInfo.balance_inscription
+      };
+      return {
+        balance: addressSummaryInfo.balance.toString(),
+        bitcoinBalanceMetadata: bitcoinBalanceMetadata
+      };
+    } catch (error) {
+      console.log('Error while fetching Bitcoin balances', error);
+      return getDefaultBalanceResult();
+    }
+  }));
+}
+export function subscribeBitcoinBalance(params) {
+  var _Object$values$;
+  const {
+    addresses,
+    assetMap,
+    bitcoinApi,
+    callback,
+    chainInfo
+  } = params;
+  const chain = chainInfo.slug;
+  const nativeTokenInfo = filterAssetsByChainAndType(assetMap, chain, [_AssetType.NATIVE]);
+  const nativeTokenSlug = ((_Object$values$ = Object.values(nativeTokenInfo)[0]) === null || _Object$values$ === void 0 ? void 0 : _Object$values$.slug) || '';
+  const getBalance = () => {
+    getBitcoinBalance(bitcoinApi, addresses).then(balances => {
+      return balances.map(({
+        balance,
+        bitcoinBalanceMetadata
+      }, index) => {
+        return {
+          address: addresses[index],
+          tokenSlug: nativeTokenSlug,
+          state: APIItemState.READY,
+          free: balance,
+          locked: (parseInt(bitcoinBalanceMetadata.runeBalance.toString()) + parseInt(bitcoinBalanceMetadata.inscriptionBalance.toString())).toString(),
+          metadata: bitcoinBalanceMetadata
+        };
+      });
+    }).catch(e => {
+      console.error('Error on get Bitcoin balance with token bitcoin', e);
+      return addresses.map(address => {
+        return {
+          address: address,
+          tokenSlug: nativeTokenSlug,
+          state: APIItemState.READY,
+          free: '0',
+          locked: '0'
+        };
+      });
+    }).then(items => {
+      callback(items);
+    }).catch(console.error);
+  };
+  const interval = setInterval(getBalance, BITCOIN_REFRESH_BALANCE_INTERVAL);
+  getBalance();
+  return () => {
+    clearInterval(interval);
+  };
+}

package/services/balance-service/helpers/subscribe/index.d.ts

@@ -1,6 +1,6 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { _CardanoApi, _EvmApi, _SubstrateApi, _TonApi } from '@subwallet/extension-base/services/chain-service/types';
+import { _BitcoinApi, _CardanoApi, _EvmApi, _SubstrateApi, _TonApi } from '@subwallet/extension-base/services/chain-service/types';
 import { AccountJson, BalanceItem } from '@subwallet/extension-base/types';
 /**
  * @function getAccountJsonByAddress
@@ -12,4 +12,4 @@ import { AccountJson, BalanceItem } from '@subwallet/extension-base/types';
  * @returns {AccountJson|null}  - Account info or null if not found
  */
 export declare const getAccountJsonByAddress: (address: string) => AccountJson | null;
-export declare function subscribeBalance(addresses: string[], chains: string[], tokens: string[], _chainAssetMap: Record<string, _ChainAsset>, _chainInfoMap: Record<string, _ChainInfo>, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, tonApiMap: Record<string, _TonApi>, cardanoApiMap: Record<string, _CardanoApi>, callback: (rs: BalanceItem[]) => void, extrinsicType?: ExtrinsicType): () => void;
+export declare function subscribeBalance(addresses: string[], chains: string[], tokens: string[], _chainAssetMap: Record<string, _ChainAsset>, _chainInfoMap: Record<string, _ChainInfo>, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, tonApiMap: Record<string, _TonApi>, cardanoApiMap: Record<string, _CardanoApi>, bitcoinApiMap: Record<string, _BitcoinApi>, callback: (rs: BalanceItem[]) => void, extrinsicType?: ExtrinsicType): () => void;

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

@@ -3,8 +3,9 @@
 
 import { _AssetType } from '@subwallet/chain-list/types';
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
+import { subscribeBitcoinBalance } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/bitcoin';
 import { subscribeCardanoBalance } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano';
-import { _getSubstrateGenesisHash, _isChainBitcoinCompatible, _isChainCardanoCompatible, _isChainEvmCompatible, _isChainTonCompatible, _isPureCardanoChain, _isPureEvmChain, _isPureTonChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getSubstrateGenesisHash, _isChainBitcoinCompatible, _isChainCardanoCompatible, _isChainEvmCompatible, _isChainTonCompatible, _isPureBitcoinChain, _isPureCardanoChain, _isPureEvmChain, _isPureTonChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { filterAssetsByChainAndType, getAddressesByChainTypeMap, pairToAccount } from '@subwallet/extension-base/utils';
 import keyring from '@subwallet/ui-keyring';
 import { subscribeTonBalance } from "./ton/ton.js";
@@ -37,20 +38,21 @@ export const getAccountJsonByAddress = address => {
 /** Filter addresses to subscribe by chain info */
 const filterAddress = (addresses, chainInfo) => {
   const {
+    _bitcoin,
     bitcoin,
     cardano,
     evm,
     substrate,
     ton
-  } = getAddressesByChainTypeMap(addresses);
+  } = getAddressesByChainTypeMap(addresses, chainInfo);
   if (_isChainEvmCompatible(chainInfo)) {
-    return [evm, [...bitcoin, ...substrate, ...ton, ...cardano]];
+    return [evm, [bitcoin, substrate, ton, cardano, _bitcoin].flat()];
   } else if (_isChainBitcoinCompatible(chainInfo)) {
-    return [bitcoin, [...evm, ...substrate, ...ton, ...cardano]];
+    return [bitcoin, [evm, substrate, ton, cardano, _bitcoin].flat()];
   } else if (_isChainTonCompatible(chainInfo)) {
-    return [ton, [...bitcoin, ...evm, ...substrate, ...cardano]];
+    return [ton, [bitcoin, evm, substrate, cardano, _bitcoin].flat()];
   } else if (_isChainCardanoCompatible(chainInfo)) {
-    return [cardano, [...bitcoin, ...evm, ...substrate, ...ton]];
+    return [cardano, [bitcoin, evm, substrate, ton, _bitcoin].flat()];
   } else {
     const fetchList = [];
     const unfetchList = [];
@@ -76,7 +78,7 @@ const filterAddress = (addresses, chainInfo) => {
         fetchList.push(address);
       }
     });
-    return [fetchList, [...unfetchList, ...bitcoin, ...evm, ...ton, ...cardano]];
+    return [fetchList, [unfetchList, bitcoin, evm, ton, cardano, _bitcoin].flat()];
   }
 };
 const handleUnsupportedOrPendingAddresses = (addresses, chainSlug, chainAssetMap, state, callback) => {
@@ -96,7 +98,7 @@ const handleUnsupportedOrPendingAddresses = (addresses, chainSlug, chainAssetMap
 };
 
 // main subscription, use for multiple chains, multiple addresses and multiple tokens
-export function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoMap, substrateApiMap, evmApiMap, tonApiMap, cardanoApiMap, callback, extrinsicType) {
+export function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoMap, substrateApiMap, evmApiMap, tonApiMap, cardanoApiMap, bitcoinApiMap, callback, extrinsicType) {
   // Filter chain and token
   const chainAssetMap = Object.fromEntries(Object.entries(_chainAssetMap).filter(([token]) => tokens.includes(token)));
   const chainInfoMap = Object.fromEntries(Object.entries(_chainInfoMap).filter(([chain]) => chains.includes(chain)));
@@ -138,6 +140,16 @@ export function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _cha
         cardanoApi
       });
     }
+    const bitcoinApi = bitcoinApiMap[chainSlug];
+    if (_isPureBitcoinChain(chainInfo)) {
+      return subscribeBitcoinBalance({
+        addresses: useAddresses,
+        assetMap: chainAssetMap,
+        bitcoinApi,
+        callback,
+        chainInfo
+      });
+    }
 
     // If the chain is not ready, return pending state
     if (!substrateApiMap[chainSlug].isApiReady) {

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

@@ -18,6 +18,7 @@ export declare class BalanceService implements StoppableServiceInterface {
     stopPromiseHandler: PromiseHandler<void>;
     status: ServiceStatus;
     private isReload;
+    get isStarted(): boolean;
     private readonly detectAccountBalanceStore;
     private readonly balanceDetectSubject;
     private readonly intervalTime;
@@ -87,6 +88,7 @@ export declare class BalanceService implements StoppableServiceInterface {
     private _unsubscribeBalance;
     /** Subscribe balance subscription */
     runSubscribeBalances(): Promise<void>;
+    refreshBalanceForAddress(address: string, chain: string, asset: string, extrinsicType?: ExtrinsicType): Promise<void>;
     /** Unsubscribe balance subscription */
     runUnsubscribeBalances(): void;
     /** Reload balance subscription */