Merge branch 'main' into tests/improve-framework

Author: greged93

.cargo/config.toml

@@ -1,2 +1,4 @@
 [alias]
 docs = "doc --workspace --all-features --no-deps"
+[build]
+rustflags = ["--cfg", "tokio_unstable"]

.dockerignore

@@ -3,6 +3,7 @@
 
 # include source files
 !/bin
+!/.cargo
 !/crates
 !/testing
 !/tests

.github/workflows/book.yml

@@ -9,7 +9,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: peaceiris/actions-mdbook@v2
         with:
           mdbook-version: 'latest'

Cargo.toml

@@ -230,7 +230,7 @@ serde_json = { version = "1.0" }
 sea-orm = { version = "1.1.0" }
 strum = "0.27.1"
 thiserror = "2.0"
-tokio = { version = "1.39", default-features = false }
+tokio = { version = "1.39", default-features = false, features = ["tracing"] }
 tokio-stream = { version = "0.1", default-features = false }
 tracing = "0.1.0"
 getrandom = { version = "0.2", features = ["js"] }

Dockerfile

@@ -14,6 +14,7 @@ RUN --mount=target=. \
 FROM chef AS builder
 WORKDIR /app
 COPY --from=planner /recipe.json recipe.json
+COPY .cargo /app/.cargo
 RUN cargo chef cook --release --recipe-path recipe.json
 RUN --mount=target=. \
     cargo build ${CARGO_FEATURES:+--features $CARGO_FEATURES} --release --target-dir=/app-target
@@ -29,6 +30,6 @@ WORKDIR /app
 
 COPY --from=builder /app-target/release/rollup-node /bin/
 
-EXPOSE 30303 30303/udp 9001 8545 8546
+EXPOSE 30303 30303/udp 9001 8545 8546 6669
 
 ENTRYPOINT ["rollup-node"]

Dockerfile.test

@@ -8,7 +8,6 @@ RUN cargo install cargo-chef --locked
 
 FROM chef AS planner
 WORKDIR /app
-
 COPY . .
 # Hacky: Replace tests with dummy stub to avoid workspace member issues of top-level Cargo.toml.
 # This is needed because within the Docker integration tests we don't need the tests crate 
@@ -28,6 +27,7 @@ RUN cargo chef prepare --recipe-path /recipe.json
 FROM chef AS builder
 WORKDIR /app
 COPY --from=planner /recipe.json recipe.json
+COPY .cargo /app/.cargo
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
     --mount=type=cache,target=/usr/local/cargo/git \
     cargo chef cook --release --recipe-path recipe.json
@@ -47,6 +47,6 @@ WORKDIR /app
 
 COPY --from=builder /app-target/release/rollup-node /bin/
 
-EXPOSE 30303 30303/udp 9001 8545 8546
+EXPOSE 30303 30303/udp 9001 8545 8546 6669
 
 ENTRYPOINT ["rollup-node"]

Dockerfile.test.dockerignore

@@ -3,6 +3,7 @@
 
 # include source files
 !/bin
+!/.cargo
 !/crates
 !/testing
 !book.toml

crates/chain-orchestrator/src/lib.rs

@@ -21,7 +21,7 @@ use rollup_node_providers::L1MessageProvider;
 use rollup_node_sequencer::{Sequencer, SequencerEvent};
 use rollup_node_signer::{SignatureAsBytes, SignerEvent, SignerHandle};
 use rollup_node_watcher::L1Notification;
-use scroll_alloy_consensus::TxL1Message;
+use scroll_alloy_consensus::{ScrollTxEnvelope, TxL1Message};
 use scroll_alloy_hardforks::ScrollHardforks;
 use scroll_alloy_network::Scroll;
 use scroll_alloy_provider::ScrollEngineApi;
@@ -356,13 +356,23 @@ impl<
                 let _ = tx.send(self.network.handle().clone());
             }
             ChainOrchestratorCommand::UpdateFcsHead((head, sender)) => {
+                // Collect transactions of reverted blocks from l2 client.
+                let reverted_transactions = self
+                    .collect_reverted_txs_in_range(
+                        head.number.saturating_add(1),
+                        self.engine.fcs().head_block_info().number,
+                    )
+                    .await?;
                 self.engine.update_fcs(Some(head), None, None).await?;
                 self.database
                     .tx_mut(move |tx| async move {
                         tx.purge_l1_message_to_l2_block_mappings(Some(head.number + 1)).await?;
                         tx.set_l2_head_block_number(head.number).await
                     })
                     .await?;
+
+                // Add all reverted transactions to the transaction pool.
+                self.reinsert_txs_into_pool(reverted_transactions).await;
                 self.notify(ChainOrchestratorEvent::FcsHeadUpdated(head));
                 let _ = sender.send(());
             }
@@ -560,6 +570,43 @@ impl<
         Ok(Some(ChainOrchestratorEvent::NewL1Block(block_number)))
     }
 
+    /// Collects reverted L2 transactions in [from, to], excluding L1 messages.
+    async fn collect_reverted_txs_in_range(
+        &self,
+        from: u64,
+        to: u64,
+    ) -> Result<Vec<ScrollTxEnvelope>, ChainOrchestratorError> {
+        let mut reverted_transactions: Vec<ScrollTxEnvelope> = Vec::new();
+        for number in from..=to {
+            let block = self
+                .l2_client
+                .get_block_by_number(number.into())
+                .full()
+                .await?
+                .ok_or_else(|| ChainOrchestratorError::L2BlockNotFoundInL2Client(number))?;
+
+            let block = block.into_consensus().map_transactions(|tx| tx.inner.into_inner());
+            reverted_transactions.extend(
+                block.into_body().transactions.into_iter().filter(|tx| !tx.is_l1_message()),
+            );
+        }
+        Ok(reverted_transactions)
+    }
+
+    /// Reinserts given L2 transactions into the transaction pool.
+    async fn reinsert_txs_into_pool(&self, txs: Vec<ScrollTxEnvelope>) {
+        for tx in txs {
+            let encoded_tx = tx.encoded_2718();
+            if let Err(err) = self.l2_client.send_raw_transaction(&encoded_tx).await {
+                tracing::warn!(
+                    target: "scroll::chain_orchestrator",
+                    ?err,
+                    "failed to reinsert reverted transaction into pool"
+                );
+            }
+        }
+    }
+
     /// Handles a reorganization event by deleting all indexed data which is greater than the
     /// provided block number.
     async fn handle_l1_reorg(
@@ -570,27 +617,36 @@ impl<
         let UnwindResult { l1_block_number, queue_index, l2_head_block_number, l2_safe_block_info } =
             self.database.unwind(genesis_hash, block_number).await?;
 
-        let l2_head_block_info = if let Some(block_number) = l2_head_block_number {
-            // Fetch the block hash of the new L2 head block.
-            let block_hash = self
-                .l2_client
-                .get_block_by_number(block_number.into())
-                .full()
-                .await?
-                .expect("L2 head block must exist")
-                .header
-                .hash_slow();
+        let (l2_head_block_info, reverted_transactions) =
+            if let Some(block_number) = l2_head_block_number {
+                // Fetch the block hash of the new L2 head block.
+                let block_hash = self
+                    .l2_client
+                    .get_block_by_number(block_number.into())
+                    .full()
+                    .await?
+                    .expect("L2 head block must exist")
+                    .header
+                    .hash_slow();
+
+                // Cancel the inflight payload building job if the head has changed.
+                if let Some(s) = self.sequencer.as_mut() {
+                    s.cancel_payload_building_job();
+                };
+
+                // Collect transactions of reverted blocks from l2 client.
+                let reverted_transactions = self
+                    .collect_reverted_txs_in_range(
+                        block_number.saturating_add(1),
+                        self.engine.fcs().head_block_info().number,
+                    )
+                    .await?;
 
-            // Cancel the inflight payload building job if the head has changed.
-            if let Some(s) = self.sequencer.as_mut() {
-                s.cancel_payload_building_job();
+                (Some(BlockInfo { number: block_number, hash: block_hash }), reverted_transactions)
+            } else {
+                (None, Vec::new())
             };
 
-            Some(BlockInfo { number: block_number, hash: block_hash })
-        } else {
-            None
-        };
-
         // If the L1 reorg is before the origin of the inflight payload building job, cancel it.
         if Some(l1_block_number) <
             self.sequencer
@@ -608,6 +664,9 @@ impl<
             self.engine.update_fcs(l2_head_block_info, l2_safe_block_info, None).await?;
         }
 
+        // Add all reverted transactions to the transaction pool.
+        self.reinsert_txs_into_pool(reverted_transactions).await;
+
         let event = ChainOrchestratorEvent::L1Reorg {
             l1_block_number,
             queue_index,

crates/database/migration/src/m20250408_150338_load_header_metadata.rs

@@ -199,7 +199,7 @@ async fn get_file_size(client: &ClientWithMiddleware, url: &str) -> eyre::Result
 
 /// Check the hash of the data.
 fn verify_data_hash(expected_data_hash: B256, data: &[u8]) -> eyre::Result<()> {
-    let hash = B256::try_from(Sha256::digest(data).as_slice())?;
+    let hash = B256::from_slice(Sha256::digest(data).as_ref());
     if hash != expected_data_hash {
         bail!("corrupted data, expected data to hash to {expected_data_hash}, got {hash}.")
     }

crates/node/Cargo.toml

@@ -103,6 +103,7 @@ jsonrpsee = { version = "0.26.0", features = ["server", "client", "macros"] }
 reqwest.workspace = true
 tokio.workspace = true
 tracing.workspace = true
+console-subscriber = "0.5.0"
 
 [dev-dependencies]
 alloy-chains.workspace = true