From adbe1ba9b1a25b022322bd878649c2bf6e098d54 Mon Sep 17 00:00:00 2001
From: Vid Kersic <38610409+Vid201@users.noreply.github.com>
Date: Tue, 21 May 2024 10:31:08 +0200
Subject: [PATCH] chore: use with_chain_id for CfgEnv (#8327)

---
 crates/ethereum/engine-primitives/src/payload.rs | 3 +--
 crates/optimism/payload/src/payload.rs           | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/crates/ethereum/engine-primitives/src/payload.rs b/crates/ethereum/engine-primitives/src/payload.rs
index 55a97c96d..ed3f484b8 100644
--- a/crates/ethereum/engine-primitives/src/payload.rs
+++ b/crates/ethereum/engine-primitives/src/payload.rs
@@ -220,8 +220,7 @@ impl PayloadBuilderAttributes for EthPayloadBuilderAttributes {
         parent: &Header,
     ) -> (CfgEnvWithHandlerCfg, BlockEnv) {
         // configure evm env based on parent block
-        let mut cfg = CfgEnv::default();
-        cfg.chain_id = chain_spec.chain().id();
+        let cfg = CfgEnv::default().with_chain_id(chain_spec.chain().id());
 
         // ensure we're not missing any timestamp based hardforks
         let spec_id = revm_spec_by_timestamp_after_merge(chain_spec, self.timestamp());
diff --git a/crates/optimism/payload/src/payload.rs b/crates/optimism/payload/src/payload.rs
index 9cd47ef42..182dadfed 100644
--- a/crates/optimism/payload/src/payload.rs
+++ b/crates/optimism/payload/src/payload.rs
@@ -105,8 +105,7 @@ impl PayloadBuilderAttributes for OptimismPayloadBuilderAttributes {
         parent: &Header,
     ) -> (CfgEnvWithHandlerCfg, BlockEnv) {
         // configure evm env based on parent block
-        let mut cfg = CfgEnv::default();
-        cfg.chain_id = chain_spec.chain().id();
+        let cfg = CfgEnv::default().with_chain_id(chain_spec.chain().id());
 
         // ensure we're not missing any timestamp based hardforks
         let spec_id = revm_spec_by_timestamp_after_merge(chain_spec, self.timestamp());