Bump citrea e2e (#1792)

Cargo.toml

@@ -156,7 +156,7 @@ alloy-eips = { version = "0.4.2", default-features = false }
 alloy-consensus = { version = "0.4.2", default-features = false, features = ["serde", "serde-bincode-compat"] }
 alloy-network = { version = "0.4.2", default-features = false }
 
-citrea-e2e = { git = "https://github.com/chainwayxyz/citrea-e2e", rev = "928f68178ba8d7e7a0ab7f7c4286c8cd01f42e16" }
+citrea-e2e = { git = "https://github.com/chainwayxyz/citrea-e2e", rev = "3383e0e" }
 
 [patch.crates-io]
 bitcoincore-rpc = { version = "0.18.0", git = "https://github.com/chainwayxyz/rust-bitcoincore-rpc.git", rev = "ca3cfa2" }

bin/citrea/tests/bitcoin_e2e/batch_prover_test.rs

@@ -13,8 +13,7 @@ use citrea_e2e::config::{
     SequencerMempoolConfig, TestCaseConfig, TestCaseEnv,
 };
 use citrea_e2e::framework::TestFramework;
-use citrea_e2e::full_node::FullNode;
-use citrea_e2e::node::{Config, NodeKind};
+use citrea_e2e::node::{FullNode, NodeKind};
 use citrea_e2e::test_case::{TestCase, TestCaseRunner};
 use citrea_e2e::traits::NodeT;
 use citrea_e2e::Result;

bin/citrea/tests/bitcoin_e2e/bitcoin_test.rs

@@ -265,8 +265,10 @@ impl TestCase for CpfpFeeBumpingTest {
         let batch_prover = f.batch_prover.as_mut().unwrap();
         let da = f.bitcoin_nodes.get(0).unwrap();
 
+        let min_soft_confirmations_per_commitment =
+            sequencer.min_soft_confirmations_per_commitment();
         // Generate seqcommitments
-        for _ in 0..sequencer.min_soft_confirmations_per_commitment() {
+        for _ in 0..min_soft_confirmations_per_commitment {
             sequencer.client.send_publish_batch_request().await?;
         }
 
@@ -344,7 +346,7 @@ impl TestCase for CpfpFeeBumpingTest {
         da.generate(1).await?;
 
         // Generate another seqcommitments to assert that it spends from cpfp output
-        for _ in 0..sequencer.min_soft_confirmations_per_commitment() {
+        for _ in 0..min_soft_confirmations_per_commitment {
             sequencer.client.send_publish_batch_request().await?;
         }
 

bin/citrea/tests/bitcoin_e2e/mempool_accept.rs

@@ -27,7 +27,11 @@ impl TestCase for MempoolAcceptTest {
         let sequencer = f.sequencer.as_ref().unwrap();
         let da = f.bitcoin_nodes.get(0).expect("DA not running.");
 
-        let min_soft_conf_per_commitment = sequencer.min_soft_confirmations_per_commitment();
+        let min_soft_conf_per_commitment = sequencer
+            .sequencer
+            .config
+            .node
+            .min_soft_confirmations_per_commitment;
 
         // publish min_soft_conf_per_commitment - 1 confirmations, no commitments should be sent
         for _ in 0..min_soft_conf_per_commitment {

bin/citrea/tests/bitcoin_e2e/sequencer_commitments.rs

@@ -10,8 +10,7 @@ use borsh::BorshDeserialize;
 use citrea_e2e::bitcoin::BitcoinNode;
 use citrea_e2e::config::{SequencerConfig, TestCaseConfig};
 use citrea_e2e::framework::TestFramework;
-use citrea_e2e::full_node::FullNode;
-use citrea_e2e::sequencer::Sequencer;
+use citrea_e2e::node::{FullNode, Sequencer};
 use citrea_e2e::test_case::{TestCase, TestCaseRunner};
 use citrea_e2e::Result;
 use citrea_primitives::TO_BATCH_PROOF_PREFIX;

bin/citrea/tests/bitcoin_e2e/tx_chain.rs

@@ -6,7 +6,7 @@ use bitcoincore_rpc::RpcApi;
 use citrea_e2e::bitcoin::{BitcoinNode, FINALITY_DEPTH};
 use citrea_e2e::config::{BitcoinConfig, SequencerConfig, TestCaseConfig};
 use citrea_e2e::framework::TestFramework;
-use citrea_e2e::sequencer::Sequencer;
+use citrea_e2e::node::Sequencer;
 use citrea_e2e::test_case::{TestCase, TestCaseRunner};
 use citrea_e2e::traits::Restart;
 use citrea_e2e::Result;

bin/citrea/tests/bitcoin_e2e/tx_propagation.rs

@@ -5,7 +5,6 @@ use alloy_primitives::{Address, TxHash};
 use async_trait::async_trait;
 use citrea_e2e::config::TestCaseConfig;
 use citrea_e2e::framework::TestFramework;
-use citrea_e2e::node::Config;
 use citrea_e2e::test_case::{TestCase, TestCaseRunner};
 use citrea_e2e::traits::NodeT;
 use citrea_e2e::Result;