Skip to content

Commit

Permalink
Merge branch 'evalir/migrate-executor-folder' into evalir/migrate-for…
Browse files Browse the repository at this point in the history
…k-primitives
  • Loading branch information
Evalir committed Sep 1, 2023
2 parents b509722 + 3b65c52 commit b084d66
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 6 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion crates/anvil/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ ethers = { workspace = true, features = ["rustls", "ws", "ipc"] }
trie-db = { version = "0.23" }
hash-db = { version = "0.15" }
memory-db = { version = "0.29" }
alloy-primitives = { version = "0.3", default-features = false, features = ["std", "serde"] }
alloy-primitives = { workspace = true, default-features = false, features = ["std", "serde"] }

# axum related
axum = { version = "0.5", features = ["ws"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/anvil/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repository.workspace = true
# foundry internal
foundry-evm = { path = "../../evm" }
revm = { version = "3", default-features = false, features = ["std", "serde", "memory_limit"] }
alloy-primitives = { version = "0.3", default-features = false, features = ["std", "serde"] }
alloy-primitives = { workspace = true, default-features = false, features = ["std", "serde"] }

ethers-core.workspace = true
serde = { version = "1", features = ["derive"], optional = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/evm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ revm = { version = "3", default-features = false, features = [
"optional_no_base_fee",
] }

alloy-primitives = { version = "0.3", default-features = false, features = ["std", "serde"] }
alloy-primitives = { workspace = true, default-features = false, features = ["std", "serde"] }

# Fuzzer
proptest = "1"
Expand Down
3 changes: 1 addition & 2 deletions crates/forge/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ forge-doc.workspace = true
foundry-cli.workspace = true
ui.workspace = true

alloy-primitives = { version = "0.3", default-features = false, features = ["std", "serde"] }
alloy-rlp = { version = "0.3", default-features = false, features = ["std", "derive"] }
alloy-primitives = { workspace = true, default-features = false, features = ["std", "serde"] }

async-trait = "0.1"
bytes = "1.4"
Expand Down

0 comments on commit b084d66

Please sign in to comment.