feat: add fee estimate mode option (#943)

Author: lautarodragan

src/BlockchainWriter/Controller.ts

@@ -15,6 +15,7 @@ export interface ControllerConfiguration {
   readonly poetNetwork: string
   readonly poetVersion: number
   readonly maximumTransactionAgeInBlocks: number
+  readonly bitcoinFeeEstimateMode: 'CONSERVATIVE' | 'ECONOMICAL'
 }
 
 export const convertLightBlockToEntry = (lightBlock: LightBlock): Entry => ({
@@ -159,7 +160,10 @@ export class Controller {
       'Got rawTransaction from Bitcoin Core',
     )
 
-    const fundedTransaction = await bitcoinCore.fundRawTransaction(rawTransaction).catch(translateFundTransactionError)
+    const fundedTransaction = await bitcoinCore.fundRawTransaction(
+      rawTransaction,
+      { estimate_mode: this.configuration.bitcoinFeeEstimateMode },
+    ).catch(translateFundTransactionError)
 
     logger.trace(
       {

src/BlockchainWriter/index.ts

@@ -33,6 +33,7 @@ const blockchainWriter = new BlockchainWriter({
   bitcoinNetwork: configuration.bitcoinNetwork,
   bitcoinUsername: configuration.bitcoinUsername,
   bitcoinPassword: configuration.bitcoinPassword,
+  bitcoinFeeEstimateMode: configuration.bitcoinFeeEstimateMode,
   exchanges: {
     anchorNextHashRequest: configuration.exchangeAnchorNextHashRequest,
     ipfsHashTxId: configuration.exchangeIpfsHashTxId,

src/Configuration.ts

@@ -40,6 +40,8 @@ export interface Configuration extends LoggingConfiguration, BitcoinRPCConfigura
 
   readonly uploadClaimIntervalInSeconds: number
   readonly uploadClaimMaxAttempts: number
+
+  readonly bitcoinFeeEstimateMode: 'CONSERVATIVE' | 'ECONOMICAL'
 }
 
 export interface LoggingConfiguration {
@@ -100,6 +102,7 @@ export const DefaultConfiguration: Configuration = {
   anchorIntervalInSeconds: 30,
   purgeStaleTransactionsIntervalInSeconds: 600,
   maximumTransactionAgeInBlocks: 25,
+  bitcoinFeeEstimateMode: 'CONSERVATIVE',
 
   healthIntervalInSeconds: 30,
   lowWalletBalanceInBitcoin: 1,

src/app.ts

@@ -184,6 +184,7 @@ export async function app(localVars: any = {}) {
         bitcoinNetwork: configuration.bitcoinNetwork,
         bitcoinUsername: configuration.bitcoinUsername,
         bitcoinPassword: configuration.bitcoinPassword,
+        bitcoinFeeEstimateMode: configuration.bitcoinFeeEstimateMode,
         exchanges: {
           anchorNextHashRequest: configuration.exchangeAnchorNextHashRequest,
           ipfsHashTxId: configuration.exchangeIpfsHashTxId,

typings/bitcoin-core.d.ts

@@ -57,13 +57,17 @@ declare module 'bitcoin-core' {
     getNetworkInfo(): any
     getWalletInfo(): any
     createRawTransaction(inputs: any, outputs: any): Promise<string>
-    fundRawTransaction(hexstring: string): Promise<FundRawTransactionResponse>
+    fundRawTransaction(hexstring: string, options?: FundRawTransactionOptions): Promise<FundRawTransactionResponse>
     setNetworkActive(flag: boolean): Promise<void>
     signRawTransaction(hexstring: string): Promise<SignRawTransactionResponse>
     sendRawTransaction(hexstring: string): Promise<string>
     estimateSmartFee(blocks: number): Promise<EstimateSmartFeeResponse>
   }
 
+  interface FundRawTransactionOptions {
+    readonly estimate_mode: EstimateMode
+  }
+
   interface FundRawTransactionResponse {
     readonly hex: string
     readonly changepos: number
@@ -80,5 +84,7 @@ declare module 'bitcoin-core' {
     readonly blocks: number
   }
 
+  type EstimateMode = 'CONSERVATIVE' | 'ECONOMICAL'
+
   export = BitcoinCore
 }