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

Fork1 tests v2 #1604

Merged
merged 17 commits into from
Dec 19, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
get rid of revm c-kzg feature
eyusufatik committed Dec 16, 2024

Verified

This commit was signed with the committer’s verified signature.
eyusufatik Esad Yusuf Atik
commit e09ecf796c2f25e5805b17dd7e38fa4ceeba4d3c
95 changes: 46 additions & 49 deletions Cargo.lock

Large diffs are not rendered by default.

35 changes: 19 additions & 16 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -123,22 +123,25 @@ revm = { version = "12.1", features = ["serde"], default-features = false }
# forcing cargo for this version or else chooses 3.1.1 and there is some dependency conflicts
revm-primitives = { version = "8", default-features = false }
revm-inspectors = { version = "=0.5.5", default-features = false }
reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }
reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }
reth-rpc-types = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false, features = ["jsonrpsee-types"] }
reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }
reth-rpc-server-types = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }
reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }
reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }
reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }
reth-tasks = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }
reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }
reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }
reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }
reth-stages = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }

# temporarily moving reth crates to a fork where reth-revm is updated to not depend on revm/c-kzg
# once reth is updated check back if we can use the paradigmxyz/reth version
reth-primitives = { git = "https://github.com/eyusufatik/reth", rev = "19e733d1e69f3dd1900234141618be64284ade95", default-features = false }
reth-chainspec = { git = "https://github.com/eyusufatik/reth", rev = "19e733d1e69f3dd1900234141618be64284ade95", default-features = false }
reth-errors = { git = "https://github.com/eyusufatik/reth", rev = "19e733d1e69f3dd1900234141618be64284ade95", default-features = false }
reth-rpc-types = { git = "https://github.com/eyusufatik/reth", rev = "19e733d1e69f3dd1900234141618be64284ade95", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/eyusufatik/reth", rev = "19e733d1e69f3dd1900234141618be64284ade95", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/eyusufatik/reth", rev = "19e733d1e69f3dd1900234141618be64284ade95", default-features = false }
reth-rpc-server-types = { git = "https://github.com/eyusufatik/reth", rev = "19e733d1e69f3dd1900234141618be64284ade95", default-features = false }
reth-rpc-types-compat = { git = "https://github.com/eyusufatik/reth", rev = "19e733d1e69f3dd1900234141618be64284ade95", default-features = false }
reth-node-api = { git = "https://github.com/eyusufatik/reth", rev = "19e733d1e69f3dd1900234141618be64284ade95", default-features = false }
reth-transaction-pool = { git = "https://github.com/eyusufatik/reth", rev = "19e733d1e69f3dd1900234141618be64284ade95", default-features = false }
reth-provider = { git = "https://github.com/eyusufatik/reth", rev = "19e733d1e69f3dd1900234141618be64284ade95", default-features = false }
reth-tasks = { git = "https://github.com/eyusufatik/reth", rev = "19e733d1e69f3dd1900234141618be64284ade95", default-features = false }
reth-db = { git = "https://github.com/eyusufatik/reth", rev = "19e733d1e69f3dd1900234141618be64284ade95", default-features = false }
reth-trie = { git = "https://github.com/eyusufatik/reth", rev = "19e733d1e69f3dd1900234141618be64284ade95", default-features = false }
reth-rpc = { git = "https://github.com/eyusufatik/reth", rev = "19e733d1e69f3dd1900234141618be64284ade95", default-features = false }
reth-stages = { git = "https://github.com/eyusufatik/reth", rev = "19e733d1e69f3dd1900234141618be64284ade95", default-features = false }

alloy-trie = { version = "0.3.8", default-features = false }
alloy-rlp = { version = "0.3.8", default-features = false }
5 changes: 4 additions & 1 deletion crates/evm/src/tests/fork_tests.rs
Original file line number Diff line number Diff line change
@@ -662,7 +662,10 @@ fn test_kzg_point_eval_should_revert() {
.unwrap();
assert_ne!(
storage_value,
U256::from_str("52435875175126190479447740508185965837690552500527637822603658699938581184513").unwrap()
U256::from_str(
"52435875175126190479447740508185965837690552500527637822603658699938581184513"
)
.unwrap()
);
}

20 changes: 10 additions & 10 deletions guests/risc0/batch-proof-bitcoin/Cargo.lock

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

14 changes: 7 additions & 7 deletions guests/risc0/batch-proof-mock/Cargo.lock

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

14 changes: 7 additions & 7 deletions guests/risc0/light-client-proof-bitcoin/Cargo.lock

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

14 changes: 7 additions & 7 deletions guests/risc0/light-client-proof-mock/Cargo.lock

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