fix conflict

Author: georgehao

.github/workflows/lint.yaml

@@ -21,7 +21,7 @@ jobs:
       - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@clippy
         with:
-          toolchain: nightly-2026-01-05
+          toolchain: 'nightly-2026-01-05'
           components: clippy
       - uses: Swatinem/rust-cache@v2
         with:
@@ -39,7 +39,7 @@ jobs:
       - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2026-01-05
+          toolchain: 'nightly-2026-01-05'
           components: rustfmt
       - name: Run fmt
         run: cargo fmt --all --check
@@ -62,14 +62,14 @@ jobs:
       - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2026-01-05
+          toolchain: 'nightly-2026-01-05'
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
       - uses: taiki-e/install-action@cargo-udeps
       - name: Run udeps
         run: cargo udeps --workspace --lib --examples --tests --benches --all-features --locked
-  
+
   zepter:
     runs-on: ubuntu-latest
     timeout-minutes: 10
@@ -93,7 +93,7 @@ jobs:
       - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2026-01-05
+          toolchain: 'nightly-2026-01-05'
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true

.github/workflows/test.yaml

@@ -24,7 +24,7 @@ jobs:
       - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2026-01-05
+          toolchain: 'nightly-2026-01-05'
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
@@ -43,7 +43,7 @@ jobs:
       - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2026-01-05
+          toolchain: 'nightly-2026-01-05'
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true

Makefile

@@ -1,6 +1,8 @@
+NIGHTLY_TOOLCHAIN := nightly-2026-01-05
+
 .PHONY: fmt
 fmt:
-	cargo +nightly fmt
+	cargo +$(NIGHTLY_TOOLCHAIN) fmt
 
 .PHONY: lint-toml
 lint-toml: ensure-dprint
@@ -14,7 +16,7 @@ ensure-dprint:
 
 .PHONY: clippy
 clippy:
-	cargo +nightly clippy \
+	cargo +$(NIGHTLY_TOOLCHAIN) clippy \
 	--workspace \
 	--lib \
 	--examples \
@@ -25,7 +27,7 @@ clippy:
 
 .PHONY: clippy-fix
 clippy-fix:
-	cargo +nightly clippy \
+	cargo +$(NIGHTLY_TOOLCHAIN) clippy \
 	--workspace \
 	--lib \
 	--examples \
@@ -37,7 +39,7 @@ clippy-fix:
 
 .PHONY: udeps
 udeps:
-	cargo +nightly udeps --workspace --lib --examples --tests --benches --all-features --locked
+	cargo +$(NIGHTLY_TOOLCHAIN) udeps --workspace --lib --examples --tests --benches --all-features --locked
 
 .PHONY: codespell
 codespell: ensure-codespell
@@ -64,7 +66,7 @@ lint: fmt lint-toml clippy udeps codespell zepter
 
 .PHONY: test
 test:
-	cargo nextest run \
+	cargo +$(NIGHTLY_TOOLCHAIN) nextest run \
 	--workspace \
 	--locked \
 	--all-features \

crates/chain-orchestrator/src/consensus.rs

@@ -63,14 +63,24 @@ impl SystemContractConsensus {
     /// Creates a new [`SystemContractConsensus`] consensus instance with the given authorized
     /// signers.
     pub fn new(authorized_signer: Address) -> Self {
+        tracing::info!(
+            target: "scroll::consensus",
+            "Initialized system contract consensus with authorized signer: {authorized_signer}"
+        );
         Self { authorized_signer, metrics: SystemContractConsensusMetrics::default() }
     }
 }
 
 impl Consensus for SystemContractConsensus {
     fn update_config(&mut self, update: &ConsensusUpdate) {
         match update {
-            ConsensusUpdate::AuthorizedSigner(signer) => self.authorized_signer = *signer,
+            ConsensusUpdate::AuthorizedSigner(signer) => {
+                tracing::info!(
+                    target: "scroll::consensus",
+                    "Authorized signer updated to: {signer}"
+                );
+                self.authorized_signer = *signer
+            }
         };
     }
 

crates/node/src/main.rs

@@ -45,7 +45,11 @@ fn main() {
                         .config()
                         .engine
                         .tree_config()
-                        .with_always_process_payload_attributes_on_canonical_head(true).with_persistence_threshold(0).with_unwind_canonical_header(true);
+                        .with_always_process_payload_attributes_on_canonical_head(true)
+                        .with_persistence_threshold(0)
+                        .with_unwind_canonical_header(true)
+                        // Use legacy state root processor due to performance issues with the new state root processor in reth.
+                        .with_legacy_state_root(true);
                     let launcher = EngineNodeLauncher::new(
                         builder.task_executor().clone(),
                         builder.config().datadir(),