migrate(forge-bind): to alloy
#7919
Conversation
|
Proposing to make the utils method |
|
TODO:
|
There was a problem hiding this comment.
@DaniPopes is best equipped to give directions here, but I think this sounds reasonable
|
@DaniPopes please drop your final review whenever possible |
crates/forge/bin/cmd/bind.rs
Outdated
| @@ -158,9 +159,29 @@ impl BindArgs { | |||
| .into() | |||
| } | |||
|
|
|||
| fn get_alloy_filter(&self) -> Filter { | |||
There was a problem hiding this comment.
is this necessary? The filtering and file finding behavior should be the same
There was a problem hiding this comment.
Yeah, so get_filter returns ContractFilter which is specific to ethers. These methods just return the regex that is then used in a unified setting in get_json_files to actually get the files.
|
@DaniPopes ptal |
|
|
||
| let tokens = quote::quote! { | ||
| #[derive(Debug)] | ||
| #[sol(rpc)] |
There was a problem hiding this comment.
This is missing bytecode attributes
| "#, | ||
| instance.name.to_lowercase() | ||
| ); | ||
| let contents = "//! This module was autogenerated by the alloy sol!.\n//! More information can be found here <https://docs.rs/alloy-sol-macro/latest/alloy_sol_macro/macro.sol.html>.\n".to_string() + &instance.expansion.as_ref().unwrap().to_string(); |
There was a problem hiding this comment.
use format! and split to multiple lines like above
| cargo_toml_contents.contains(alloy_contract_check); | ||
| eyre::ensure!( | ||
| toml_consistent, | ||
| format!("The contents of Cargo.toml do not match the expected output of the newest `ethers::Abigen` version.\ |
There was a problem hiding this comment.
this error message can be 2 lines
Motivation
Final part of alloy migration
Solution
In order to do this, we have to make use of parts of code that make up the
sol!macro to create aSolMacroGentype that is similar to theAbigentype in ethers.We're reading the JSON abi files (the artifacts) and retrieving the
ABIfrom it then converting that to a SolidityTokenStreamand ultimately convert that to aSolInputthat should be passed to the expander that is used by thesol!macro here: https://github.com/alloy-rs/core/blob/85aecdf54c56da20f274a21f372d3d37b8c118ca/crates/sol-macro/src/lib.rs#L281.However the issue is that the
expandmodule is private in thesol-macrocrate and cannot be made public since it's not a macro.@DaniPopes @mattsse I can move the
expandmodule to a new cratesol-macro-expander, make it public and use it in foundry??TODO
expandpublic by moving to a new crate.