automatic fidelity renewal for taproot maker

src/maker/server.rs

@@ -250,12 +250,13 @@ fn setup_fidelity_bond(maker: &Maker, maker_address: &str) -> Result<FidelityPro
 
     if let Some(i) = highest_index {
         let wallet_read = maker.get_wallet().read()?;
-        let bond = wallet_read.store.fidelity_bond.get(&i).unwrap();
-
+        let bond = wallet_read.store.fidelity_bond.get(&i).unwrap().clone();
         let current_height = wallet_read
             .rpc
             .get_block_count()
             .map_err(WalletError::Rpc)? as u32;
+        let bond_value = wallet_read.calculate_bond_value(&bond)?.to_sat();
+        drop(wallet_read);
 
         let highest_proof = maker
             .get_wallet()
@@ -268,7 +269,7 @@ fn setup_fidelity_bond(maker: &Maker, maker_address: &str) -> Result<FidelityPro
             i,
             bond.amount.to_sat(),
             bond.lock_time.to_consensus_u32() - current_height,
-            wallet_read.calculate_bond_value(bond)?.to_sat()
+            bond_value
         );
 
         *proof = Some(highest_proof);

src/maker/server2.rs

@@ -30,6 +30,7 @@ pub(crate) use super::api2::{Maker, RPC_PING_INTERVAL};
 use crate::{
     error::NetError,
     maker::{
+        api::FIDELITY_BOND_UPDATE_INTERVAL,
         api2::{check_for_broadcasted_contracts, check_for_idle_states, ConnectionState},
         handlers2::handle_message_taproot,
         rpc::start_rpc_server,
@@ -240,12 +241,13 @@ fn setup_fidelity_bond_taproot(
 
     if let Some(i) = highest_index {
         let wallet_read = maker.wallet().read()?;
-        let bond = wallet_read.store.fidelity_bond.get(&i).unwrap();
-
+        let bond = wallet_read.store.fidelity_bond.get(&i).unwrap().clone();
         let current_height = wallet_read
             .rpc
             .get_block_count()
             .map_err(WalletError::Rpc)? as u32;
+        let bond_value = wallet_read.calculate_bond_value(&bond)?.to_sat();
+        drop(wallet_read);
 
         let proof_message = maker
             .wallet()
@@ -268,7 +270,7 @@ fn setup_fidelity_bond_taproot(
             i,
             bond.amount.to_sat(),
             bond.lock_time.to_consensus_u32() - current_height,
-            wallet_read.calculate_bond_value(bond)?.to_sat()
+            bond_value
         );
 
         // Store the fidelity proof in maker
@@ -716,6 +718,52 @@ pub fn start_maker_server_taproot(maker: Arc<Maker>) -> Result<(), MakerError> {
         })?;
     maker.thread_pool.add_thread(liquidity_handle);
 
+    // fidelity renewal thread
+    let maker_clone_fidelity = maker.clone();
+    let maker_addr_clone = maker_address.clone();
+    let fidelity_handle = thread::Builder::new()
+        .name("fidelity-monitor-taproot".to_string())
+        .spawn(move || {
+            let mut counter = 0u64;
+            let check_interval =
+                FIDELITY_BOND_UPDATE_INTERVAL as u64 / HEART_BEAT_INTERVAL.as_secs();
+
+            loop {
+                if maker_clone_fidelity.shutdown.load(Relaxed) {
+                    break;
+                }
+
+                let swaps_empty = maker_clone_fidelity
+                    .ongoing_swap_state
+                    .lock()
+                    .map(|s| s.is_empty())
+                    .unwrap_or(false);
+
+                let check_is_due = counter.is_multiple_of(check_interval);
+
+                if check_is_due && swaps_empty {
+                    log::debug!(
+                        "[{}] Running periodic fidelity bond check",
+                        maker_clone_fidelity.config.network_port
+                    );
+                    if let Err(e) = manage_fidelity_bonds_taproot(
+                        maker_clone_fidelity.clone(),
+                        &maker_addr_clone,
+                        false,
+                    ) {
+                        log::error!("Fidelity bond renewal error: {:?}", e);
+                    }
+                }
+
+                if swaps_empty || !check_is_due {
+                    counter += 1;
+                }
+
+                sleep(HEART_BEAT_INTERVAL);
+            }
+        })?;
+    maker.thread_pool.add_thread(fidelity_handle);
+
     // Start Bitcoin Core connection monitoring
     let maker_clone_core = maker.clone();
     let core_monitor_handle = thread::Builder::new()