Merge branch 'main' of github.com:chainwayxyz/citrea-e2e into da-monitoring

Author: jfldde

.github/workflows/code_checks.yml

@@ -52,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        short_prefix: [0, 1]
+        ci_test_mode: [0, 1]
 
     steps:
     - uses: actions/checkout@v4
@@ -64,4 +64,4 @@ jobs:
         toolchain: stable
 
     - name: Run Cargo test
-      run: SHORT_PREFIX=${{ matrix.short_prefix }} cargo test
+      run: CI_TEST_MODE=${{ matrix.ci_test_mode }} cargo test

Cargo.toml

@@ -23,8 +23,8 @@ tracing = { version = "0.1.40", default-features = false }
 tracing-subscriber = { version = "0.3.17", features = ["env-filter", "json", "fmt"] }
 
 # Citrea dependencies
-sov-ledger-rpc = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d", default-features = false, features = ["client"] }
-sov-rollup-interface = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d" }
+sov-ledger-rpc = { git = "https://github.com/chainwayxyz/citrea", rev = "42693cc", default-features = false, features = ["client"] }
+sov-rollup-interface = { git = "https://github.com/chainwayxyz/citrea", rev = "42693cc"}
 
 [patch.crates-io]
 bitcoincore-rpc = { version = "0.18.0", git = "https://github.com/chainwayxyz/rust-bitcoincore-rpc.git", rev = "ede8097" }

src/client.rs

@@ -8,7 +8,7 @@ use jsonrpsee::{
 };
 use sov_ledger_rpc::client::RpcClient;
 use sov_rollup_interface::rpc::{
-    SequencerCommitmentResponse, SoftConfirmationResponse, VerifiedProofResponse,
+    SequencerCommitmentResponse, SoftConfirmationResponse, VerifiedBatchProofResponse,
 };
 use tokio::time::sleep;
 use tracing::trace;
@@ -57,13 +57,13 @@ impl Client {
         Ok(self.client.get_head_soft_confirmation().await?)
     }
 
-    pub async fn ledger_get_verified_proofs_by_slot_height(
+    pub async fn ledger_get_verified_batch_proofs_by_slot_height(
         &self,
         height: u64,
-    ) -> Result<Option<Vec<VerifiedProofResponse>>> {
+    ) -> Result<Option<Vec<VerifiedBatchProofResponse>>> {
         Ok(self
             .client
-            .get_verified_proofs_by_slot_height(height)
+            .get_verified_batch_proofs_by_slot_height(height)
             .await?)
     }
 

src/config/docker.rs

@@ -12,7 +12,7 @@ use crate::{
 
 const DEFAULT_BITCOIN_DOCKER_IMAGE: &str = "bitcoin/bitcoin:28.0";
 const DEFAULT_CITREA_DOCKER_IMAGE: &str =
-    "chainwayxyz/citrea-test:57f9b46a366413f2e5b04a2bca07abcc21ad0dde";
+    "chainwayxyz/citrea-test:d3a6f5f25175cbfa925ff8fad5069828bd30c06c";
 
 #[derive(Debug)]
 pub struct VolumeConfig {
@@ -76,8 +76,8 @@ where
             ports: vec![config.rollup.rpc.bind_port],
             image: config.docker_image.clone().unwrap_or_else(|| {
                 let base_img = DEFAULT_CITREA_DOCKER_IMAGE;
-                match std::env::var("SHORT_PREFIX") {
-                    Ok(v) if v == "1" || v == "true" => format!("{base_img}-short-prefix"),
+                match std::env::var("CI_TEST_MODE") {
+                    Ok(v) if v == "1" || v == "true" => format!("{base_img}-ci"),
                     _ => base_img.to_string(),
                 }
             }),

src/full_node.rs

@@ -1,5 +1,5 @@
 use anyhow::bail;
-use sov_rollup_interface::rpc::{SequencerCommitmentResponse, VerifiedProofResponse};
+use sov_rollup_interface::rpc::{SequencerCommitmentResponse, VerifiedBatchProofResponse};
 use tokio::time::{sleep, Duration, Instant};
 
 use super::{config::FullFullNodeConfig, Result};
@@ -37,7 +37,7 @@ impl FullNode {
         &self,
         height: u64,
         timeout: Option<Duration>,
-    ) -> Result<Vec<VerifiedProofResponse>> {
+    ) -> Result<Vec<VerifiedBatchProofResponse>> {
         let start = Instant::now();
         let timeout = timeout.unwrap_or(Duration::from_secs(30));
 
@@ -48,7 +48,7 @@ impl FullNode {
 
             match self
                 .client
-                .ledger_get_verified_proofs_by_slot_height(height)
+                .ledger_get_verified_batch_proofs_by_slot_height(height)
                 .await?
             {
                 Some(proofs) => return Ok(proofs),