refactor: get block number and timestamp from blockenv

crates/ethereum/payload/src/lib.rs

@@ -113,7 +113,6 @@ where
             .build();
 
         let base_fee = initialized_block_env.basefee.to::<u64>();
-        let block_number = initialized_block_env.number.to::<u64>();
         let block_gas_limit =
             initialized_block_env.gas_limit.try_into().unwrap_or(chain_spec.max_gas_limit);
 
@@ -124,8 +123,6 @@ where
             &chain_spec,
             &initialized_cfg,
             &initialized_block_env,
-            block_number,
-            attributes.timestamp,
             attributes.parent_beacon_block_root,
         )
         .map_err(|err| {
@@ -144,8 +141,6 @@ where
             &chain_spec,
             &initialized_cfg,
             &initialized_block_env,
-            block_number,
-            attributes.timestamp,
             parent_block.hash(),
         )
         .map_err(|err| {
@@ -307,8 +302,6 @@ where
         &chain_spec,
         &initialized_cfg,
         &initialized_block_env,
-        block_number,
-        attributes.timestamp,
         attributes.parent_beacon_block_root,
     )
     .map_err(|err| {
@@ -327,8 +320,6 @@ where
         &chain_spec,
         &initialized_cfg,
         &initialized_block_env,
-        block_number,
-        attributes.timestamp,
         parent_block.hash(),
     )
     .map_err(|err| {

crates/evm/src/system_calls.rs

@@ -31,15 +31,12 @@ use revm_primitives::{
 ///
 /// This uses [`apply_blockhashes_contract_call`] to ultimately apply the blockhash contract state
 /// change.
-#[allow(clippy::too_many_arguments)]
 pub fn pre_block_blockhashes_contract_call<EvmConfig, DB>(
     db: &mut DB,
     evm_config: &EvmConfig,
     chain_spec: &ChainSpec,
     initialized_cfg: &CfgEnvWithHandlerCfg,
     initialized_block_env: &BlockEnv,
-    block_number: u64,
-    block_timestamp: u64,
     parent_block_hash: B256,
 ) -> Result<(), BlockExecutionError>
 where
@@ -60,8 +57,8 @@ where
     apply_blockhashes_contract_call(
         evm_config,
         chain_spec,
-        block_timestamp,
-        block_number,
+        initialized_block_env.timestamp.to(),
+        initialized_block_env.number.to(),
         parent_block_hash,
         &mut evm_pre_block,
     )
@@ -135,15 +132,12 @@ where
 ///
 /// This uses [`apply_beacon_root_contract_call`] to ultimately apply the beacon root contract state
 /// change.
-#[allow(clippy::too_many_arguments)]
 pub fn pre_block_beacon_root_contract_call<EvmConfig, DB>(
     db: &mut DB,
     evm_config: &EvmConfig,
     chain_spec: &ChainSpec,
     initialized_cfg: &CfgEnvWithHandlerCfg,
     initialized_block_env: &BlockEnv,
-    block_number: u64,
-    block_timestamp: u64,
     parent_beacon_block_root: Option<B256>,
 ) -> Result<(), BlockExecutionError>
 where
@@ -165,8 +159,8 @@ where
     apply_beacon_root_contract_call(
         evm_config,
         chain_spec,
-        block_timestamp,
-        block_number,
+        initialized_block_env.timestamp.to(),
+        initialized_block_env.number.to(),
         parent_beacon_block_root,
         &mut evm_pre_block,
     )

crates/optimism/payload/src/builder.rs

@@ -113,7 +113,6 @@ where
             .build();
 
         let base_fee = initialized_block_env.basefee.to::<u64>();
-        let block_number = initialized_block_env.number.to::<u64>();
         let block_gas_limit: u64 =
             initialized_block_env.gas_limit.try_into().unwrap_or(chain_spec.max_gas_limit);
 
@@ -124,8 +123,6 @@ where
             &chain_spec,
             &initialized_cfg,
             &initialized_block_env,
-            block_number,
-            attributes.payload_attributes.timestamp,
             attributes.payload_attributes.parent_beacon_block_root,
         )
         .map_err(|err| {
@@ -289,8 +286,6 @@ where
         &chain_spec,
         &initialized_cfg,
         &initialized_block_env,
-        block_number,
-        attributes.payload_attributes.timestamp,
         attributes.payload_attributes.parent_beacon_block_root,
     )
     .map_err(|err| {

crates/rpc/rpc-eth-api/src/helpers/pending_block.rs

@@ -253,8 +253,6 @@ pub trait LoadPendingBlock: EthApiTypes {
                 chain_spec.as_ref(),
                 &cfg,
                 &block_env,
-                block_number,
-                block_env.timestamp.to::<u64>(),
                 origin.header().parent_beacon_block_root,
             )
             .map_err(|err| EthApiError::Internal(err.into()))?;
@@ -268,8 +266,6 @@ pub trait LoadPendingBlock: EthApiTypes {
             chain_spec.as_ref(),
             &cfg,
             &block_env,
-            block_number,
-            block_env.timestamp.to::<u64>(),
             origin.header().hash(),
         )
         .map_err(|err| EthApiError::Internal(err.into()))?;

crates/rpc/rpc/src/debug.rs

@@ -591,8 +591,6 @@ where
                     &this.inner.provider.chain_spec(),
                     &cfg,
                     &block_env,
-                    block.timestamp,
-                    block.number,
                     block.parent_beacon_block_root,
                 )
                 .map_err(|err| EthApiError::Internal(err.into()))?;
@@ -604,8 +602,6 @@ where
                     &this.inner.provider.chain_spec(),
                     &cfg,
                     &block_env,
-                    block.timestamp,
-                    block.number,
                     block.parent_hash,
                 )
                 .map_err(|err| EthApiError::Internal(err.into()))?;