include pending utxos in get_utxos (#1154)

chainwayxyz · Sep 10, 2024 · f06a37e · f06a37e
1 parent 9c88bed
commit f06a37e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/bin/citrea/tests/e2e/syncing.rs b/bin/citrea/tests/e2e/syncing.rs
@@ -551,8 +551,6 @@ async fn test_healthcheck() {
     let full_node_addr = full_node_port_rx.await.unwrap();
     let full_node_test_client = make_test_client(full_node_addr).await.unwrap();
 
-    wait_for_l2_block(&full_node_test_client, 2, None).await;
-
     let status = full_node_test_client.healthcheck().await.unwrap();
     assert_eq!(status, 200);
 

diff --git a/crates/bitcoin-da/src/service.rs b/crates/bitcoin-da/src/service.rs
@@ -265,7 +265,7 @@ impl BitcoinService {
     async fn get_utxos(&self) -> Result<Vec<UTXO>, anyhow::Error> {
         let utxos = self
             .client
-            .list_unspent(None, None, None, None, None)
+            .list_unspent(Some(0), None, None, None, None)
             .await?;
         if utxos.is_empty() {
             return Err(anyhow::anyhow!("There are no UTXOs"));

diff --git a/crates/sequencer/src/sequencer.rs b/crates/sequencer/src/sequencer.rs
@@ -604,10 +604,10 @@ where
         info!("Resubmitting pending commitments");
 
         let pending_db_commitments = self.ledger_db.get_pending_commitments_l2_range()?;
-        debug!("Pending db commitments: {:?}", pending_db_commitments);
+        info!("Pending db commitments: {:?}", pending_db_commitments);
 
         let pending_mempool_commitments = self.get_pending_mempool_commitments().await;
-        debug!(
+        info!(
             "Commitments that are already in DA mempool: {:?}",
             pending_mempool_commitments
         );
@@ -619,7 +619,7 @@ where
         let mined_commitments = self
             .get_mined_commitments_from(last_commitment_l1_height)
             .await?;
-        debug!(
+        info!(
             "Commitments that are already mined by DA: {:?}",
             mined_commitments
         );
@@ -628,7 +628,6 @@ where
         pending_commitments_to_remove.extend(pending_mempool_commitments);
         pending_commitments_to_remove.extend(mined_commitments);
 
-        // TODO: also take mined DA blocks into account
         for (l2_start, l2_end) in pending_db_commitments {
             if pending_commitments_to_remove.iter().any(|commitment| {
                 commitment.l2_start_block_number == l2_start.0
@@ -642,7 +641,7 @@ where
                     }
                 };
 
-                // Delete from pending db if it is already in DA mempool
+                // Delete from pending db if it is already in DA mempool or mined
                 self.ledger_db
                     .delete_pending_commitment_l2_range(&(l2_start, l2_end))?;
             } else {