poller: prepare update_feerate_estimates for testing

Author: JSwambo

src/bitcoind/interface.rs

@@ -425,6 +425,27 @@ impl BitcoinD {
         self.make_node_request_failible("sendrawtransaction", &params!(tx_hex))
             .map(|_| ())
     }
+
+    /// Get fee-rate estimate
+    /// TODO: limit conf_target to range 1 to 1008
+    pub fn feerate_estimate(&self, conf_target: i16) -> Option<FeeRate> {
+        let result = self.make_node_request("estimatesmartfee", &params!(conf_target));
+
+        if let Some(_) = result.get("errors") {
+            None
+        } else {
+            let feerate = result
+                .get("feerate")
+                .and_then(|f| f.as_f64())
+                .expect("'estimatesmartfee' didn't return a 'feerate' entry");
+            let blocks = result
+                .get("blocks")
+                .and_then(|n| n.as_i64())
+                .expect("'estimatesmartfee' didn't return a 'blocks' entry");
+
+            Some(FeeRate { feerate, blocks })
+        }
+    }
 }
 
 /// Info about bitcoind's sync state
@@ -448,3 +469,9 @@ pub struct UtxoInfo {
     pub bestblock: BlockHash,
     pub value: Amount,
 }
+
+/// FeeRate information from estimatesmartfee
+pub struct FeeRate {
+    pub feerate: f64,
+    pub blocks: i64,
+}

src/poller.rs

@@ -380,6 +380,22 @@ fn maybe_revault(
     Ok(())
 }
 
+fn update_feerate_estimates(
+    db_path: &path::Path,
+    bitcoind: &BitcoinD,
+    current_tip: &ChainTip,
+) -> Result<(), PollerError> {
+    let conf_target = 1;
+    if let Some(feerate) = bitcoind.feerate_estimate(conf_target) {
+        log::debug!(
+            "At block {} feerate estimate is {:?}",
+            current_tip.height,
+            feerate.feerate
+        )
+    }
+    Ok(())
+}
+
 // We only do actual processing on new blocks. This puts a natural limit on the amount of work
 // we are doing, reduces the number of edge cases we need to handle, and there is no benefit to try
 // to cancel Unvaults right after their broadcast.
@@ -393,6 +409,7 @@ fn new_block(
 ) -> Result<(), PollerError> {
     // Update the fee-bumping reserves estimates
     // TODO
+    update_feerate_estimates(db_path, bitcoind, current_tip)?;
 
     // Any vault to forget and feebump coins to unregister?
     // TODO

tests/test_chain.py

@@ -32,7 +32,8 @@ def test_simple_unvault_broadcast(miradord, bitcoind):
         [
             f"Got a confirmed Unvault UTXO at '{unvault_txid}:0'",
             f"Broadcasted Cancel transaction '{txs['cancel']['tx']}'",
-            f"Unvault transaction '{unvault_txid}' for vault at '{deposit_outpoint}' is still unspent",
+            f"Unvault transaction '{unvault_txid}' for vault at '{deposit_outpoint}' is"
+            " still unspent",
         ]
     )
 
@@ -70,7 +71,8 @@ def test_spent_cancel_detection(miradord, bitcoind):
         [
             f"Got a confirmed Unvault UTXO at '{unvault_txid}:0'",
             f"Broadcasted Cancel transaction '{txs['cancel']['tx']}'",
-            f"Unvault transaction '{unvault_txid}' for vault at '{deposit_outpoint}' is still unspent",
+            f"Unvault transaction '{unvault_txid}' for vault at '{deposit_outpoint}' is"
+            " still unspent",
         ]
     )
 
@@ -82,7 +84,8 @@ def test_spent_cancel_detection(miradord, bitcoind):
 
     bitcoind.generate_block(1, wait_for_mempool=[cancel_tx["txid"], unvault_txid])
     miradord.wait_for_log(
-        f"Noticed at height .* that Cancel transaction was confirmed for vault at '{deposit_outpoint}'"
+        "Noticed at height .* that Cancel transaction was confirmed for vault at"
+        f" '{deposit_outpoint}'"
     )
 
 
@@ -119,9 +122,24 @@ def test_simple_spend_detection(miradord, bitcoind):
     bitcoind.rpc.sendrawtransaction(txs["spend"]["tx"])
     bitcoind.generate_block(1, 1)
     miradord.wait_for_log(
-        f"Noticed .* that Spend transaction was confirmed for vault at '{deposit_outpoint}'"
+        "Noticed .* that Spend transaction was confirmed for vault at"
+        f" '{deposit_outpoint}'"
     )
 
     # Generate two days worth of blocks, the WT should forget about this vault
     bitcoind.generate_block(288)
     miradord.wait_for_log(f"Forgetting about consumed vault at '{deposit_outpoint}'")
+
+
+def test_feerate_estimation(miradord, bitcoind):
+    # Generate some transaction history for estimatesmartfee.
+    # 10 transactions in 50 blocks (send to deposit address)
+    amount = 1
+    for block in range(0, 50):
+        wait_for_mempool = []
+        for tx in range(0, 10):
+            txid, outpoint = bitcoind.create_utxo(DEPOSIT_ADDRESS, amount)
+            wait_for_mempool.append(txid)
+        bitcoind.generate_block(1, wait_for_mempool)
+    feerate = bitcoind.estimatesmartfee(1)["feerate"].normalize()
+    miradord.wait_for_logs([f"feerate estimate is {feerate}"])

tests/test_framework/bitcoind.py

@@ -132,6 +132,9 @@ def generate_blocks_censor(self, n, txids):
         for txid in txids:
             self.rpc.prioritisetransaction(txid, None, fee_delta)
 
+    def estimatesmartfee(self, conf_target):
+        return self.rpc.estimatesmartfee(conf_target)
+
     def simple_reorg(self, height, shift=0):
         """
         Reorganize chain by creating a fork at height={height} and: