[wip] feat: provider alloy migration

Cargo.toml

@@ -148,6 +148,7 @@ ethers-solc = { version = "2.0", default-features = false }
 
 ## alloy
 alloy-consensus = { git = "https://github.com/alloy-rs/alloy" }
+alloy-contract = { git = "https://github.com/alloy-rs/alloy" }
 alloy-eips = { git = "https://github.com/alloy-rs/alloy" }
 alloy-genesis = { git = "https://github.com/alloy-rs/alloy" }
 alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy" }
@@ -164,9 +165,9 @@ alloy-transport-http = { git = "https://github.com/alloy-rs/alloy" }
 alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy" }
 alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy" }
 alloy-primitives = { version = "0.6.2", features = ["getrandom"] }
-alloy-dyn-abi = "0.6.2"
-alloy-json-abi = "0.6.2"
-alloy-sol-types = "0.6.2"
+alloy-dyn-abi = "0.6"
+alloy-json-abi = "0.6"
+alloy-sol-types = "0.6"
 syn-solidity = "0.6.0"
 alloy-chains = "0.1"
 
@@ -227,6 +228,11 @@ ethers-signers = { git = "https://github.com/gakonst/ethers-rs", rev = "f0e5b194
 ethers-middleware = { git = "https://github.com/gakonst/ethers-rs", rev = "f0e5b194f09c533feb10d1a686ddb9e5946ec107" }
 ethers-solc = { git = "https://github.com/gakonst/ethers-rs", rev = "f0e5b194f09c533feb10d1a686ddb9e5946ec107" }
 
+alloy-sol-types = { git = "https://github.com/alloy-rs/core", rev = "18b0509950c90d9ec38f25913b692ae4cdd6f227" }
+alloy-dyn-abi = { git = "https://github.com/alloy-rs/core", rev = "18b0509950c90d9ec38f25913b692ae4cdd6f227" }
+alloy-json-abi = { git = "https://github.com/alloy-rs/core", rev = "18b0509950c90d9ec38f25913b692ae4cdd6f227" }
+alloy-primitives = { git = "https://github.com/alloy-rs/core", rev = "18b0509950c90d9ec38f25913b692ae4cdd6f227" }
+
 revm = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze" }
 revm-primitives = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze" }
 revm-interpreter = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze" }

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

@@ -268,7 +268,7 @@ impl ClientFork {
 
         let block_id = BlockId::Number(blocknumber.into());
 
-        let code = self.provider().get_code_at(address, block_id).await?;
+        let code = self.provider().get_code_at(address, Some(block_id)).await?;
 
         let mut storage = self.storage_write();
         storage.code_at.insert((address, blocknumber), code.clone().0.into());

crates/cast/bin/cmd/access_list.rs

@@ -1,3 +1,4 @@
+use alloy_providers::provider::TempProvider;
 use cast::{Cast, TxBuilder};
 use clap::Parser;
 use ethers_core::types::{BlockId, NameOrAddress};
@@ -60,18 +61,37 @@ impl AccessListArgs {
 
         let config = Config::from(&eth);
         let provider = utils::get_provider(&config)?;
+        let alloy_provider = utils::get_alloy_provider(&config)?;
         let chain = utils::get_chain(config.chain, &provider).await?;
         let sender = eth.wallet.sender().await;
 
-        access_list(&provider, sender.to_ethers(), to, sig, args, data, tx, chain, block, to_json)
-            .await?;
+        access_list(
+            &provider,
+            alloy_provider,
+            sender.to_ethers(),
+            to,
+            sig,
+            args,
+            data,
+            tx,
+            chain,
+            block,
+            to_json,
+        )
+        .await?;
         Ok(())
     }
 }
 
 #[allow(clippy::too_many_arguments)]
-async fn access_list<M: Middleware, F: Into<NameOrAddress>, T: Into<NameOrAddress>>(
+async fn access_list<
+    M: Middleware,
+    P: TempProvider,
+    F: Into<NameOrAddress>,
+    T: Into<NameOrAddress>,
+>(
     provider: M,
+    alloy_provider: P,
     from: F,
     to: Option<T>,
     sig: Option<String>,
@@ -104,7 +124,7 @@ where
 
     let builder_output = builder.peek();
 
-    let cast = Cast::new(&provider);
+    let cast = Cast::new(&provider, alloy_provider);
 
     let access_list: String = cast.access_list(builder_output, block, to_json).await?;
 

crates/cast/bin/cmd/call.rs

@@ -116,6 +116,7 @@ impl CallArgs {
 
         let config = Config::from(&eth);
         let provider = utils::get_provider(&config)?;
+        let alloy_provider = utils::get_alloy_provider(&config)?;
         let chain = utils::get_chain(config.chain, &provider).await?;
         let sender = eth.wallet.sender().await;
 
@@ -196,7 +197,7 @@ impl CallArgs {
         };
 
         let builder_output = builder.build();
-        println!("{}", Cast::new(provider).call(builder_output, block).await?);
+        println!("{}", Cast::new(provider, alloy_provider).call(builder_output, block).await?);
 
         Ok(())
     }

crates/cast/bin/cmd/estimate.rs

@@ -81,6 +81,7 @@ impl EstimateArgs {
 
         let figment = Figment::from(Config::figment()).merge(etherscan).merge(rpc);
         let config = Config::try_from(figment)?;
+        let alloy_provider = utils::get_alloy_provider(&config)?;
 
         let provider = utils::get_provider(&config)?;
         let chain = utils::get_chain(config.chain, &provider).await?;
@@ -109,7 +110,7 @@ impl EstimateArgs {
         };
 
         let builder_output = builder.peek();
-        let gas = Cast::new(&provider).estimate(builder_output).await?;
+        let gas = Cast::new(&provider, alloy_provider).estimate(builder_output).await?;
         println!("{gas}");
         Ok(())
     }

crates/cast/bin/cmd/find_block.rs

@@ -25,9 +25,10 @@ impl FindBlockArgs {
         let ts_target = U256::from(timestamp);
         let config = Config::from(&rpc);
         let provider = utils::get_provider(&config)?;
+        let alloy_provider = utils::get_alloy_provider(&config)?;
 
         let last_block_num = provider.get_block_number().await?;
-        let cast_provider = Cast::new(provider);
+        let cast_provider = Cast::new(provider, alloy_provider);
 
         let res = join!(cast_provider.timestamp(last_block_num), cast_provider.timestamp(1));
         let ts_block_latest = res.0?;

crates/cast/bin/cmd/logs.rs

@@ -1,17 +1,17 @@
+use alloy_rpc_types::BlockHashOrNumber;
 use cast::Cast;
 use clap::Parser;
 use ethers_core::{
     abi::{
         token::{LenientTokenizer, StrictTokenizer, Tokenizer},
         Address, Event, HumanReadableParser, ParamType, RawTopicFilter, Token, Topic, TopicFilter,
     },
-    types::{
-        BlockId, BlockNumber, Filter, FilterBlockOption, NameOrAddress, ValueOrArray, H256, U256,
-    },
+    types::{BlockNumber, Filter, FilterBlockOption, NameOrAddress, ValueOrArray, H256, U256},
 };
 use ethers_providers::Middleware;
 use eyre::{Result, WrapErr};
 use foundry_cli::{opts::EthereumOpts, utils};
+use foundry_common::types::ToEthers;
 use foundry_config::Config;
 use itertools::Itertools;
 use std::{io, str::FromStr};
@@ -23,13 +23,13 @@ pub struct LogsArgs {
     ///
     /// Can also be the tags earliest, finalized, safe, latest, or pending.
     #[clap(long)]
-    from_block: Option<BlockId>,
+    from_block: Option<BlockHashOrNumber>,
 
     /// The block height to stop query at.
     ///
     /// Can also be the tags earliest, finalized, safe, latest, or pending.
     #[clap(long)]
-    to_block: Option<BlockId>,
+    to_block: Option<BlockHashOrNumber>,
 
     /// The contract address to filter on.
     #[clap(
@@ -76,8 +76,9 @@ impl LogsArgs {
 
         let config = Config::from(&eth);
         let provider = utils::get_provider(&config)?;
+        let alloy_provider = utils::get_alloy_provider(&config)?;
 
-        let cast = Cast::new(&provider);
+        let cast = Cast::new(&provider, alloy_provider);
 
         let address = match address {
             Some(address) => {
@@ -90,8 +91,8 @@ impl LogsArgs {
             None => None,
         };
 
-        let from_block = cast.convert_block_number(from_block).await?;
-        let to_block = cast.convert_block_number(to_block).await?;
+        let from_block = cast.convert_block_number(from_block).await?.map(ToEthers::to_ethers);
+        let to_block = cast.convert_block_number(to_block).await?.map(ToEthers::to_ethers);
 
         let filter = build_filter(from_block, to_block, address, sig_or_topic, topics_or_args)?;
 

crates/cast/bin/cmd/rpc.rs

@@ -39,6 +39,7 @@ impl RpcArgs {
 
         let config = Config::from(&rpc);
         let provider = utils::get_provider(&config)?;
+        let alloy_provider = utils::get_alloy_provider(&config)?;
 
         let params = if raw {
             if params.is_empty() {
@@ -53,7 +54,7 @@ impl RpcArgs {
         } else {
             serde_json::Value::Array(params.into_iter().map(value_or_string).collect())
         };
-        println!("{}", Cast::new(provider).rpc(&method, params).await?);
+        println!("{}", Cast::new(provider, alloy_provider).rpc(&method, params).await?);
         Ok(())
     }
 }

crates/cast/bin/cmd/send.rs

@@ -1,3 +1,4 @@
+use alloy_providers::provider::TempProvider;
 use cast::{Cast, TxBuilder};
 use clap::Parser;
 use ethers_core::types::NameOrAddress;
@@ -114,6 +115,7 @@ impl SendTxArgs {
 
         let config = Config::from(&eth);
         let provider = utils::get_provider(&config)?;
+        let alloy_provider = utils::get_alloy_provider(&config)?;
         let chain = utils::get_chain(config.chain, &provider).await?;
         let api_key = config.get_etherscan_api_key(Some(chain));
 
@@ -152,6 +154,7 @@ impl SendTxArgs {
 
             cast_send(
                 provider,
+                alloy_provider,
                 config.sender.to_ethers(),
                 to,
                 code,
@@ -195,6 +198,7 @@ corresponds to the sender, or let foundry automatically detect it by not specify
 
             cast_send(
                 provider,
+                alloy_provider,
                 from,
                 to,
                 code,
@@ -212,8 +216,9 @@ corresponds to the sender, or let foundry automatically detect it by not specify
 }
 
 #[allow(clippy::too_many_arguments)]
-async fn cast_send<M: Middleware, F: Into<NameOrAddress>, T: Into<NameOrAddress>>(
+async fn cast_send<M: Middleware, P: TempProvider, F: Into<NameOrAddress>, T: Into<NameOrAddress>>(
     provider: M,
+    alloy_provider: P,
     from: F,
     to: Option<T>,
     code: Option<String>,
@@ -253,7 +258,7 @@ where
     };
     let builder_output = builder.build();
 
-    let cast = Cast::new(provider);
+    let cast = Cast::new(provider, alloy_provider);
 
     let pending_tx = cast.send(builder_output).await?;
     let tx_hash = *pending_tx;

crates/cast/bin/cmd/storage.rs

@@ -82,10 +82,11 @@ impl StorageArgs {
         let Self { address, slot, block, build, .. } = self;
 
         let provider = utils::get_provider(&config)?;
+        let alloy_provider = utils::get_alloy_provider(&config)?;
 
         // Slot was provided, perform a simple RPC call
         if let Some(slot) = slot {
-            let cast = Cast::new(provider);
+            let cast = Cast::new(provider, alloy_provider);
             println!("{}", cast.storage(address, slot.to_ethers(), block).await?);
             return Ok(());
         }