eip 7928 related changes

.github/workflows/ci.yml

@@ -2,8 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [main]
+    branches: ["**"]
   pull_request:
+    branches: ["**"]
 
 env:
   CARGO_TERM_COLOR: always

Cargo.toml

@@ -41,18 +41,19 @@ alloy-op-evm = { version = "0.21.2", path = "crates/op-evm", default-features =
 # alloy
 alloy-eip2124 = { version = "0.2", default-features = false }
 alloy-chains = { version = "0.2.0", default-features = false }
-alloy-eips = { version = "1.0.34", default-features = false }
-alloy-consensus = { version = "1.0.27", default-features = false }
+alloy-eips = { version = "1.0.37", default-features = false }
+alloy-consensus = { version = "1.0.37", default-features = false }
 alloy-primitives = { version = "1.0.0", default-features = false }
 alloy-sol-types = { version = "1.0.0", default-features = false }
-alloy-hardforks = { version = "0.3" }
-alloy-rpc-types-eth = { version = "1.0.27", default-features = false }
-alloy-rpc-types-engine = { version = "1.0.27", default-features = false }
+alloy-hardforks = { version = "0.3.1" }
+alloy-rpc-types-eth = { version = "1.0.37", default-features = false }
+alloy-rlp = { version = "0.3.12", default-features = false }
+alloy-rpc-types-engine = { version = "1.0.37", default-features = false }
 
 # op-alloy
-alloy-op-hardforks = { version = "0.3" }
-op-alloy-consensus = { version = "0.20", default-features = false }
-op-alloy-rpc-types-engine = { version = "0.20", default-features = false }
+alloy-op-hardforks = { version = "0.3.1" }
+op-alloy-consensus = { version = "0.20.0", default-features = false }
+op-alloy-rpc-types-engine = { version = "0.20.0", default-features = false }
 
 # revm
 revm = { version = "29.0.0", default-features = false }
@@ -64,8 +65,14 @@ derive_more = { version = "2", default-features = false, features = ["full"] }
 serde = { version = "1", default-features = false, features = ["derive"] }
 thiserror = { version = "2.0.0", default-features = false }
 serde_json = "1"
+tracing = { version = "0.1.41", default-features = false }
 test-case = "3"
 
 [patch.crates-io]
-# revm = { git = "https://github.com/bluealloy/revm", rev = "11b16259" }
-# op-revm = { git = "https://github.com/bluealloy/revm", rev = "11b16259" }
+revm = { git = "https://github.com/Soubhik-10/revm", branch = "bal" }
+op-revm = { git = "https://github.com/Soubhik-10/revm", branch = "bal" }
+alloy-eips = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
+alloy-consensus = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
+# alloy-hardforks = { git = "https://github.com/Rimeeeeee/hardforks", branch = "amsterdam" }
+alloy-rpc-types-eth = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }
+alloy-rpc-types-engine = { git = "https://github.com/Soubhik-10/alloy", branch = "bal" }

crates/evm/Cargo.toml

@@ -21,39 +21,39 @@ alloy-eips.workspace = true
 alloy-hardforks.workspace = true
 alloy-op-hardforks = { workspace = true, optional = true }
 alloy-rpc-types-eth = { workspace = true, optional = true }
+alloy-rlp.workspace = true
 alloy-rpc-types-engine = { workspace = true, optional = true }
 op-alloy-rpc-types-engine = { workspace = true, optional = true }
 
-revm.workspace = true
+revm = { workspace = true, features = ["glamsterdam"] }
 op-revm = { workspace = true, optional = true }
 op-alloy-consensus = { workspace = true, optional = true }
 
 auto_impl.workspace = true
 derive_more.workspace = true
 thiserror.workspace = true
-
+tracing.workspace = true
 [dev-dependencies]
 alloy-primitives = { workspace = true, features = ["serde"] }
 serde_json.workspace = true
 test-case.workspace = true
 
 [features]
 default = ["std"]
-secp256k1 = [
-    "std",
-    "alloy-consensus/secp256k1",
-]
+secp256k1 = ["std", "alloy-consensus/secp256k1"]
 std = [
-    "alloy-primitives/std",
-    "revm/std",
-    "alloy-consensus/std",
-    "alloy-eips/std",
-    "alloy-sol-types/std",
-    "derive_more/std",
-    "op-revm?/std",
-    "thiserror/std",
-    "op-alloy-consensus?/std",
-    "alloy-rpc-types-eth?/std",
+	"alloy-primitives/std",
+	"revm/std",
+	"alloy-consensus/std",
+	"alloy-eips/std",
+	"alloy-sol-types/std",
+	"derive_more/std",
+	"op-revm?/std",
+	"thiserror/std",
+	"op-alloy-consensus?/std",
+	"alloy-rpc-types-eth?/std",
+	"alloy-rlp/std",
+	"tracing/std",
     "alloy-rpc-types-engine?/std",
     "op-alloy-rpc-types-engine?/std",
 ]

crates/evm/src/block/mod.rs

@@ -2,7 +2,7 @@
 
 use crate::{Database, Evm, EvmFactory, FromRecoveredTx, FromTxWithEncoded, RecoveredTx, ToTxEnv};
 use alloc::{boxed::Box, vec::Vec};
-use alloy_eips::eip7685::Requests;
+use alloy_eips::{eip7685::Requests, eip7928::BlockAccessList};
 use revm::{
     context::result::{ExecutionResult, ResultAndState},
     database::State,
@@ -32,6 +32,8 @@ pub struct BlockExecutionResult<T> {
     pub requests: Requests,
     /// The total gas used by the block.
     pub gas_used: u64,
+    /// block-level access list
+    pub block_access_list: Option<BlockAccessList>,
 }
 
 /// Helper trait to encapsulate requirements for a type to be used as input for [`BlockExecutor`].

crates/evm/src/block/state_changes.rs

@@ -38,13 +38,19 @@ where
         // Ommer rewards
         for ommer in ommers {
             *balance_increments.entry(ommer.beneficiary()).or_default() += calc::ommer_reward(
+                //bal
                 base_block_reward,
                 block_env.number.saturating_to(),
                 ommer.number(),
             );
         }
 
         // Full block reward
+        tracing::debug!(
+            "Adding block reward of {} to beneficiary {:?}",
+            calc::block_reward(base_block_reward, ommers.len()),
+            block_env.beneficiary
+        );
         *balance_increments.entry(block_env.beneficiary).or_default() +=
             calc::block_reward(base_block_reward, ommers.len());
     }
@@ -131,6 +137,7 @@ where
                 storage: Default::default(),
                 status: AccountStatus::Touched,
                 transaction_id: 0,
+                ..Default::default()
             },
         ))
     };

crates/evm/src/block/system_calls/mod.rs

@@ -4,13 +4,17 @@ use crate::{
     block::{BlockExecutionError, OnStateHook},
     Evm,
 };
-use alloc::{borrow::Cow, boxed::Box};
+use alloc::{borrow::Cow, boxed::Box, vec::Vec};
 use alloy_consensus::BlockHeader;
 use alloy_eips::{
-    eip7002::WITHDRAWAL_REQUEST_TYPE, eip7251::CONSOLIDATION_REQUEST_TYPE, eip7685::Requests,
+    eip2935::{HISTORY_SERVE_WINDOW, HISTORY_STORAGE_ADDRESS},
+    eip7002::WITHDRAWAL_REQUEST_TYPE,
+    eip7251::CONSOLIDATION_REQUEST_TYPE,
+    eip7685::Requests,
+    eip7928::{AccountChanges, SlotChanges, StorageChange},
 };
 use alloy_hardforks::EthereumHardforks;
-use alloy_primitives::{Bytes, B256};
+use alloy_primitives::{Bytes, B256, U256};
 use revm::{state::EvmState, DatabaseCommit};
 
 use super::{StateChangePostBlockSource, StateChangePreBlockSource, StateChangeSource};
@@ -88,7 +92,7 @@ where
         &mut self,
         parent_block_hash: B256,
         evm: &mut impl Evm<DB: DatabaseCommit>,
-    ) -> Result<(), BlockExecutionError> {
+    ) -> Result<Option<AccountChanges>, BlockExecutionError> {
         let result_and_state =
             eip2935::transact_blockhashes_contract_call(&self.spec, parent_block_hash, evm)?;
 
@@ -100,17 +104,31 @@ where
                 );
             }
             evm.db_mut().commit(res.state);
+
+            if self.spec.is_amsterdam_active_at_timestamp(evm.block().timestamp.saturating_to()) {
+                let block_num: u64 = evm.block().number.saturating_to();
+                let slot_change = SlotChanges::default()
+                    .with_change(StorageChange {
+                        block_access_index: 0,
+                        new_value: parent_block_hash,
+                    })
+                    .with_slot(U256::from((block_num - 1) % HISTORY_SERVE_WINDOW as u64).into());
+                let acc_changes = AccountChanges::default()
+                    .with_storage_change(slot_change)
+                    .with_address(HISTORY_STORAGE_ADDRESS);
+                return Ok(Some(acc_changes));
+            }
         }
 
-        Ok(())
+        Ok(None)
     }
 
     /// Applies the pre-block call to the EIP-4788 beacon root contract.
     pub fn apply_beacon_root_contract_call(
         &mut self,
         parent_beacon_block_root: Option<B256>,
         evm: &mut impl Evm<DB: DatabaseCommit>,
-    ) -> Result<(), BlockExecutionError> {
+    ) -> Result<Option<Vec<SlotChanges>>, BlockExecutionError> {
         let result_and_state =
             eip4788::transact_beacon_root_contract_call(&self.spec, parent_beacon_block_root, evm)?;
 
@@ -122,9 +140,33 @@ where
                 );
             }
             evm.db_mut().commit(res.state);
+            if self.spec.is_amsterdam_active_at_timestamp(evm.block().timestamp.saturating_to()) {
+                let timestamp: u64 = evm.block().timestamp.saturating_to();
+                let slot_changes: Vec<SlotChanges> = alloc::vec![
+                    SlotChanges::default()
+                        .with_change(StorageChange {
+                            block_access_index: 0,
+                            new_value: U256::from(timestamp).into(),
+                        })
+                        .with_slot(U256::from(timestamp % HISTORY_SERVE_WINDOW as u64).into()),
+                    SlotChanges::default()
+                        .with_change(StorageChange {
+                            block_access_index: 0,
+                            new_value: parent_beacon_block_root.unwrap(),
+                        })
+                        .with_slot(
+                            U256::from(
+                                (timestamp % HISTORY_SERVE_WINDOW as u64)
+                                    + HISTORY_SERVE_WINDOW as u64,
+                            )
+                            .into(),
+                        ),
+                ];
+
+                return Ok(Some(slot_changes));
+            }
         }
-
-        Ok(())
+        Ok(None)
     }
 
     /// Applies the post-block call to the EIP-7002 withdrawal request contract.