From 334787314745a78618eb1c859f5cd6664b96c707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erce=20Can=20Bekt=C3=BCre?= <canerce99@hotmail.com>
Date: Sat, 21 Dec 2024 00:45:48 +0300
Subject: [PATCH] Update citrea e2e

---
 Cargo.lock                                           | 12 ++++++------
 bin/citrea/Cargo.toml                                |  2 +-
 bin/citrea/tests/bitcoin_e2e/prover_test.rs          |  2 +-
 .../tests/bitcoin_e2e/sequencer_commitments.rs       |  8 +++++---
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8ce423b19..85ca6b85f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1772,7 +1772,7 @@ dependencies = [
 [[package]]
 name = "citrea-e2e"
 version = "0.1.0"
-source = "git+https://github.com/chainwayxyz/citrea-e2e?rev=a4407ce0c611ed581db7e467bea3a699f43f5ce1#a4407ce0c611ed581db7e467bea3a699f43f5ce1"
+source = "git+https://github.com/chainwayxyz/citrea-e2e?rev=e4d54ce012bda35e6407417cc915195ea3b41ab2#e4d54ce012bda35e6407417cc915195ea3b41ab2"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1787,8 +1787,8 @@ dependencies = [
  "reth-primitives",
  "serde",
  "serde_json",
- "sov-ledger-rpc 0.5.0-rc.1 (git+https://github.com/chainwayxyz/citrea?rev=879a075590250cd26e721f31c4cedf3b28832cb0)",
- "sov-rollup-interface 0.5.0-rc.1 (git+https://github.com/chainwayxyz/citrea?rev=879a075590250cd26e721f31c4cedf3b28832cb0)",
+ "sov-ledger-rpc 0.5.0-rc.1 (git+https://github.com/chainwayxyz/citrea?rev=6dbcc54de4df455b23675dd1ee51e05835d877b9)",
+ "sov-rollup-interface 0.5.0-rc.1 (git+https://github.com/chainwayxyz/citrea?rev=6dbcc54de4df455b23675dd1ee51e05835d877b9)",
  "tempfile",
  "tokio",
  "toml",
@@ -7485,12 +7485,12 @@ dependencies = [
 [[package]]
 name = "sov-ledger-rpc"
 version = "0.5.0-rc.1"
-source = "git+https://github.com/chainwayxyz/citrea?rev=879a075590250cd26e721f31c4cedf3b28832cb0#879a075590250cd26e721f31c4cedf3b28832cb0"
+source = "git+https://github.com/chainwayxyz/citrea?rev=6dbcc54de4df455b23675dd1ee51e05835d877b9#6dbcc54de4df455b23675dd1ee51e05835d877b9"
 dependencies = [
  "jsonrpsee",
  "reth-primitives",
  "serde",
- "sov-rollup-interface 0.5.0-rc.1 (git+https://github.com/chainwayxyz/citrea?rev=879a075590250cd26e721f31c4cedf3b28832cb0)",
+ "sov-rollup-interface 0.5.0-rc.1 (git+https://github.com/chainwayxyz/citrea?rev=6dbcc54de4df455b23675dd1ee51e05835d877b9)",
 ]
 
 [[package]]
@@ -7769,7 +7769,7 @@ dependencies = [
 [[package]]
 name = "sov-rollup-interface"
 version = "0.5.0-rc.1"
-source = "git+https://github.com/chainwayxyz/citrea?rev=879a075590250cd26e721f31c4cedf3b28832cb0#879a075590250cd26e721f31c4cedf3b28832cb0"
+source = "git+https://github.com/chainwayxyz/citrea?rev=6dbcc54de4df455b23675dd1ee51e05835d877b9#6dbcc54de4df455b23675dd1ee51e05835d877b9"
 dependencies = [
  "anyhow",
  "async-trait",
diff --git a/bin/citrea/Cargo.toml b/bin/citrea/Cargo.toml
index c9ad854ad..a412bb1c8 100644
--- a/bin/citrea/Cargo.toml
+++ b/bin/citrea/Cargo.toml
@@ -85,7 +85,7 @@ rustc_version_runtime = { workspace = true }
 # bitcoin-e2e dependencies
 bitcoin.workspace = true
 bitcoincore-rpc.workspace = true
-citrea-e2e = { git = "https://github.com/chainwayxyz/citrea-e2e", rev = "a4407ce0c611ed581db7e467bea3a699f43f5ce1" }
+citrea-e2e = { git = "https://github.com/chainwayxyz/citrea-e2e", rev = "e4d54ce012bda35e6407417cc915195ea3b41ab2" }
 
 [features]
 default = [] # Deviate from convention by making the "native" feature active by default. This aligns with how this package is meant to be used (as a binary first, library second).
diff --git a/bin/citrea/tests/bitcoin_e2e/prover_test.rs b/bin/citrea/tests/bitcoin_e2e/prover_test.rs
index 1f48177e4..3ece16e52 100644
--- a/bin/citrea/tests/bitcoin_e2e/prover_test.rs
+++ b/bin/citrea/tests/bitcoin_e2e/prover_test.rs
@@ -293,7 +293,7 @@ impl TestCase for SkipPreprovenCommitmentsTest {
         let proofs = full_node
             .wait_for_zkproofs(
                 finalized_height + FINALITY_DEPTH,
-                Some(Duration::from_secs(120)),
+                Some(Duration::from_secs(480)),
             )
             .await
             .unwrap();
diff --git a/bin/citrea/tests/bitcoin_e2e/sequencer_commitments.rs b/bin/citrea/tests/bitcoin_e2e/sequencer_commitments.rs
index 2545a0e10..824918f6e 100644
--- a/bin/citrea/tests/bitcoin_e2e/sequencer_commitments.rs
+++ b/bin/citrea/tests/bitcoin_e2e/sequencer_commitments.rs
@@ -1,3 +1,5 @@
+use std::time::Duration;
+
 use async_trait::async_trait;
 use bitcoin::hashes::Hash;
 use bitcoin_da::service::{get_relevant_blobs_from_txs, FINALITY_DEPTH};
@@ -195,7 +197,7 @@ impl TestCase for SequencerSendCommitmentsToDaTest {
             .await?;
 
         da.generate(FINALITY_DEPTH, None).await?;
-        tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
+        tokio::time::sleep(std::time::Duration::from_secs(30)).await;
 
         let finalized_height = da.get_finalized_height().await?;
 
@@ -218,7 +220,7 @@ impl TestCase for SequencerSendCommitmentsToDaTest {
         sequencer
             .wait_for_l2_height(
                 min_soft_confirmations_per_commitment + FINALITY_DEPTH - 1,
-                None,
+                Some(Duration::from_secs(120)),
             )
             .await?;
 
@@ -241,7 +243,7 @@ impl TestCase for SequencerSendCommitmentsToDaTest {
         sequencer
             .wait_for_l2_height(
                 end_l2_block + min_soft_confirmations_per_commitment + FINALITY_DEPTH - 2,
-                None,
+                Some(Duration::from_secs(120)),
             )
             .await?;