From c0926ba10e6fcbb31ae1a603308b8e7956eb5453 Mon Sep 17 00:00:00 2001
From: Federico Gimenez <fgimenez@users.noreply.github.com>
Date: Mon, 22 Apr 2024 11:58:19 +0200
Subject: [PATCH] feat: enable OP hardforks in DEV chainspec (#7787)

---
 crates/optimism/node/src/txpool.rs  | 12 +++---------
 crates/primitives/src/chain/spec.rs |  6 ++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/crates/optimism/node/src/txpool.rs b/crates/optimism/node/src/txpool.rs
index 417b65f62..73097ce27 100644
--- a/crates/optimism/node/src/txpool.rs
+++ b/crates/optimism/node/src/txpool.rs
@@ -56,7 +56,6 @@ where
             // so that we will accept txs into the pool before the first block
             if block.number == 0 {
                 this.block_info.timestamp.store(block.timestamp, Ordering::Relaxed);
-                *this.block_info.l1_block_info.write() = Some(Default::default())
             } else {
                 this.update_l1_block_info(&block);
             }
@@ -77,7 +76,7 @@ where
     fn update_l1_block_info(&self, block: &Block) {
         self.block_info.timestamp.store(block.timestamp, Ordering::Relaxed);
         if let Ok(cost_addition) = reth_revm::optimism::extract_l1_info(block) {
-            *self.block_info.l1_block_info.write() = Some(cost_addition);
+            *self.block_info.l1_block_info.write() = cost_addition;
         }
     }
 
@@ -109,12 +108,7 @@ where
             propagate,
         } = outcome
         {
-            let Some(l1_block_info) = self.block_info.l1_block_info.read().clone() else {
-                return TransactionValidationOutcome::Error(
-                    *valid_tx.hash(),
-                    "L1BlockInfoError".into(),
-                )
-            };
+            let l1_block_info = self.block_info.l1_block_info.read().clone();
 
             let mut encoded = Vec::new();
             valid_tx.transaction().to_recovered_transaction().encode_enveloped(&mut encoded);
@@ -199,7 +193,7 @@ where
 #[derive(Debug, Default)]
 pub struct OpL1BlockInfo {
     /// The current L1 block info.
-    l1_block_info: RwLock<Option<L1BlockInfo>>,
+    l1_block_info: RwLock<L1BlockInfo>,
     /// Current block timestamp.
     timestamp: AtomicU64,
 }
diff --git a/crates/primitives/src/chain/spec.rs b/crates/primitives/src/chain/spec.rs
index 356f87190..6b2a6a4dc 100644
--- a/crates/primitives/src/chain/spec.rs
+++ b/crates/primitives/src/chain/spec.rs
@@ -243,6 +243,12 @@ pub static DEV: Lazy<Arc<ChainSpec>> = Lazy::new(|| {
             ),
             (Hardfork::Shanghai, ForkCondition::Timestamp(0)),
             (Hardfork::Cancun, ForkCondition::Timestamp(0)),
+            #[cfg(feature = "optimism")]
+            (Hardfork::Regolith, ForkCondition::Timestamp(0)),
+            #[cfg(feature = "optimism")]
+            (Hardfork::Bedrock, ForkCondition::Block(0)),
+            #[cfg(feature = "optimism")]
+            (Hardfork::Ecotone, ForkCondition::Timestamp(0)),
         ]),
         base_fee_params: BaseFeeParamsKind::Constant(BaseFeeParams::ethereum()),
         deposit_contract: None, // TODO: do we even have?