tempoxyz
diff --git a/‎Cargo.lock‎
Lines changed: 119 additions & 116 deletions b/‎Cargo.lock‎
Lines changed: 119 additions & 116 deletions
diff --git a/‎Cargo.toml‎
Lines changed: 29 additions & 29 deletions b/‎Cargo.toml‎
Lines changed: 29 additions & 29 deletions
diff --git a/‎crates/anvil/src/eth/backend/executor.rs‎
Lines changed: 36 additions & 2 deletions b/‎crates/anvil/src/eth/backend/executor.rs‎
Lines changed: 36 additions & 2 deletions
diff --git a/‎crates/anvil/src/evm.rs‎
Lines changed: 7 additions & 7 deletions b/‎crates/anvil/src/evm.rs‎
Lines changed: 7 additions & 7 deletions
diff --git a/‎crates/anvil/src/server/beacon_handler.rs‎
Lines changed: 12 additions & 6 deletions b/‎crates/anvil/src/server/beacon_handler.rs‎
Lines changed: 12 additions & 6 deletions
@@ -236,31 +236,31 @@ svm = { package = "svm-rs", version = "0.5", default-features = false, features
 ] }
 
 ## alloy
-alloy-consensus = { version = "1.1.0", default-features = false }
-alloy-contract = { version = "1.1.0", default-features = false }
-alloy-eips = { version = "1.1.0", default-features = false }
-alloy-eip5792 = { version = "1.1.0", default-features = false }
-alloy-ens = { version = "1.1.0", default-features = false }
-alloy-genesis = { version = "1.1.0", default-features = false }
-alloy-json-rpc = { version = "1.1.0", default-features = false }
-alloy-network = { version = "1.1.0", default-features = false }
-alloy-provider = { version = "1.1.0", default-features = false }
-alloy-pubsub = { version = "1.1.0", default-features = false }
-alloy-rpc-client = { version = "1.1.0", default-features = false }
-alloy-rpc-types = { version = "1.1.0", default-features = true }
-alloy-rpc-types-beacon = { version = "1.1.0", default-features = true }
-alloy-serde = { version = "1.1.0", default-features = false }
-alloy-signer = { version = "1.1.0", default-features = false }
-alloy-signer-aws = { version = "1.1.0", default-features = false }
-alloy-signer-gcp = { version = "1.1.0", default-features = false }
-alloy-signer-ledger = { version = "1.1.0", default-features = false }
-alloy-signer-local = { version = "1.1.0", default-features = false }
-alloy-signer-trezor = { version = "1.1.0", default-features = false }
-alloy-signer-turnkey = { version = "1.1.0", default-features = false }
-alloy-transport = { version = "1.1.0", default-features = false }
-alloy-transport-http = { version = "1.1.0", default-features = false }
-alloy-transport-ipc = { version = "1.1.0", default-features = false }
-alloy-transport-ws = { version = "1.1.0", default-features = false }
+alloy-consensus = { version = "1.1.1", default-features = false }
+alloy-contract = { version = "1.1.1", default-features = false }
+alloy-eips = { version = "1.1.1", default-features = false }
+alloy-eip5792 = { version = "1.1.1", default-features = false }
+alloy-ens = { version = "1.1.1", default-features = false }
+alloy-genesis = { version = "1.1.1", default-features = false }
+alloy-json-rpc = { version = "1.1.1", default-features = false }
+alloy-network = { version = "1.1.1", default-features = false }
+alloy-provider = { version = "1.1.1", default-features = false }
+alloy-pubsub = { version = "1.1.1", default-features = false }
+alloy-rpc-client = { version = "1.1.1", default-features = false }
+alloy-rpc-types = { version = "1.1.1", default-features = true }
+alloy-rpc-types-beacon = { version = "1.1.1", default-features = true }
+alloy-serde = { version = "1.1.1", default-features = false }
+alloy-signer = { version = "1.1.1", default-features = false }
+alloy-signer-aws = { version = "1.1.1", default-features = false }
+alloy-signer-gcp = { version = "1.1.1", default-features = false }
+alloy-signer-ledger = { version = "1.1.1", default-features = false }
+alloy-signer-local = { version = "1.1.1", default-features = false }
+alloy-signer-trezor = { version = "1.1.1", default-features = false }
+alloy-signer-turnkey = { version = "1.1.1", default-features = false }
+alloy-transport = { version = "1.1.1", default-features = false }
+alloy-transport-http = { version = "1.1.1", default-features = false }
+alloy-transport-ipc = { version = "1.1.1", default-features = false }
+alloy-transport-ws = { version = "1.1.1", default-features = false }
 alloy-hardforks = { version = "0.4.0", default-features = false }
 alloy-op-hardforks = { version = "0.4.0", default-features = false }
 
@@ -287,9 +287,9 @@ op-alloy-rpc-types = "0.22.0"
 op-alloy-flz = "0.13.1"
 
 ## revm
-revm = { version = "33.0.0", default-features = false }
+revm = { version = "33.0.1", default-features = false }
 revm-inspectors = { version = "0.33.0", features = ["serde"] }
-op-revm = { version = "14.0.0", default-features = false }
+op-revm = { version = "14.0.1", default-features = false }
 
 # tempo
 tempo-contracts = { git = "ssh://git@github.com/tempoxyz/tempo", rev = "8c55629" }
@@ -449,8 +449,8 @@ rexpect = { git = "https://github.com/rust-cli/rexpect", rev = "2ed0b1898d7edaf6
 # alloy-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "237d0a0" }
 # alloy-op-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "237d0a0" }
 
-## revm
-# revm = { git = "https://github.com/bluealloy/revm", rev = "7e59936" }
+# revm
+# revm = { git = "https://github.com/bluealloy/revm.git", rev = "7e59936" }
 # op-revm = { git = "https://github.com/bluealloy/revm.git", rev = "7e59936" }
 # revm-inspectors = { git = "https://github.com/zerosnacks/revm-inspectors.git", rev = "0aaab71" }
 
 
@@ -14,9 +14,14 @@ use crate::{
     mem::inspector::AnvilInspector,
 };
 use alloy_consensus::{
-    Header, Receipt, ReceiptWithBloom, constants::EMPTY_WITHDRAWALS, proofs::calculate_receipt_root,
+    Header, Receipt, ReceiptWithBloom, constants::EMPTY_WITHDRAWALS,
+    proofs::calculate_receipt_root, transaction::Either,
+};
+use alloy_eips::{
+    eip7685::EMPTY_REQUESTS_HASH,
+    eip7702::{RecoveredAuthority, RecoveredAuthorization},
+    eip7840::BlobParams,
 };
-use alloy_eips::{eip7685::EMPTY_REQUESTS_HASH, eip7840::BlobParams};
 use alloy_evm::{
     EthEvm, Evm, FromRecoveredTx,
     eth::EthEvmContext,
@@ -276,6 +281,35 @@ impl<DB: Db + ?Sized, V: TransactionValidator> TransactionExecutor<'_, DB, V> {
         let mut tx_env: OpTransaction<TxEnv> =
             FromRecoveredTx::from_recovered_tx(&tx.transaction.transaction, *tx.sender());
 
+        if let TypedTransaction::EIP7702(tx_7702) = &tx.transaction.transaction
+            && self.cheats.has_recover_overrides()
+        {
+            // Override invalid recovered authorizations with signature overrides from cheat manager
+            let cheated_auths = tx_7702
+                .tx()
+                .authorization_list
+                .iter()
+                .zip(tx_env.base.authorization_list)
+                .map(|(signed_auth, either_auth)| {
+                    either_auth.right_and_then(|recovered_auth| {
+                        if recovered_auth.authority().is_none()
+                            && let Ok(signature) = signed_auth.signature()
+                            && let Some(override_addr) =
+                                self.cheats.get_recover_override(&signature.as_bytes().into())
+                        {
+                            Either::Right(RecoveredAuthorization::new_unchecked(
+                                recovered_auth.into_parts().0,
+                                RecoveredAuthority::Valid(override_addr),
+                            ))
+                        } else {
+                            Either::Right(recovered_auth)
+                        }
+                    })
+                })
+                .collect();
+            tx_env.base.authorization_list = cheated_auths;
+        }
+
         if self.networks.is_optimism() {
             tx_env.enveloped_tx = Some(alloy_rlp::encode(&tx.transaction.transaction).into());
         }
 
@@ -1,9 +1,9 @@
 use std::fmt::Debug;
 
 use alloy_evm::{
+    Database, Evm,
     eth::EthEvmContext,
     precompiles::{DynPrecompile, PrecompilesMap},
-    Database, Evm,
 };
 use alloy_primitives::Address;
 use foundry_evm::core::either_evm::EitherEvm;
@@ -23,27 +23,27 @@ mod tests {
 
     use crate::PrecompileFactory;
     use alloy_evm::{
+        EthEvm, Evm, EvmEnv,
         eth::EthEvmContext,
         precompiles::{DynPrecompile, PrecompilesMap},
-        EthEvm, Evm, EvmEnv,
     };
     use alloy_op_evm::OpEvm;
-    use alloy_primitives::{address, Address, Bytes, TxKind, U256};
+    use alloy_primitives::{Address, Bytes, TxKind, U256, address};
     use foundry_evm::core::either_evm::EitherEvm;
     use foundry_evm_networks::NetworkConfigs;
     use itertools::Itertools;
-    use op_revm::{precompiles::OpPrecompiles, L1BlockInfo, OpContext, OpSpecId, OpTransaction};
+    use op_revm::{L1BlockInfo, OpContext, OpSpecId, OpTransaction, precompiles::OpPrecompiles};
     use revm::{
+        Journal,
         context::{CfgEnv, Evm as RevmEvm, JournalTr, LocalContext, TxEnv},
         database::{EmptyDB, EmptyDBTyped},
-        handler::{instructions::EthInstructions, EthPrecompiles},
+        handler::{EthPrecompiles, instructions::EthInstructions},
         inspector::NoOpInspector,
         interpreter::interpreter::EthInterpreter,
         precompile::{PrecompileOutput, PrecompileSpecId, Precompiles},
         primitives::hardfork::SpecId,
-        Journal,
     };
-    use tempo_revm::{evm::TempoContext, TempoTxEnv};
+    use tempo_revm::{TempoTxEnv, evm::TempoContext};
 
     // A precompile activated in the `Prague` spec.
     const ETH_PRAGUE_PRECOMPILE: Address = address!("0x0000000000000000000000000000000000000011");
 
@@ -5,6 +5,7 @@ use crate::eth::{
 use alloy_eips::BlockId;
 use alloy_primitives::{B256, aliases::B32};
 use alloy_rpc_types_beacon::{
+    genesis::{GenesisData, GenesisResponse},
     header::Header,
     sidecar::{BlobData, GetBlobsResponse},
 };
@@ -99,12 +100,17 @@ pub async fn handle_get_blobs(
 /// GET /eth/v1/beacon/genesis
 pub async fn handle_get_genesis(State(api): State<EthApi>) -> Response {
     match api.anvil_get_genesis_time() {
-        Ok(genesis_time) => BeaconResponse::new(GenesisDetails {
-            genesis_time,
-            genesis_validators_root: B256::ZERO,
-            genesis_fork_version: B32::ZERO,
-        })
-        .into_response(),
+        Ok(genesis_time) => (
+            StatusCode::OK,
+            Json(GenesisResponse {
+                data: GenesisData {
+                    genesis_time,
+                    genesis_validators_root: B256::ZERO,
+                    genesis_fork_version: B32::ZERO,
+                },
+            }),
+        )
+            .into_response(),
         Err(_) => BeaconError::internal_error().into_response(),
     }
 }