Skip to content
This repository has been archived by the owner on Oct 19, 2024. It is now read-only.

feat: support abi generated from forge #740

Merged
merged 1 commit into from
Jan 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ethers-contract/ethers-contract-abigen/src/contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ impl Context {
/// Create a context from the code generation arguments.
pub fn from_abigen(args: Abigen) -> Result<Self> {
// get the actual ABI string
let abi_str =
let mut abi_str =
args.abi_source.get().map_err(|e| anyhow!("failed to get ABI JSON: {}", e))?;

let (abi, human_readable, abi_parser) = parse_abi(&abi_str)?;
Expand All @@ -172,6 +172,13 @@ impl Context {
internal_structs.outputs = abi_parser.outputs.clone();

internal_structs
} else if abi_str.starts_with('{') {
abi_str = serde_json::to_string(&abi).context("fail to serialize abi to json")?;

serde_json::from_str::<RawAbi>(&abi_str)
.ok()
.map(InternalStructs::new)
.unwrap_or_default()
} else {
serde_json::from_str::<RawAbi>(&abi_str)
.ok()
Expand Down
5 changes: 5 additions & 0 deletions ethers-contract/tests/abigen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ fn can_gen_human_readable() {
assert_eq!("ValueChanged(address,string,string)", ValueChangedFilter::abi_signature());
}

#[test]
fn can_gen_not_human_readable() {
abigen!(VerifierAbiHardhatContract, "./tests/solidity-contracts/verifier_abi_hardhat.json");
}

#[test]
fn can_gen_human_readable_multiple() {
abigen!(
Expand Down