From 170ddcd6dcd58da49da936a3ea181e46eea01741 Mon Sep 17 00:00:00 2001 From: Jude Nelson Date: Fri, 16 Apr 2021 03:07:05 -0400 Subject: [PATCH] plumb through new config option max_rbf --- .../src/burnchains/bitcoin_regtest_controller.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs b/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs index 9aa382c30..c1a70a5b4 100644 --- a/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs +++ b/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs @@ -1032,9 +1032,14 @@ impl BitcoinRegtestController { } } - // Stop as soon as the fee_rate is 1.50 higher, stop RBF - if ongoing_op.fees.fee_rate > (self.config.burnchain.satoshis_per_byte * 150 / 100) { - warn!("RBF'd block commits reached 1.5x satoshi per byte fee rate, not resubmitting"); + // Stop as soon as the fee_rate is ${self.config.burnchain.max_rbf} percent higher, stop RBF + if ongoing_op.fees.fee_rate + > (self.config.burnchain.satoshis_per_byte * self.config.burnchain.max_rbf / 100) + { + warn!( + "RBF'd block commits reached {}% satoshi per byte fee rate, not resubmitting", + self.config.burnchain.max_rbf + ); self.ongoing_block_commit = Some(ongoing_op); return None; }