Upgrade to latest version of Alloy and port Anvil tests

Cargo.toml

@@ -155,7 +155,6 @@ ethers-contract = { version = "2.0.14", default-features = false }
 ethers-contract-abigen = { version = "2.0.14", default-features = false }
 ethers-providers = { version = "2.0.14", default-features = false }
 ethers-signers = { version = "2.0.14", default-features = false }
-ethers-middleware = { version = "2.0.14", default-features = false }
 
 ## alloy
 alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "8808d21", default-features = false }
@@ -168,6 +167,7 @@ alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "8808d2
 alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "8808d21", default-features = false }
 alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "8808d21", default-features = false }
 alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "8808d21", default-features = false }
+alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "8808d21", default-features = false }
 alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "8808d21", default-features = false }
 alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "8808d21", default-features = false }
 alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "8808d21", default-features = false }
@@ -180,10 +180,10 @@ alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "8808d
 alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "8808d21", default-features = false }
 alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "8808d21", default-features = false }
 alloy-primitives = { version = "0.7.1", features = ["getrandom"] }
-alloy-dyn-abi = "0.7.0"
-alloy-json-abi = "0.7.0"
-alloy-sol-types = "0.7.0"
-syn-solidity = "0.7.0"
+alloy-dyn-abi = "0.7.1"
+alloy-json-abi = "0.7.1"
+alloy-sol-types = "0.7.1"
+syn-solidity = "0.7.1"
 alloy-chains = "0.1"
 alloy-trie = "0.3.1"
 alloy-rlp = "0.3.3"

crates/anvil/Cargo.toml

@@ -16,7 +16,11 @@ path = "src/anvil.rs"
 required-features = ["cli"]
 
 [build-dependencies]
-vergen = { workspace = true, default-features = false, features = ["build", "git", "gitcl"] }
+vergen = { workspace = true, default-features = false, features = [
+    "build",
+    "git",
+    "gitcl",
+] }
 
 [dependencies]
 # foundry internal
@@ -34,6 +38,7 @@ k256.workspace = true
 ethers = { workspace = true, features = ["rustls", "ws", "ipc", "optimism"] }
 alloy-primitives = { workspace = true, features = ["serde"] }
 alloy-consensus = { workspace = true, features = ["k256", "kzg"] }
+alloy-contract = { workspace = true, features = ["pubsub"] }
 alloy-network.workspace = true
 alloy-eips.workspace = true
 alloy-rlp.workspace = true
@@ -77,7 +82,11 @@ rand = "0.8"
 eyre.workspace = true
 
 # cli
-clap = { version = "4", features = ["derive", "env", "wrap_help"], optional = true }
+clap = { version = "4", features = [
+    "derive",
+    "env",
+    "wrap_help",
+], optional = true }
 clap_complete = { version = "4", optional = true }
 chrono.workspace = true
 auto_impl = "1"
@@ -94,8 +103,12 @@ alloy-json-abi.workspace = true
 ethers = { workspace = true, features = ["abigen", "optimism"] }
 ethers-core = { workspace = true, features = ["optimism"] }
 foundry-compilers = { workspace = true, features = ["project-util", "full"] }
+alloy-rpc-client = { workspace = true, features = ["pubsub"] }
+alloy-transport-ipc = { workspace = true, features = ["mock"] }
+alloy-transport-ws.workspace = true
+alloy-json-rpc.workspace = true
+alloy-pubsub.workspace = true
 foundry-test-utils.workspace = true
-
 pretty_assertions.workspace = true
 tokio = { version = "1", features = ["full"] }
 crc = "3.0.1"

crates/anvil/core/src/eth/transaction/mod.rs

@@ -58,13 +58,12 @@ pub fn transaction_request_to_typed(
         other,
     } = tx;
 
-    let to = if let Some(TxKind::Call(to)) = to { TxKind::Call(to) } else { TxKind::Create };
     // Special case: OP-stack deposit tx
     if transaction_type == Some(126) {
         return Some(TypedTransactionRequest::Deposit(DepositTransactionRequest {
             from: from.unwrap_or_default(),
             source_hash: other.get_deserialized::<B256>("sourceHash")?.ok()?,
-            kind: to,
+            kind: to.unwrap_or_default(),
             mint: other.get_deserialized::<U256>("mint")?.ok()?,
             value: value.unwrap_or_default(),
             gas_limit: gas.unwrap_or_default(),
@@ -93,7 +92,7 @@ pub fn transaction_request_to_typed(
                 gas_limit: gas.unwrap_or_default(),
                 value: value.unwrap_or(U256::ZERO),
                 input: input.into_input().unwrap_or_default(),
-                to,
+                to: to.unwrap_or_default(),
                 chain_id: None,
             }))
         }
@@ -106,7 +105,7 @@ pub fn transaction_request_to_typed(
                 gas_limit: gas.unwrap_or_default(),
                 value: value.unwrap_or(U256::ZERO),
                 input: input.into_input().unwrap_or_default(),
-                to,
+                to: to.unwrap_or_default(),
                 chain_id: 0,
                 access_list: access_list.unwrap_or_default(),
             }))
@@ -124,13 +123,13 @@ pub fn transaction_request_to_typed(
                 gas_limit: gas.unwrap_or_default(),
                 value: value.unwrap_or(U256::ZERO),
                 input: input.into_input().unwrap_or_default(),
-                to,
+                to: to.unwrap_or_default(),
                 chain_id: 0,
                 access_list: access_list.unwrap_or_default(),
             }))
         }
         // EIP4844
-        (Some(3), None, _, _, _, Some(_), Some(_), Some(sidecar), TxKind::Call(to)) => {
+        (Some(3), None, _, _, _, Some(_), Some(_), Some(sidecar), Some(to)) => {
             let tx = TxEip4844 {
                 nonce: nonce.unwrap_or_default(),
                 max_fee_per_gas: max_fee_per_gas.unwrap_or_default(),
@@ -139,7 +138,10 @@ pub fn transaction_request_to_typed(
                 gas_limit: gas.unwrap_or_default(),
                 value: value.unwrap_or(U256::ZERO),
                 input: input.into_input().unwrap_or_default(),
-                to,
+                to: match to {
+                    TxKind::Call(to) => to,
+                    TxKind::Create => Address::ZERO,
+                },
                 chain_id: 0,
                 access_list: access_list.unwrap_or_default(),
                 blob_versioned_hashes: blob_versioned_hashes.unwrap_or_default(),

crates/anvil/src/config.rs

@@ -27,8 +27,7 @@ use alloy_signer_wallet::{
 use alloy_transport::{Transport, TransportError};
 use anvil_server::ServerConfig;
 use foundry_common::{
-    provider::alloy::ProviderBuilder, ALCHEMY_FREE_TIER_CUPS, NON_ARCHIVE_NODE_WARNING,
-    REQUEST_TIMEOUT,
+    provider::ProviderBuilder, ALCHEMY_FREE_TIER_CUPS, NON_ARCHIVE_NODE_WARNING, REQUEST_TIMEOUT,
 };
 use foundry_config::Config;
 use foundry_evm::{

crates/anvil/src/eth/api.rs

@@ -62,7 +62,7 @@ use anvil_core::{
     },
 };
 use anvil_rpc::{error::RpcError, response::ResponseResult};
-use foundry_common::provider::alloy::ProviderBuilder;
+use foundry_common::provider::ProviderBuilder;
 use foundry_evm::{
     backend::DatabaseError,
     decode::RevertDecoder,
@@ -2188,11 +2188,11 @@ impl EthApi {
     {
         // If the request is a simple native token transfer we can optimize
         // We assume it's a transfer if we have no input data.
-        let to = if let Some(TxKind::Call(to)) = request.to { Some(to) } else { None };
+        let to = request.to.as_ref().and_then(TxKind::to);
         let likely_transfer = request.input.clone().into_input().is_none();
         if likely_transfer {
             if let Some(to) = to {
-                if let Ok(target_code) = self.backend.get_code_with_state(&state, to) {
+                if let Ok(target_code) = self.backend.get_code_with_state(&state, *to) {
                     if target_code.as_ref().is_empty() {
                         return Ok(MIN_TRANSACTION_GAS);
                     }

crates/anvil/src/eth/backend/fork.rs

@@ -14,7 +14,7 @@ use alloy_rpc_types_trace::{
 };
 use alloy_transport::TransportError;
 use anvil_core::eth::transaction::{convert_to_anvil_receipt, ReceiptResponse};
-use foundry_common::provider::alloy::{ProviderBuilder, RetryProvider};
+use foundry_common::provider::{ProviderBuilder, RetryProvider};
 use parking_lot::{
     lock_api::{RwLockReadGuard, RwLockWriteGuard},
     RawRwLock, RwLock,