Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(deps): Move to Alloy ABI encoding/decoding & alloy types #5986

Merged
merged 83 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
ee18e87
feat: find and replace all ethers_solc mentions outside anvil
Evalir Oct 5, 2023
6c6aa4e
chore: keep resolving errors as fuzz is getting migrated
Evalir Oct 5, 2023
f33e414
feat: fuzz/trace changes
Evalir Oct 6, 2023
a8bb5b0
feat: partial trace migration
Evalir Oct 6, 2023
adc2786
chore: use temporal sol! macro in diff file for decode migration
Evalir Oct 17, 2023
8bc67d2
feat: use proptest traits instead of custom impl
Evalir Oct 17, 2023
65f0918
chore: address comments
Evalir Oct 17, 2023
a54005a
chore: remove alloy console bindings
Evalir Oct 17, 2023
2c70bd9
feat: introduce foundry-block-explorers
Evalir Oct 17, 2023
55ad9bf
chore: partial common abi helpers migration
Evalir Oct 17, 2023
94fb974
feat: partial decode migration
Evalir Oct 18, 2023
b3935cc
feat: re-introduce block-explorers
Evalir Oct 18, 2023
8737a52
feat: fix compiler errors
Evalir Oct 18, 2023
988e756
chore
Evalir Oct 18, 2023
5b8c207
chore: tentative inspector migration
Evalir Oct 18, 2023
bd2fbb3
Merge branch 'master' into evalir/introduce-foundry-compilers
Evalir Oct 18, 2023
3c3b35c
feat: switch to using static decoder to decode errors
Evalir Oct 18, 2023
7484d3b
chore: clippy
Evalir Oct 18, 2023
3adebd5
feat: migrate trace types temporarily
Evalir Oct 19, 2023
c44e796
chore: replace ethers tracing types for local tracing types
Evalir Oct 19, 2023
b51f741
chore: rebase
Evalir Oct 19, 2023
bb68371
fix: handle decoding with static decoder, tests
Evalir Oct 19, 2023
079c879
chore: use JsonAbi for console/hardhat/hevm abis
Evalir Oct 19, 2023
d9207b2
chore: add todo
Evalir Oct 19, 2023
efd0323
chore: replace types downstream and remove glue
Evalir Oct 19, 2023
de459d4
feat: fix last evm issues, start fixing downstream type issues
Evalir Oct 20, 2023
8356303
chore: cargo
Evalir Oct 20, 2023
bcb57a2
chore: more downstream error fixes
Evalir Oct 20, 2023
4d4255b
chore: fix test files
Evalir Oct 20, 2023
5f145b7
chore: more downstream fixes
Evalir Oct 20, 2023
90d5b05
chore: fmt
Evalir Oct 20, 2023
3ea011c
feat: migrate unit utils, replace
Evalir Oct 20, 2023
48832e5
chore: fix tests, fmt
Evalir Oct 20, 2023
2cefb6f
compiles
Evalir Oct 22, 2023
6bef6ad
clippy
Evalir Oct 22, 2023
170f5e6
chore: clippy
Evalir Oct 22, 2023
d8e54b9
Merge branch 'master' into evalir/introduce-foundry-compilers
Evalir Oct 22, 2023
5b404e0
chore: last fixes
Evalir Oct 22, 2023
2dbe680
chore: update block explorers
Evalir Oct 22, 2023
ea9b980
chore: actually coerce values correctly
Evalir Oct 23, 2023
a1b7442
chore: fix broken test
Evalir Oct 23, 2023
23e281d
chore: fix estimation test, parse values as alloy nums
Evalir Oct 23, 2023
bdc95bb
chore: fix abi parsing
Evalir Oct 23, 2023
8507f92
chore: selector tests
Evalir Oct 23, 2023
e42aeba
chore: fix more tests, remove more glue
Evalir Oct 23, 2023
dc05ee5
chore: properly decode logs
Evalir Oct 23, 2023
944174a
chore: use selector_type to handle tuples correctly
Evalir Oct 23, 2023
4b2f0ea
chore: clippy and fix another test
Evalir Oct 23, 2023
f297ace
chore: fix remaining abi tests
Evalir Oct 23, 2023
403de57
chore: use proptest traits for fuzzer
Evalir Oct 23, 2023
ffcb558
more test fixes ongod
Evalir Oct 23, 2023
2c64c3d
clippy
Evalir Oct 23, 2023
ef21ace
chore: use abigen for console logs for now
Evalir Oct 23, 2023
99c228d
fix: generate valid values in fuzzer
Evalir Oct 23, 2023
ebf9523
chore: clippy
Evalir Oct 23, 2023
92c6b5a
chore: readd settings
Evalir Oct 23, 2023
e3dfa8b
chore: various fixes
Evalir Oct 23, 2023
da9b483
chore: fix script arguments decoding
Evalir Oct 24, 2023
adc940a
chore: fix more tests
Evalir Oct 24, 2023
b1f5ff7
chore: last ots fixes
Evalir Oct 24, 2023
0dbcf71
fix: decoding
Evalir Oct 24, 2023
0e2c954
chore: clippy
Evalir Oct 24, 2023
4d9ea34
chore: fmt
Evalir Oct 24, 2023
9b5c45c
chore: fix deny check
Evalir Oct 24, 2023
1d1dc01
chore: deny fixes
Evalir Oct 24, 2023
e50cc48
chore: force default features off
Evalir Oct 24, 2023
5ce86fe
Merge branch 'master' into evalir/introduce-foundry-compilers
Evalir Oct 24, 2023
5c37c4b
chore: update block-explorers
Evalir Oct 24, 2023
30b2295
chore: doc fixes
Evalir Oct 24, 2023
cd25d3b
chore: ignore invariant storage test due to flakyness
Evalir Oct 24, 2023
6c88473
chore: update foundry-block-explorers
Evalir Oct 24, 2023
fb7bd39
chore: cleanup, config migration
Evalir Oct 24, 2023
5500c14
chore: resolve comments, more cleanup, remove unwraps
Evalir Oct 24, 2023
e4e347a
chore: remove last mentions of ethers::etherscan
Evalir Oct 24, 2023
823a6e3
chore: remove ethers-solc feat
Evalir Oct 24, 2023
27f107a
Merge branch 'master' into evalir/introduce-foundry-compilers
Evalir Oct 24, 2023
cf7fdce
chore: use alloy master again
Evalir Oct 24, 2023
371e817
chore: readd NameOrAddress
Evalir Oct 24, 2023
4e4e4c1
chore: clippy/fmt
Evalir Oct 24, 2023
bcd565f
chore: readd support on storage
Evalir Oct 24, 2023
bd3e506
fix: add remappings on settings
Evalir Oct 25, 2023
f958758
chore: address comments (remove create2, noop map, remove eyre from d…
Evalir Oct 25, 2023
963234d
chore: use NameOrAddress
Evalir Oct 25, 2023
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
Prev Previous commit
Next Next commit
chore: clippy
  • Loading branch information
Evalir committed Oct 18, 2023
commit 7484d3bd99e16a47af0b7b2fd2a7548848e9aa73
7 changes: 3 additions & 4 deletions crates/evm/src/decode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::{
use alloy_dyn_abi::{DynSolType, DynSolValue, JsonAbiExt};
use alloy_json_abi::JsonAbi;
use alloy_primitives::{Bytes, Log as AlloyLog, B256};
use alloy_sol_types::{sol, SolEvent, sol_data::String as SolString, SolType};
use alloy_sol_types::{sol, sol_data::String as SolString, SolEvent, SolType};
use ethers::{
abi::{decode, Contract as Abi, ParamType, RawLog, Token},
contract::EthLogDecode,
Expand Down Expand Up @@ -173,9 +173,8 @@ pub fn decode_revert(
}
}
// keccak(Error(string))
[8, 195, 121, 160] => {
SolString::abi_decode(&err[SELECTOR_LEN..], false).map_err(|_| eyre::eyre!("Bad string decode"))
}
[8, 195, 121, 160] => SolString::abi_decode(&err[SELECTOR_LEN..], false)
.map_err(|_| eyre::eyre!("Bad string decode")),
// keccak(expectRevert(bytes))
[242, 141, 206, 179] => {
let err_data = &err[SELECTOR_LEN..];
Expand Down
2 changes: 1 addition & 1 deletion crates/evm/src/trace/decoder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ impl CallTraceDecoder {

events: CONSOLE_ABI
.events()
.map(|event| ((event.signature(), indexed_inputs(event)), vec![event.clone()]))
.map(|event| ((event.selector(), indexed_inputs(event)), vec![event.clone()]))
.collect(),

errors: Default::default(),
Expand Down