fix: artifact api changes from ethers-rs (#614)

* fix: artifact api changes from ethers-rs

* chore(cli/cast): allow clippy lint for too many args

* chore: temporarily disable geb tests

Co-authored-by: Georgios Konstantopoulos <[email protected]>

Author: tarrencev

cli/src/cast.rs

@@ -578,6 +578,7 @@ where
     })
 }
 
+#[allow(clippy::too_many_arguments)]
 async fn cast_send<M: Middleware, F: Into<NameOrAddress>, T: Into<NameOrAddress>>(
     provider: M,
     from: F,

cli/src/cmd/create.rs

@@ -49,6 +49,11 @@ impl Cmd for CreateArgs {
         // Get ABI and BIN
         let (abi, bin, _) = super::read_artifact(&project, compiled, self.contract.clone())?;
 
+        let bin = match bin.object {
+            BytecodeObject::Bytecode(_) => bin.object,
+            _ => eyre::bail!("Dynamic linking not supported in `create` command - deploy the library contract first, then provide the address to link at compile time")
+        };
+
         // Add arguments to constructor
         let provider = Provider::<Http>::try_from(self.eth.rpc_url()?)?;
         let params = match abi.constructor {

cli/src/cmd/mod.rs

@@ -52,7 +52,10 @@ pub mod verify;
 use crate::opts::forge::ContractInfo;
 use ethers::{
     abi::Abi,
-    prelude::Graph,
+    prelude::{
+        artifacts::{CompactBytecode, CompactDeployedBytecode},
+        Graph,
+    },
     solc::{
         artifacts::{Source, Sources},
         cache::SolFilesCache,
@@ -66,9 +69,7 @@ pub trait Cmd: clap::Parser + Sized {
     fn run(self) -> eyre::Result<Self::Output>;
 }
 
-use ethers::solc::{
-    artifacts::BytecodeObject, MinimalCombinedArtifacts, Project, ProjectCompileOutput,
-};
+use ethers::solc::{MinimalCombinedArtifacts, Project, ProjectCompileOutput};
 
 /// Compiles the provided [`Project`], throws if there's any compiler error and logs whether
 /// compilation was successful or if there was a cache hit.
@@ -135,7 +136,7 @@ pub fn read_artifact(
     project: &Project,
     compiled: ProjectCompileOutput<MinimalCombinedArtifacts>,
     contract: ContractInfo,
-) -> eyre::Result<(Abi, BytecodeObject, BytecodeObject)> {
+) -> eyre::Result<(Abi, CompactBytecode, CompactDeployedBytecode)> {
     Ok(match contract.path {
         Some(path) => get_artifact_from_path(project, path, contract.name)?,
         None => get_artifact_from_name(contract, compiled)?,
@@ -148,7 +149,7 @@ pub fn read_artifact(
 fn get_artifact_from_name(
     contract: ContractInfo,
     compiled: ProjectCompileOutput<MinimalCombinedArtifacts>,
-) -> eyre::Result<(Abi, BytecodeObject, BytecodeObject)> {
+) -> eyre::Result<(Abi, CompactBytecode, CompactDeployedBytecode)> {
     let mut has_found_contract = false;
     let mut contract_artifact = None;
 
@@ -175,10 +176,10 @@ fn get_artifact_from_name(
             artifact
                 .abi
                 .ok_or_else(|| eyre::Error::msg(format!("abi not found for {}", contract.name)))?,
-            artifact.bin.ok_or_else(|| {
+            artifact.bytecode.ok_or_else(|| {
                 eyre::Error::msg(format!("bytecode not found for {}", contract.name))
             })?,
-            artifact.bin_runtime.ok_or_else(|| {
+            artifact.deployed_bytecode.ok_or_else(|| {
                 eyre::Error::msg(format!("bytecode not found for {}", contract.name))
             })?,
         ),
@@ -195,7 +196,7 @@ fn get_artifact_from_path(
     project: &Project,
     path: String,
     name: String,
-) -> eyre::Result<(Abi, BytecodeObject, BytecodeObject)> {
+) -> eyre::Result<(Abi, CompactBytecode, CompactDeployedBytecode)> {
     // Get sources from the requested location
     let abs_path = dunce::canonicalize(PathBuf::from(path))?;
     let mut sources = Sources::new();
@@ -219,9 +220,11 @@ fn get_artifact_from_path(
 
     Ok((
         artifact.abi.ok_or_else(|| eyre::Error::msg(format!("abi not found for {}", name)))?,
-        artifact.bin.ok_or_else(|| eyre::Error::msg(format!("bytecode not found for {}", name)))?,
         artifact
-            .bin_runtime
+            .bytecode
+            .ok_or_else(|| eyre::Error::msg(format!("bytecode not found for {}", name)))?,
+        artifact
+            .deployed_bytecode
             .ok_or_else(|| eyre::Error::msg(format!("bytecode not found for {}", name)))?,
     ))
 }

cli/src/cmd/run.rs

@@ -1,6 +1,6 @@
 use crate::cmd::{build::BuildArgs, compile, manual_compile, Cmd};
 use clap::{Parser, ValueHint};
-use ethers::abi::Abi;
+use ethers::{abi::Abi, prelude::artifacts::CompactContract};
 use forge::ContractRunner;
 use foundry_utils::IntoFunction;
 use std::{collections::BTreeMap, path::PathBuf};
@@ -11,7 +11,7 @@ use ethers::solc::{MinimalCombinedArtifacts, Project};
 use crate::opts::evm::EvmArgs;
 use ansi_term::Colour;
 use ethers::{
-    prelude::{artifacts::ContractBytecode, Artifact},
+    prelude::artifacts::ContractBytecode,
     solc::artifacts::{CompactContractSome, ContractBytecodeSome},
 };
 use evm_adapters::{
@@ -285,7 +285,7 @@ impl RunArgs {
             contract.1
         };
 
-        let contract = contract_bytecode.into_compact_contract().unwrap();
+        let contract = CompactContract::from(contract_bytecode).try_into().expect("Couldn't create contract from bytecodes, either abi, bytecode, or deployed_bytecode were empty.");
 
         let mut highlevel_known_contracts = BTreeMap::new();
 

cli/tests/integration.rs

@@ -3,7 +3,9 @@
 use foundry_cli_test_utils::forgetest_external;
 
 forgetest_external!(solmate, "Rari-Capital/solmate");
-forgetest_external!(geb, "reflexer-labs/geb");
+// There's an issue with geb's automatic version detection due to faulty
+// pragmas. Temporarily disabled.
+// forgetest_external!(geb, "reflexer-labs/geb");
 forgetest_external!(stringutils, "Arachnid/solidity-stringutils");
 forgetest_external!(vaults, "Rari-Capital/vaults");
 forgetest_external!(multicall, "makerdao/multicall", &["--block-number", "1"]);