chore: solc 0.8.25 (#7424)

* chore: solc 0.8.25

* replace ethers-solc

Cargo.toml

@@ -138,7 +138,7 @@ foundry-linking = { path = "crates/linking" }
 
 # solc & compilation utilities
 foundry-block-explorers = { version = "0.2.3", default-features = false }
-foundry-compilers = { version = "0.3.9", default-features = false }
+foundry-compilers = { version = "0.3.13", default-features = false }
 
 ## revm
 # no default features to avoid c-kzg
@@ -156,7 +156,6 @@ 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 }
-ethers-solc = { version = "2.0.14", default-features = false }
 
 ## alloy
 alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "9ac2c90", default-features = false }

crates/anvil/Cargo.toml

@@ -95,9 +95,11 @@ clap_complete_fig = "4"
 ethereum-forkid = "0.12"
 
 [dev-dependencies]
+alloy-json-abi.workspace = true
 ethers = { workspace = true, features = ["abigen"] }
 ethers-core = { workspace = true, features = ["optimism"] }
-ethers-solc = { workspace = true, features = ["project-util", "full"] }
+foundry-compilers = { workspace = true, features = ["project-util", "full"] }
+
 pretty_assertions = "1.3.0"
 tokio = { version = "1", features = ["full"] }
 crc = "3.0.1"

crates/anvil/tests/it/ganache.rs

@@ -1,6 +1,9 @@
 //! tests against local ganache for local debug purposes
 #![allow(unused)]
-use crate::init_tracing;
+use crate::{
+    init_tracing,
+    utils::{ContractInstanceCompat, DeploymentTxFactoryCompat},
+};
 use ethers::{
     abi::Address,
     contract::{Contract, ContractFactory, ContractInstance},
@@ -11,7 +14,7 @@ use ethers::{
     types::{BlockNumber, U256},
     utils::hex,
 };
-use ethers_solc::{project_util::TempProject, Artifact};
+use foundry_compilers::{project_util::TempProject, Artifact};
 use std::sync::Arc;
 
 // the mnemonic used to start the local ganache instance
@@ -115,7 +118,7 @@ contract Contract {
 
     let (abi, bytecode, _) = contract.into_contract_bytecode().into_parts();
 
-    let factory = ContractFactory::new(abi.unwrap(), bytecode.unwrap(), Arc::clone(&client));
+    let factory = ContractFactory::new_compat(abi.unwrap(), bytecode.unwrap(), Arc::clone(&client));
     let contract = factory.deploy(()).unwrap().legacy().send().await;
     contract.unwrap_err();
 }
@@ -153,13 +156,13 @@ contract Contract {
     let client = Arc::new(http_client());
 
     // deploy successfully
-    let factory = ContractFactory::new(abi.clone().unwrap(), bytecode.unwrap(), client);
+    let factory = ContractFactory::new_compat(abi.clone().unwrap(), bytecode.unwrap(), client);
     let contract = factory.deploy(()).unwrap().legacy().send().await.unwrap();
     let provider = SignerMiddleware::new(
         Provider::<Http>::try_from("http://127.0.0.1:8545").unwrap(),
         ganache_wallet2(),
     );
-    let contract = ContractInstance::new(contract.address(), abi.unwrap(), provider);
+    let contract = ContractInstance::new_compat(contract.address(), abi.unwrap(), provider);
     let resp = contract.method::<_, U256>("getSecret", ()).unwrap().legacy().call().await;
     resp.unwrap_err();
 

crates/anvil/tests/it/geth.rs

@@ -1,6 +1,9 @@
 //! tests against local geth for local debug purposes
 
-use crate::abi::VENDING_MACHINE_CONTRACT;
+use crate::{
+    abi::VENDING_MACHINE_CONTRACT,
+    utils::{ContractInstanceCompat, DeploymentTxFactoryCompat},
+};
 use ethers::{
     abi::Address,
     contract::{Contract, ContractFactory},
@@ -9,7 +12,7 @@ use ethers::{
     types::U256,
     utils::WEI_IN_ETHER,
 };
-use ethers_solc::{project_util::TempProject, Artifact};
+use foundry_compilers::{project_util::TempProject, Artifact};
 use futures::StreamExt;
 use std::sync::Arc;
 use tokio::time::timeout;
@@ -52,15 +55,15 @@ async fn test_geth_revert_transaction() {
 
     // deploy successfully
     let factory =
-        ContractFactory::new(abi.clone().unwrap(), bytecode.unwrap(), Arc::clone(&client));
+        ContractFactory::new_compat(abi.clone().unwrap(), bytecode.unwrap(), Arc::clone(&client));
 
     let mut tx = factory.deploy(()).unwrap().tx;
     tx.set_from(account);
 
     let resp = client.send_transaction(tx, None).await.unwrap().await.unwrap().unwrap();
 
     let contract =
-        Contract::<Provider<_>>::new(resp.contract_address.unwrap(), abi.unwrap(), client);
+        Contract::<Provider<_>>::new_compat(resp.contract_address.unwrap(), abi.unwrap(), client);
 
     let ten = WEI_IN_ETHER.saturating_mul(10u64.into());
     let call = contract.method::<_, ()>("buyRevert", ten).unwrap().value(ten).from(account);

crates/anvil/tests/it/otterscan.rs

@@ -1,7 +1,9 @@
 //! tests for otterscan endpoints
 use crate::{
     abi::MulticallContract,
-    utils::{ethers_http_provider, ethers_ws_provider},
+    utils::{
+        ethers_http_provider, ethers_ws_provider, ContractInstanceCompat, DeploymentTxFactoryCompat,
+    },
 };
 use alloy_primitives::U256 as rU256;
 use alloy_rpc_types::{BlockNumberOrTag, BlockTransactions};
@@ -19,8 +21,8 @@ use ethers::{
     types::{Bytes, TransactionRequest},
     utils::get_contract_address,
 };
-use ethers_solc::{project_util::TempProject, Artifact};
 use foundry_common::types::{ToAlloy, ToEthers};
+use foundry_compilers::{project_util::TempProject, Artifact};
 use std::{collections::VecDeque, str::FromStr, sync::Arc};
 
 #[tokio::test(flavor = "multi_thread")]
@@ -136,10 +138,10 @@ contract Contract {
     let client = Arc::new(SignerMiddleware::new(provider, wallets[0].clone()));
 
     // deploy successfully
-    let factory = ContractFactory::new(abi.clone().unwrap(), bytecode.unwrap(), client);
+    let factory = ContractFactory::new_compat(abi.clone().unwrap(), bytecode.unwrap(), client);
     let contract = factory.deploy(()).unwrap().send().await.unwrap();
 
-    let contract = ContractInstance::new(
+    let contract = ContractInstance::new_compat(
         contract.address(),
         abi.unwrap(),
         SignerMiddleware::new(ethers_http_provider(&handle.http_endpoint()), wallets[1].clone()),
@@ -194,10 +196,10 @@ contract Contract {
     let client = Arc::new(SignerMiddleware::new(provider, wallets[0].clone()));
 
     // deploy successfully
-    let factory = ContractFactory::new(abi.clone().unwrap(), bytecode.unwrap(), client);
+    let factory = ContractFactory::new_compat(abi.clone().unwrap(), bytecode.unwrap(), client);
     let contract = factory.deploy(()).unwrap().send().await.unwrap();
 
-    let contract = ContractInstance::new(
+    let contract = ContractInstance::new_compat(
         contract.address(),
         abi.unwrap(),
         SignerMiddleware::new(ethers_http_provider(&handle.http_endpoint()), wallets[1].clone()),
@@ -307,10 +309,10 @@ contract Contract {
     let client = Arc::new(SignerMiddleware::new(provider, wallets[0].clone()));
 
     // deploy successfully
-    let factory = ContractFactory::new(abi.clone().unwrap(), bytecode.unwrap(), client);
+    let factory = ContractFactory::new_compat(abi.clone().unwrap(), bytecode.unwrap(), client);
     let contract = factory.deploy(()).unwrap().send().await.unwrap();
 
-    let contract = ContractInstance::new(
+    let contract = ContractInstance::new_compat(
         contract.address(),
         abi.unwrap(),
         SignerMiddleware::new(ethers_http_provider(&handle.http_endpoint()), wallets[1].clone()),
@@ -397,7 +399,7 @@ contract Contract {
     let client = Arc::new(SignerMiddleware::new(provider, wallet));
 
     // deploy successfully
-    let factory = ContractFactory::new(abi.clone().unwrap(), bytecode.unwrap(), client);
+    let factory = ContractFactory::new_compat(abi.clone().unwrap(), bytecode.unwrap(), client);
     let contract = factory.deploy(()).unwrap().send().await.unwrap();
 
     let call = contract.method::<_, ()>("trigger_revert", ()).unwrap().gas(150_000u64);

crates/anvil/tests/it/revert.rs

@@ -6,7 +6,7 @@ use ethers::{
     types::U256,
     utils::WEI_IN_ETHER,
 };
-use ethers_solc::{project_util::TempProject, Artifact};
+use foundry_compilers::{project_util::TempProject, Artifact};
 use std::sync::Arc;
 
 #[tokio::test(flavor = "multi_thread")]