Merge pull request #191 from openbitdev/koni/dev/issue-189

Optimize fee rate level and bitcoin balance

Author: saltict

packages/extension-base/src/services/chain-service/handler/bitcoin/strategy/BlockStream/index.ts

@@ -3,7 +3,7 @@
 
 import { SWError } from '@subwallet/extension-base/background/errors/SWError';
 import { _BEAR_TOKEN } from '@subwallet/extension-base/services/chain-service/constants';
-import { BitcoinAddressSummaryInfo, BlockStreamBlock, BlockStreamFeeEstimates, BlockStreamTransactionDetail, BlockStreamTransactionStatus, Brc20BalanceItem, Inscription, InscriptionFetchedData, RunesInfoByAddress, RunesInfoByAddressFetchedData, RuneTxs, RuneTxsResponse, UpdateOpenBitUtxo } from '@subwallet/extension-base/services/chain-service/handler/bitcoin/strategy/BlockStream/types';
+import { BitcoinAddressSummaryInfo, BlockStreamBlock, BlockStreamFeeEstimates, BlockStreamTransactionDetail, BlockStreamTransactionStatus, Brc20BalanceItem, Inscription, InscriptionFetchedData, RecommendedFeeEstimates, RunesInfoByAddress, RunesInfoByAddressFetchedData, RuneTxs, RuneTxsResponse, UpdateOpenBitUtxo } from '@subwallet/extension-base/services/chain-service/handler/bitcoin/strategy/BlockStream/types';
 import { BitcoinApiStrategy, BitcoinTransactionEventMap } from '@subwallet/extension-base/services/chain-service/handler/bitcoin/strategy/types';
 import { OBResponse } from '@subwallet/extension-base/services/chain-service/types';
 import { HiroService } from '@subwallet/extension-base/services/hiro-service';
@@ -150,6 +150,38 @@ export class BlockStreamRequestStrategy extends BaseApiRequestStrategy implement
     }, 0);
   }
 
+  getRecommendedFeeRate (): Promise<BitcoinFeeInfo> {
+    return this.addRequest<BitcoinFeeInfo>(async (): Promise<BitcoinFeeInfo> => {
+      const _rs = await getRequest(this.getUrl('fee-estimates/recommended'), undefined, this.headers);
+      const rs = await _rs.json() as OBResponse<RecommendedFeeEstimates>;
+
+      if (rs.status_code !== 200) {
+        throw new SWError('BlockStreamRequestStrategy.getRecommendedFeeRate', rs.message);
+      }
+
+      const result = rs.result;
+
+      const convertTimeMilisec = {
+        fastestFee: 10 * 60000,
+        halfHourFee: 30 * 60000,
+        hourFee: 60 * 60000
+      };
+
+      const convertFee = (fee: number) => parseInt(new BigN(fee).toFixed());
+
+      return {
+        type: 'bitcoin',
+        busyNetwork: false,
+        options: {
+          slow: { feeRate: convertFee(result.hourFee), time: convertTimeMilisec.hourFee },
+          average: { feeRate: convertFee(result.halfHourFee), time: convertTimeMilisec.halfHourFee },
+          fast: { feeRate: convertFee(result.fastestFee), time: convertTimeMilisec.fastestFee },
+          default: 'slow'
+        }
+      };
+    }, 0);
+  }
+
   getUtxos (address: string): Promise<UtxoResponseItem[]> {
     return this.addRequest<UtxoResponseItem[]>(async (): Promise<UtxoResponseItem[]> => {
       const _rs = await getRequest(this.getUrl(`address/${address}/utxo`), undefined, this.headers);

packages/extension-base/src/services/chain-service/handler/bitcoin/strategy/BlockStream/types.ts

@@ -198,6 +198,14 @@ export interface BlockStreamFeeEstimates {
   8: number;
 }
 
+export interface RecommendedFeeEstimates {
+  fastestFee: number,
+  halfHourFee: number,
+  hourFee: number,
+  economyFee: number,
+  minimumFee: number
+}
+
 export interface BlockStreamTransactionVectorOutput {
   scriptpubkey: string;
   scriptpubkey_asm: string;

packages/extension-base/src/services/chain-service/handler/bitcoin/strategy/types.ts

@@ -18,6 +18,7 @@ export interface BitcoinApiStrategy extends Omit<ApiRequestStrategy, 'addRequest
   getTransactionStatus (txHash: string): Promise<BitcoinTransactionStatus>;
   getTransactionDetail (txHash: string): Promise<BitcoinTx>;
   getFeeRate (): Promise<BitcoinFeeInfo>;
+  getRecommendedFeeRate (): Promise<BitcoinFeeInfo>;
   getUtxos (address: string): Promise<UtxoResponseItem[]>;
   getTxHex (txHash: string): Promise<string>;
   sendRawTransaction (rawTransaction: string): EventEmitter<BitcoinTransactionEventMap>;

packages/extension-base/src/services/fee-service/service.ts

@@ -142,7 +142,7 @@ export default class FeeService {
             } else if (type === 'bitcoin') {
               const api = this.state.getBitcoinApi(chain);
 
-              api.api.getFeeRate()
+              api.api.getRecommendedFeeRate()
                 .then((info) => {
                   observer.next(info);
                 })