Skip to content

Commit

Permalink
fix: use alloy-trie for eth_getProof (#7546)
Browse files Browse the repository at this point in the history
* use alloy-trie for eth_getProof

* fmt

* collect proofs via single pass

* fixes and test

* tests

* add files

* ordered_trie_root

* clippy

* move to workspace
  • Loading branch information
klkvr authored Apr 8, 2024
1 parent 72bc4f4 commit 61f046d
Show file tree
Hide file tree
Showing 17 changed files with 367 additions and 765 deletions.
189 changes: 36 additions & 153 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ alloy-json-abi = "0.6.3"
alloy-sol-types = "0.6.3"
syn-solidity = "0.6.3"
alloy-chains = "0.1"
alloy-trie = "0.3"

alloy-rlp = "0.3.3"
solang-parser = "=0.3.3"
Expand Down
4 changes: 1 addition & 3 deletions crates/anvil/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ foundry-evm.workspace = true
bytes = "1.4.0"
k256.workspace = true
ethers = { workspace = true, features = ["rustls", "ws", "ipc", "optimism"] }
trie-db = "0.23"
hash-db = "0.15"
memory-db = "0.29"
alloy-primitives = { workspace = true, features = ["serde"] }
alloy-consensus = { workspace = true, features = ["k256", "kzg"] }
alloy-network.workspace = true
Expand All @@ -48,6 +45,7 @@ alloy-providers.workspace = true
alloy-transport.workspace = true
alloy-chains.workspace = true
alloy-genesis.workspace = true
alloy-trie.workspace = true

# axum related
axum.workspace = true
Expand Down
10 changes: 2 additions & 8 deletions crates/anvil/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,15 @@ alloy-rpc-trace-types.workspace = true
alloy-rlp.workspace = true
alloy-eips.workspace = true
alloy-network = { workspace = true, features = ["k256"] }
alloy-consensus = { workspace = true, features = ["k256", "kzg"]}
alloy-consensus = { workspace = true, features = ["k256", "kzg"] }
alloy-dyn-abi = { workspace = true, features = ["std", "eip712"] }
alloy-trie.workspace = true

serde = { workspace = true, optional = true }
serde_json.workspace = true
bytes = "1.4"
c-kzg = { version = "0.4.2", features = ["serde"] }

# trie
hash-db = { version = "0.15", default-features = false }
hash256-std-hasher = { version = "0.15", default-features = false }
triehash = { version = "0.8", default-features = false }
reference-trie = "0.25"
keccak-hasher = "0.15"

# misc
rand = "0.8"

Expand Down
Loading

0 comments on commit 61f046d

Please sign in to comment.