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

refactor: migrate to alloy providers #6219

Merged
merged 88 commits into from
Jan 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
e4bc2c4
wip
onbjerg Nov 5, 2023
b9bb156
fmt
onbjerg Nov 5, 2023
186dc9d
wip
onbjerg Nov 5, 2023
dedb8df
more wip
onbjerg Nov 9, 2023
ec2bff3
wip
onbjerg Nov 9, 2023
d7020f1
wip
onbjerg Nov 12, 2023
dbec07d
rebase stuff
onbjerg Nov 12, 2023
4182c3f
more rebase stuff
onbjerg Nov 13, 2023
121b7bb
wip
onbjerg Nov 13, 2023
029a8ba
fmt
onbjerg Nov 13, 2023
f7280b1
wip resolve warnings
onbjerg Nov 13, 2023
d63e380
wip
onbjerg Nov 13, 2023
ebbe3f7
wip
onbjerg Nov 13, 2023
621aedc
wip
onbjerg Nov 13, 2023
c98dfb7
aaand cast started complaining gn
onbjerg Nov 13, 2023
20327ef
feat(`anvil`): RPC Types migration (#6256)
Evalir Nov 17, 2023
bd3efab
Merge branch 'master' into onbjerg/alloy-providers
Evalir Nov 17, 2023
0177611
fix latest rebase errors
Evalir Nov 17, 2023
8f55ab3
chore: `alloy-transports` -> `alloy-transport` (#6341)
onbjerg Nov 17, 2023
2f513fb
fix: use new `TransportResult` (#6342)
onbjerg Nov 17, 2023
cd56fe0
fix: `TransportResult` for multi wallet (#6343)
onbjerg Nov 17, 2023
cc7e6f8
feat: use TransportError on Anvil (#6344)
Evalir Nov 17, 2023
a946dd9
fix: uncomment serde tests, fix genesis test (#6346)
Evalir Nov 17, 2023
67a22f5
refactor: split ethers/alloy providers (#6378)
onbjerg Nov 21, 2023
8f0d513
fix: block numbers are u64 (#6382)
onbjerg Nov 21, 2023
f31c0f9
fix: remove U64 cast (#6384)
onbjerg Nov 21, 2023
1fbb5c2
chore(`anvil`): fix tests (#6383)
Evalir Nov 21, 2023
df0a11e
fix(anvil): port serde helpers, remove multiline jsons (#6404)
Evalir Nov 22, 2023
ef5129c
chore(`anvil`): extend alloy types until entry lib, cleanup warnings …
Evalir Nov 23, 2023
6fec3de
chore: pin alloy providers to repo & test fixup (#6414)
Evalir Nov 24, 2023
7a3e823
Merge branch 'master' into onbjerg/alloy-providers
Evalir Nov 28, 2023
7b84b66
chore: fix warnings
Evalir Nov 28, 2023
6797d2d
chore: fmt, switch to local tx request type in the meanwhile for opti…
Evalir Nov 28, 2023
44cec7a
[Alloy providers migration]: Fix tests (#6462)
Evalir Nov 29, 2023
9f623ce
Merge branch 'master' into onbjerg/alloy-providers
Evalir Nov 29, 2023
95aadf2
chore: fix up anvil API tests (#6517)
Evalir Dec 4, 2023
009c43b
feat: `RuntimeTransport` for `ws`/`ipc` support (#6525)
Evalir Dec 11, 2023
e8e926e
feat: enable anvil ipc tests (#6570)
Evalir Dec 11, 2023
a3150d5
refactor: replace tracers with reth tracers (#6428)
onbjerg Dec 11, 2023
0f91743
Merge branch 'master' into onbjerg/alloy-providers
Evalir Dec 11, 2023
f3c83f7
fix lockfile
Evalir Dec 11, 2023
1e2784a
chore: fix anvil test
Evalir Dec 11, 2023
0ffd3ee
fixup: missing import
onbjerg Dec 11, 2023
f30a390
chore: lint
onbjerg Dec 11, 2023
f7d6ca4
fixup: imports
onbjerg Dec 11, 2023
1338db8
fixup: more fixes
onbjerg Dec 11, 2023
0fdcf21
chore: fmt
onbjerg Dec 11, 2023
0d6dd3d
clippy clippy clippy always clippy
onbjerg Dec 11, 2023
2b3b62b
and fmt
onbjerg Dec 11, 2023
6ee712a
test: fix test
onbjerg Dec 11, 2023
7d24582
chore: add todo
onbjerg Dec 11, 2023
6499316
clippy
onbjerg Dec 11, 2023
61469f0
feat(`anvil`/`evm`): re-add support for additional fields (#6573)
Evalir Dec 11, 2023
d492573
bump Cargo.lock
Evalir Dec 11, 2023
eca0dc0
chore: handle mixhash being optional (#6575)
Evalir Dec 11, 2023
70c66fd
fix: always ensure prevrandao is set (#6576)
Evalir Dec 12, 2023
4254f2f
chore: cleanup, reintroduce trace endpoints (#6577)
Evalir Dec 12, 2023
b7aee57
feat: re-enable debug_traceTransaction support (#6583)
Evalir Dec 12, 2023
d47acfa
chore: fix ipc test
Evalir Dec 12, 2023
f907bab
chore: re-enable trace tests (#6586)
Evalir Dec 12, 2023
0b11cf8
refactor: rm unused param
onbjerg Dec 13, 2023
c1e8bb4
refactor: rm gas adjustment in script
onbjerg Dec 13, 2023
d3be7a1
chore: fix ci failures (#6595)
Evalir Dec 13, 2023
d7fc4d7
chore: fix deny check
Evalir Dec 13, 2023
e9886c6
feat(`RuntimeTransport`): port cups/retry logic (#6594)
Evalir Dec 15, 2023
641ed76
some random stuff
DaniPopes Dec 18, 2023
b326f28
fmt: toml
DaniPopes Dec 18, 2023
f02d6b3
chore: use u64 in BlockRequest::Number
DaniPopes Dec 18, 2023
b982257
Merge branch 'master' into onbjerg/alloy-providers
DaniPopes Dec 18, 2023
c940ff9
update
DaniPopes Dec 18, 2023
f67b15f
chore: remove some more ethers
DaniPopes Dec 18, 2023
ae46d36
chore: more ethers removals (units)
DaniPopes Dec 18, 2023
c37b79b
wip: remove reth
DaniPopes Dec 18, 2023
41d2609
wip
DaniPopes Dec 18, 2023
5d1ad99
rm ice
DaniPopes Dec 18, 2023
8b93b27
fix(`rpc-types`): use newer `alloy-rpc-types`, `alloy-rpc-trace-types…
Evalir Jan 4, 2024
a36ae6b
Merge branch 'master' into onbjerg/alloy-providers
Evalir Jan 4, 2024
95c11b6
Merge branch 'master' into onbjerg/alloy-providers
Evalir Jan 4, 2024
ec829e7
chore: fix imports
Evalir Jan 4, 2024
6099171
chore: quicknode retry (#6712)
mattsse Jan 5, 2024
f984087
fix(`general`): get ci green on 6219 (#6711)
Evalir Jan 5, 2024
cba1d93
chore: remove borrows
Evalir Jan 5, 2024
87108d5
chore: add removal note
Evalir Jan 5, 2024
78823ae
chore: use alloy chains to compare
Evalir Jan 5, 2024
2f3ebba
chore: remove some conversions, migrate feemanager/newblocknotifications
Evalir Jan 5, 2024
025d27d
Merge branch 'master' into onbjerg/alloy-providers
onbjerg Jan 8, 2024
41962ad
chore: clippy
onbjerg Jan 8, 2024
526e91f
chore: fix doctests
onbjerg Jan 8, 2024
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
1,058 changes: 1,035 additions & 23 deletions Cargo.lock

Large diffs are not rendered by default.

32 changes: 27 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ foundry-evm-traces = { path = "crates/evm/traces" }
foundry-macros = { path = "crates/macros" }
foundry-test-utils = { path = "crates/test-utils" }

# solc & compilation utilities
foundry-block-explorers = { version = "0.1.3", default-features = false }
foundry-compilers = { version = "0.1.4", default-features = false }

Expand All @@ -142,10 +143,20 @@ ethers-middleware = { version = "2.0", default-features = false }
ethers-solc = { version = "2.0", default-features = false }

## alloy
alloy-primitives = "0.5.0"
alloy-dyn-abi = "0.5.0"
alloy-json-abi = "0.5.0"
alloy-sol-types = "0.5.0"
alloy-providers = "0.1.0"
alloy-transport = "0.1.0"
alloy-transport-http = "0.1.0"
alloy-transport-ws = "0.1.0"
alloy-transport-ipc = "0.1.0"
alloy-rpc-types = "0.1.0"
alloy-rpc-trace-types = "0.1.0"
alloy-json-rpc = "0.1.0"
alloy-pubsub = "0.1.0"
alloy-rpc-client = "0.1.0"
alloy-primitives = "0.5.1"
alloy-dyn-abi = "0.5.1"
alloy-json-abi = "0.5.1"
alloy-sol-types = "0.5.1"
syn-solidity = "0.5.0"

alloy-chains = "0.1.5"
Expand Down Expand Up @@ -197,7 +208,18 @@ ethers-signers = { git = "https://github.com/gakonst/ethers-rs", rev = "f0e5b194
ethers-middleware = { git = "https://github.com/gakonst/ethers-rs", rev = "f0e5b194f09c533feb10d1a686ddb9e5946ec107" }
ethers-solc = { git = "https://github.com/gakonst/ethers-rs", rev = "f0e5b194f09c533feb10d1a686ddb9e5946ec107" }

alloy-providers = { git = "https://github.com/alloy-rs/alloy/" }
alloy-transport = { git = "https://github.com/alloy-rs/alloy/" }
alloy-transport-http = { git = "https://github.com/alloy-rs/alloy/" }
alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy/" }
alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy/" }
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy/" }
alloy-rpc-trace-types = { git = "https://github.com/alloy-rs/alloy/" }
alloy-pubsub = { git = "https://github.com/alloy-rs/alloy/" }
alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy/" }
alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy/" }

revm = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze" }
revm-primitives = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze" }
revm-interpreter = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze" }
revm-precompile = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze" }
revm-primitives = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze" }
6 changes: 6 additions & 0 deletions crates/anvil/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ trie-db = "0.23"
hash-db = "0.15"
memory-db = "0.29"
alloy-primitives = { workspace = true, features = ["serde"] }
alloy-rpc-types.workspace = true
alloy-rpc-trace-types.workspace = true
alloy-providers.workspace = true
alloy-transport.workspace = true
alloy-chains.workspace = true

# axum related
axum.workspace = true
Expand All @@ -62,6 +67,7 @@ yansi = "0.5"
tempfile = "3"
itertools.workspace = true
rand = "0.8"
eyre.workspace = true

# cli
clap = { version = "4", features = ["derive", "env", "wrap_help"], optional = true }
Expand Down
8 changes: 5 additions & 3 deletions crates/anvil/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ repository.workspace = true
[dependencies]
foundry-common.workspace = true
foundry-evm.workspace = true
revm = { workspace = true, default-features = false, features = ["std", "serde", "memory_limit"] }

alloy-primitives = { workspace = true, features = ["serde"] }
revm = { workspace = true, default-features = false, features = ["std", "serde", "memory_limit"] }
alloy-rpc-types = { workspace = true }
alloy-rpc-trace-types.workspace = true
ethers-core = { workspace = true, features = ["optimism"] }
# theses are not used by anvil-core, but are required by ethers, because pulled in via foundry-common
ethers-contract = { workspace = true, features = ["optimism"] }
Expand All @@ -23,7 +25,7 @@ ethers-middleware = { workspace = true, features = ["optimism"] }

serde = { workspace = true, optional = true }
serde_json.workspace = true
bytes = { version = "1.4" }
bytes = "1.4"
open-fastrlp = { version = "0.1.4", optional = true }

# trie
Expand All @@ -40,4 +42,4 @@ anvil-core = { path = ".", features = ["serde"] }
default = ["serde"]
impersonated-tx = []
fastrlp = ["dep:open-fastrlp"]
serde = ["dep:serde"]
serde = ["dep:serde"]
Loading
Loading