obtain elasticity_multiplier and base_fee_change_denominator from chain config

.gitignore

@@ -9,6 +9,9 @@ target/
 # MSVC Windows builds of rustc generate these, which store debugging information
 *.pdb
 
+# Generated by VSCode
+.vscode
+
 
 # Generated by Intellij-based IDEs.
 .idea

bin/reth/Cargo.toml

@@ -99,6 +99,16 @@ min-warn-logs = ["tracing/release_max_level_warn"]
 min-info-logs = ["tracing/release_max_level_info"]
 min-debug-logs = ["tracing/release_max_level_debug"]
 min-trace-logs = ["tracing/release_max_level_trace"]
+optimism = [
+  "reth-primitives/optimism",
+  "reth-revm/optimism",
+  "reth-interfaces/optimism",
+  "reth-rpc-engine-api/optimism",
+  "reth-transaction-pool/optimism",
+  "reth-provider/optimism",
+  "reth-beacon-consensus/optimism",
+  "reth-basic-payload-builder/optimism",
+]
 
 [build-dependencies]
 vergen = { version = "8.0.0", features = ["build", "cargo", "git", "gitcl"] }

bin/reth/src/args/rpc_server_args.rs

@@ -344,6 +344,7 @@ impl RpcServerArgs {
     ) -> Result<AuthServerHandle, RpcError>
     where
         Provider: BlockReaderIdExt
+            + ChainSpecProvider
             + HeaderProvider
             + StateProviderFactory
             + EvmEnvProvider

bin/reth/src/init.rs

@@ -272,6 +272,8 @@ mod tests {
             fork_timestamps: ForkTimestamps { shanghai: None },
             genesis_hash: None,
             paris_block_and_final_difficulty: None,
+            #[cfg(feature = "optimism")]
+            optimism: None,
         });
 
         let db = create_test_rw_db();

crates/consensus/auto-seal/src/task.rs

@@ -124,10 +124,13 @@ where
                     let mut storage = storage.write().await;
 
                     // check previous block for base fee
-                    let base_fee_per_gas = storage
-                        .headers
-                        .get(&storage.best_block)
-                        .and_then(|parent| parent.next_block_base_fee());
+                    let base_fee_per_gas =
+                        storage.headers.get(&storage.best_block).and_then(|parent| {
+                            parent.next_block_base_fee(
+                                chain_spec.elasticity_multiplier(),
+                                chain_spec.base_fee_change_denominator(),
+                            )
+                        });
 
                     let mut header = Header {
                         parent_hash: storage.best_hash,

crates/consensus/beacon/Cargo.toml

@@ -44,3 +44,12 @@ reth-revm = { path = "../../revm" }
 reth-downloaders = { path = "../../net/downloaders" }
 
 assert_matches = "1.5"
+
+[features]
+optimism = [
+  "reth-consensus-common/optimism",
+  "reth-primitives/optimism",
+  "reth-interfaces/optimism",
+  "reth-provider/optimism",
+  "reth-rpc-types/optimism",
+]

crates/consensus/common/Cargo.toml

@@ -18,3 +18,6 @@ reth-interfaces = { workspace = true, features = ["test-utils"] }
 reth-provider = { workspace = true, features = ["test-utils"] }
 assert_matches = "1.5.0"
 mockall = "0.11.3"
+
+[features]
+optimism = ["reth-primitives/optimism"]

crates/consensus/common/src/validation.rs

@@ -10,6 +10,9 @@ use std::{
     time::SystemTime,
 };
 
+#[cfg(feature = "optimism")]
+use reth_primitives::TxDeposit;
+
 /// Validate header standalone
 pub fn validate_header_standalone(
     header: &SealedHeader,
@@ -99,6 +102,8 @@ pub fn validate_transaction_regarding_header(
 
             Some(*chain_id)
         }
+        #[cfg(feature = "optimism")]
+        Transaction::Deposit(TxDeposit { .. }) => None,
     };
     if let Some(chain_id) = chain_id {
         if chain_id != chain_spec.chain().id() {
@@ -265,27 +270,32 @@ pub fn validate_header_regarding_parent(
     // TODO Check difficulty increment between parent and child
     // Ace age did increment it by some formula that we need to follow.
 
-    let mut parent_gas_limit = parent.gas_limit;
+    // Check gas limit, max diff between child/parent gas_limit should be  max_diff=parent_gas/1024
+    // On Optimism, the gas limit can adjust instantly, so we skip this check if the optimism
+    // feature flag is enabled.
+    #[cfg(not(feature = "optimism"))]
+    {
+        let mut parent_gas_limit = parent.gas_limit;
 
-    // By consensus, gas_limit is multiplied by elasticity (*2) on
-    // on exact block that hardfork happens.
-    if chain_spec.fork(Hardfork::London).transitions_at_block(child.number) {
-        parent_gas_limit = parent.gas_limit * constants::EIP1559_ELASTICITY_MULTIPLIER;
-    }
+        // By consensus, gas_limit is multiplied by elasticity (*2) on
+        // on exact block that hardfork happens.
+        if chain_spec.fork(Hardfork::London).transitions_at_block(child.number) {
+            parent_gas_limit = parent.gas_limit * constants::EIP1559_ELASTICITY_MULTIPLIER;
+        }
 
-    // Check gas limit, max diff between child/parent gas_limit should be  max_diff=parent_gas/1024
-    if child.gas_limit > parent_gas_limit {
-        if child.gas_limit - parent_gas_limit >= parent_gas_limit / 1024 {
-            return Err(ConsensusError::GasLimitInvalidIncrease {
+        if child.gas_limit > parent_gas_limit {
+            if child.gas_limit - parent_gas_limit >= parent_gas_limit / 1024 {
+                return Err(ConsensusError::GasLimitInvalidIncrease {
+                    parent_gas_limit,
+                    child_gas_limit: child.gas_limit,
+                })
+            }
+        } else if parent_gas_limit - child.gas_limit >= parent_gas_limit / 1024 {
+            return Err(ConsensusError::GasLimitInvalidDecrease {
                 parent_gas_limit,
                 child_gas_limit: child.gas_limit,
             })
         }
-    } else if parent_gas_limit - child.gas_limit >= parent_gas_limit / 1024 {
-        return Err(ConsensusError::GasLimitInvalidDecrease {
-            parent_gas_limit,
-            child_gas_limit: child.gas_limit,
-        })
     }
 
     // EIP-1559 check base fee
@@ -297,7 +307,12 @@ pub fn validate_header_regarding_parent(
                 constants::EIP1559_INITIAL_BASE_FEE
             } else {
                 // This BaseFeeMissing will not happen as previous blocks are checked to have them.
-                parent.next_block_base_fee().ok_or(ConsensusError::BaseFeeMissing)?
+                parent
+                    .next_block_base_fee(
+                        chain_spec.base_fee_change_denominator(),
+                        chain_spec.elasticity_multiplier(),
+                    )
+                    .ok_or(ConsensusError::BaseFeeMissing)?
             };
         if expected_base_fee != base_fee {
             return Err(ConsensusError::BaseFeeDiff { expected: expected_base_fee, got: base_fee })

crates/interfaces/Cargo.toml

@@ -54,4 +54,5 @@ secp256k1 = { workspace = true, features = [
 
 [features]
 test-utils = ["tokio-stream/sync", "secp256k1", "rand/std_rng"]
-cli = ["clap"]
+cli = ["clap"]
+optimism = ["reth-eth-wire/optimism"]

crates/interfaces/src/blockchain_tree/error.rs

@@ -194,6 +194,9 @@ impl InsertBlockErrorKind {
                     BlockExecutionError::BlockHashNotFoundInChain { .. } |
                     BlockExecutionError::AppendChainDoesntConnect { .. } |
                     BlockExecutionError::UnavailableForTest => false,
+                    #[cfg(feature = "optimism")]
+                    BlockExecutionError::L1BlockInfoError { .. } |
+                    BlockExecutionError::InsufficientFundsForL1Cost { .. } => false,
                 }
             }
             InsertBlockErrorKind::Tree(err) => {

crates/interfaces/src/executor.rs

@@ -42,7 +42,6 @@ pub enum BlockExecutionError {
     CanonicalRevert { inner: String },
     #[error("Transaction error on commit: {inner:?}")]
     CanonicalCommit { inner: String },
-
     // === tree errors ===
     // TODO(mattsse): move this to tree error
     #[error("Block hash {block_hash} not found in blockchain tree chain")]
@@ -57,6 +56,13 @@ pub enum BlockExecutionError {
     /// Note: this is not feature gated for convenience.
     #[error("Execution unavailable for tests")]
     UnavailableForTest,
+
+    #[cfg(feature = "optimism")]
+    #[error("Could not get L1 block info from L2 block: {message:?}")]
+    L1BlockInfoError { message: String },
+    #[cfg(feature = "optimism")]
+    #[error("Insufficient funds to cover transaction L1 cost: want {want}, have {have}")]
+    InsufficientFundsForL1Cost { want: u64, have: u64 },
 }
 
 impl BlockExecutionError {

crates/interfaces/src/test_utils/generators.rs

@@ -349,6 +349,8 @@ pub fn random_receipt<R: Rng>(
         } else {
             vec![]
         },
+        #[cfg(feature = "optimism")]
+        deposit_nonce: None,
     }
 }
 

crates/net/eth-wire/Cargo.toml

@@ -64,6 +64,7 @@ proptest-derive = "0.3"
 default = ["serde"]
 serde = ["dep:serde", "smol_str/serde"]
 arbitrary = ["reth-primitives/arbitrary", "dep:arbitrary", "dep:proptest", "dep:proptest-derive"]
+optimism = []
 
 [[test]]
 name = "fuzz_roundtrip"

crates/net/eth-wire/src/types/receipts.rs

@@ -49,6 +49,8 @@ mod test {
                 success: false,
                 cumulative_gas_used: 0,
                 logs: vec![],
+                #[cfg(feature = "optimism")]
+                deposit_nonce: None,
             },
             bloom: Default::default(),
         }]]);
@@ -102,10 +104,10 @@ mod test {
         let mut data = vec![];
         let request = RequestPair::<Receipts> {
             request_id: 1111,
-            message: Receipts(vec![
-                vec![
-                    ReceiptWithBloom {
-                        receipt: Receipt {tx_type: TxType::Legacy,
+            message: Receipts(vec![vec![
+                ReceiptWithBloom {
+                    receipt: Receipt {
+                        tx_type: TxType::Legacy,
                         cumulative_gas_used: 0x1u64,
                         logs: vec![
                             Log {
@@ -118,10 +120,12 @@ mod test {
                             },
                         ],
                         success: false,
-                    },bloom: hex!("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000").into(),
-                }
-                ],
-            ]),
+                        #[cfg(feature = "optimism")]
+                        deposit_nonce: None,
+                    },
+                    bloom: hex!("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000").into(),
+                },
+            ]]),
         };
         request.encode(&mut data);
         assert_eq!(data, expected);
@@ -153,6 +157,8 @@ mod test {
                                     },
                                 ],
                                 success: false,
+                                #[cfg(feature = "optimism")]
+                                deposit_nonce: None,
                             },
                             bloom: hex!("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000").into(),
                         },

crates/payload/basic/Cargo.toml

@@ -29,3 +29,11 @@ futures-util = { workspace = true }
 
 ## misc
 tracing = { workspace = true }
+
+[features]
+optimism = [
+  "reth-primitives/optimism",
+  "reth-revm/optimism",
+  "reth-transaction-pool/optimism",
+  "reth-provider/optimism"
+]

crates/payload/basic/src/lib.rs

@@ -659,6 +659,8 @@ fn build_payload<Pool, Client>(
                     success: result.is_success(),
                     cumulative_gas_used,
                     logs: result.logs().into_iter().map(into_reth_log).collect(),
+                    #[cfg(feature = "optimism")]
+                    deposit_nonce: None,
                 },
             );
 

crates/payload/builder/Cargo.toml

@@ -32,3 +32,9 @@ tracing = { workspace = true }
 
 [features]
 test-utils = []
+optimism = [
+  "reth-primitives/optimism",
+  "reth-rpc-types/optimism",
+  "reth-interfaces/optimism",
+  "reth-revm-primitives/optimism",
+]

crates/payload/builder/src/payload.rs

@@ -134,7 +134,14 @@ impl PayloadBuilderAttributes {
             prevrandao: Some(self.prev_randao),
             gas_limit: U256::from(parent.gas_limit),
             // calculate basefee based on parent block's gas usage
-            basefee: U256::from(parent.next_block_base_fee().unwrap_or_default()),
+            basefee: U256::from(
+                parent
+                    .next_block_base_fee(
+                        chain_spec.base_fee_change_denominator(),
+                        chain_spec.elasticity_multiplier(),
+                    )
+                    .unwrap_or_default(),
+            ),
         };
 
         (cfg, block_env)

crates/primitives/Cargo.toml

@@ -92,6 +92,7 @@ pprof = { version = "0.12", features = ["flamegraph", "frame-pointer", "criterio
 default = []
 arbitrary = ["revm-primitives/arbitrary", "dep:arbitrary", "dep:proptest", "dep:proptest-derive"]
 test-utils = []
+optimism = []
 
 [[bench]]
 name = "recover_ecdsa_crit"