Add client missing RPC methods

Author: jfldde

src/bitcoin.rs

@@ -8,12 +8,8 @@ use std::{
 use anyhow::{bail, Context};
 use async_trait::async_trait;
 use bitcoin::Address;
-use bitcoin_da::{
-    service::{get_relevant_blobs_from_txs, FINALITY_DEPTH},
-    spec::blob::BlobWithSender,
-};
+use bitcoin_da::service::FINALITY_DEPTH;
 use bitcoincore_rpc::{json::AddressType::Bech32m, Auth, Client, RpcApi};
-use citrea_primitives::REVEAL_BATCH_PROOF_PREFIX;
 use futures::TryStreamExt;
 use tokio::{process::Command, sync::OnceCell, time::sleep};
 
@@ -102,16 +98,6 @@ impl BitcoinNode {
         Ok(self.get_block_count().await? - FINALITY_DEPTH + 1)
     }
 
-    pub async fn get_relevant_blobs_from_block(&self, height: u64) -> Result<Vec<BlobWithSender>> {
-        let hash = self.get_block_hash(height).await?;
-        let block = self.get_block(&hash).await?;
-
-        Ok(get_relevant_blobs_from_txs(
-            block.txdata,
-            REVEAL_BATCH_PROOF_PREFIX,
-        ))
-    }
-
     async fn wait_for_shutdown(&self) -> Result<()> {
         let timeout_duration = Duration::from_secs(30);
         let start = std::time::Instant::now();

src/client.rs

@@ -79,6 +79,16 @@ impl Client {
         Ok(self.client.get_soft_confirmation_by_number(num).await?)
     }
 
+    pub async fn ledger_get_sequencer_commitments_on_slot_by_hash(
+        &self,
+        hash: [u8; 32],
+    ) -> Result<Option<Vec<SequencerCommitmentResponse>>> {
+        self.client
+            .get_sequencer_commitments_on_slot_by_hash(hash)
+            .await
+            .map_err(|e| e.into())
+    }
+
     pub async fn ledger_get_head_soft_confirmation_height(&self) -> Result<u64> {
         Ok(self.client.get_head_soft_confirmation_height().await?)
     }

src/node.rs

@@ -1,7 +1,14 @@
-use std::{fmt, fs::File, path::PathBuf, process::Stdio, time::Duration};
+use std::{
+    fmt,
+    fs::File,
+    path::PathBuf,
+    process::Stdio,
+    time::{Duration, SystemTime},
+};
 
-use anyhow::Context;
+use anyhow::{bail, Context};
 use async_trait::async_trait;
+use log::debug;
 use serde::Serialize;
 use tokio::{
     process::Command,
@@ -116,6 +123,30 @@ impl<C: Config> Node<C> {
             .context(format!("Failed to spawn {} process", kind))
             .map(SpawnOutput::Child)
     }
+
+    pub async fn wait_for_l2_height(&self, num: u64, timeout: Option<Duration>) -> Result<()> {
+        let start = SystemTime::now();
+        let timeout = timeout.unwrap_or(Duration::from_secs(30)); // Default 30 seconds timeout
+        loop {
+            debug!("Waiting for soft confirmation {}", num);
+            let latest_block = self
+                .client
+                .ledger_get_head_soft_confirmation_height()
+                .await?;
+
+            if latest_block >= num {
+                break;
+            }
+
+            let now = SystemTime::now();
+            if start + timeout <= now {
+                bail!("Timeout. Latest L2 block is {:?}", latest_block);
+            }
+
+            sleep(Duration::from_secs(1)).await;
+        }
+        Ok(())
+    }
 }
 
 #[async_trait]