feat: configurable fixed fee rate (#944)

poetapp · Jun 5, 2019 · b07b875 · b07b875
1 parent 296e7e0
commit b07b875
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 4 deletions.
diff --git a/src/BlockchainWriter/BlockchainWriter.ts b/src/BlockchainWriter/BlockchainWriter.ts
@@ -43,7 +43,6 @@ export class BlockchainWriter {
     const db = await this.mongoClient.db()
 
     const blockchainWriterCollection: Collection = db.collection('blockchainWriter')
-    const blockchainInfoCollection: Collection = db.collection('blockchainInfo')
 
     const exchangesMessaging = pick(['poetAnchorDownloaded', 'claimsDownloaded'], this.configuration.exchanges)
 

diff --git a/src/BlockchainWriter/Controller.ts b/src/BlockchainWriter/Controller.ts
@@ -16,6 +16,7 @@ export interface ControllerConfiguration {
   readonly poetVersion: number
   readonly maximumTransactionAgeInBlocks: number
   readonly bitcoinFeeEstimateMode: 'CONSERVATIVE' | 'ECONOMICAL'
+  readonly bitcoinFeeRate: number
 }
 
 export const convertLightBlockToEntry = (lightBlock: LightBlock): Entry => ({
@@ -149,6 +150,7 @@ export class Controller {
 
   private anchorData = async (data: string) => {
     const { bitcoinCore } = this
+    const { bitcoinFeeEstimateMode, bitcoinFeeRate } = this.configuration
     const logger = this.logger.child({ method: 'anchorData' })
 
     const rawTransaction = await bitcoinCore.createRawTransaction([], { data })
@@ -160,14 +162,20 @@ export class Controller {
       'Got rawTransaction from Bitcoin Core',
     )
 
+    const fundRawTransactionOptions = {
+      estimate_mode: bitcoinFeeRate === undefined ? bitcoinFeeEstimateMode : undefined,
+      feeRate: bitcoinFeeRate,
+    }
+
     const fundedTransaction = await bitcoinCore.fundRawTransaction(
       rawTransaction,
-      { estimate_mode: this.configuration.bitcoinFeeEstimateMode },
+      fundRawTransactionOptions,
     ).catch(translateFundTransactionError)
 
     logger.trace(
       {
         fundedTransaction,
+        fundRawTransactionOptions,
       },
       'Got fundedTransaction from Bitcoin Core',
     )

diff --git a/src/BlockchainWriter/index.ts b/src/BlockchainWriter/index.ts
@@ -34,6 +34,7 @@ const blockchainWriter = new BlockchainWriter({
   bitcoinUsername: configuration.bitcoinUsername,
   bitcoinPassword: configuration.bitcoinPassword,
   bitcoinFeeEstimateMode: configuration.bitcoinFeeEstimateMode,
+  bitcoinFeeRate: configuration.bitcoinFeeRate,
   exchanges: {
     anchorNextHashRequest: configuration.exchangeAnchorNextHashRequest,
     ipfsHashTxId: configuration.exchangeIpfsHashTxId,

diff --git a/src/Configuration.ts b/src/Configuration.ts
@@ -42,6 +42,7 @@ export interface Configuration extends LoggingConfiguration, BitcoinRPCConfigura
   readonly uploadClaimMaxAttempts: number
 
   readonly bitcoinFeeEstimateMode: 'CONSERVATIVE' | 'ECONOMICAL'
+  readonly bitcoinFeeRate: number
 }
 
 export interface LoggingConfiguration {
@@ -103,6 +104,7 @@ export const DefaultConfiguration: Configuration = {
   purgeStaleTransactionsIntervalInSeconds: 600,
   maximumTransactionAgeInBlocks: 25,
   bitcoinFeeEstimateMode: 'CONSERVATIVE',
+  bitcoinFeeRate: undefined,
 
   healthIntervalInSeconds: 30,
   lowWalletBalanceInBitcoin: 1,

diff --git a/src/app.ts b/src/app.ts
@@ -185,6 +185,7 @@ export async function app(localVars: any = {}) {
         bitcoinUsername: configuration.bitcoinUsername,
         bitcoinPassword: configuration.bitcoinPassword,
         bitcoinFeeEstimateMode: configuration.bitcoinFeeEstimateMode,
+        bitcoinFeeRate: configuration.bitcoinFeeRate,
         exchanges: {
           anchorNextHashRequest: configuration.exchangeAnchorNextHashRequest,
           ipfsHashTxId: configuration.exchangeIpfsHashTxId,

diff --git a/src/index.ts b/src/index.ts
@@ -5,6 +5,16 @@ import * as Pino from 'pino'
 
 const logger: Pino.Logger = Pino()
 
+process.on('unhandledRejection', (e) => {
+  logger.fatal('unhandledRejection', e)
+  process.exit()
+})
+
+process.on('uncaughtException', (e) => {
+  logger.fatal('uncaughtException', e)
+  process.exit()
+})
+
 app()
   .then(server => process.on('SIGINT', () => server.stop()))
-  .catch(exception => logger.error({ exception }, 'server was unable to start'))
+  .catch(exception => logger.fatal({ exception }, 'server was unable to start'))
diff --git a/typings/bitcoin-core.d.ts b/typings/bitcoin-core.d.ts
@@ -65,7 +65,8 @@ declare module 'bitcoin-core' {
   }
 
   interface FundRawTransactionOptions {
-    readonly estimate_mode: EstimateMode
+    readonly estimate_mode?: EstimateMode
+    readonly feeRate?: number
   }
 
   interface FundRawTransactionResponse {