Merge remote-tracking branch 'origin/main' into fred

Cargo.toml

@@ -32,6 +32,7 @@ members = [
     "examples/database_components",
     "examples/uniswap_get_reserves",
     "examples/uniswap_v2_usdc_swap",
+    "examples/erc20_gas",
     #"examples/custom_opcodes",
 ]
 resolver = "2"

bins/revme/src/cmd/statetest/runner.rs

@@ -286,11 +286,16 @@ pub fn execute_test_suite(
         cfg.chain_id = 1;
 
         // Block env
-        block.number = unit.env.current_number;
+        block.number = unit.env.current_number.try_into().unwrap_or(u64::MAX);
         block.beneficiary = unit.env.current_coinbase;
-        block.timestamp = unit.env.current_timestamp;
-        block.gas_limit = unit.env.current_gas_limit;
-        block.basefee = unit.env.current_base_fee.unwrap_or_default();
+        block.timestamp = unit.env.current_timestamp.try_into().unwrap_or(u64::MAX);
+        block.gas_limit = unit.env.current_gas_limit.try_into().unwrap_or(u64::MAX);
+        block.basefee = unit
+            .env
+            .current_base_fee
+            .unwrap_or_default()
+            .try_into()
+            .unwrap_or(u64::MAX);
         block.difficulty = unit.env.current_difficulty;
         // After the Merge prevrandao replaces mix_hash field in block and replaced difficulty opcode in EVM.
         block.prevrandao = unit.env.current_random;

crates/context/interface/src/block.rs

@@ -10,28 +10,28 @@ use std::boxed::Box;
 #[auto_impl(&, &mut, Box, Arc)]
 pub trait Block {
     /// The number of ancestor blocks of this block (block height).
-    fn number(&self) -> &U256;
+    fn number(&self) -> u64;
 
     /// Beneficiary (Coinbase, miner) is a address that have signed the block.
     ///
     /// This is the receiver address of priority gas rewards.
-    fn beneficiary(&self) -> &Address;
+    fn beneficiary(&self) -> Address;
 
     /// The timestamp of the block in seconds since the UNIX epoch.
-    fn timestamp(&self) -> &U256;
+    fn timestamp(&self) -> u64;
 
     /// The gas limit of the block.
-    fn gas_limit(&self) -> &U256;
+    fn gas_limit(&self) -> u64;
 
     /// The base fee per gas, added in the London upgrade with [EIP-1559].
     ///
     /// [EIP-1559]: https://eips.ethereum.org/EIPS/eip-1559
-    fn basefee(&self) -> &U256;
+    fn basefee(&self) -> u64;
 
     /// The difficulty of the block.
     ///
     /// Unused after the Paris (AKA the merge) upgrade, and replaced by `prevrandao`.
-    fn difficulty(&self) -> &U256;
+    fn difficulty(&self) -> U256;
 
     /// The output of the randomness beacon provided by the beacon chain.
     ///
@@ -40,7 +40,7 @@ pub trait Block {
     /// Note: `prevrandao` can be found in a block in place of `mix_hash`.
     ///
     /// [EIP-4399]: https://eips.ethereum.org/EIPS/eip-4399
-    fn prevrandao(&self) -> Option<&B256>;
+    fn prevrandao(&self) -> Option<B256>;
 
     /// Excess blob gas and blob gasprice.
     /// See also [`calc_excess_blob_gas`]
@@ -49,7 +49,7 @@ pub trait Block {
     /// Incorporated as part of the Cancun upgrade via [EIP-4844].
     ///
     /// [EIP-4844]: https://eips.ethereum.org/EIPS/eip-4844
-    fn blob_excess_gas_and_price(&self) -> Option<&BlobExcessGasAndPrice>;
+    fn blob_excess_gas_and_price(&self) -> Option<BlobExcessGasAndPrice>;
 
     /// See [EIP-4844] and [`calc_blob_gasprice`].
     ///

crates/context/interface/src/block/blob.rs

@@ -7,7 +7,7 @@ use specification::eip4844::{
 /// Incorporated as part of the Cancun upgrade via [EIP-4844].
 ///
 /// [EIP-4844]: https://eips.ethereum.org/EIPS/eip-4844
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct BlobExcessGasAndPrice {
     /// The excess blob gas of the block

crates/context/interface/src/journaled_state.rs

@@ -1,6 +1,6 @@
 use core::ops::{Deref, DerefMut};
 use database_interface::{Database, DatabaseGetter};
-use primitives::{Address, Log, B256, U256};
+use primitives::{Address, HashSet, Log, B256, U256};
 use specification::hardfork::SpecId;
 use state::{Account, Bytecode};
 use std::boxed::Box;
@@ -17,10 +17,10 @@ pub trait Journal {
     fn new(database: Self::Database) -> Self;
 
     /// Returns the database.
-    fn db(&self) -> &Self::Database;
+    fn db_ref(&self) -> &Self::Database;
 
     /// Returns the mutable database.
-    fn db_mut(&mut self) -> &mut Self::Database;
+    fn db(&mut self) -> &mut Self::Database;
 
     /// Returns the storage value from Journal state.
     ///
@@ -63,6 +63,10 @@ pub trait Journal {
 
     fn warm_account(&mut self, address: Address);
 
+    fn warm_precompiles(&mut self, addresses: HashSet<Address>);
+
+    fn precompile_addresses(&self) -> &HashSet<Address>;
+
     fn set_spec_id(&mut self, spec_id: SpecId);
 
     fn touch_account(&mut self, address: Address);

crates/context/interface/src/result.rs

@@ -54,6 +54,15 @@ impl<HaltReasonT: HaltReasonTrait> ExecutionResult<HaltReasonT> {
         matches!(self, Self::Success { .. })
     }
 
+    /// Returns created address if execution is Create transaction
+    /// and Contract was created.
+    pub fn created_address(&self) -> Option<Address> {
+        match self {
+            Self::Success { output, .. } => output.address().cloned(),
+            _ => None,
+        }
+    }
+
     /// Returns true if execution result is a Halt.
     pub fn is_halt(&self) -> bool {
         matches!(self, Self::Halt { .. })
@@ -175,9 +184,9 @@ impl<DB, TX> FromStringError for EVMError<DB, TX> {
     }
 }
 
-impl<DB, TXERROR: From<InvalidTransaction>> From<InvalidTransaction> for EVMError<DB, TXERROR> {
+impl<DB> From<InvalidTransaction> for EVMError<DB, InvalidTransaction> {
     fn from(value: InvalidTransaction) -> Self {
-        Self::Transaction(value.into())
+        Self::Transaction(value)
     }
 }