From 517a3025e1f0ec9d81890f6a2f26a3592a8c7555 Mon Sep 17 00:00:00 2001 From: halo3mic <46010359+halo3mic@users.noreply.github.com> Date: Fri, 27 Sep 2024 20:34:09 +0000 Subject: [PATCH 1/5] revmc integration --- Cargo.lock | 1951 ++++++++++++----- crates/rbuilder/Cargo.toml | 7 + crates/rbuilder/build.rs | 1 + .../src/backtest/backtest_build_block.rs | 26 +- .../src/backtest/backtest_build_range.rs | 2 + crates/rbuilder/src/backtest/execute.rs | 5 + .../src/backtest/redistribute/cli/mod.rs | 6 + .../rbuilder/src/backtest/redistribute/mod.rs | 22 +- .../resim_landed_block.rs | 3 + .../rbuilder/src/bin/debug-bench-machine.rs | 1 + crates/rbuilder/src/bin/dummy-builder.rs | 1 + crates/rbuilder/src/bin/revmc-aot-compile.rs | 174 ++ crates/rbuilder/src/building/evm_inspector.rs | 2 +- crates/rbuilder/src/building/mod.rs | 8 + crates/rbuilder/src/building/order_commit.rs | 21 +- crates/rbuilder/src/building/revmc_ext_ctx.rs | 92 + .../src/building/testing/test_chain_state.rs | 1 + .../rbuilder/src/live_builder/base_config.rs | 21 +- crates/rbuilder/src/live_builder/mod.rs | 4 + 19 files changed, 1815 insertions(+), 533 deletions(-) create mode 100644 crates/rbuilder/src/bin/revmc-aot-compile.rs create mode 100644 crates/rbuilder/src/building/revmc_ext_ctx.rs diff --git a/Cargo.lock b/Cargo.lock index fb1aa429..76b18aad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2553,6 +2553,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562" +[[package]] +name = "dotenv" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" + [[package]] name = "dotenvy" version = "0.15.7" @@ -2835,12 +2841,12 @@ dependencies = [ "alloy-trie", "hash-db", "rayon", - "reth-db-api", - "reth-errors", - "reth-execution-errors", - "reth-provider", - "reth-trie", - "reth-trie-db", + "reth-db-api 1.0.6", + "reth-errors 1.0.6", + "reth-execution-errors 1.0.6", + "reth-provider 1.0.6", + "reth-trie 1.0.6", + "reth-trie-db 1.0.6", "revm", "revm-primitives", "rustc-hash 2.0.0", @@ -4134,6 +4140,31 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" +[[package]] +name = "inkwell" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40fb405537710d51f6bdbc8471365ddd4cd6d3a3c3ad6e0c8291691031ba94b2" +dependencies = [ + "either", + "inkwell_internals", + "libc", + "llvm-sys", + "once_cell", + "thiserror", +] + +[[package]] +name = "inkwell_internals" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd28cfd4cfba665d47d31c08a6ba637eed16770abca2eccbbc3ca831fef1e44" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "inout" version = "0.1.3" @@ -4969,6 +5000,20 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "llvm-sys" +version = "180.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "778fa5fa02e32728e718f11eec147e6f134137399ab02fd2c13d32476337affa" +dependencies = [ + "anyhow", + "cc", + "lazy_static", + "libc", + "regex-lite", + "semver 1.0.23", +] + [[package]] name = "lock_api" version = "0.4.12" @@ -7027,6 +7072,7 @@ dependencies = [ "csv", "ctor", "derivative", + "dotenv", "eth-sparse-mpt", "ethereum-consensus", "ethereum_ssz", @@ -7059,23 +7105,28 @@ dependencies = [ "reqwest 0.11.27", "reth", "reth-basic-payload-builder", - "reth-chainspec", - "reth-db", + "reth-chainspec 1.0.6", + "reth-db 1.0.6", "reth-db-common", - "reth-errors", - "reth-evm", - "reth-evm-ethereum", - "reth-libmdbx", + "reth-errors 1.0.6", + "reth-evm 1.0.6", + "reth-evm-ethereum 1.0.6", + "reth-libmdbx 1.0.6", "reth-node-api", "reth-node-core", "reth-payload-builder", - "reth-primitives", - "reth-provider", - "reth-trie", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", + "reth-trie 1.0.6", "reth-trie-parallel", "revm", "revm-inspectors", "revm-primitives", + "revmc-build", + "revmc-toolbox-build", + "revmc-toolbox-load", + "revmc-toolbox-sim", + "revmc-toolbox-utils", "secp256k1", "serde", "serde_json", @@ -7193,6 +7244,12 @@ dependencies = [ "regex-syntax 0.8.4", ] +[[package]] +name = "regex-lite" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" + [[package]] name = "regex-syntax" version = "0.6.29" @@ -7322,27 +7379,27 @@ dependencies = [ "reth-basic-payload-builder", "reth-beacon-consensus", "reth-blockchain-tree", - "reth-chainspec", + "reth-chainspec 1.0.6", "reth-cli-commands", "reth-cli-runner", "reth-cli-util", "reth-config", - "reth-consensus", - "reth-consensus-common", - "reth-db", - "reth-db-api", + "reth-consensus 1.0.6", + "reth-consensus-common 1.0.6", + "reth-db 1.0.6", + "reth-db-api 1.0.6", "reth-db-common", "reth-downloaders", "reth-engine-util", - "reth-errors", + "reth-errors 1.0.6", "reth-ethereum-payload-builder", - "reth-evm", - "reth-execution-types", + "reth-evm 1.0.6", + "reth-execution-types 1.0.6", "reth-exex", - "reth-fs-util", + "reth-fs-util 1.0.6", "reth-network", "reth-network-api", - "reth-network-p2p", + "reth-network-p2p 1.0.6", "reth-node-api", "reth-node-builder", "reth-node-core", @@ -7354,26 +7411,26 @@ dependencies = [ "reth-payload-builder", "reth-payload-primitives", "reth-payload-validator", - "reth-primitives", - "reth-provider", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", "reth-prune", - "reth-revm", + "reth-revm 1.0.6", "reth-rpc", "reth-rpc-api", "reth-rpc-builder", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types", + "reth-rpc-types 1.0.6", "reth-rpc-types-compat", "reth-stages", "reth-stages-api", "reth-static-file", - "reth-static-file-types", + "reth-static-file-types 1.0.6", "reth-tasks", - "reth-tracing", + "reth-tracing 1.0.6", "reth-transaction-pool", - "reth-trie", - "reth-trie-db", + "reth-trie 1.0.6", + "reth-trie-db 1.0.6", "serde", "serde_json", "similar-asserts", @@ -7391,22 +7448,22 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18 dependencies = [ "futures-util", "reth-beacon-consensus", - "reth-chainspec", - "reth-consensus", + "reth-chainspec 1.0.6", + "reth-consensus 1.0.6", "reth-engine-primitives", - "reth-evm", - "reth-execution-errors", - "reth-execution-types", - "reth-network-p2p", - "reth-network-peers", - "reth-primitives", - "reth-provider", - "reth-revm", - "reth-rpc-types", + "reth-evm 1.0.6", + "reth-execution-errors 1.0.6", + "reth-execution-types 1.0.6", + "reth-network-p2p 1.0.6", + "reth-network-peers 1.0.6", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", + "reth-revm 1.0.6", + "reth-rpc-types 1.0.6", "reth-stages-api", "reth-tokio-util", "reth-transaction-pool", - "reth-trie", + "reth-trie 1.0.6", "tokio", "tokio-stream", "tracing", @@ -7421,13 +7478,13 @@ dependencies = [ "futures-core", "futures-util", "metrics", - "reth-chainspec", - "reth-metrics", + "reth-chainspec 1.0.6", + "reth-metrics 1.0.6", "reth-payload-builder", "reth-payload-primitives", - "reth-primitives", - "reth-provider", - "reth-revm", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", + "reth-revm 1.0.6", "reth-tasks", "reth-transaction-pool", "revm", @@ -7443,21 +7500,21 @@ dependencies = [ "futures", "itertools 0.13.0", "metrics", - "reth-blockchain-tree-api", - "reth-chainspec", - "reth-db-api", + "reth-blockchain-tree-api 1.0.6", + "reth-chainspec 1.0.6", + "reth-db-api 1.0.6", "reth-engine-primitives", - "reth-errors", - "reth-ethereum-consensus", - "reth-metrics", - "reth-network-p2p", + "reth-errors 1.0.6", + "reth-ethereum-consensus 1.0.6", + "reth-metrics 1.0.6", + "reth-network-p2p 1.0.6", "reth-payload-builder", "reth-payload-primitives", "reth-payload-validator", - "reth-primitives", - "reth-provider", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", "reth-prune", - "reth-rpc-types", + "reth-rpc-types 1.0.6", "reth-stages-api", "reth-static-file", "reth-tasks", @@ -7478,40 +7535,74 @@ dependencies = [ "linked_hash_set", "metrics", "parking_lot 0.12.3", - "reth-blockchain-tree-api", - "reth-consensus", - "reth-db", - "reth-db-api", - "reth-evm", - "reth-execution-errors", - "reth-execution-types", - "reth-metrics", + "reth-blockchain-tree-api 1.0.6", + "reth-consensus 1.0.6", + "reth-db 1.0.6", + "reth-db-api 1.0.6", + "reth-evm 1.0.6", + "reth-execution-errors 1.0.6", + "reth-execution-types 1.0.6", + "reth-metrics 1.0.6", "reth-network", - "reth-primitives", - "reth-provider", - "reth-prune-types", - "reth-revm", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", + "reth-prune-types 1.0.6", + "reth-revm 1.0.6", "reth-stages-api", - "reth-storage-errors", - "reth-trie", - "reth-trie-db", + "reth-storage-errors 1.0.6", + "reth-trie 1.0.6", + "reth-trie-db 1.0.6", "reth-trie-parallel", "tokio", "tracing", ] +[[package]] +name = "reth-blockchain-tree-api" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "reth-consensus 1.0.5", + "reth-execution-errors 1.0.5", + "reth-primitives 1.0.5", + "reth-storage-errors 1.0.5", + "thiserror", +] + [[package]] name = "reth-blockchain-tree-api" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-consensus", - "reth-execution-errors", - "reth-primitives", - "reth-storage-errors", + "reth-consensus 1.0.6", + "reth-execution-errors 1.0.6", + "reth-primitives 1.0.6", + "reth-storage-errors 1.0.6", "thiserror", ] +[[package]] +name = "reth-chain-state" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "auto_impl", + "derive_more 1.0.0", + "metrics", + "parking_lot 0.12.3", + "pin-project", + "reth-chainspec 1.0.5", + "reth-errors 1.0.5", + "reth-execution-types 1.0.5", + "reth-metrics 1.0.5", + "reth-primitives 1.0.5", + "reth-storage-api 1.0.5", + "reth-trie 1.0.5", + "tokio", + "tokio-stream", + "tracing", +] + [[package]] name = "reth-chain-state" version = "1.0.6" @@ -7525,19 +7616,39 @@ dependencies = [ "parking_lot 0.12.3", "pin-project", "rand 0.8.5", - "reth-chainspec", - "reth-errors", - "reth-execution-types", - "reth-metrics", - "reth-primitives", - "reth-storage-api", - "reth-trie", + "reth-chainspec 1.0.6", + "reth-errors 1.0.6", + "reth-execution-types 1.0.6", + "reth-metrics 1.0.6", + "reth-primitives 1.0.6", + "reth-storage-api 1.0.6", + "reth-trie 1.0.6", "revm", "tokio", "tokio-stream", "tracing", ] +[[package]] +name = "reth-chainspec" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-chains", + "alloy-eips", + "alloy-genesis", + "alloy-primitives 0.8.0", + "alloy-trie", + "auto_impl", + "derive_more 1.0.0", + "once_cell", + "reth-ethereum-forks 1.0.5", + "reth-network-peers 1.0.5", + "reth-primitives-traits 1.0.5", + "reth-trie-common 1.0.5", + "serde_json", +] + [[package]] name = "reth-chainspec" version = "1.0.6" @@ -7551,10 +7662,10 @@ dependencies = [ "auto_impl", "derive_more 1.0.0", "once_cell", - "reth-ethereum-forks", - "reth-network-peers", - "reth-primitives-traits", - "reth-trie-common", + "reth-ethereum-forks 1.0.6", + "reth-network-peers 1.0.6", + "reth-primitives-traits 1.0.6", + "reth-trie-common 1.0.6", "serde_json", ] @@ -7575,35 +7686,35 @@ dependencies = [ "itertools 0.13.0", "ratatui", "reth-beacon-consensus", - "reth-chainspec", + "reth-chainspec 1.0.6", "reth-cli-runner", "reth-cli-util", "reth-config", - "reth-consensus", - "reth-db", - "reth-db-api", + "reth-consensus 1.0.6", + "reth-db 1.0.6", + "reth-db-api 1.0.6", "reth-db-common", "reth-downloaders", "reth-ecies", "reth-eth-wire", - "reth-evm", + "reth-evm 1.0.6", "reth-exex", - "reth-fs-util", + "reth-fs-util 1.0.6", "reth-network", - "reth-network-p2p", - "reth-network-peers", + "reth-network-p2p 1.0.6", + "reth-network-peers 1.0.6", "reth-node-builder", "reth-node-core", "reth-node-events", "reth-node-metrics", - "reth-primitives", - "reth-provider", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", "reth-prune", "reth-stages", "reth-static-file", - "reth-static-file-types", - "reth-trie", - "reth-trie-db", + "reth-static-file-types 1.0.6", + "reth-trie 1.0.6", + "reth-trie-db 1.0.6", "secp256k1", "serde", "serde_json", @@ -7632,11 +7743,27 @@ dependencies = [ "eyre", "libc", "rand 0.8.5", - "reth-fs-util", + "reth-fs-util 1.0.6", "secp256k1", "thiserror", ] +[[package]] +name = "reth-codecs" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-genesis", + "alloy-primitives 0.8.0", + "alloy-trie", + "bytes", + "modular-bitfield", + "reth-codecs-derive 1.0.5", + "serde", +] + [[package]] name = "reth-codecs" version = "1.0.6" @@ -7649,10 +7776,21 @@ dependencies = [ "alloy-trie", "bytes", "modular-bitfield", - "reth-codecs-derive", + "reth-codecs-derive 1.0.6", "serde", ] +[[package]] +name = "reth-codecs-derive" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "convert_case 0.6.0", + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "reth-codecs-derive" version = "1.0.6" @@ -7671,13 +7809,23 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18 dependencies = [ "eyre", "humantime-serde", - "reth-network-types", - "reth-prune-types", - "reth-stages-types", + "reth-network-types 1.0.6", + "reth-prune-types 1.0.6", + "reth-stages-types 1.0.6", "serde", "toml 0.8.15", ] +[[package]] +name = "reth-consensus" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "auto_impl", + "derive_more 1.0.0", + "reth-primitives 1.0.5", +] + [[package]] name = "reth-consensus" version = "1.0.6" @@ -7685,7 +7833,17 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18 dependencies = [ "auto_impl", "derive_more 1.0.0", - "reth-primitives", + "reth-primitives 1.0.6", +] + +[[package]] +name = "reth-consensus-common" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "reth-chainspec 1.0.5", + "reth-consensus 1.0.5", + "reth-primitives 1.0.5", ] [[package]] @@ -7693,9 +7851,9 @@ name = "reth-consensus-common" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chainspec", - "reth-consensus", - "reth-primitives", + "reth-chainspec 1.0.6", + "reth-consensus 1.0.6", + "reth-primitives 1.0.6", ] [[package]] @@ -7714,13 +7872,43 @@ dependencies = [ "reth-node-core", "reth-rpc-api", "reth-rpc-builder", - "reth-rpc-types", - "reth-tracing", + "reth-rpc-types 1.0.6", + "reth-tracing 1.0.6", "ringbuffer", "serde", "tokio", ] +[[package]] +name = "reth-db" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "bytes", + "derive_more 1.0.0", + "eyre", + "metrics", + "page_size", + "paste", + "reth-db-api 1.0.5", + "reth-fs-util 1.0.5", + "reth-libmdbx 1.0.5", + "reth-metrics 1.0.5", + "reth-nippy-jar 1.0.5", + "reth-primitives 1.0.5", + "reth-primitives-traits 1.0.5", + "reth-prune-types 1.0.5", + "reth-stages-types 1.0.5", + "reth-storage-errors 1.0.5", + "reth-tracing 1.0.5", + "reth-trie-common 1.0.5", + "rustc-hash 2.0.0", + "serde", + "strum", + "sysinfo 0.30.13", + "thiserror", +] + [[package]] name = "reth-db" version = "1.0.6" @@ -7732,18 +7920,18 @@ dependencies = [ "metrics", "page_size", "paste", - "reth-db-api", - "reth-fs-util", - "reth-libmdbx", - "reth-metrics", - "reth-nippy-jar", - "reth-primitives", - "reth-primitives-traits", - "reth-prune-types", - "reth-stages-types", - "reth-storage-errors", - "reth-tracing", - "reth-trie-common", + "reth-db-api 1.0.6", + "reth-fs-util 1.0.6", + "reth-libmdbx 1.0.6", + "reth-metrics 1.0.6", + "reth-nippy-jar 1.0.6", + "reth-primitives 1.0.6", + "reth-primitives-traits 1.0.6", + "reth-prune-types 1.0.6", + "reth-stages-types 1.0.6", + "reth-storage-errors 1.0.6", + "reth-tracing 1.0.6", + "reth-trie-common 1.0.6", "rustc-hash 2.0.0", "serde", "strum", @@ -7752,6 +7940,27 @@ dependencies = [ "thiserror", ] +[[package]] +name = "reth-db-api" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "bytes", + "derive_more 1.0.0", + "metrics", + "modular-bitfield", + "parity-scale-codec", + "reth-codecs 1.0.5", + "reth-db-models 1.0.5", + "reth-primitives 1.0.5", + "reth-primitives-traits 1.0.5", + "reth-prune-types 1.0.5", + "reth-stages-types 1.0.5", + "reth-storage-errors 1.0.5", + "reth-trie-common 1.0.5", + "serde", +] + [[package]] name = "reth-db-api" version = "1.0.6" @@ -7764,14 +7973,14 @@ dependencies = [ "modular-bitfield", "parity-scale-codec", "proptest", - "reth-codecs", - "reth-db-models", - "reth-primitives", - "reth-primitives-traits", - "reth-prune-types", - "reth-stages-types", - "reth-storage-errors", - "reth-trie-common", + "reth-codecs 1.0.6", + "reth-db-models 1.0.6", + "reth-primitives 1.0.6", + "reth-primitives-traits 1.0.6", + "reth-prune-types 1.0.6", + "reth-stages-types 1.0.6", + "reth-storage-errors 1.0.6", + "reth-trie-common 1.0.6", "serde", ] @@ -7783,24 +7992,36 @@ dependencies = [ "alloy-genesis", "boyer-moore-magiclen", "eyre", - "reth-chainspec", - "reth-codecs", + "reth-chainspec 1.0.6", + "reth-codecs 1.0.6", "reth-config", - "reth-db", - "reth-db-api", + "reth-db 1.0.6", + "reth-db-api 1.0.6", "reth-etl", - "reth-fs-util", - "reth-primitives", - "reth-provider", - "reth-stages-types", - "reth-trie", - "reth-trie-db", + "reth-fs-util 1.0.6", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", + "reth-stages-types 1.0.6", + "reth-trie 1.0.6", + "reth-trie-db 1.0.6", "serde", "serde_json", "thiserror", "tracing", ] +[[package]] +name = "reth-db-models" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "bytes", + "modular-bitfield", + "reth-codecs 1.0.5", + "reth-primitives 1.0.5", + "serde", +] + [[package]] name = "reth-db-models" version = "1.0.6" @@ -7810,8 +8031,8 @@ dependencies = [ "bytes", "modular-bitfield", "proptest", - "reth-codecs", - "reth-primitives", + "reth-codecs 1.0.6", + "reth-primitives 1.0.6", "serde", ] @@ -7826,10 +8047,10 @@ dependencies = [ "enr 0.12.1", "generic-array", "parking_lot 0.12.3", - "reth-ethereum-forks", - "reth-net-banlist", + "reth-ethereum-forks 1.0.6", + "reth-net-banlist 1.0.6", "reth-net-nat", - "reth-network-peers", + "reth-network-peers 1.0.6", "schnellru", "secp256k1", "serde", @@ -7853,10 +8074,10 @@ dependencies = [ "itertools 0.13.0", "metrics", "rand 0.8.5", - "reth-chainspec", - "reth-ethereum-forks", - "reth-metrics", - "reth-network-peers", + "reth-chainspec 1.0.6", + "reth-ethereum-forks 1.0.6", + "reth-metrics 1.0.6", + "reth-network-peers 1.0.6", "secp256k1", "thiserror", "tokio", @@ -7873,8 +8094,8 @@ dependencies = [ "enr 0.12.1", "linked_hash_set", "parking_lot 0.12.3", - "reth-ethereum-forks", - "reth-network-peers", + "reth-ethereum-forks 1.0.6", + "reth-network-peers 1.0.6", "reth-tokio-util", "schnellru", "secp256k1", @@ -7898,12 +8119,12 @@ dependencies = [ "pin-project", "rayon", "reth-config", - "reth-consensus", - "reth-metrics", - "reth-network-p2p", - "reth-network-peers", - "reth-primitives", - "reth-storage-api", + "reth-consensus 1.0.6", + "reth-metrics 1.0.6", + "reth-network-p2p 1.0.6", + "reth-network-peers 1.0.6", + "reth-primitives 1.0.6", + "reth-storage-api 1.0.6", "reth-tasks", "thiserror", "tokio", @@ -7931,7 +8152,7 @@ dependencies = [ "hmac 0.12.1", "pin-project", "rand 0.8.5", - "reth-network-peers", + "reth-network-peers 1.0.6", "secp256k1", "sha2 0.10.8", "sha3", @@ -7948,7 +8169,7 @@ name = "reth-engine-primitives" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chainspec", + "reth-chainspec 1.0.6", "reth-payload-primitives", "serde", ] @@ -7961,16 +8182,16 @@ dependencies = [ "futures", "pin-project", "reth-beacon-consensus", - "reth-chainspec", - "reth-consensus", - "reth-db-api", + "reth-chainspec 1.0.6", + "reth-consensus 1.0.6", + "reth-db-api 1.0.6", "reth-engine-primitives", "reth-engine-tree", - "reth-evm", - "reth-network-p2p", + "reth-evm 1.0.6", + "reth-network-p2p 1.0.6", "reth-payload-builder", "reth-payload-validator", - "reth-provider", + "reth-provider 1.0.6", "reth-prune", "reth-stages-api", "reth-tasks", @@ -7986,27 +8207,27 @@ dependencies = [ "metrics", "reth-beacon-consensus", "reth-blockchain-tree", - "reth-blockchain-tree-api", - "reth-chain-state", - "reth-consensus", - "reth-db", - "reth-db-api", + "reth-blockchain-tree-api 1.0.6", + "reth-chain-state 1.0.6", + "reth-consensus 1.0.6", + "reth-db 1.0.6", + "reth-db-api 1.0.6", "reth-engine-primitives", - "reth-errors", - "reth-evm", - "reth-metrics", - "reth-network-p2p", + "reth-errors 1.0.6", + "reth-evm 1.0.6", + "reth-metrics 1.0.6", + "reth-network-p2p 1.0.6", "reth-payload-builder", "reth-payload-primitives", "reth-payload-validator", - "reth-primitives", - "reth-provider", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", "reth-prune", - "reth-revm", - "reth-rpc-types", + "reth-revm 1.0.6", + "reth-rpc-types 1.0.6", "reth-stages-api", "reth-tasks", - "reth-trie", + "reth-trie 1.0.6", "thiserror", "tokio", "tracing", @@ -8023,17 +8244,17 @@ dependencies = [ "pin-project", "reth-beacon-consensus", "reth-engine-primitives", - "reth-errors", - "reth-ethereum-forks", - "reth-evm", - "reth-fs-util", + "reth-errors 1.0.6", + "reth-ethereum-forks 1.0.6", + "reth-evm 1.0.6", + "reth-fs-util 1.0.6", "reth-payload-validator", - "reth-primitives", - "reth-provider", - "reth-revm", - "reth-rpc-types", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", + "reth-revm 1.0.6", + "reth-rpc-types 1.0.6", "reth-rpc-types-compat", - "reth-trie", + "reth-trie 1.0.6", "revm-primitives", "serde", "serde_json", @@ -8042,16 +8263,29 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-errors" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "reth-blockchain-tree-api 1.0.5", + "reth-consensus 1.0.5", + "reth-execution-errors 1.0.5", + "reth-fs-util 1.0.5", + "reth-storage-errors 1.0.5", + "thiserror", +] + [[package]] name = "reth-errors" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-blockchain-tree-api", - "reth-consensus", - "reth-execution-errors", - "reth-fs-util", - "reth-storage-errors", + "reth-blockchain-tree-api 1.0.6", + "reth-consensus 1.0.6", + "reth-execution-errors 1.0.6", + "reth-fs-util 1.0.6", + "reth-storage-errors 1.0.6", "thiserror", ] @@ -8065,13 +8299,13 @@ dependencies = [ "derive_more 1.0.0", "futures", "pin-project", - "reth-chainspec", - "reth-codecs", + "reth-chainspec 1.0.6", + "reth-codecs 1.0.6", "reth-ecies", - "reth-eth-wire-types", - "reth-metrics", - "reth-network-peers", - "reth-primitives", + "reth-eth-wire-types 1.0.6", + "reth-metrics 1.0.6", + "reth-network-peers 1.0.6", + "reth-primitives 1.0.6", "snap", "thiserror", "tokio", @@ -8080,6 +8314,22 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-eth-wire-types" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-chains", + "alloy-genesis", + "alloy-rlp", + "bytes", + "derive_more 1.0.0", + "reth-chainspec 1.0.5", + "reth-codecs-derive 1.0.5", + "reth-primitives 1.0.5", + "thiserror", +] + [[package]] name = "reth-eth-wire-types" version = "1.0.6" @@ -8090,21 +8340,33 @@ dependencies = [ "alloy-rlp", "bytes", "derive_more 1.0.0", - "reth-chainspec", - "reth-codecs-derive", - "reth-primitives", + "reth-chainspec 1.0.6", + "reth-codecs-derive 1.0.6", + "reth-primitives 1.0.6", "thiserror", ] +[[package]] +name = "reth-ethereum-consensus" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "reth-chainspec 1.0.5", + "reth-consensus 1.0.5", + "reth-consensus-common 1.0.5", + "reth-primitives 1.0.5", + "tracing", +] + [[package]] name = "reth-ethereum-consensus" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chainspec", - "reth-consensus", - "reth-consensus-common", - "reth-primitives", + "reth-chainspec 1.0.6", + "reth-consensus 1.0.6", + "reth-consensus-common 1.0.6", + "reth-primitives 1.0.6", "tracing", ] @@ -8114,18 +8376,35 @@ version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ "alloy-rlp", - "reth-chainspec", + "reth-chainspec 1.0.6", "reth-engine-primitives", - "reth-evm-ethereum", + "reth-evm-ethereum 1.0.6", "reth-payload-primitives", - "reth-primitives", - "reth-rpc-types", + "reth-primitives 1.0.6", + "reth-rpc-types 1.0.6", "reth-rpc-types-compat", "revm-primitives", "serde", "sha2 0.10.8", ] +[[package]] +name = "reth-ethereum-forks" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-chains", + "alloy-primitives 0.8.0", + "alloy-rlp", + "auto_impl", + "crc", + "dyn-clone", + "once_cell", + "rustc-hash 2.0.0", + "serde", + "thiserror-no-std", +] + [[package]] name = "reth-ethereum-forks" version = "1.0.6" @@ -8152,16 +8431,16 @@ version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ "reth-basic-payload-builder", - "reth-errors", - "reth-evm", - "reth-evm-ethereum", - "reth-execution-types", + "reth-errors 1.0.6", + "reth-evm 1.0.6", + "reth-evm-ethereum 1.0.6", + "reth-execution-types 1.0.6", "reth-payload-builder", - "reth-primitives", - "reth-provider", - "reth-revm", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", + "reth-revm 1.0.6", "reth-transaction-pool", - "reth-trie", + "reth-trie 1.0.6", "revm", "tracing", ] @@ -8172,10 +8451,28 @@ version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ "rayon", - "reth-db-api", + "reth-db-api 1.0.6", "tempfile", ] +[[package]] +name = "reth-evm" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-eips", + "auto_impl", + "futures-util", + "reth-chainspec 1.0.5", + "reth-execution-errors 1.0.5", + "reth-execution-types 1.0.5", + "reth-primitives 1.0.5", + "reth-prune-types 1.0.5", + "reth-storage-errors 1.0.5", + "revm", + "revm-primitives", +] + [[package]] name = "reth-evm" version = "1.0.6" @@ -8184,16 +8481,34 @@ dependencies = [ "alloy-eips", "auto_impl", "futures-util", - "reth-chainspec", - "reth-execution-errors", - "reth-execution-types", - "reth-primitives", - "reth-prune-types", - "reth-storage-errors", + "reth-chainspec 1.0.6", + "reth-execution-errors 1.0.6", + "reth-execution-types 1.0.6", + "reth-primitives 1.0.6", + "reth-prune-types 1.0.6", + "reth-storage-errors 1.0.6", "revm", "revm-primitives", ] +[[package]] +name = "reth-evm-ethereum" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-eips", + "alloy-sol-types", + "reth-chainspec 1.0.5", + "reth-ethereum-consensus 1.0.5", + "reth-ethereum-forks 1.0.5", + "reth-evm 1.0.5", + "reth-execution-types 1.0.5", + "reth-primitives 1.0.5", + "reth-prune-types 1.0.5", + "reth-revm 1.0.5", + "revm-primitives", +] + [[package]] name = "reth-evm-ethereum" version = "1.0.6" @@ -8201,14 +8516,14 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18 dependencies = [ "alloy-eips", "alloy-sol-types", - "reth-chainspec", - "reth-ethereum-consensus", - "reth-ethereum-forks", - "reth-evm", - "reth-execution-types", - "reth-primitives", - "reth-prune-types", - "reth-revm", + "reth-chainspec 1.0.6", + "reth-ethereum-consensus 1.0.6", + "reth-ethereum-forks 1.0.6", + "reth-evm 1.0.6", + "reth-execution-types 1.0.6", + "reth-primitives 1.0.6", + "reth-prune-types 1.0.6", + "reth-revm 1.0.6", "revm-primitives", ] @@ -8217,21 +8532,37 @@ name = "reth-evm-optimism" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chainspec", - "reth-ethereum-forks", - "reth-evm", - "reth-execution-errors", - "reth-execution-types", + "reth-chainspec 1.0.6", + "reth-ethereum-forks 1.0.6", + "reth-evm 1.0.6", + "reth-execution-errors 1.0.6", + "reth-execution-types 1.0.6", "reth-optimism-consensus", - "reth-primitives", - "reth-prune-types", - "reth-revm", + "reth-primitives 1.0.6", + "reth-prune-types 1.0.6", + "reth-revm 1.0.6", "revm", "revm-primitives", "thiserror", "tracing", ] +[[package]] +name = "reth-execution-errors" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-eips", + "alloy-primitives 0.8.0", + "alloy-rlp", + "derive_more 1.0.0", + "nybbles", + "reth-consensus 1.0.5", + "reth-prune-types 1.0.5", + "reth-storage-errors 1.0.5", + "revm-primitives", +] + [[package]] name = "reth-execution-errors" version = "1.0.6" @@ -8242,20 +8573,31 @@ dependencies = [ "alloy-rlp", "derive_more 1.0.0", "nybbles", - "reth-consensus", - "reth-prune-types", - "reth-storage-errors", + "reth-consensus 1.0.6", + "reth-prune-types 1.0.6", + "reth-storage-errors 1.0.6", "revm-primitives", ] +[[package]] +name = "reth-execution-types" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "reth-execution-errors 1.0.5", + "reth-primitives 1.0.5", + "reth-trie 1.0.5", + "revm", +] + [[package]] name = "reth-execution-types" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-execution-errors", - "reth-primitives", - "reth-trie", + "reth-execution-errors 1.0.6", + "reth-primitives 1.0.6", + "reth-trie 1.0.6", "revm", ] @@ -8268,20 +8610,20 @@ dependencies = [ "futures", "metrics", "reth-config", - "reth-evm", + "reth-evm 1.0.6", "reth-exex-types", - "reth-metrics", + "reth-metrics 1.0.6", "reth-node-api", "reth-node-core", "reth-payload-builder", - "reth-primitives", - "reth-primitives-traits", - "reth-provider", - "reth-prune-types", - "reth-revm", + "reth-primitives 1.0.6", + "reth-primitives-traits 1.0.6", + "reth-provider 1.0.6", + "reth-prune-types 1.0.6", + "reth-revm 1.0.6", "reth-stages-api", "reth-tasks", - "reth-tracing", + "reth-tracing 1.0.6", "tokio", "tokio-util", ] @@ -8292,7 +8634,17 @@ version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ "alloy-primitives 0.8.0", - "reth-provider", + "reth-provider 1.0.6", +] + +[[package]] +name = "reth-fs-util" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "serde", + "serde_json", + "thiserror", ] [[package]] @@ -8326,6 +8678,22 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-libmdbx" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "bitflags 2.6.0", + "byteorder", + "dashmap 6.0.1", + "derive_more 1.0.0", + "indexmap 2.2.6", + "parking_lot 0.12.3", + "reth-mdbx-sys 1.0.5", + "thiserror", + "tracing", +] + [[package]] name = "reth-libmdbx" version = "1.0.6" @@ -8337,11 +8705,20 @@ dependencies = [ "derive_more 1.0.0", "indexmap 2.2.6", "parking_lot 0.12.3", - "reth-mdbx-sys", + "reth-mdbx-sys 1.0.6", "thiserror", "tracing", ] +[[package]] +name = "reth-mdbx-sys" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "bindgen", + "cc", +] + [[package]] name = "reth-mdbx-sys" version = "1.0.6" @@ -8351,6 +8728,15 @@ dependencies = [ "cc", ] +[[package]] +name = "reth-metrics" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "metrics", + "reth-metrics-derive 1.0.5", +] + [[package]] name = "reth-metrics" version = "1.0.6" @@ -8358,11 +8744,22 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18 dependencies = [ "futures", "metrics", - "reth-metrics-derive", + "reth-metrics-derive 1.0.6", "tokio", "tokio-util", ] +[[package]] +name = "reth-metrics-derive" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "syn 2.0.72", +] + [[package]] name = "reth-metrics-derive" version = "1.0.6" @@ -8376,8 +8773,16 @@ dependencies = [ [[package]] name = "reth-net-banlist" -version = "1.0.6" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-primitives 0.8.0", +] + +[[package]] +name = "reth-net-banlist" +version = "1.0.6" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ "alloy-primitives 0.8.0", ] @@ -8411,22 +8816,22 @@ dependencies = [ "parking_lot 0.12.3", "pin-project", "rand 0.8.5", - "reth-chainspec", - "reth-consensus", + "reth-chainspec 1.0.6", + "reth-consensus 1.0.6", "reth-discv4", "reth-discv5", "reth-dns-discovery", "reth-ecies", "reth-eth-wire", - "reth-fs-util", - "reth-metrics", - "reth-net-banlist", + "reth-fs-util 1.0.6", + "reth-metrics 1.0.6", + "reth-net-banlist 1.0.6", "reth-network-api", - "reth-network-p2p", - "reth-network-peers", - "reth-network-types", - "reth-primitives", - "reth-storage-api", + "reth-network-p2p 1.0.6", + "reth-network-peers 1.0.6", + "reth-network-types 1.0.6", + "reth-primitives 1.0.6", + "reth-storage-api 1.0.6", "reth-tasks", "reth-tokio-util", "reth-transaction-pool", @@ -8453,11 +8858,11 @@ dependencies = [ "derive_more 1.0.0", "enr 0.12.1", "futures", - "reth-eth-wire-types", - "reth-ethereum-forks", - "reth-network-p2p", - "reth-network-peers", - "reth-network-types", + "reth-eth-wire-types 1.0.6", + "reth-ethereum-forks 1.0.6", + "reth-network-p2p 1.0.6", + "reth-network-peers 1.0.6", + "reth-network-types 1.0.6", "reth-tokio-util", "serde", "thiserror", @@ -8465,6 +8870,24 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "reth-network-p2p" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "auto_impl", + "derive_more 1.0.0", + "futures", + "reth-consensus 1.0.5", + "reth-eth-wire-types 1.0.5", + "reth-network-peers 1.0.5", + "reth-network-types 1.0.5", + "reth-primitives 1.0.5", + "reth-storage-errors 1.0.5", + "tokio", + "tracing", +] + [[package]] name = "reth-network-p2p" version = "1.0.6" @@ -8473,16 +8896,29 @@ dependencies = [ "auto_impl", "derive_more 1.0.0", "futures", - "reth-consensus", - "reth-eth-wire-types", - "reth-network-peers", - "reth-network-types", - "reth-primitives", - "reth-storage-errors", + "reth-consensus 1.0.6", + "reth-eth-wire-types 1.0.6", + "reth-network-peers 1.0.6", + "reth-network-types 1.0.6", + "reth-primitives 1.0.6", + "reth-storage-errors 1.0.6", "tokio", "tracing", ] +[[package]] +name = "reth-network-peers" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-primitives 0.8.0", + "alloy-rlp", + "enr 0.12.1", + "serde_with", + "thiserror", + "url", +] + [[package]] name = "reth-network-peers" version = "1.0.6" @@ -8498,20 +8934,52 @@ dependencies = [ "url", ] +[[package]] +name = "reth-network-types" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "reth-ethereum-forks 1.0.5", + "reth-net-banlist 1.0.5", + "reth-network-peers 1.0.5", + "serde_json", + "tracing", +] + [[package]] name = "reth-network-types" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ "humantime-serde", - "reth-ethereum-forks", - "reth-net-banlist", - "reth-network-peers", + "reth-ethereum-forks 1.0.6", + "reth-net-banlist 1.0.6", + "reth-network-peers 1.0.6", "serde", "serde_json", "tracing", ] +[[package]] +name = "reth-nippy-jar" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "anyhow", + "bincode", + "cuckoofilter", + "derive_more 1.0.0", + "lz4_flex", + "memmap2 0.9.4", + "ph", + "reth-fs-util 1.0.5", + "serde", + "sucds", + "thiserror", + "tracing", + "zstd 0.13.2", +] + [[package]] name = "reth-nippy-jar" version = "1.0.6" @@ -8524,7 +8992,7 @@ dependencies = [ "lz4_flex", "memmap2 0.9.4", "ph", - "reth-fs-util", + "reth-fs-util 1.0.6", "serde", "sucds", "thiserror", @@ -8537,14 +9005,14 @@ name = "reth-node-api" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chainspec", - "reth-db-api", + "reth-chainspec 1.0.6", + "reth-db-api 1.0.6", "reth-engine-primitives", - "reth-evm", + "reth-evm 1.0.6", "reth-network-api", "reth-payload-builder", "reth-payload-primitives", - "reth-provider", + "reth-provider 1.0.6", "reth-rpc-eth-api", "reth-tasks", "reth-transaction-pool", @@ -8564,42 +9032,42 @@ dependencies = [ "reth-auto-seal-consensus", "reth-beacon-consensus", "reth-blockchain-tree", - "reth-chainspec", + "reth-chainspec 1.0.6", "reth-cli-util", "reth-config", - "reth-consensus", + "reth-consensus 1.0.6", "reth-consensus-debug-client", - "reth-db-api", + "reth-db-api 1.0.6", "reth-db-common", "reth-downloaders", "reth-engine-service", "reth-engine-tree", "reth-engine-util", - "reth-evm", + "reth-evm 1.0.6", "reth-exex", "reth-network", "reth-network-api", - "reth-network-p2p", + "reth-network-p2p 1.0.6", "reth-node-api", "reth-node-core", "reth-node-events", "reth-node-metrics", "reth-payload-builder", "reth-payload-validator", - "reth-primitives", - "reth-provider", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", "reth-prune", "reth-rpc", "reth-rpc-builder", "reth-rpc-engine-api", "reth-rpc-eth-types", "reth-rpc-layer", - "reth-rpc-types", + "reth-rpc-types 1.0.6", "reth-stages", "reth-static-file", "reth-tasks", "reth-tokio-util", - "reth-tracing", + "reth-tracing 1.0.6", "reth-transaction-pool", "secp256k1", "tokio", @@ -8622,31 +9090,31 @@ dependencies = [ "futures", "humantime", "rand 0.8.5", - "reth-chainspec", + "reth-chainspec 1.0.6", "reth-cli-util", "reth-config", - "reth-consensus-common", - "reth-db", - "reth-db-api", + "reth-consensus-common 1.0.6", + "reth-db 1.0.6", + "reth-db-api 1.0.6", "reth-discv4", "reth-discv5", - "reth-fs-util", + "reth-fs-util 1.0.6", "reth-net-nat", "reth-network", - "reth-network-p2p", - "reth-network-peers", - "reth-primitives", - "reth-provider", - "reth-prune-types", + "reth-network-p2p 1.0.6", + "reth-network-peers 1.0.6", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", + "reth-prune-types 1.0.6", "reth-rpc-api", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types", + "reth-rpc-types 1.0.6", "reth-rpc-types-compat", - "reth-stages-types", - "reth-storage-errors", - "reth-tracing", + "reth-stages-types 1.0.6", + "reth-storage-errors 1.0.6", + "reth-tracing 1.0.6", "reth-transaction-pool", "secp256k1", "serde", @@ -8666,18 +9134,18 @@ dependencies = [ "reth-auto-seal-consensus", "reth-basic-payload-builder", "reth-beacon-consensus", - "reth-chainspec", - "reth-consensus", + "reth-chainspec 1.0.6", + "reth-consensus 1.0.6", "reth-ethereum-engine-primitives", "reth-ethereum-payload-builder", - "reth-evm-ethereum", + "reth-evm-ethereum 1.0.6", "reth-network", "reth-node-api", "reth-node-builder", "reth-payload-builder", - "reth-provider", + "reth-provider 1.0.6", "reth-rpc", - "reth-tracing", + "reth-tracing 1.0.6", "reth-transaction-pool", ] @@ -8693,9 +9161,9 @@ dependencies = [ "reth-beacon-consensus", "reth-network", "reth-network-api", - "reth-primitives", - "reth-primitives-traits", - "reth-provider", + "reth-primitives 1.0.6", + "reth-primitives-traits 1.0.6", + "reth-provider 1.0.6", "reth-prune", "reth-stages", "reth-static-file", @@ -8716,9 +9184,9 @@ dependencies = [ "metrics-process", "metrics-util", "procfs", - "reth-db-api", - "reth-metrics", - "reth-provider", + "reth-db-api 1.0.6", + "reth-metrics 1.0.6", + "reth-provider 1.0.6", "reth-tasks", "tikv-jemalloc-ctl", "tokio", @@ -8732,10 +9200,10 @@ name = "reth-optimism-consensus" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chainspec", - "reth-consensus", - "reth-consensus-common", - "reth-primitives", + "reth-chainspec 1.0.6", + "reth-consensus 1.0.6", + "reth-consensus-common 1.0.6", + "reth-primitives 1.0.6", "tracing", ] @@ -8754,19 +9222,19 @@ dependencies = [ "op-alloy-network", "parking_lot 0.12.3", "reqwest 0.12.5", - "reth-chainspec", - "reth-evm", + "reth-chainspec 1.0.6", + "reth-evm 1.0.6", "reth-evm-optimism", "reth-network-api", "reth-node-api", "reth-node-builder", - "reth-primitives", - "reth-provider", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", "reth-rpc", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types", + "reth-rpc-types 1.0.6", "reth-tasks", "reth-transaction-pool", "revm", @@ -8784,13 +9252,13 @@ dependencies = [ "futures-util", "metrics", "pin-project", - "reth-errors", + "reth-errors 1.0.6", "reth-ethereum-engine-primitives", - "reth-metrics", + "reth-metrics 1.0.6", "reth-payload-primitives", - "reth-primitives", - "reth-provider", - "reth-rpc-types", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", + "reth-rpc-types 1.0.6", "reth-transaction-pool", "thiserror", "tokio", @@ -8803,11 +9271,11 @@ name = "reth-payload-primitives" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chain-state", - "reth-chainspec", - "reth-errors", - "reth-primitives", - "reth-rpc-types", + "reth-chain-state 1.0.6", + "reth-chainspec 1.0.6", + "reth-errors 1.0.6", + "reth-primitives 1.0.6", + "reth-rpc-types 1.0.6", "reth-transaction-pool", "serde", "thiserror", @@ -8819,12 +9287,45 @@ name = "reth-payload-validator" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chainspec", - "reth-primitives", - "reth-rpc-types", + "reth-chainspec 1.0.6", + "reth-primitives 1.0.6", + "reth-rpc-types 1.0.6", "reth-rpc-types-compat", ] +[[package]] +name = "reth-primitives" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-genesis", + "alloy-primitives 0.8.0", + "alloy-rlp", + "alloy-rpc-types", + "alloy-serde", + "bytes", + "c-kzg", + "derive_more 1.0.0", + "k256 0.13.3", + "modular-bitfield", + "once_cell", + "op-alloy-rpc-types", + "rayon", + "reth-codecs 1.0.5", + "reth-ethereum-forks 1.0.5", + "reth-primitives-traits 1.0.5", + "reth-static-file-types 1.0.5", + "reth-trie-common 1.0.5", + "revm-primitives", + "secp256k1", + "serde", + "tempfile", + "thiserror", + "zstd 0.13.2", +] + [[package]] name = "reth-primitives" version = "1.0.6" @@ -8847,12 +9348,12 @@ dependencies = [ "op-alloy-rpc-types", "proptest", "rayon", - "reth-chainspec", - "reth-codecs", - "reth-ethereum-forks", - "reth-primitives-traits", - "reth-static-file-types", - "reth-trie-common", + "reth-chainspec 1.0.6", + "reth-codecs 1.0.6", + "reth-ethereum-forks 1.0.6", + "reth-primitives-traits 1.0.6", + "reth-static-file-types 1.0.6", + "reth-trie-common 1.0.6", "revm-primitives", "secp256k1", "serde", @@ -8861,6 +9362,27 @@ dependencies = [ "zstd 0.13.2", ] +[[package]] +name = "reth-primitives-traits" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-genesis", + "alloy-primitives 0.8.0", + "alloy-rlp", + "alloy-rpc-types-eth", + "byteorder", + "bytes", + "derive_more 1.0.0", + "modular-bitfield", + "reth-codecs 1.0.5", + "revm-primitives", + "roaring", + "serde", +] + [[package]] name = "reth-primitives-traits" version = "1.0.6" @@ -8879,12 +9401,50 @@ dependencies = [ "modular-bitfield", "proptest", "proptest-arbitrary-interop", - "reth-codecs", + "reth-codecs 1.0.6", "revm-primitives", "roaring", "serde", ] +[[package]] +name = "reth-provider" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-rpc-types-engine", + "auto_impl", + "dashmap 6.0.1", + "itertools 0.13.0", + "metrics", + "parking_lot 0.12.3", + "rayon", + "reth-blockchain-tree-api 1.0.5", + "reth-chain-state 1.0.5", + "reth-chainspec 1.0.5", + "reth-codecs 1.0.5", + "reth-db 1.0.5", + "reth-db-api 1.0.5", + "reth-errors 1.0.5", + "reth-evm 1.0.5", + "reth-execution-types 1.0.5", + "reth-fs-util 1.0.5", + "reth-metrics 1.0.5", + "reth-network-p2p 1.0.5", + "reth-nippy-jar 1.0.5", + "reth-primitives 1.0.5", + "reth-prune-types 1.0.5", + "reth-stages-types 1.0.5", + "reth-storage-api 1.0.5", + "reth-storage-errors 1.0.5", + "reth-trie 1.0.5", + "reth-trie-db 1.0.5", + "revm", + "strum", + "tokio", + "tracing", +] + [[package]] name = "reth-provider" version = "1.0.6" @@ -8898,26 +9458,26 @@ dependencies = [ "once_cell", "parking_lot 0.12.3", "rayon", - "reth-blockchain-tree-api", - "reth-chain-state", - "reth-chainspec", - "reth-codecs", - "reth-db", - "reth-db-api", - "reth-errors", - "reth-evm", - "reth-execution-types", - "reth-fs-util", - "reth-metrics", - "reth-network-p2p", - "reth-nippy-jar", - "reth-primitives", - "reth-prune-types", - "reth-stages-types", - "reth-storage-api", - "reth-storage-errors", - "reth-trie", - "reth-trie-db", + "reth-blockchain-tree-api 1.0.6", + "reth-chain-state 1.0.6", + "reth-chainspec 1.0.6", + "reth-codecs 1.0.6", + "reth-db 1.0.6", + "reth-db-api 1.0.6", + "reth-errors 1.0.6", + "reth-evm 1.0.6", + "reth-execution-types 1.0.6", + "reth-fs-util 1.0.6", + "reth-metrics 1.0.6", + "reth-network-p2p 1.0.6", + "reth-nippy-jar 1.0.6", + "reth-primitives 1.0.6", + "reth-prune-types 1.0.6", + "reth-stages-types 1.0.6", + "reth-storage-api 1.0.6", + "reth-storage-errors 1.0.6", + "reth-trie 1.0.6", + "reth-trie-db 1.0.6", "revm", "strum", "tokio", @@ -8933,16 +9493,16 @@ dependencies = [ "itertools 0.13.0", "metrics", "rayon", - "reth-chainspec", + "reth-chainspec 1.0.6", "reth-config", - "reth-db", - "reth-db-api", - "reth-errors", + "reth-db 1.0.6", + "reth-db-api 1.0.6", + "reth-errors 1.0.6", "reth-exex-types", - "reth-metrics", - "reth-provider", - "reth-prune-types", - "reth-static-file-types", + "reth-metrics 1.0.6", + "reth-provider 1.0.6", + "reth-prune-types 1.0.6", + "reth-static-file-types 1.0.6", "reth-tokio-util", "rustc-hash 2.0.0", "thiserror", @@ -8950,6 +9510,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-prune-types" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-primitives 0.8.0", + "bytes", + "derive_more 1.0.0", + "modular-bitfield", + "reth-codecs 1.0.5", + "serde", + "thiserror", +] + [[package]] name = "reth-prune-types" version = "1.0.6" @@ -8959,23 +9533,38 @@ dependencies = [ "bytes", "derive_more 1.0.0", "modular-bitfield", - "reth-codecs", + "reth-codecs 1.0.6", "serde", "thiserror", ] +[[package]] +name = "reth-revm" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "reth-chainspec 1.0.5", + "reth-consensus-common 1.0.5", + "reth-execution-errors 1.0.5", + "reth-primitives 1.0.5", + "reth-prune-types 1.0.5", + "reth-storage-api 1.0.5", + "reth-storage-errors 1.0.5", + "revm", +] + [[package]] name = "reth-revm" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chainspec", - "reth-consensus-common", - "reth-execution-errors", - "reth-primitives", - "reth-prune-types", - "reth-storage-api", - "reth-storage-errors", + "reth-chainspec 1.0.6", + "reth-consensus-common 1.0.6", + "reth-execution-errors 1.0.6", + "reth-primitives 1.0.6", + "reth-prune-types 1.0.6", + "reth-storage-api 1.0.6", + "reth-storage-errors 1.0.6", "revm", ] @@ -9000,27 +9589,27 @@ dependencies = [ "parking_lot 0.12.3", "pin-project", "rand 0.8.5", - "reth-chainspec", - "reth-consensus-common", - "reth-errors", - "reth-evm", + "reth-chainspec 1.0.6", + "reth-consensus-common 1.0.6", + "reth-errors 1.0.6", + "reth-evm 1.0.6", "reth-network-api", - "reth-network-peers", - "reth-network-types", + "reth-network-peers 1.0.6", + "reth-network-types 1.0.6", "reth-node-api", - "reth-primitives", - "reth-provider", - "reth-revm", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", + "reth-revm 1.0.6", "reth-rpc-api", "reth-rpc-engine-api", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types", + "reth-rpc-types 1.0.6", "reth-rpc-types-compat", "reth-tasks", "reth-transaction-pool", - "reth-trie", + "reth-trie 1.0.6", "revm", "revm-inspectors", "revm-primitives", @@ -9043,10 +9632,10 @@ dependencies = [ "alloy-json-rpc", "jsonrpsee 0.24.3", "reth-engine-primitives", - "reth-network-peers", - "reth-primitives", + "reth-network-peers 1.0.6", + "reth-primitives 1.0.6", "reth-rpc-eth-api", - "reth-rpc-types", + "reth-rpc-types 1.0.6", ] [[package]] @@ -9058,21 +9647,21 @@ dependencies = [ "jsonrpsee 0.24.3", "metrics", "pin-project", - "reth-chainspec", + "reth-chainspec 1.0.6", "reth-engine-primitives", - "reth-evm", + "reth-evm 1.0.6", "reth-ipc", - "reth-metrics", + "reth-metrics 1.0.6", "reth-network-api", "reth-node-core", - "reth-provider", + "reth-provider 1.0.6", "reth-rpc", "reth-rpc-api", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-layer", "reth-rpc-server-types", - "reth-rpc-types", + "reth-rpc-types 1.0.6", "reth-tasks", "reth-transaction-pool", "serde", @@ -9092,17 +9681,17 @@ dependencies = [ "jsonrpsee-types 0.24.3", "metrics", "reth-beacon-consensus", - "reth-chainspec", + "reth-chainspec 1.0.6", "reth-engine-primitives", - "reth-evm", - "reth-metrics", + "reth-evm 1.0.6", + "reth-metrics 1.0.6", "reth-payload-builder", "reth-payload-primitives", - "reth-primitives", + "reth-primitives 1.0.6", "reth-rpc-api", - "reth-rpc-types", + "reth-rpc-types 1.0.6", "reth-rpc-types-compat", - "reth-storage-api", + "reth-storage-api 1.0.6", "reth-tasks", "serde", "thiserror", @@ -9125,21 +9714,21 @@ dependencies = [ "jsonrpsee 0.24.3", "jsonrpsee-types 0.24.3", "parking_lot 0.12.3", - "reth-chainspec", - "reth-errors", - "reth-evm", - "reth-execution-types", + "reth-chainspec 1.0.6", + "reth-errors 1.0.6", + "reth-evm 1.0.6", + "reth-execution-types 1.0.6", "reth-network-api", - "reth-primitives", - "reth-provider", - "reth-revm", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", + "reth-revm 1.0.6", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types", + "reth-rpc-types 1.0.6", "reth-rpc-types-compat", "reth-tasks", "reth-transaction-pool", - "reth-trie", + "reth-trie 1.0.6", "revm", "revm-inspectors", "revm-primitives", @@ -9159,21 +9748,21 @@ dependencies = [ "jsonrpsee-types 0.24.3", "metrics", "rand 0.8.5", - "reth-chain-state", - "reth-chainspec", - "reth-errors", - "reth-evm", - "reth-execution-types", - "reth-metrics", - "reth-primitives", - "reth-revm", + "reth-chain-state 1.0.6", + "reth-chainspec 1.0.6", + "reth-errors 1.0.6", + "reth-evm 1.0.6", + "reth-execution-types 1.0.6", + "reth-metrics 1.0.6", + "reth-primitives 1.0.6", + "reth-revm 1.0.6", "reth-rpc-server-types", - "reth-rpc-types", + "reth-rpc-types 1.0.6", "reth-rpc-types-compat", - "reth-storage-api", + "reth-storage-api 1.0.6", "reth-tasks", "reth-transaction-pool", - "reth-trie", + "reth-trie 1.0.6", "revm", "revm-inspectors", "revm-primitives", @@ -9206,14 +9795,34 @@ dependencies = [ "alloy-primitives 0.8.0", "jsonrpsee-core 0.24.3", "jsonrpsee-types 0.24.3", - "reth-errors", + "reth-errors 1.0.6", "reth-network-api", - "reth-primitives", - "reth-rpc-types", + "reth-primitives 1.0.6", + "reth-rpc-types 1.0.6", "serde", "strum", ] +[[package]] +name = "reth-rpc-types" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-primitives 0.8.0", + "alloy-rpc-types", + "alloy-rpc-types-admin", + "alloy-rpc-types-anvil", + "alloy-rpc-types-beacon", + "alloy-rpc-types-engine", + "alloy-rpc-types-mev", + "alloy-rpc-types-trace", + "alloy-rpc-types-txpool", + "alloy-serde", + "jsonrpsee-types 0.24.3", + "op-alloy-rpc-types", + "op-alloy-rpc-types-engine", +] + [[package]] name = "reth-rpc-types" version = "1.0.6" @@ -9241,9 +9850,9 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18 dependencies = [ "alloy-rlp", "alloy-rpc-types", - "reth-primitives", - "reth-rpc-types", - "reth-trie-common", + "reth-primitives 1.0.6", + "reth-rpc-types 1.0.6", + "reth-trie-common 1.0.6", ] [[package]] @@ -9255,26 +9864,26 @@ dependencies = [ "itertools 0.13.0", "num-traits", "rayon", - "reth-codecs", + "reth-codecs 1.0.6", "reth-config", - "reth-consensus", - "reth-db", - "reth-db-api", + "reth-consensus 1.0.6", + "reth-db 1.0.6", + "reth-db-api 1.0.6", "reth-etl", - "reth-evm", - "reth-execution-types", + "reth-evm 1.0.6", + "reth-execution-types 1.0.6", "reth-exex", - "reth-network-p2p", - "reth-primitives", - "reth-primitives-traits", - "reth-provider", + "reth-network-p2p 1.0.6", + "reth-primitives 1.0.6", + "reth-primitives-traits 1.0.6", + "reth-provider 1.0.6", "reth-prune", - "reth-prune-types", - "reth-revm", + "reth-prune-types 1.0.6", + "reth-revm 1.0.6", "reth-stages-api", - "reth-storage-errors", - "reth-trie", - "reth-trie-db", + "reth-storage-errors 1.0.6", + "reth-trie 1.0.6", + "reth-trie-db 1.0.6", "thiserror", "tokio", "tracing", @@ -9290,23 +9899,36 @@ dependencies = [ "auto_impl", "futures-util", "metrics", - "reth-consensus", - "reth-db-api", - "reth-errors", - "reth-metrics", - "reth-network-p2p", - "reth-primitives-traits", - "reth-provider", + "reth-consensus 1.0.6", + "reth-db-api 1.0.6", + "reth-errors 1.0.6", + "reth-metrics 1.0.6", + "reth-network-p2p 1.0.6", + "reth-primitives-traits 1.0.6", + "reth-provider 1.0.6", "reth-prune", - "reth-stages-types", + "reth-stages-types 1.0.6", "reth-static-file", - "reth-static-file-types", + "reth-static-file-types 1.0.6", "reth-tokio-util", "thiserror", "tokio", "tracing", ] +[[package]] +name = "reth-stages-types" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-primitives 0.8.0", + "bytes", + "modular-bitfield", + "reth-codecs 1.0.5", + "reth-trie-common 1.0.5", + "serde", +] + [[package]] name = "reth-stages-types" version = "1.0.6" @@ -9315,8 +9937,8 @@ dependencies = [ "alloy-primitives 0.8.0", "bytes", "modular-bitfield", - "reth-codecs", - "reth-trie-common", + "reth-codecs 1.0.6", + "reth-trie-common 1.0.6", "serde", ] @@ -9328,18 +9950,29 @@ dependencies = [ "alloy-primitives 0.8.0", "parking_lot 0.12.3", "rayon", - "reth-db", - "reth-db-api", - "reth-nippy-jar", - "reth-provider", - "reth-prune-types", - "reth-stages-types", - "reth-static-file-types", - "reth-storage-errors", + "reth-db 1.0.6", + "reth-db-api 1.0.6", + "reth-nippy-jar 1.0.6", + "reth-provider 1.0.6", + "reth-prune-types 1.0.6", + "reth-stages-types 1.0.6", + "reth-static-file-types 1.0.6", + "reth-storage-errors 1.0.6", "reth-tokio-util", "tracing", ] +[[package]] +name = "reth-static-file-types" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-primitives 0.8.0", + "derive_more 1.0.0", + "serde", + "strum", +] + [[package]] name = "reth-static-file-types" version = "1.0.6" @@ -9352,20 +9985,47 @@ dependencies = [ "strum", ] +[[package]] +name = "reth-storage-api" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "auto_impl", + "reth-chainspec 1.0.5", + "reth-db-models 1.0.5", + "reth-execution-types 1.0.5", + "reth-primitives 1.0.5", + "reth-prune-types 1.0.5", + "reth-stages-types 1.0.5", + "reth-storage-errors 1.0.5", + "reth-trie 1.0.5", +] + [[package]] name = "reth-storage-api" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ "auto_impl", - "reth-chainspec", - "reth-db-models", - "reth-execution-types", - "reth-primitives", - "reth-prune-types", - "reth-stages-types", - "reth-storage-errors", - "reth-trie", + "reth-chainspec 1.0.6", + "reth-db-models 1.0.6", + "reth-execution-types 1.0.6", + "reth-primitives 1.0.6", + "reth-prune-types 1.0.6", + "reth-stages-types 1.0.6", + "reth-storage-errors 1.0.6", + "reth-trie 1.0.6", +] + +[[package]] +name = "reth-storage-errors" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-rlp", + "derive_more 1.0.0", + "reth-fs-util 1.0.5", + "reth-primitives 1.0.5", ] [[package]] @@ -9375,8 +10035,8 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18 dependencies = [ "alloy-rlp", "derive_more 1.0.0", - "reth-fs-util", - "reth-primitives", + "reth-fs-util 1.0.6", + "reth-primitives 1.0.6", ] [[package]] @@ -9390,7 +10050,7 @@ dependencies = [ "metrics", "pin-project", "rayon", - "reth-metrics", + "reth-metrics 1.0.6", "thiserror", "tokio", "tracing", @@ -9407,6 +10067,21 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-tracing" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "clap", + "eyre", + "rolling-file", + "tracing", + "tracing-appender", + "tracing-journald", + "tracing-logfmt", + "tracing-subscriber", +] + [[package]] name = "reth-tracing" version = "1.0.6" @@ -9434,14 +10109,14 @@ dependencies = [ "futures-util", "metrics", "parking_lot 0.12.3", - "reth-chain-state", - "reth-chainspec", - "reth-eth-wire-types", - "reth-execution-types", - "reth-fs-util", - "reth-metrics", - "reth-primitives", - "reth-storage-api", + "reth-chain-state 1.0.6", + "reth-chainspec 1.0.6", + "reth-eth-wire-types 1.0.6", + "reth-execution-types 1.0.6", + "reth-fs-util 1.0.6", + "reth-metrics 1.0.6", + "reth-primitives 1.0.6", + "reth-storage-api 1.0.6", "reth-tasks", "revm", "rustc-hash 2.0.0", @@ -9454,6 +10129,27 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-trie" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-rlp", + "auto_impl", + "derive_more 1.0.0", + "itertools 0.13.0", + "metrics", + "rayon", + "reth-execution-errors 1.0.5", + "reth-metrics 1.0.5", + "reth-primitives 1.0.5", + "reth-stages-types 1.0.5", + "reth-storage-errors 1.0.5", + "reth-trie-common 1.0.5", + "revm", + "tracing", +] + [[package]] name = "reth-trie" version = "1.0.6" @@ -9465,17 +10161,37 @@ dependencies = [ "itertools 0.13.0", "metrics", "rayon", - "reth-execution-errors", - "reth-metrics", - "reth-primitives", - "reth-stages-types", - "reth-storage-errors", - "reth-trie-common", + "reth-execution-errors 1.0.6", + "reth-metrics 1.0.6", + "reth-primitives 1.0.6", + "reth-stages-types 1.0.6", + "reth-storage-errors 1.0.6", + "reth-trie-common 1.0.6", "revm", "tracing", "triehash", ] +[[package]] +name = "reth-trie-common" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-consensus", + "alloy-genesis", + "alloy-primitives 0.8.0", + "alloy-rlp", + "alloy-trie", + "bytes", + "derive_more 1.0.0", + "itertools 0.13.0", + "nybbles", + "reth-codecs 1.0.5", + "reth-primitives-traits 1.0.5", + "revm-primitives", + "serde", +] + [[package]] name = "reth-trie-common" version = "1.0.6" @@ -9493,12 +10209,36 @@ dependencies = [ "itertools 0.13.0", "nybbles", "plain_hasher", - "reth-codecs", - "reth-primitives-traits", + "reth-codecs 1.0.6", + "reth-primitives-traits 1.0.6", "revm-primitives", "serde", ] +[[package]] +name = "reth-trie-db" +version = "1.0.5" +source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" +dependencies = [ + "alloy-rlp", + "auto_impl", + "derive_more 1.0.0", + "itertools 0.13.0", + "metrics", + "rayon", + "reth-db 1.0.5", + "reth-db-api 1.0.5", + "reth-execution-errors 1.0.5", + "reth-metrics 1.0.5", + "reth-primitives 1.0.5", + "reth-stages-types 1.0.5", + "reth-storage-errors 1.0.5", + "reth-trie 1.0.5", + "reth-trie-common 1.0.5", + "revm", + "tracing", +] + [[package]] name = "reth-trie-db" version = "1.0.6" @@ -9510,15 +10250,15 @@ dependencies = [ "itertools 0.13.0", "metrics", "rayon", - "reth-db", - "reth-db-api", - "reth-execution-errors", - "reth-metrics", - "reth-primitives", - "reth-stages-types", - "reth-storage-errors", - "reth-trie", - "reth-trie-common", + "reth-db 1.0.6", + "reth-db-api 1.0.6", + "reth-execution-errors 1.0.6", + "reth-metrics 1.0.6", + "reth-primitives 1.0.6", + "reth-stages-types 1.0.6", + "reth-storage-errors 1.0.6", + "reth-trie 1.0.6", + "reth-trie-common 1.0.6", "revm", "tracing", ] @@ -9533,15 +10273,15 @@ dependencies = [ "itertools 0.13.0", "metrics", "rayon", - "reth-db", - "reth-db-api", - "reth-execution-errors", - "reth-metrics", - "reth-primitives", - "reth-provider", + "reth-db 1.0.6", + "reth-db-api 1.0.6", + "reth-execution-errors 1.0.6", + "reth-metrics 1.0.6", + "reth-primitives 1.0.6", + "reth-provider 1.0.6", "reth-tasks", - "reth-trie", - "reth-trie-db", + "reth-trie 1.0.6", + "reth-trie-db 1.0.6", "thiserror", "tokio", "tracing", @@ -9584,6 +10324,8 @@ version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "959ecbc36802de6126852479844737f20194cf8e6718e0c30697d306a2cca916" dependencies = [ + "paste", + "phf 0.11.2", "revm-primitives", "serde", ] @@ -9627,6 +10369,173 @@ dependencies = [ "serde", ] +[[package]] +name = "revmc" +version = "0.1.0" +source = "git+https://github.com/paradigmxyz/revmc#9ad12ebe060ab25818ae1bf89febde70e08ca775" +dependencies = [ + "alloy-primitives 0.8.0", + "bitflags 2.6.0", + "bitvec", + "either", + "revm-interpreter", + "revm-primitives", + "revmc-backend", + "revmc-builtins", + "revmc-context", + "revmc-llvm", + "rustc-hash 2.0.0", + "tracing", +] + +[[package]] +name = "revmc-backend" +version = "0.1.0" +source = "git+https://github.com/paradigmxyz/revmc#9ad12ebe060ab25818ae1bf89febde70e08ca775" +dependencies = [ + "eyre", + "ruint", +] + +[[package]] +name = "revmc-build" +version = "0.1.0" +source = "git+https://github.com/paradigmxyz/revmc#9ad12ebe060ab25818ae1bf89febde70e08ca775" + +[[package]] +name = "revmc-builtins" +version = "0.1.0" +source = "git+https://github.com/paradigmxyz/revmc#9ad12ebe060ab25818ae1bf89febde70e08ca775" +dependencies = [ + "paste", + "revm-interpreter", + "revm-primitives", + "revmc-backend", + "revmc-context", + "tracing", +] + +[[package]] +name = "revmc-context" +version = "0.1.0" +source = "git+https://github.com/paradigmxyz/revmc#9ad12ebe060ab25818ae1bf89febde70e08ca775" +dependencies = [ + "revm-interpreter", + "revm-primitives", +] + +[[package]] +name = "revmc-llvm" +version = "0.1.0" +source = "git+https://github.com/paradigmxyz/revmc#9ad12ebe060ab25818ae1bf89febde70e08ca775" +dependencies = [ + "inkwell", + "revmc-backend", + "rustc-hash 2.0.0", + "tracing", +] + +[[package]] +name = "revmc-toolbox-build" +version = "0.1.0" +dependencies = [ + "eyre", + "hex", + "rayon", + "revm", + "revmc", + "serde", + "serde_json", + "tracing", +] + +[[package]] +name = "revmc-toolbox-load" +version = "0.1.0" +dependencies = [ + "eyre", + "libloading", + "revm", + "revmc", + "rustc-hash 2.0.0", + "tracing", +] + +[[package]] +name = "revmc-toolbox-sim" +version = "0.1.0" +dependencies = [ + "cc", + "clap", + "criterion", + "csv", + "dotenv", + "eyre", + "hex", + "libloading", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rayon", + "reth-chainspec 1.0.5", + "reth-db 1.0.5", + "reth-evm 1.0.5", + "reth-evm-ethereum 1.0.5", + "reth-primitives 1.0.5", + "reth-provider 1.0.5", + "reth-revm 1.0.5", + "reth-rpc-types 1.0.5", + "revm", + "revm-interpreter", + "revmc", + "revmc-build", + "revmc-builtins", + "revmc-context", + "revmc-toolbox-build", + "revmc-toolbox-load", + "revmc-toolbox-utils", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "revmc-toolbox-utils" +version = "0.1.0" +dependencies = [ + "cc", + "clap", + "criterion", + "csv", + "dotenv", + "eyre", + "hex", + "libloading", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rayon", + "reth-chainspec 1.0.5", + "reth-db 1.0.5", + "reth-evm 1.0.5", + "reth-evm-ethereum 1.0.5", + "reth-primitives 1.0.5", + "reth-provider 1.0.5", + "reth-revm 1.0.5", + "reth-rpc-types 1.0.5", + "revm", + "revm-interpreter", + "revmc", + "revmc-build", + "revmc-builtins", + "revmc-context", + "revmc-toolbox-build", + "revmc-toolbox-load", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + [[package]] name = "rfc6979" version = "0.3.1" diff --git a/crates/rbuilder/Cargo.toml b/crates/rbuilder/Cargo.toml index 4f7b9490..7bc34a4c 100644 --- a/crates/rbuilder/Cargo.toml +++ b/crates/rbuilder/Cargo.toml @@ -126,8 +126,15 @@ async-trait = "0.1.80" eth-sparse-mpt = { git = "https://github.com/flashbots/eth-sparse-mpt", rev = "664759b" } +revmc-toolbox-load = { path = "../../../revmc-toolkit/crates/load" } +revmc-toolbox-sim = { path = "../../../revmc-toolkit/crates/sim" } +revmc-toolbox-build = { path = "../../../revmc-toolkit/crates/build" } +revmc-toolbox-utils = { path = "../../../revmc-toolkit/crates/utils" } +dotenv = "0.15.0" + [build-dependencies] built = { version = "0.7.1", features = ["git2", "chrono"] } +revmc-build = { git = "https://github.com/paradigmxyz/revmc" } [dev-dependencies] tempfile = "3.8" diff --git a/crates/rbuilder/build.rs b/crates/rbuilder/build.rs index d8f91cb9..ccc8bfca 100644 --- a/crates/rbuilder/build.rs +++ b/crates/rbuilder/build.rs @@ -1,3 +1,4 @@ fn main() { built::write_built_file().expect("Failed to acquire build-time information"); + revmc_build::emit(); } diff --git a/crates/rbuilder/src/backtest/backtest_build_block.rs b/crates/rbuilder/src/backtest/backtest_build_block.rs index 8062f565..ddada4e0 100644 --- a/crates/rbuilder/src/backtest/backtest_build_block.rs +++ b/crates/rbuilder/src/backtest/backtest_build_block.rs @@ -7,7 +7,6 @@ use ahash::HashMap; use alloy_primitives::utils::format_ether; - use crate::backtest::restore_landed_orders::{ restore_landed_orders, sim_historical_block, ExecutedBlockTx, ExecutedTxs, SimplifiedOrder, }; @@ -58,6 +57,16 @@ struct Cli { block: u64, } +// todo: into utils +macro_rules! timeit { + ($block:expr) => {{ + let t0 = std::time::Instant::now(); + let res = $block; + let elapsed = t0.elapsed(); + (res, elapsed) + }}; +} + pub async fn run_backtest_build_block() -> eyre::Result<()> { let cli = Cli::parse(); @@ -91,26 +100,33 @@ pub async fn run_backtest_build_block() -> eyre:: .provider_factory_unchecked(); let chain_spec = config.base_config().chain_spec()?; let sbundle_mergeabe_signers = config.base_config().sbundle_mergeabe_signers(); + let llvm_compiler_fns = config.base_config().load_llvm_compiled_fns()?; if cli.sim_landed_block { let tx_sim_results = sim_historical_block( provider_factory.clone(), chain_spec.clone(), block_data.onchain_block.clone(), + llvm_compiler_fns.clone(), )?; print_onchain_block_data(tx_sim_results, &orders, &block_data); } - let BacktestBlockInput { - ctx, sim_orders, .. - } = backtest_prepare_ctx_for_block( + let t0 = std::time::Instant::now(); + + let ( + BacktestBlockInput {ctx, sim_orders, .. }, + elapsed + ) = timeit!({backtest_prepare_ctx_for_block( block_data.clone(), provider_factory.clone(), chain_spec.clone(), cli.block_building_time_ms, config.base_config().blocklist()?, config.base_config().coinbase_signer()?, - )?; + llvm_compiler_fns, + )?}); + println!("Prepared ctx in: {:?}", elapsed); if cli.show_sim { print_simulated_orders(&sim_orders, &order_and_timestamp, &block_data); diff --git a/crates/rbuilder/src/backtest/backtest_build_range.rs b/crates/rbuilder/src/backtest/backtest_build_range.rs index b54b5f6a..42fa9095 100644 --- a/crates/rbuilder/src/backtest/backtest_build_range.rs +++ b/crates/rbuilder/src/backtest/backtest_build_range.rs @@ -115,6 +115,7 @@ pub async fn run_backtest_build_range Some(ok), Err(err) => { diff --git a/crates/rbuilder/src/backtest/execute.rs b/crates/rbuilder/src/backtest/execute.rs index 3fc77dde..6e0bb381 100644 --- a/crates/rbuilder/src/backtest/execute.rs +++ b/crates/rbuilder/src/backtest/execute.rs @@ -16,6 +16,7 @@ use reth::providers::ProviderFactory; use reth_chainspec::ChainSpec; use reth_db::{database::Database, DatabaseEnv}; use reth_payload_builder::database::CachedReads; +use revmc_toolbox_load::EvmCompilerFns; use serde::{Deserialize, Serialize}; use std::sync::Arc; @@ -64,6 +65,7 @@ pub fn backtest_prepare_ctx_for_block( build_block_lag_ms: i64, blocklist: HashSet
, builder_signer: Signer, + llvm_compiler_fns: Option, ) -> eyre::Result { let orders = block_data .available_orders @@ -85,6 +87,7 @@ pub fn backtest_prepare_ctx_for_block( builder_signer.address, block_data.winning_bid_trace.proposer_fee_recipient, Some(builder_signer), + llvm_compiler_fns, ); let (sim_orders, sim_errors) = simulate_all_orders_with_sim_tree(provider_factory.clone(), &ctx, &orders, false)?; @@ -105,6 +108,7 @@ pub fn backtest_simulate_block( config: &ConfigType, blocklist: HashSet
, sbundle_mergeabe_signers: &[Address], + llvm_compiler_fns: Option, ) -> eyre::Result { let BacktestBlockInput { ctx, @@ -117,6 +121,7 @@ pub fn backtest_simulate_block( build_block_lag_ms, blocklist, config.base_config().coinbase_signer()?, + llvm_compiler_fns, )?; let filtered_orders_blocklist_count = sim_errors diff --git a/crates/rbuilder/src/backtest/redistribute/cli/mod.rs b/crates/rbuilder/src/backtest/redistribute/cli/mod.rs index 9a904bbb..0b74c7f8 100644 --- a/crates/rbuilder/src/backtest/redistribute/cli/mod.rs +++ b/crates/rbuilder/src/backtest/redistribute/cli/mod.rs @@ -6,6 +6,7 @@ use crate::live_builder::base_config::load_config_toml_and_env; use crate::live_builder::cli::LiveBuilderConfig; use crate::{backtest::HistoricalDataStorage, live_builder::config::Config}; use alloy_primitives::utils::format_ether; +use revmc_toolbox_load::EvmCompilerFns; use clap::Parser; use csv_output::{CSVOutputRow, CSVResultWriter}; use reth_db::DatabaseEnv; @@ -58,6 +59,7 @@ pub async fn run_backtest_redistribute() -> eyre: .base_config .provider_factory()? .provider_factory_unchecked(); + let llvm_compiler_fns = config.base_config.load_llvm_compiled_fns()?; let mut csv_writer = cli .csv .map(|path| -> io::Result<_> { CSVResultWriter::new(path) }) @@ -77,6 +79,7 @@ pub async fn run_backtest_redistribute() -> eyre: provider_factory.clone(), &config, cli.distribute_to_mempool_txs, + llvm_compiler_fns, )?; } Commands::Range { @@ -94,6 +97,7 @@ pub async fn run_backtest_redistribute() -> eyre: provider_factory.clone(), &config, cli.distribute_to_mempool_txs, + llvm_compiler_fns.clone(), )?; } } @@ -114,6 +118,7 @@ fn process_redisribution( provider_factory: ProviderFactory>, config: &ConfigType, distribute_to_mempool_txs: bool, + llvm_compiler_fns: Option, ) -> eyre::Result<()> { let block_number = block_data.block_number; let block_hash = block_data.onchain_block.header.hash; @@ -123,6 +128,7 @@ fn process_redisribution( config, block_data, distribute_to_mempool_txs, + llvm_compiler_fns, ) { Ok(ok) => ok, Err(err) => { diff --git a/crates/rbuilder/src/backtest/redistribute/mod.rs b/crates/rbuilder/src/backtest/redistribute/mod.rs index aed7f5db..f177addc 100644 --- a/crates/rbuilder/src/backtest/redistribute/mod.rs +++ b/crates/rbuilder/src/backtest/redistribute/mod.rs @@ -25,6 +25,7 @@ use reth_provider::ProviderFactory; use std::cmp::{max, min}; use std::sync::Arc; use tracing::{debug, info, info_span, trace, warn}; +use revmc_toolbox_load::EvmCompilerFns; #[derive(Debug, Clone, Serialize)] #[serde(rename_all = "camelCase")] @@ -92,6 +93,7 @@ pub fn calc_redistributions( config: &ConfigType, block_data: BlockData, distribute_to_mempool_txs: bool, + llvm_compiler_fns: Option, ) -> eyre::Result { let _block_span = info_span!("block", block = block_data.block_number).entered(); let protect_signers = config.base_config().backtest_protect_bundle_signers.clone(); @@ -106,6 +108,7 @@ pub fn calc_redistributions( config.base_config().chain_spec()?, &block_data, &included_orders_available, + llvm_compiler_fns.clone(), )?; let available_orders = split_orders_by_identities( @@ -116,7 +119,11 @@ pub fn calc_redistributions( ); let results_without_exclusion = - calculate_backtest_without_exclusion(provider_factory.clone(), config, block_data.clone())?; + calculate_backtest_without_exclusion( + provider_factory.clone(), + config, block_data.clone(), + llvm_compiler_fns.clone() + )?; let exclusion_results = calculate_backtest_identity_and_order_exclusion( provider_factory.clone(), @@ -124,6 +131,7 @@ pub fn calc_redistributions( block_data.clone(), &available_orders, &results_without_exclusion, + llvm_compiler_fns.clone(), )?; let exclusion_results = calc_joint_exclusion_results( @@ -133,6 +141,7 @@ pub fn calc_redistributions( &available_orders, &results_without_exclusion, exclusion_results, + llvm_compiler_fns.clone(), )?; let calculated_redistribution_result = apply_redistribution_formula( @@ -238,11 +247,13 @@ fn restore_available_landed_orders( chain_spec: Arc, block_data: &BlockData, included_orders_available: &[OrdersWithTimestamp], + llvm_compiler_fns: Option, ) -> eyre::Result> { let block_txs = sim_historical_block( provider_factory.clone(), chain_spec, block_data.onchain_block.clone(), + llvm_compiler_fns, )? .into_iter() .map(|executed_tx| { @@ -431,6 +442,7 @@ fn calculate_backtest_without_exclusion( provider_factory: ProviderFactory>, config: &ConfigType, block_data: BlockData, + llvm_compiler_fns: Option, ) -> eyre::Result { let ExclusionResult { profit, @@ -447,6 +459,7 @@ fn calculate_backtest_without_exclusion( orders_excluded_before: vec![], profit_before: U256::ZERO, }, + llvm_compiler_fns, )?; Ok(ResultsWithoutExclusion { profit, @@ -492,6 +505,7 @@ fn calculate_backtest_identity_and_order_exclusion, ) -> eyre::Result { let included_orders_exclusion = { let mut result = Vec::new(); @@ -517,6 +531,7 @@ fn calculate_backtest_identity_and_order_exclusion( available_orders: &AvailableOrders, results_without_exclusion: &ResultsWithoutExclusion, mut exclusion_results: ExclusionResults, + llvm_compiler_fns: Option, ) -> eyre::Result { // calculate identities that are possibly connected let mut joint_contribution_todo: Vec<(Address, Address)> = Vec::new(); @@ -619,6 +636,7 @@ fn calc_joint_exclusion_results( config, &block_data, results_without_exclusion.exclusion_input(orders), + llvm_compiler_fns.clone(), ) .map(|ok| ((address1, address2), ok)) }) @@ -869,6 +887,7 @@ fn calc_profit_after_exclusion( config: &ConfigType, block_data: &BlockData, exclusion_input: ExclusionInput, + llvm_compiler_fns: Option, ) -> eyre::Result { let block_data_with_excluded = { let mut block_data = block_data.clone(); @@ -904,6 +923,7 @@ fn calc_profit_after_exclusion( config, base_config.blocklist()?, &base_config.sbundle_mergeabe_signers(), + llvm_compiler_fns, )? .builder_outputs .into_iter() diff --git a/crates/rbuilder/src/backtest/restore_landed_orders/resim_landed_block.rs b/crates/rbuilder/src/backtest/restore_landed_orders/resim_landed_block.rs index bffbdf4f..62fbb9f1 100644 --- a/crates/rbuilder/src/backtest/restore_landed_orders/resim_landed_block.rs +++ b/crates/rbuilder/src/backtest/restore_landed_orders/resim_landed_block.rs @@ -9,6 +9,7 @@ use eyre::Context; use reth_chainspec::ChainSpec; use reth_db::DatabaseEnv; use reth_primitives::{Receipt, TransactionSignedEcRecovered, TxHash}; +use revmc_toolbox_load::EvmCompilerFns; use reth_provider::ProviderFactory; use std::sync::Arc; @@ -30,6 +31,7 @@ pub fn sim_historical_block( provider_factory: ProviderFactory>, chain_spec: Arc, onchain_block: alloy_rpc_types::Block, + llvm_compiler_fns: Option, ) -> eyre::Result> { let mut results = Vec::new(); @@ -46,6 +48,7 @@ pub fn sim_historical_block( coinbase, suggested_fee_recipient, None, + llvm_compiler_fns, ); let state_provider = provider_factory.history_by_block_hash(ctx.attributes.parent)?; diff --git a/crates/rbuilder/src/bin/debug-bench-machine.rs b/crates/rbuilder/src/bin/debug-bench-machine.rs index f2cc7584..6c91c323 100644 --- a/crates/rbuilder/src/bin/debug-bench-machine.rs +++ b/crates/rbuilder/src/bin/debug-bench-machine.rs @@ -72,6 +72,7 @@ async fn main() -> eyre::Result<()> { coinbase, suggested_fee_recipient, None, + None, ); // let signer = Signer::try_from_secret(B256::random())?; diff --git a/crates/rbuilder/src/bin/dummy-builder.rs b/crates/rbuilder/src/bin/dummy-builder.rs index 561a9294..5d40e435 100644 --- a/crates/rbuilder/src/bin/dummy-builder.rs +++ b/crates/rbuilder/src/bin/dummy-builder.rs @@ -99,6 +99,7 @@ async fn main() -> eyre::Result<()> { extra_rpc: RpcModule::new(()), sink_factory: Box::new(TraceBlockSinkFactory {}), builders: vec![Arc::new(DummyBuildingAlgorithm::new(10))], + llvm_compiled_fns: None, }; let ctrlc = tokio::spawn(async move { diff --git a/crates/rbuilder/src/bin/revmc-aot-compile.rs b/crates/rbuilder/src/bin/revmc-aot-compile.rs new file mode 100644 index 00000000..eb2fec05 --- /dev/null +++ b/crates/rbuilder/src/bin/revmc-aot-compile.rs @@ -0,0 +1,174 @@ + + +use clap::Parser; +use revmc_toolbox_sim::gas_guzzlers::GasGuzzlerConfig; +use revmc_toolbox_build::{compile_contracts_aot, CompilerOptions, OptimizationLevelDeseralizable}; +use revm::primitives::SpecId; +use std::{path::PathBuf, str::FromStr}; +use eyre::{OptionExt, Result}; +use std::sync::Arc; +use revmc_toolbox_utils::evm as evm_utils; +use tracing::debug; + +// todo: compiler opt to file + +#[derive(Parser, Debug)] +struct Cli { + #[clap(flatten)] + compiler_opt: CompilerOptionsCli, + #[clap(subcommand)] + commands: Commands, +} + +#[derive(Parser, Debug)] +enum Commands { + #[clap(about = "Fetches contracts specified in config file.")] + FromConfig, + #[clap(about = "Fetches contracts based on their historical gas usage.")] + GasGuzzlers(GasGuzzlerConfigCli), +} + +#[derive(Parser, Debug)] +struct CompilerOptionsCli { + #[clap(long, value_parser, help = "Output directory")] + out_dir: Option, + #[clap(long, value_parser, help = "Target features")] + target_features: Option, + #[clap(long, value_parser, help = "Target CPU")] + target_cpu: Option, + #[clap(long, value_parser, help = "Target")] + target: Option, + #[clap(long, value_parser, help = "Optimization level")] + opt_level: Option, + #[clap(long, value_parser, help = "No link")] + no_link: Option, + #[clap(long, value_parser, help = "No gas")] + no_gas: Option, + #[clap(long, value_parser, help = "No length checks")] + no_len_checks: Option, + #[clap(long, value_parser, help = "Frame pointers")] + frame_pointers: Option, + #[clap(long, value_parser, help = "Debug assertions")] + debug_assertions: Option, + #[clap(long, value_parser, help = "Label")] + label: Option, + #[clap(long, value_parser, help = "Spec id")] + spec_id: Option, +} + + +macro_rules! set_if_some { + ($src:ident, $dst:ident, { $( $field:ident ),+ }) => { + $( + if let Some(value) = $src.$field { + $dst.$field = value; + } + )+ + }; +} + +macro_rules! set_if_some_opt { + ($src:ident, $dst:ident, { $( $field:ident ),+ }) => { + $( + if let Some(value) = $src.$field { + $dst.$field = Some(value); + } + )+ + }; +} + +impl TryFrom for CompilerOptions { + type Error = eyre::Error; + + fn try_from(config_cli: CompilerOptionsCli) -> Result { + let mut config = CompilerOptions::default(); + + set_if_some_opt!(config_cli, config, { target_features, target_cpu, label }); + set_if_some!(config_cli, config, { no_link, no_gas, no_len_checks, frame_pointers, debug_assertions, target }); + + if let Some(out_dir) = config_cli.out_dir { + config.out_dir = PathBuf::from_str(&out_dir)?; + } + config.opt_level = config_cli.opt_level + .map(|opt_id| opt_id.try_into()) + .transpose()? + .unwrap_or_default(); + config.spec_id = config_cli.spec_id + .map(|s_id| SpecId::try_from_u8(s_id).ok_or_eyre("Invalid spec id")) + .transpose()? + .unwrap_or_default(); + + Ok(config) + } +} + + +#[derive(Parser, Debug)] +struct GasGuzzlerConfigCli { + #[clap(long, help = "Start block")] + start_block: u64, + #[clap(long, help = "End block")] + end_block: Option, + #[clap(long, help = "Number of top contracts to consider.")] + head_size: usize, + #[clap(long, help = "Size of the sample. If not provided, all blocks will be used.")] + sample_size: Option, + #[clap(long, help = "Seed for generating pseudo-random sample")] + seed: Option, + +} + +impl From for GasGuzzlerConfig { + fn from(config: GasGuzzlerConfigCli) -> Self { + let rnd_seed = config.seed.map(|seed| revm::primitives::keccak256(seed.as_bytes()).0); + Self { + start_block: config.start_block, + end_block: config.end_block, + sample_size: config.sample_size, + seed: rnd_seed, + } + } +} + + +fn main() -> Result<()> { + let Cli { compiler_opt, commands } = Cli::parse(); + + let bytecodes = match commands { + Commands::FromConfig => { + debug!("Fetching contracts from config"); + unimplemented!() // TODO + } + Commands::GasGuzzlers(gas_guzzlers_config) => { + debug!("Searching for gas guzzlers"); + println!("Gas guzzlers: {:?}", gas_guzzlers_config); + let provider_factory = new_provider_factory()?; + let head_size = gas_guzzlers_config.head_size; + // todo: improve this to eliminate contracts that dont have conistent gas usage + GasGuzzlerConfig::from(gas_guzzlers_config) + .find_gas_guzzlers(provider_factory)? + .contract_to_bytecode()? + .into_top_guzzlers(head_size) + } + // todo: add remove command + // todo: add command that lists top gas guzzler addresses + }; + let bytecodes = bytecodes.into_iter().map(|c| c.into()).collect(); + let compiler_opt = CompilerOptions::try_from(compiler_opt)?; + let out_dir = compiler_opt.out_dir.clone(); + debug!("Compiling contracts"); + compile_contracts_aot(bytecodes, Some(compiler_opt))? + .into_iter().collect::>()?; + debug!("Compiled contracts have been written to {out_dir:?}"); + + Ok(()) +} + +fn new_provider_factory() -> Result>> { + // todo: source this from toml config file instead (like the rest of the program) + dotenv::dotenv()?; + let dir_path = std::env::var("RETH_DB_PATH") + .expect("RETH_DB_PATH env var not set"); + let dir_path = PathBuf::from_str(&dir_path)?; + evm_utils::make_provider_factory(&dir_path).map(Arc::new) +} \ No newline at end of file diff --git a/crates/rbuilder/src/building/evm_inspector.rs b/crates/rbuilder/src/building/evm_inspector.rs index 073c5889..47febca4 100644 --- a/crates/rbuilder/src/building/evm_inspector.rs +++ b/crates/rbuilder/src/building/evm_inspector.rs @@ -40,7 +40,7 @@ enum NextStepAction { } #[derive(Debug)] -struct UsedStateEVMInspector<'a> { +pub(crate) struct UsedStateEVMInspector<'a> { next_step_action: NextStepAction, used_state_trace: &'a mut UsedStateTrace, } diff --git a/crates/rbuilder/src/building/mod.rs b/crates/rbuilder/src/building/mod.rs index 491e51f8..9018b482 100644 --- a/crates/rbuilder/src/building/mod.rs +++ b/crates/rbuilder/src/building/mod.rs @@ -10,6 +10,7 @@ pub mod payout_tx; pub mod sim; pub mod testing; pub mod tracers; +pub mod revmc_ext_ctx; pub use block_orders::BlockOrders; use eth_sparse_mpt::SparseTrieSharedCache; use reth_primitives::proofs::calculate_requests_root; @@ -45,6 +46,7 @@ use revm::{ db::states::bundle_state::BundleRetention::{self, PlainState}, primitives::{BlobExcessGasAndPrice, BlockEnv, CfgEnvWithHandlerCfg, SpecId}, }; +use revmc_toolbox_load::EvmCompilerFns; use serde::Deserialize; use std::{hash::Hash, str::FromStr, sync::Arc}; use thiserror::Error; @@ -66,6 +68,7 @@ pub struct BlockBuildingContext { pub initialized_cfg: CfgEnvWithHandlerCfg, pub attributes: EthPayloadBuilderAttributes, pub chain_spec: Arc, + pub llvm_compiled_fns: Option, /// Signer to sign builder payoffs (end of block and mev-share). /// Is Option to avoid any possible bug (losing money!) with payoffs. /// None: coinbase = attributes.suggested_fee_recipient. No payoffs allowed. @@ -92,6 +95,7 @@ impl BlockBuildingContext { prefer_gas_limit: Option, extra_data: Vec, spec_id: Option, + llvm_compiled_fns: Option, ) -> BlockBuildingContext { let attributes = EthPayloadBuilderAttributes::try_new( attributes.data.parent_block_hash, @@ -138,6 +142,7 @@ impl BlockBuildingContext { initialized_cfg, attributes, chain_spec, + llvm_compiled_fns, builder_signer: Some(signer), blocklist, extra_data, @@ -158,6 +163,7 @@ impl BlockBuildingContext { coinbase: Address, suggested_fee_recipient: Address, builder_signer: Option, + llvm_compiled_fns: Option, ) -> BlockBuildingContext { let block_number = onchain_block.header.number; @@ -228,6 +234,7 @@ impl BlockBuildingContext { extra_data: Vec::new(), excess_blob_gas: onchain_block.header.excess_blob_gas.map(|b| b as u64), spec_id, + llvm_compiled_fns, shared_sparse_mpt_cache: Default::default(), } } @@ -244,6 +251,7 @@ impl BlockBuildingContext { Default::default(), Default::default(), Default::default(), + None, ) } diff --git a/crates/rbuilder/src/building/order_commit.rs b/crates/rbuilder/src/building/order_commit.rs index 59f43bda..c9e737f9 100644 --- a/crates/rbuilder/src/building/order_commit.rs +++ b/crates/rbuilder/src/building/order_commit.rs @@ -31,6 +31,8 @@ use revm::{ use crate::building::evm_inspector::{RBuilderEVMInspector, UsedStateTrace}; use std::{collections::HashMap, sync::Arc}; use thiserror::Error; +use crate::building::revmc_ext_ctx::RBuilderRevmcInspectorExtCtx; +use revmc_toolbox_load::{revmc_register_handler, RevmcExtCtx}; #[derive(Clone)] pub struct BlockState { @@ -431,14 +433,23 @@ impl<'a, 'b, Tracer: SimulationTracer> PartialBlockFork<'a, 'b, Tracer> { let used_state_tracer = self.tracer.as_mut().and_then(|t| t.get_used_state_tracer()); let mut rbuilder_inspector = RBuilderEVMInspector::new(tx, used_state_tracer); + let rbuilder_inspector_with_revmc = RBuilderRevmcInspectorExtCtx::new( + &mut rbuilder_inspector, + ctx.llvm_compiled_fns.clone() + .map(|fns| RevmcExtCtx::from(fns).with_touch_tracking()), + ); - let mut evm = revm::Evm::builder() + let mut partial_evm = revm::Evm::builder() .with_spec_id(ctx.spec_id) .with_env(Box::new(env)) .with_db(db.as_mut()) - .with_external_context(&mut rbuilder_inspector) - .append_handler_register(inspector_handle_register) - .build(); + .with_external_context(rbuilder_inspector_with_revmc) + .append_handler_register(inspector_handle_register); + if ctx.llvm_compiled_fns.is_some() { + partial_evm = partial_evm.append_handler_register(revmc_register_handler); + } + let mut evm = partial_evm.build(); + let res = match evm.transact() { Ok(res) => res, Err(err) => match err { @@ -451,6 +462,8 @@ impl<'a, 'b, Tracer: SimulationTracer> PartialBlockFork<'a, 'b, Tracer> { | EVMError::Precompile(_) => return Err(err.into()), }, }; + // todo: does it make sense to log how many touches were non-native? + let mut db_context = evm.into_context(); let db = &mut db_context.evm.db; let access_list = rbuilder_inspector.into_access_list(); diff --git a/crates/rbuilder/src/building/revmc_ext_ctx.rs b/crates/rbuilder/src/building/revmc_ext_ctx.rs new file mode 100644 index 00000000..f8ece6a4 --- /dev/null +++ b/crates/rbuilder/src/building/revmc_ext_ctx.rs @@ -0,0 +1,92 @@ +use revm::{ + interpreter::{CallInputs, CallOutcome, Interpreter}, + primitives::{B256, U256, Address}, + Database, EvmContext, Inspector, +}; +use revmc_toolbox_load::{ + RevmcExtCtxExtTrait, + RevmcExtCtx, + EvmCompilerFn, + Touches, +}; +use super::evm_inspector::{ + RBuilderEVMInspector, + UsedStateEVMInspector, +}; + + +pub struct RBuilderRevmcInspectorExtCtx<'a, 'b> where 'a: 'b { + evm_inspector: &'b mut RBuilderEVMInspector<'a>, + pub revmc_ext_ctx: Option, +} + +impl<'a, 'b> RBuilderRevmcInspectorExtCtx<'a, 'b> { + pub fn new( + evm_inspector: &'b mut RBuilderEVMInspector<'a>, + revmc_ext_ctx: Option, + ) -> Self { + Self { + evm_inspector, + revmc_ext_ctx, + } + } + +} + +impl<'a, 'b, DB> Inspector for RBuilderRevmcInspectorExtCtx<'a, 'b> +where + DB: Database, + UsedStateEVMInspector<'a>: Inspector, +{ + #[inline] + fn step(&mut self, interp: &mut Interpreter, data: &mut EvmContext) { + self.evm_inspector.step(interp, data); + } + + #[inline] + fn call( + &mut self, + context: &mut EvmContext, + inputs: &mut CallInputs, + ) -> Option { + self.evm_inspector.call(context, inputs) + } + + #[inline] + fn create_end( + &mut self, + context: &mut EvmContext, + inputs: &revm::interpreter::CreateInputs, + outcome: revm::interpreter::CreateOutcome, + ) -> revm::interpreter::CreateOutcome { + self.evm_inspector.create_end(context, inputs, outcome) + } + + #[inline] + fn selfdestruct(&mut self, contract: Address, target: Address, value: U256) { + self.evm_inspector.selfdestruct(contract, target, value) + } +} + +// todo: improve this - move away from if let statements +impl RevmcExtCtxExtTrait for RBuilderRevmcInspectorExtCtx<'_, '_> { + fn get_function(&self, bytecode_hash: B256) -> Option { + if let Some(revmc_ext_ctx) = &self.revmc_ext_ctx { + revmc_ext_ctx.get_function(bytecode_hash) + } else { + None + } + } + fn register_touch(&mut self, address: Address, non_native: bool) { + if let Some(revmc_ext_ctx) = &mut self.revmc_ext_ctx { + revmc_ext_ctx.register_touch(address, non_native); + } + } + fn touches(&self) -> Option<&Touches> { + if let Some(revmc_ext_ctx) = &self.revmc_ext_ctx { + revmc_ext_ctx.touches.as_ref() + } else { + None + } + } +} diff --git a/crates/rbuilder/src/building/testing/test_chain_state.rs b/crates/rbuilder/src/building/testing/test_chain_state.rs index 50832b8f..8f10cee3 100644 --- a/crates/rbuilder/src/building/testing/test_chain_state.rs +++ b/crates/rbuilder/src/building/testing/test_chain_state.rs @@ -319,6 +319,7 @@ impl TestBlockContextBuilder { self.prefer_gas_limit, vec![], Some(SpecId::SHANGHAI), + None, ); if self.use_suggested_fee_recipient_as_coinbase { res.modify_use_suggested_fee_recipient_as_coinbase(); diff --git a/crates/rbuilder/src/live_builder/base_config.rs b/crates/rbuilder/src/live_builder/base_config.rs index 83764560..fafbcab5 100644 --- a/crates/rbuilder/src/live_builder/base_config.rs +++ b/crates/rbuilder/src/live_builder/base_config.rs @@ -9,12 +9,13 @@ use crate::{ }; use ahash::HashSet; use alloy_primitives::{Address, B256}; -use eyre::{eyre, Context}; +use eyre::{eyre, Context, OptionExt}; use jsonrpsee::RpcModule; use lazy_static::lazy_static; use reth::tasks::pool::BlockingTaskPool; use reth_chainspec::ChainSpec; use reth_db::DatabaseEnv; +use revmc_toolbox_load::{EvmCompilerFns, EvmCompilerFnLoader}; use reth_node_core::args::utils::chain_value_parser; use reth_primitives::StaticFileSegment; use reth_provider::StaticFileProviderFactory; @@ -101,6 +102,10 @@ pub struct BaseConfig { pub backtest_builders: Vec, pub backtest_results_store_path: PathBuf, pub backtest_protect_bundle_signers: Vec
, + + // llvm compiled fns + pub use_llvm_compiled_fns: bool, + pub aot_compiled_fns_dir: Option, } lazy_static! { @@ -132,6 +137,7 @@ pub fn load_config_toml_and_env( path.as_ref().to_string_lossy() ) })?; + println!("data: {:?}", data); let config: T = toml::from_str(&data).context("Config file parsing")?; Ok(config) @@ -213,9 +219,20 @@ impl BaseConfig { extra_rpc: RpcModule::new(()), sink_factory, builders: Vec::new(), + llvm_compiled_fns: self.load_llvm_compiled_fns()?, }) } + pub fn load_llvm_compiled_fns(&self) -> eyre::Result> { + if !self.use_llvm_compiled_fns { + return Ok(None); + } + // todo: implement config file for whitelists/blacklists and filter with EvmCompilerFnLoader::load_selected + let dir_path = self.aot_compiled_fns_dir.as_ref() + .ok_or_eyre("no llvm dir specified")?; // todo: resort to default + EvmCompilerFnLoader::new(dir_path).load_all().map(|fns| Some(fns.into())) + } + pub fn jsonrpc_server_ip(&self) -> Ipv4Addr { parse_ip(&self.jsonrpc_server_ip) } @@ -437,6 +454,8 @@ impl Default for BaseConfig { live_builders: vec!["mgp-ordering".to_string(), "mp-ordering".to_string()], simulation_threads: 1, sbundle_mergeabe_signers: None, + use_llvm_compiled_fns: false, + aot_compiled_fns_dir: None, } } } diff --git a/crates/rbuilder/src/live_builder/mod.rs b/crates/rbuilder/src/live_builder/mod.rs index 7d5b6a24..620612fe 100644 --- a/crates/rbuilder/src/live_builder/mod.rs +++ b/crates/rbuilder/src/live_builder/mod.rs @@ -38,6 +38,7 @@ use time::OffsetDateTime; use tokio::{sync::mpsc, task::spawn_blocking}; use tokio_util::sync::CancellationToken; use tracing::{debug, error, info, warn}; +use revmc_toolbox_load::EvmCompilerFns; /// Time the proposer have to propose a block from the beginning of the slot (https://www.paradigm.xyz/2023/04/mev-boost-ethereum-consensus Slot anatomy) const SLOT_PROPOSAL_DURATION: std::time::Duration = Duration::from_secs(4); @@ -76,6 +77,8 @@ pub struct LiveBuilder { pub sink_factory: Box, pub builders: Vec>>, pub extra_rpc: RpcModule<()>, + + pub llvm_compiled_fns: Option, } impl @@ -215,6 +218,7 @@ impl Some(payload.suggested_gas_limit), self.extra_data.clone(), None, + self.llvm_compiled_fns.clone(), ); builder_pool.start_block_building( From 23e1b2fb989820d128382cad97bc680040746388 Mon Sep 17 00:00:00 2001 From: halo3mic <46010359+halo3mic@users.noreply.github.com> Date: Sat, 28 Sep 2024 09:43:22 +0000 Subject: [PATCH 2/5] timeit --- .../src/backtest/backtest_build_block.rs | 16 ++-------------- crates/rbuilder/src/backtest/mod.rs | 1 + crates/rbuilder/src/backtest/utils.rs | 10 ++++++++++ 3 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 crates/rbuilder/src/backtest/utils.rs diff --git a/crates/rbuilder/src/backtest/backtest_build_block.rs b/crates/rbuilder/src/backtest/backtest_build_block.rs index ddada4e0..08be2ad6 100644 --- a/crates/rbuilder/src/backtest/backtest_build_block.rs +++ b/crates/rbuilder/src/backtest/backtest_build_block.rs @@ -14,7 +14,7 @@ use crate::backtest::OrdersWithTimestamp; use crate::{ backtest::{ execute::{backtest_prepare_ctx_for_block, BacktestBlockInput}, - BlockData, HistoricalDataStorage, + BlockData, HistoricalDataStorage, utils, }, building::builders::BacktestSimulateBlockInput, live_builder::{base_config::load_config_toml_and_env, cli::LiveBuilderConfig}, @@ -57,16 +57,6 @@ struct Cli { block: u64, } -// todo: into utils -macro_rules! timeit { - ($block:expr) => {{ - let t0 = std::time::Instant::now(); - let res = $block; - let elapsed = t0.elapsed(); - (res, elapsed) - }}; -} - pub async fn run_backtest_build_block() -> eyre::Result<()> { let cli = Cli::parse(); @@ -112,12 +102,10 @@ pub async fn run_backtest_build_block() -> eyre:: print_onchain_block_data(tx_sim_results, &orders, &block_data); } - let t0 = std::time::Instant::now(); - let ( BacktestBlockInput {ctx, sim_orders, .. }, elapsed - ) = timeit!({backtest_prepare_ctx_for_block( + ) = utils::timeit!({backtest_prepare_ctx_for_block( block_data.clone(), provider_factory.clone(), chain_spec.clone(), diff --git a/crates/rbuilder/src/backtest/mod.rs b/crates/rbuilder/src/backtest/mod.rs index 21bfb526..8847a8bf 100644 --- a/crates/rbuilder/src/backtest/mod.rs +++ b/crates/rbuilder/src/backtest/mod.rs @@ -7,6 +7,7 @@ pub mod redistribute; pub mod restore_landed_orders; mod results_store; mod store; +mod utils; pub use backtest_build_block::run_backtest_build_block; pub use backtest_build_range::run_backtest_build_range; diff --git a/crates/rbuilder/src/backtest/utils.rs b/crates/rbuilder/src/backtest/utils.rs new file mode 100644 index 00000000..3cf3612a --- /dev/null +++ b/crates/rbuilder/src/backtest/utils.rs @@ -0,0 +1,10 @@ +macro_rules! timeit { + ($block:expr) => {{ + let t0 = std::time::Instant::now(); + let res = $block; + let elapsed = t0.elapsed(); + (res, elapsed) + }}; +} + +pub(crate) use timeit; \ No newline at end of file From 683f56cbc4103e3a68c7dc91fb2cc6619d0975d3 Mon Sep 17 00:00:00 2001 From: halo3mic <46010359+halo3mic@users.noreply.github.com> Date: Sat, 28 Sep 2024 09:47:22 +0000 Subject: [PATCH 3/5] rethdb from toml config --- Cargo.lock | 1753 +++++------------ crates/rbuilder/src/bin/revmc-aot-compile.rs | 79 +- .../rbuilder/src/live_builder/base_config.rs | 4 +- 3 files changed, 577 insertions(+), 1259 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 76b18aad..e62d6088 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2841,12 +2841,12 @@ dependencies = [ "alloy-trie", "hash-db", "rayon", - "reth-db-api 1.0.6", - "reth-errors 1.0.6", - "reth-execution-errors 1.0.6", - "reth-provider 1.0.6", - "reth-trie 1.0.6", - "reth-trie-db 1.0.6", + "reth-db-api", + "reth-errors", + "reth-execution-errors", + "reth-provider", + "reth-trie", + "reth-trie-db", "revm", "revm-primitives", "rustc-hash 2.0.0", @@ -7105,19 +7105,19 @@ dependencies = [ "reqwest 0.11.27", "reth", "reth-basic-payload-builder", - "reth-chainspec 1.0.6", - "reth-db 1.0.6", + "reth-chainspec", + "reth-db", "reth-db-common", - "reth-errors 1.0.6", - "reth-evm 1.0.6", - "reth-evm-ethereum 1.0.6", - "reth-libmdbx 1.0.6", + "reth-errors", + "reth-evm", + "reth-evm-ethereum", + "reth-libmdbx", "reth-node-api", "reth-node-core", "reth-payload-builder", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", - "reth-trie 1.0.6", + "reth-primitives", + "reth-provider", + "reth-trie", "reth-trie-parallel", "revm", "revm-inspectors", @@ -7379,27 +7379,27 @@ dependencies = [ "reth-basic-payload-builder", "reth-beacon-consensus", "reth-blockchain-tree", - "reth-chainspec 1.0.6", + "reth-chainspec", "reth-cli-commands", "reth-cli-runner", "reth-cli-util", "reth-config", - "reth-consensus 1.0.6", - "reth-consensus-common 1.0.6", - "reth-db 1.0.6", - "reth-db-api 1.0.6", + "reth-consensus", + "reth-consensus-common", + "reth-db", + "reth-db-api", "reth-db-common", "reth-downloaders", "reth-engine-util", - "reth-errors 1.0.6", + "reth-errors", "reth-ethereum-payload-builder", - "reth-evm 1.0.6", - "reth-execution-types 1.0.6", + "reth-evm", + "reth-execution-types", "reth-exex", - "reth-fs-util 1.0.6", + "reth-fs-util", "reth-network", "reth-network-api", - "reth-network-p2p 1.0.6", + "reth-network-p2p", "reth-node-api", "reth-node-builder", "reth-node-core", @@ -7411,26 +7411,26 @@ dependencies = [ "reth-payload-builder", "reth-payload-primitives", "reth-payload-validator", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", + "reth-primitives", + "reth-provider", "reth-prune", - "reth-revm 1.0.6", + "reth-revm", "reth-rpc", "reth-rpc-api", "reth-rpc-builder", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types 1.0.6", + "reth-rpc-types", "reth-rpc-types-compat", "reth-stages", "reth-stages-api", "reth-static-file", - "reth-static-file-types 1.0.6", + "reth-static-file-types", "reth-tasks", - "reth-tracing 1.0.6", + "reth-tracing", "reth-transaction-pool", - "reth-trie 1.0.6", - "reth-trie-db 1.0.6", + "reth-trie", + "reth-trie-db", "serde", "serde_json", "similar-asserts", @@ -7448,22 +7448,22 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18 dependencies = [ "futures-util", "reth-beacon-consensus", - "reth-chainspec 1.0.6", - "reth-consensus 1.0.6", + "reth-chainspec", + "reth-consensus", "reth-engine-primitives", - "reth-evm 1.0.6", - "reth-execution-errors 1.0.6", - "reth-execution-types 1.0.6", - "reth-network-p2p 1.0.6", - "reth-network-peers 1.0.6", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", - "reth-revm 1.0.6", - "reth-rpc-types 1.0.6", + "reth-evm", + "reth-execution-errors", + "reth-execution-types", + "reth-network-p2p", + "reth-network-peers", + "reth-primitives", + "reth-provider", + "reth-revm", + "reth-rpc-types", "reth-stages-api", "reth-tokio-util", "reth-transaction-pool", - "reth-trie 1.0.6", + "reth-trie", "tokio", "tokio-stream", "tracing", @@ -7478,13 +7478,13 @@ dependencies = [ "futures-core", "futures-util", "metrics", - "reth-chainspec 1.0.6", - "reth-metrics 1.0.6", + "reth-chainspec", + "reth-metrics", "reth-payload-builder", "reth-payload-primitives", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", - "reth-revm 1.0.6", + "reth-primitives", + "reth-provider", + "reth-revm", "reth-tasks", "reth-transaction-pool", "revm", @@ -7500,21 +7500,21 @@ dependencies = [ "futures", "itertools 0.13.0", "metrics", - "reth-blockchain-tree-api 1.0.6", - "reth-chainspec 1.0.6", - "reth-db-api 1.0.6", + "reth-blockchain-tree-api", + "reth-chainspec", + "reth-db-api", "reth-engine-primitives", - "reth-errors 1.0.6", - "reth-ethereum-consensus 1.0.6", - "reth-metrics 1.0.6", - "reth-network-p2p 1.0.6", + "reth-errors", + "reth-ethereum-consensus", + "reth-metrics", + "reth-network-p2p", "reth-payload-builder", "reth-payload-primitives", "reth-payload-validator", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", + "reth-primitives", + "reth-provider", "reth-prune", - "reth-rpc-types 1.0.6", + "reth-rpc-types", "reth-stages-api", "reth-static-file", "reth-tasks", @@ -7535,74 +7535,40 @@ dependencies = [ "linked_hash_set", "metrics", "parking_lot 0.12.3", - "reth-blockchain-tree-api 1.0.6", - "reth-consensus 1.0.6", - "reth-db 1.0.6", - "reth-db-api 1.0.6", - "reth-evm 1.0.6", - "reth-execution-errors 1.0.6", - "reth-execution-types 1.0.6", - "reth-metrics 1.0.6", + "reth-blockchain-tree-api", + "reth-consensus", + "reth-db", + "reth-db-api", + "reth-evm", + "reth-execution-errors", + "reth-execution-types", + "reth-metrics", "reth-network", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", - "reth-prune-types 1.0.6", - "reth-revm 1.0.6", + "reth-primitives", + "reth-provider", + "reth-prune-types", + "reth-revm", "reth-stages-api", - "reth-storage-errors 1.0.6", - "reth-trie 1.0.6", - "reth-trie-db 1.0.6", + "reth-storage-errors", + "reth-trie", + "reth-trie-db", "reth-trie-parallel", "tokio", "tracing", ] -[[package]] -name = "reth-blockchain-tree-api" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "reth-consensus 1.0.5", - "reth-execution-errors 1.0.5", - "reth-primitives 1.0.5", - "reth-storage-errors 1.0.5", - "thiserror", -] - [[package]] name = "reth-blockchain-tree-api" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-consensus 1.0.6", - "reth-execution-errors 1.0.6", - "reth-primitives 1.0.6", - "reth-storage-errors 1.0.6", + "reth-consensus", + "reth-execution-errors", + "reth-primitives", + "reth-storage-errors", "thiserror", ] -[[package]] -name = "reth-chain-state" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "auto_impl", - "derive_more 1.0.0", - "metrics", - "parking_lot 0.12.3", - "pin-project", - "reth-chainspec 1.0.5", - "reth-errors 1.0.5", - "reth-execution-types 1.0.5", - "reth-metrics 1.0.5", - "reth-primitives 1.0.5", - "reth-storage-api 1.0.5", - "reth-trie 1.0.5", - "tokio", - "tokio-stream", - "tracing", -] - [[package]] name = "reth-chain-state" version = "1.0.6" @@ -7616,39 +7582,19 @@ dependencies = [ "parking_lot 0.12.3", "pin-project", "rand 0.8.5", - "reth-chainspec 1.0.6", - "reth-errors 1.0.6", - "reth-execution-types 1.0.6", - "reth-metrics 1.0.6", - "reth-primitives 1.0.6", - "reth-storage-api 1.0.6", - "reth-trie 1.0.6", + "reth-chainspec", + "reth-errors", + "reth-execution-types", + "reth-metrics", + "reth-primitives", + "reth-storage-api", + "reth-trie", "revm", "tokio", "tokio-stream", "tracing", ] -[[package]] -name = "reth-chainspec" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-chains", - "alloy-eips", - "alloy-genesis", - "alloy-primitives 0.8.0", - "alloy-trie", - "auto_impl", - "derive_more 1.0.0", - "once_cell", - "reth-ethereum-forks 1.0.5", - "reth-network-peers 1.0.5", - "reth-primitives-traits 1.0.5", - "reth-trie-common 1.0.5", - "serde_json", -] - [[package]] name = "reth-chainspec" version = "1.0.6" @@ -7662,10 +7608,10 @@ dependencies = [ "auto_impl", "derive_more 1.0.0", "once_cell", - "reth-ethereum-forks 1.0.6", - "reth-network-peers 1.0.6", - "reth-primitives-traits 1.0.6", - "reth-trie-common 1.0.6", + "reth-ethereum-forks", + "reth-network-peers", + "reth-primitives-traits", + "reth-trie-common", "serde_json", ] @@ -7686,35 +7632,35 @@ dependencies = [ "itertools 0.13.0", "ratatui", "reth-beacon-consensus", - "reth-chainspec 1.0.6", + "reth-chainspec", "reth-cli-runner", "reth-cli-util", "reth-config", - "reth-consensus 1.0.6", - "reth-db 1.0.6", - "reth-db-api 1.0.6", + "reth-consensus", + "reth-db", + "reth-db-api", "reth-db-common", "reth-downloaders", "reth-ecies", "reth-eth-wire", - "reth-evm 1.0.6", + "reth-evm", "reth-exex", - "reth-fs-util 1.0.6", + "reth-fs-util", "reth-network", - "reth-network-p2p 1.0.6", - "reth-network-peers 1.0.6", + "reth-network-p2p", + "reth-network-peers", "reth-node-builder", "reth-node-core", "reth-node-events", "reth-node-metrics", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", + "reth-primitives", + "reth-provider", "reth-prune", "reth-stages", "reth-static-file", - "reth-static-file-types 1.0.6", - "reth-trie 1.0.6", - "reth-trie-db 1.0.6", + "reth-static-file-types", + "reth-trie", + "reth-trie-db", "secp256k1", "serde", "serde_json", @@ -7743,27 +7689,11 @@ dependencies = [ "eyre", "libc", "rand 0.8.5", - "reth-fs-util 1.0.6", + "reth-fs-util", "secp256k1", "thiserror", ] -[[package]] -name = "reth-codecs" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-genesis", - "alloy-primitives 0.8.0", - "alloy-trie", - "bytes", - "modular-bitfield", - "reth-codecs-derive 1.0.5", - "serde", -] - [[package]] name = "reth-codecs" version = "1.0.6" @@ -7776,21 +7706,10 @@ dependencies = [ "alloy-trie", "bytes", "modular-bitfield", - "reth-codecs-derive 1.0.6", + "reth-codecs-derive", "serde", ] -[[package]] -name = "reth-codecs-derive" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "convert_case 0.6.0", - "proc-macro2", - "quote", - "syn 2.0.72", -] - [[package]] name = "reth-codecs-derive" version = "1.0.6" @@ -7809,23 +7728,13 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18 dependencies = [ "eyre", "humantime-serde", - "reth-network-types 1.0.6", - "reth-prune-types 1.0.6", - "reth-stages-types 1.0.6", + "reth-network-types", + "reth-prune-types", + "reth-stages-types", "serde", "toml 0.8.15", ] -[[package]] -name = "reth-consensus" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "auto_impl", - "derive_more 1.0.0", - "reth-primitives 1.0.5", -] - [[package]] name = "reth-consensus" version = "1.0.6" @@ -7833,17 +7742,7 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18 dependencies = [ "auto_impl", "derive_more 1.0.0", - "reth-primitives 1.0.6", -] - -[[package]] -name = "reth-consensus-common" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "reth-chainspec 1.0.5", - "reth-consensus 1.0.5", - "reth-primitives 1.0.5", + "reth-primitives", ] [[package]] @@ -7851,9 +7750,9 @@ name = "reth-consensus-common" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chainspec 1.0.6", - "reth-consensus 1.0.6", - "reth-primitives 1.0.6", + "reth-chainspec", + "reth-consensus", + "reth-primitives", ] [[package]] @@ -7872,43 +7771,13 @@ dependencies = [ "reth-node-core", "reth-rpc-api", "reth-rpc-builder", - "reth-rpc-types 1.0.6", - "reth-tracing 1.0.6", + "reth-rpc-types", + "reth-tracing", "ringbuffer", "serde", "tokio", ] -[[package]] -name = "reth-db" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "bytes", - "derive_more 1.0.0", - "eyre", - "metrics", - "page_size", - "paste", - "reth-db-api 1.0.5", - "reth-fs-util 1.0.5", - "reth-libmdbx 1.0.5", - "reth-metrics 1.0.5", - "reth-nippy-jar 1.0.5", - "reth-primitives 1.0.5", - "reth-primitives-traits 1.0.5", - "reth-prune-types 1.0.5", - "reth-stages-types 1.0.5", - "reth-storage-errors 1.0.5", - "reth-tracing 1.0.5", - "reth-trie-common 1.0.5", - "rustc-hash 2.0.0", - "serde", - "strum", - "sysinfo 0.30.13", - "thiserror", -] - [[package]] name = "reth-db" version = "1.0.6" @@ -7920,18 +7789,18 @@ dependencies = [ "metrics", "page_size", "paste", - "reth-db-api 1.0.6", - "reth-fs-util 1.0.6", - "reth-libmdbx 1.0.6", - "reth-metrics 1.0.6", - "reth-nippy-jar 1.0.6", - "reth-primitives 1.0.6", - "reth-primitives-traits 1.0.6", - "reth-prune-types 1.0.6", - "reth-stages-types 1.0.6", - "reth-storage-errors 1.0.6", - "reth-tracing 1.0.6", - "reth-trie-common 1.0.6", + "reth-db-api", + "reth-fs-util", + "reth-libmdbx", + "reth-metrics", + "reth-nippy-jar", + "reth-primitives", + "reth-primitives-traits", + "reth-prune-types", + "reth-stages-types", + "reth-storage-errors", + "reth-tracing", + "reth-trie-common", "rustc-hash 2.0.0", "serde", "strum", @@ -7940,27 +7809,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "reth-db-api" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "bytes", - "derive_more 1.0.0", - "metrics", - "modular-bitfield", - "parity-scale-codec", - "reth-codecs 1.0.5", - "reth-db-models 1.0.5", - "reth-primitives 1.0.5", - "reth-primitives-traits 1.0.5", - "reth-prune-types 1.0.5", - "reth-stages-types 1.0.5", - "reth-storage-errors 1.0.5", - "reth-trie-common 1.0.5", - "serde", -] - [[package]] name = "reth-db-api" version = "1.0.6" @@ -7973,14 +7821,14 @@ dependencies = [ "modular-bitfield", "parity-scale-codec", "proptest", - "reth-codecs 1.0.6", - "reth-db-models 1.0.6", - "reth-primitives 1.0.6", - "reth-primitives-traits 1.0.6", - "reth-prune-types 1.0.6", - "reth-stages-types 1.0.6", - "reth-storage-errors 1.0.6", - "reth-trie-common 1.0.6", + "reth-codecs", + "reth-db-models", + "reth-primitives", + "reth-primitives-traits", + "reth-prune-types", + "reth-stages-types", + "reth-storage-errors", + "reth-trie-common", "serde", ] @@ -7992,36 +7840,24 @@ dependencies = [ "alloy-genesis", "boyer-moore-magiclen", "eyre", - "reth-chainspec 1.0.6", - "reth-codecs 1.0.6", + "reth-chainspec", + "reth-codecs", "reth-config", - "reth-db 1.0.6", - "reth-db-api 1.0.6", + "reth-db", + "reth-db-api", "reth-etl", - "reth-fs-util 1.0.6", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", - "reth-stages-types 1.0.6", - "reth-trie 1.0.6", - "reth-trie-db 1.0.6", + "reth-fs-util", + "reth-primitives", + "reth-provider", + "reth-stages-types", + "reth-trie", + "reth-trie-db", "serde", "serde_json", "thiserror", "tracing", ] -[[package]] -name = "reth-db-models" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "bytes", - "modular-bitfield", - "reth-codecs 1.0.5", - "reth-primitives 1.0.5", - "serde", -] - [[package]] name = "reth-db-models" version = "1.0.6" @@ -8031,8 +7867,8 @@ dependencies = [ "bytes", "modular-bitfield", "proptest", - "reth-codecs 1.0.6", - "reth-primitives 1.0.6", + "reth-codecs", + "reth-primitives", "serde", ] @@ -8047,10 +7883,10 @@ dependencies = [ "enr 0.12.1", "generic-array", "parking_lot 0.12.3", - "reth-ethereum-forks 1.0.6", - "reth-net-banlist 1.0.6", + "reth-ethereum-forks", + "reth-net-banlist", "reth-net-nat", - "reth-network-peers 1.0.6", + "reth-network-peers", "schnellru", "secp256k1", "serde", @@ -8074,10 +7910,10 @@ dependencies = [ "itertools 0.13.0", "metrics", "rand 0.8.5", - "reth-chainspec 1.0.6", - "reth-ethereum-forks 1.0.6", - "reth-metrics 1.0.6", - "reth-network-peers 1.0.6", + "reth-chainspec", + "reth-ethereum-forks", + "reth-metrics", + "reth-network-peers", "secp256k1", "thiserror", "tokio", @@ -8094,8 +7930,8 @@ dependencies = [ "enr 0.12.1", "linked_hash_set", "parking_lot 0.12.3", - "reth-ethereum-forks 1.0.6", - "reth-network-peers 1.0.6", + "reth-ethereum-forks", + "reth-network-peers", "reth-tokio-util", "schnellru", "secp256k1", @@ -8119,12 +7955,12 @@ dependencies = [ "pin-project", "rayon", "reth-config", - "reth-consensus 1.0.6", - "reth-metrics 1.0.6", - "reth-network-p2p 1.0.6", - "reth-network-peers 1.0.6", - "reth-primitives 1.0.6", - "reth-storage-api 1.0.6", + "reth-consensus", + "reth-metrics", + "reth-network-p2p", + "reth-network-peers", + "reth-primitives", + "reth-storage-api", "reth-tasks", "thiserror", "tokio", @@ -8152,7 +7988,7 @@ dependencies = [ "hmac 0.12.1", "pin-project", "rand 0.8.5", - "reth-network-peers 1.0.6", + "reth-network-peers", "secp256k1", "sha2 0.10.8", "sha3", @@ -8169,7 +8005,7 @@ name = "reth-engine-primitives" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chainspec 1.0.6", + "reth-chainspec", "reth-payload-primitives", "serde", ] @@ -8182,16 +8018,16 @@ dependencies = [ "futures", "pin-project", "reth-beacon-consensus", - "reth-chainspec 1.0.6", - "reth-consensus 1.0.6", - "reth-db-api 1.0.6", + "reth-chainspec", + "reth-consensus", + "reth-db-api", "reth-engine-primitives", "reth-engine-tree", - "reth-evm 1.0.6", - "reth-network-p2p 1.0.6", + "reth-evm", + "reth-network-p2p", "reth-payload-builder", "reth-payload-validator", - "reth-provider 1.0.6", + "reth-provider", "reth-prune", "reth-stages-api", "reth-tasks", @@ -8207,27 +8043,27 @@ dependencies = [ "metrics", "reth-beacon-consensus", "reth-blockchain-tree", - "reth-blockchain-tree-api 1.0.6", - "reth-chain-state 1.0.6", - "reth-consensus 1.0.6", - "reth-db 1.0.6", - "reth-db-api 1.0.6", + "reth-blockchain-tree-api", + "reth-chain-state", + "reth-consensus", + "reth-db", + "reth-db-api", "reth-engine-primitives", - "reth-errors 1.0.6", - "reth-evm 1.0.6", - "reth-metrics 1.0.6", - "reth-network-p2p 1.0.6", + "reth-errors", + "reth-evm", + "reth-metrics", + "reth-network-p2p", "reth-payload-builder", "reth-payload-primitives", "reth-payload-validator", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", + "reth-primitives", + "reth-provider", "reth-prune", - "reth-revm 1.0.6", - "reth-rpc-types 1.0.6", + "reth-revm", + "reth-rpc-types", "reth-stages-api", "reth-tasks", - "reth-trie 1.0.6", + "reth-trie", "thiserror", "tokio", "tracing", @@ -8244,17 +8080,17 @@ dependencies = [ "pin-project", "reth-beacon-consensus", "reth-engine-primitives", - "reth-errors 1.0.6", - "reth-ethereum-forks 1.0.6", - "reth-evm 1.0.6", - "reth-fs-util 1.0.6", + "reth-errors", + "reth-ethereum-forks", + "reth-evm", + "reth-fs-util", "reth-payload-validator", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", - "reth-revm 1.0.6", - "reth-rpc-types 1.0.6", + "reth-primitives", + "reth-provider", + "reth-revm", + "reth-rpc-types", "reth-rpc-types-compat", - "reth-trie 1.0.6", + "reth-trie", "revm-primitives", "serde", "serde_json", @@ -8263,29 +8099,16 @@ dependencies = [ "tracing", ] -[[package]] -name = "reth-errors" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "reth-blockchain-tree-api 1.0.5", - "reth-consensus 1.0.5", - "reth-execution-errors 1.0.5", - "reth-fs-util 1.0.5", - "reth-storage-errors 1.0.5", - "thiserror", -] - [[package]] name = "reth-errors" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-blockchain-tree-api 1.0.6", - "reth-consensus 1.0.6", - "reth-execution-errors 1.0.6", - "reth-fs-util 1.0.6", - "reth-storage-errors 1.0.6", + "reth-blockchain-tree-api", + "reth-consensus", + "reth-execution-errors", + "reth-fs-util", + "reth-storage-errors", "thiserror", ] @@ -8299,13 +8122,13 @@ dependencies = [ "derive_more 1.0.0", "futures", "pin-project", - "reth-chainspec 1.0.6", - "reth-codecs 1.0.6", + "reth-chainspec", + "reth-codecs", "reth-ecies", - "reth-eth-wire-types 1.0.6", - "reth-metrics 1.0.6", - "reth-network-peers 1.0.6", - "reth-primitives 1.0.6", + "reth-eth-wire-types", + "reth-metrics", + "reth-network-peers", + "reth-primitives", "snap", "thiserror", "tokio", @@ -8314,22 +8137,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "reth-eth-wire-types" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-chains", - "alloy-genesis", - "alloy-rlp", - "bytes", - "derive_more 1.0.0", - "reth-chainspec 1.0.5", - "reth-codecs-derive 1.0.5", - "reth-primitives 1.0.5", - "thiserror", -] - [[package]] name = "reth-eth-wire-types" version = "1.0.6" @@ -8340,33 +8147,21 @@ dependencies = [ "alloy-rlp", "bytes", "derive_more 1.0.0", - "reth-chainspec 1.0.6", - "reth-codecs-derive 1.0.6", - "reth-primitives 1.0.6", + "reth-chainspec", + "reth-codecs-derive", + "reth-primitives", "thiserror", ] -[[package]] -name = "reth-ethereum-consensus" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "reth-chainspec 1.0.5", - "reth-consensus 1.0.5", - "reth-consensus-common 1.0.5", - "reth-primitives 1.0.5", - "tracing", -] - [[package]] name = "reth-ethereum-consensus" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chainspec 1.0.6", - "reth-consensus 1.0.6", - "reth-consensus-common 1.0.6", - "reth-primitives 1.0.6", + "reth-chainspec", + "reth-consensus", + "reth-consensus-common", + "reth-primitives", "tracing", ] @@ -8376,35 +8171,18 @@ version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ "alloy-rlp", - "reth-chainspec 1.0.6", + "reth-chainspec", "reth-engine-primitives", - "reth-evm-ethereum 1.0.6", + "reth-evm-ethereum", "reth-payload-primitives", - "reth-primitives 1.0.6", - "reth-rpc-types 1.0.6", + "reth-primitives", + "reth-rpc-types", "reth-rpc-types-compat", "revm-primitives", "serde", "sha2 0.10.8", ] -[[package]] -name = "reth-ethereum-forks" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-chains", - "alloy-primitives 0.8.0", - "alloy-rlp", - "auto_impl", - "crc", - "dyn-clone", - "once_cell", - "rustc-hash 2.0.0", - "serde", - "thiserror-no-std", -] - [[package]] name = "reth-ethereum-forks" version = "1.0.6" @@ -8431,16 +8209,16 @@ version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ "reth-basic-payload-builder", - "reth-errors 1.0.6", - "reth-evm 1.0.6", - "reth-evm-ethereum 1.0.6", - "reth-execution-types 1.0.6", + "reth-errors", + "reth-evm", + "reth-evm-ethereum", + "reth-execution-types", "reth-payload-builder", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", - "reth-revm 1.0.6", + "reth-primitives", + "reth-provider", + "reth-revm", "reth-transaction-pool", - "reth-trie 1.0.6", + "reth-trie", "revm", "tracing", ] @@ -8451,28 +8229,10 @@ version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ "rayon", - "reth-db-api 1.0.6", + "reth-db-api", "tempfile", ] -[[package]] -name = "reth-evm" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-eips", - "auto_impl", - "futures-util", - "reth-chainspec 1.0.5", - "reth-execution-errors 1.0.5", - "reth-execution-types 1.0.5", - "reth-primitives 1.0.5", - "reth-prune-types 1.0.5", - "reth-storage-errors 1.0.5", - "revm", - "revm-primitives", -] - [[package]] name = "reth-evm" version = "1.0.6" @@ -8481,34 +8241,16 @@ dependencies = [ "alloy-eips", "auto_impl", "futures-util", - "reth-chainspec 1.0.6", - "reth-execution-errors 1.0.6", - "reth-execution-types 1.0.6", - "reth-primitives 1.0.6", - "reth-prune-types 1.0.6", - "reth-storage-errors 1.0.6", + "reth-chainspec", + "reth-execution-errors", + "reth-execution-types", + "reth-primitives", + "reth-prune-types", + "reth-storage-errors", "revm", "revm-primitives", ] -[[package]] -name = "reth-evm-ethereum" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-eips", - "alloy-sol-types", - "reth-chainspec 1.0.5", - "reth-ethereum-consensus 1.0.5", - "reth-ethereum-forks 1.0.5", - "reth-evm 1.0.5", - "reth-execution-types 1.0.5", - "reth-primitives 1.0.5", - "reth-prune-types 1.0.5", - "reth-revm 1.0.5", - "revm-primitives", -] - [[package]] name = "reth-evm-ethereum" version = "1.0.6" @@ -8516,14 +8258,14 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18 dependencies = [ "alloy-eips", "alloy-sol-types", - "reth-chainspec 1.0.6", - "reth-ethereum-consensus 1.0.6", - "reth-ethereum-forks 1.0.6", - "reth-evm 1.0.6", - "reth-execution-types 1.0.6", - "reth-primitives 1.0.6", - "reth-prune-types 1.0.6", - "reth-revm 1.0.6", + "reth-chainspec", + "reth-ethereum-consensus", + "reth-ethereum-forks", + "reth-evm", + "reth-execution-types", + "reth-primitives", + "reth-prune-types", + "reth-revm", "revm-primitives", ] @@ -8532,37 +8274,21 @@ name = "reth-evm-optimism" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chainspec 1.0.6", - "reth-ethereum-forks 1.0.6", - "reth-evm 1.0.6", - "reth-execution-errors 1.0.6", - "reth-execution-types 1.0.6", + "reth-chainspec", + "reth-ethereum-forks", + "reth-evm", + "reth-execution-errors", + "reth-execution-types", "reth-optimism-consensus", - "reth-primitives 1.0.6", - "reth-prune-types 1.0.6", - "reth-revm 1.0.6", + "reth-primitives", + "reth-prune-types", + "reth-revm", "revm", "revm-primitives", "thiserror", "tracing", ] -[[package]] -name = "reth-execution-errors" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-eips", - "alloy-primitives 0.8.0", - "alloy-rlp", - "derive_more 1.0.0", - "nybbles", - "reth-consensus 1.0.5", - "reth-prune-types 1.0.5", - "reth-storage-errors 1.0.5", - "revm-primitives", -] - [[package]] name = "reth-execution-errors" version = "1.0.6" @@ -8573,31 +8299,20 @@ dependencies = [ "alloy-rlp", "derive_more 1.0.0", "nybbles", - "reth-consensus 1.0.6", - "reth-prune-types 1.0.6", - "reth-storage-errors 1.0.6", + "reth-consensus", + "reth-prune-types", + "reth-storage-errors", "revm-primitives", ] -[[package]] -name = "reth-execution-types" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "reth-execution-errors 1.0.5", - "reth-primitives 1.0.5", - "reth-trie 1.0.5", - "revm", -] - [[package]] name = "reth-execution-types" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-execution-errors 1.0.6", - "reth-primitives 1.0.6", - "reth-trie 1.0.6", + "reth-execution-errors", + "reth-primitives", + "reth-trie", "revm", ] @@ -8610,20 +8325,20 @@ dependencies = [ "futures", "metrics", "reth-config", - "reth-evm 1.0.6", + "reth-evm", "reth-exex-types", - "reth-metrics 1.0.6", + "reth-metrics", "reth-node-api", "reth-node-core", "reth-payload-builder", - "reth-primitives 1.0.6", - "reth-primitives-traits 1.0.6", - "reth-provider 1.0.6", - "reth-prune-types 1.0.6", - "reth-revm 1.0.6", + "reth-primitives", + "reth-primitives-traits", + "reth-provider", + "reth-prune-types", + "reth-revm", "reth-stages-api", "reth-tasks", - "reth-tracing 1.0.6", + "reth-tracing", "tokio", "tokio-util", ] @@ -8634,17 +8349,7 @@ version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ "alloy-primitives 0.8.0", - "reth-provider 1.0.6", -] - -[[package]] -name = "reth-fs-util" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "serde", - "serde_json", - "thiserror", + "reth-provider", ] [[package]] @@ -8678,22 +8383,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "reth-libmdbx" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "bitflags 2.6.0", - "byteorder", - "dashmap 6.0.1", - "derive_more 1.0.0", - "indexmap 2.2.6", - "parking_lot 0.12.3", - "reth-mdbx-sys 1.0.5", - "thiserror", - "tracing", -] - [[package]] name = "reth-libmdbx" version = "1.0.6" @@ -8705,20 +8394,11 @@ dependencies = [ "derive_more 1.0.0", "indexmap 2.2.6", "parking_lot 0.12.3", - "reth-mdbx-sys 1.0.6", + "reth-mdbx-sys", "thiserror", "tracing", ] -[[package]] -name = "reth-mdbx-sys" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "bindgen", - "cc", -] - [[package]] name = "reth-mdbx-sys" version = "1.0.6" @@ -8728,15 +8408,6 @@ dependencies = [ "cc", ] -[[package]] -name = "reth-metrics" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "metrics", - "reth-metrics-derive 1.0.5", -] - [[package]] name = "reth-metrics" version = "1.0.6" @@ -8744,22 +8415,11 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18 dependencies = [ "futures", "metrics", - "reth-metrics-derive 1.0.6", + "reth-metrics-derive", "tokio", "tokio-util", ] -[[package]] -name = "reth-metrics-derive" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn 2.0.72", -] - [[package]] name = "reth-metrics-derive" version = "1.0.6" @@ -8771,14 +8431,6 @@ dependencies = [ "syn 2.0.72", ] -[[package]] -name = "reth-net-banlist" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-primitives 0.8.0", -] - [[package]] name = "reth-net-banlist" version = "1.0.6" @@ -8816,22 +8468,22 @@ dependencies = [ "parking_lot 0.12.3", "pin-project", "rand 0.8.5", - "reth-chainspec 1.0.6", - "reth-consensus 1.0.6", + "reth-chainspec", + "reth-consensus", "reth-discv4", "reth-discv5", "reth-dns-discovery", "reth-ecies", "reth-eth-wire", - "reth-fs-util 1.0.6", - "reth-metrics 1.0.6", - "reth-net-banlist 1.0.6", + "reth-fs-util", + "reth-metrics", + "reth-net-banlist", "reth-network-api", - "reth-network-p2p 1.0.6", - "reth-network-peers 1.0.6", - "reth-network-types 1.0.6", - "reth-primitives 1.0.6", - "reth-storage-api 1.0.6", + "reth-network-p2p", + "reth-network-peers", + "reth-network-types", + "reth-primitives", + "reth-storage-api", "reth-tasks", "reth-tokio-util", "reth-transaction-pool", @@ -8858,11 +8510,11 @@ dependencies = [ "derive_more 1.0.0", "enr 0.12.1", "futures", - "reth-eth-wire-types 1.0.6", - "reth-ethereum-forks 1.0.6", - "reth-network-p2p 1.0.6", - "reth-network-peers 1.0.6", - "reth-network-types 1.0.6", + "reth-eth-wire-types", + "reth-ethereum-forks", + "reth-network-p2p", + "reth-network-peers", + "reth-network-types", "reth-tokio-util", "serde", "thiserror", @@ -8870,24 +8522,6 @@ dependencies = [ "tokio-stream", ] -[[package]] -name = "reth-network-p2p" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "auto_impl", - "derive_more 1.0.0", - "futures", - "reth-consensus 1.0.5", - "reth-eth-wire-types 1.0.5", - "reth-network-peers 1.0.5", - "reth-network-types 1.0.5", - "reth-primitives 1.0.5", - "reth-storage-errors 1.0.5", - "tokio", - "tracing", -] - [[package]] name = "reth-network-p2p" version = "1.0.6" @@ -8896,29 +8530,16 @@ dependencies = [ "auto_impl", "derive_more 1.0.0", "futures", - "reth-consensus 1.0.6", - "reth-eth-wire-types 1.0.6", - "reth-network-peers 1.0.6", - "reth-network-types 1.0.6", - "reth-primitives 1.0.6", - "reth-storage-errors 1.0.6", + "reth-consensus", + "reth-eth-wire-types", + "reth-network-peers", + "reth-network-types", + "reth-primitives", + "reth-storage-errors", "tokio", "tracing", ] -[[package]] -name = "reth-network-peers" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-primitives 0.8.0", - "alloy-rlp", - "enr 0.12.1", - "serde_with", - "thiserror", - "url", -] - [[package]] name = "reth-network-peers" version = "1.0.6" @@ -8934,52 +8555,20 @@ dependencies = [ "url", ] -[[package]] -name = "reth-network-types" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "reth-ethereum-forks 1.0.5", - "reth-net-banlist 1.0.5", - "reth-network-peers 1.0.5", - "serde_json", - "tracing", -] - [[package]] name = "reth-network-types" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ "humantime-serde", - "reth-ethereum-forks 1.0.6", - "reth-net-banlist 1.0.6", - "reth-network-peers 1.0.6", + "reth-ethereum-forks", + "reth-net-banlist", + "reth-network-peers", "serde", "serde_json", "tracing", ] -[[package]] -name = "reth-nippy-jar" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "anyhow", - "bincode", - "cuckoofilter", - "derive_more 1.0.0", - "lz4_flex", - "memmap2 0.9.4", - "ph", - "reth-fs-util 1.0.5", - "serde", - "sucds", - "thiserror", - "tracing", - "zstd 0.13.2", -] - [[package]] name = "reth-nippy-jar" version = "1.0.6" @@ -8992,7 +8581,7 @@ dependencies = [ "lz4_flex", "memmap2 0.9.4", "ph", - "reth-fs-util 1.0.6", + "reth-fs-util", "serde", "sucds", "thiserror", @@ -9005,14 +8594,14 @@ name = "reth-node-api" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chainspec 1.0.6", - "reth-db-api 1.0.6", + "reth-chainspec", + "reth-db-api", "reth-engine-primitives", - "reth-evm 1.0.6", + "reth-evm", "reth-network-api", "reth-payload-builder", "reth-payload-primitives", - "reth-provider 1.0.6", + "reth-provider", "reth-rpc-eth-api", "reth-tasks", "reth-transaction-pool", @@ -9032,42 +8621,42 @@ dependencies = [ "reth-auto-seal-consensus", "reth-beacon-consensus", "reth-blockchain-tree", - "reth-chainspec 1.0.6", + "reth-chainspec", "reth-cli-util", "reth-config", - "reth-consensus 1.0.6", + "reth-consensus", "reth-consensus-debug-client", - "reth-db-api 1.0.6", + "reth-db-api", "reth-db-common", "reth-downloaders", "reth-engine-service", "reth-engine-tree", "reth-engine-util", - "reth-evm 1.0.6", + "reth-evm", "reth-exex", "reth-network", "reth-network-api", - "reth-network-p2p 1.0.6", + "reth-network-p2p", "reth-node-api", "reth-node-core", "reth-node-events", "reth-node-metrics", "reth-payload-builder", "reth-payload-validator", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", + "reth-primitives", + "reth-provider", "reth-prune", "reth-rpc", "reth-rpc-builder", "reth-rpc-engine-api", "reth-rpc-eth-types", "reth-rpc-layer", - "reth-rpc-types 1.0.6", + "reth-rpc-types", "reth-stages", "reth-static-file", "reth-tasks", "reth-tokio-util", - "reth-tracing 1.0.6", + "reth-tracing", "reth-transaction-pool", "secp256k1", "tokio", @@ -9090,31 +8679,31 @@ dependencies = [ "futures", "humantime", "rand 0.8.5", - "reth-chainspec 1.0.6", + "reth-chainspec", "reth-cli-util", "reth-config", - "reth-consensus-common 1.0.6", - "reth-db 1.0.6", - "reth-db-api 1.0.6", + "reth-consensus-common", + "reth-db", + "reth-db-api", "reth-discv4", "reth-discv5", - "reth-fs-util 1.0.6", + "reth-fs-util", "reth-net-nat", "reth-network", - "reth-network-p2p 1.0.6", - "reth-network-peers 1.0.6", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", - "reth-prune-types 1.0.6", + "reth-network-p2p", + "reth-network-peers", + "reth-primitives", + "reth-provider", + "reth-prune-types", "reth-rpc-api", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types 1.0.6", + "reth-rpc-types", "reth-rpc-types-compat", - "reth-stages-types 1.0.6", - "reth-storage-errors 1.0.6", - "reth-tracing 1.0.6", + "reth-stages-types", + "reth-storage-errors", + "reth-tracing", "reth-transaction-pool", "secp256k1", "serde", @@ -9134,18 +8723,18 @@ dependencies = [ "reth-auto-seal-consensus", "reth-basic-payload-builder", "reth-beacon-consensus", - "reth-chainspec 1.0.6", - "reth-consensus 1.0.6", + "reth-chainspec", + "reth-consensus", "reth-ethereum-engine-primitives", "reth-ethereum-payload-builder", - "reth-evm-ethereum 1.0.6", + "reth-evm-ethereum", "reth-network", "reth-node-api", "reth-node-builder", "reth-payload-builder", - "reth-provider 1.0.6", + "reth-provider", "reth-rpc", - "reth-tracing 1.0.6", + "reth-tracing", "reth-transaction-pool", ] @@ -9161,9 +8750,9 @@ dependencies = [ "reth-beacon-consensus", "reth-network", "reth-network-api", - "reth-primitives 1.0.6", - "reth-primitives-traits 1.0.6", - "reth-provider 1.0.6", + "reth-primitives", + "reth-primitives-traits", + "reth-provider", "reth-prune", "reth-stages", "reth-static-file", @@ -9184,9 +8773,9 @@ dependencies = [ "metrics-process", "metrics-util", "procfs", - "reth-db-api 1.0.6", - "reth-metrics 1.0.6", - "reth-provider 1.0.6", + "reth-db-api", + "reth-metrics", + "reth-provider", "reth-tasks", "tikv-jemalloc-ctl", "tokio", @@ -9200,10 +8789,10 @@ name = "reth-optimism-consensus" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chainspec 1.0.6", - "reth-consensus 1.0.6", - "reth-consensus-common 1.0.6", - "reth-primitives 1.0.6", + "reth-chainspec", + "reth-consensus", + "reth-consensus-common", + "reth-primitives", "tracing", ] @@ -9222,19 +8811,19 @@ dependencies = [ "op-alloy-network", "parking_lot 0.12.3", "reqwest 0.12.5", - "reth-chainspec 1.0.6", - "reth-evm 1.0.6", + "reth-chainspec", + "reth-evm", "reth-evm-optimism", "reth-network-api", "reth-node-api", "reth-node-builder", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", + "reth-primitives", + "reth-provider", "reth-rpc", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types 1.0.6", + "reth-rpc-types", "reth-tasks", "reth-transaction-pool", "revm", @@ -9252,13 +8841,13 @@ dependencies = [ "futures-util", "metrics", "pin-project", - "reth-errors 1.0.6", + "reth-errors", "reth-ethereum-engine-primitives", - "reth-metrics 1.0.6", + "reth-metrics", "reth-payload-primitives", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", - "reth-rpc-types 1.0.6", + "reth-primitives", + "reth-provider", + "reth-rpc-types", "reth-transaction-pool", "thiserror", "tokio", @@ -9271,11 +8860,11 @@ name = "reth-payload-primitives" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chain-state 1.0.6", - "reth-chainspec 1.0.6", - "reth-errors 1.0.6", - "reth-primitives 1.0.6", - "reth-rpc-types 1.0.6", + "reth-chain-state", + "reth-chainspec", + "reth-errors", + "reth-primitives", + "reth-rpc-types", "reth-transaction-pool", "serde", "thiserror", @@ -9287,45 +8876,12 @@ name = "reth-payload-validator" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chainspec 1.0.6", - "reth-primitives 1.0.6", - "reth-rpc-types 1.0.6", + "reth-chainspec", + "reth-primitives", + "reth-rpc-types", "reth-rpc-types-compat", ] -[[package]] -name = "reth-primitives" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-genesis", - "alloy-primitives 0.8.0", - "alloy-rlp", - "alloy-rpc-types", - "alloy-serde", - "bytes", - "c-kzg", - "derive_more 1.0.0", - "k256 0.13.3", - "modular-bitfield", - "once_cell", - "op-alloy-rpc-types", - "rayon", - "reth-codecs 1.0.5", - "reth-ethereum-forks 1.0.5", - "reth-primitives-traits 1.0.5", - "reth-static-file-types 1.0.5", - "reth-trie-common 1.0.5", - "revm-primitives", - "secp256k1", - "serde", - "tempfile", - "thiserror", - "zstd 0.13.2", -] - [[package]] name = "reth-primitives" version = "1.0.6" @@ -9348,12 +8904,12 @@ dependencies = [ "op-alloy-rpc-types", "proptest", "rayon", - "reth-chainspec 1.0.6", - "reth-codecs 1.0.6", - "reth-ethereum-forks 1.0.6", - "reth-primitives-traits 1.0.6", - "reth-static-file-types 1.0.6", - "reth-trie-common 1.0.6", + "reth-chainspec", + "reth-codecs", + "reth-ethereum-forks", + "reth-primitives-traits", + "reth-static-file-types", + "reth-trie-common", "revm-primitives", "secp256k1", "serde", @@ -9362,27 +8918,6 @@ dependencies = [ "zstd 0.13.2", ] -[[package]] -name = "reth-primitives-traits" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-genesis", - "alloy-primitives 0.8.0", - "alloy-rlp", - "alloy-rpc-types-eth", - "byteorder", - "bytes", - "derive_more 1.0.0", - "modular-bitfield", - "reth-codecs 1.0.5", - "revm-primitives", - "roaring", - "serde", -] - [[package]] name = "reth-primitives-traits" version = "1.0.6" @@ -9401,50 +8936,12 @@ dependencies = [ "modular-bitfield", "proptest", "proptest-arbitrary-interop", - "reth-codecs 1.0.6", + "reth-codecs", "revm-primitives", "roaring", "serde", ] -[[package]] -name = "reth-provider" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-rpc-types-engine", - "auto_impl", - "dashmap 6.0.1", - "itertools 0.13.0", - "metrics", - "parking_lot 0.12.3", - "rayon", - "reth-blockchain-tree-api 1.0.5", - "reth-chain-state 1.0.5", - "reth-chainspec 1.0.5", - "reth-codecs 1.0.5", - "reth-db 1.0.5", - "reth-db-api 1.0.5", - "reth-errors 1.0.5", - "reth-evm 1.0.5", - "reth-execution-types 1.0.5", - "reth-fs-util 1.0.5", - "reth-metrics 1.0.5", - "reth-network-p2p 1.0.5", - "reth-nippy-jar 1.0.5", - "reth-primitives 1.0.5", - "reth-prune-types 1.0.5", - "reth-stages-types 1.0.5", - "reth-storage-api 1.0.5", - "reth-storage-errors 1.0.5", - "reth-trie 1.0.5", - "reth-trie-db 1.0.5", - "revm", - "strum", - "tokio", - "tracing", -] - [[package]] name = "reth-provider" version = "1.0.6" @@ -9458,26 +8955,26 @@ dependencies = [ "once_cell", "parking_lot 0.12.3", "rayon", - "reth-blockchain-tree-api 1.0.6", - "reth-chain-state 1.0.6", - "reth-chainspec 1.0.6", - "reth-codecs 1.0.6", - "reth-db 1.0.6", - "reth-db-api 1.0.6", - "reth-errors 1.0.6", - "reth-evm 1.0.6", - "reth-execution-types 1.0.6", - "reth-fs-util 1.0.6", - "reth-metrics 1.0.6", - "reth-network-p2p 1.0.6", - "reth-nippy-jar 1.0.6", - "reth-primitives 1.0.6", - "reth-prune-types 1.0.6", - "reth-stages-types 1.0.6", - "reth-storage-api 1.0.6", - "reth-storage-errors 1.0.6", - "reth-trie 1.0.6", - "reth-trie-db 1.0.6", + "reth-blockchain-tree-api", + "reth-chain-state", + "reth-chainspec", + "reth-codecs", + "reth-db", + "reth-db-api", + "reth-errors", + "reth-evm", + "reth-execution-types", + "reth-fs-util", + "reth-metrics", + "reth-network-p2p", + "reth-nippy-jar", + "reth-primitives", + "reth-prune-types", + "reth-stages-types", + "reth-storage-api", + "reth-storage-errors", + "reth-trie", + "reth-trie-db", "revm", "strum", "tokio", @@ -9493,16 +8990,16 @@ dependencies = [ "itertools 0.13.0", "metrics", "rayon", - "reth-chainspec 1.0.6", + "reth-chainspec", "reth-config", - "reth-db 1.0.6", - "reth-db-api 1.0.6", - "reth-errors 1.0.6", + "reth-db", + "reth-db-api", + "reth-errors", "reth-exex-types", - "reth-metrics 1.0.6", - "reth-provider 1.0.6", - "reth-prune-types 1.0.6", - "reth-static-file-types 1.0.6", + "reth-metrics", + "reth-provider", + "reth-prune-types", + "reth-static-file-types", "reth-tokio-util", "rustc-hash 2.0.0", "thiserror", @@ -9510,20 +9007,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "reth-prune-types" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-primitives 0.8.0", - "bytes", - "derive_more 1.0.0", - "modular-bitfield", - "reth-codecs 1.0.5", - "serde", - "thiserror", -] - [[package]] name = "reth-prune-types" version = "1.0.6" @@ -9533,38 +9016,23 @@ dependencies = [ "bytes", "derive_more 1.0.0", "modular-bitfield", - "reth-codecs 1.0.6", + "reth-codecs", "serde", "thiserror", ] -[[package]] -name = "reth-revm" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "reth-chainspec 1.0.5", - "reth-consensus-common 1.0.5", - "reth-execution-errors 1.0.5", - "reth-primitives 1.0.5", - "reth-prune-types 1.0.5", - "reth-storage-api 1.0.5", - "reth-storage-errors 1.0.5", - "revm", -] - [[package]] name = "reth-revm" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "reth-chainspec 1.0.6", - "reth-consensus-common 1.0.6", - "reth-execution-errors 1.0.6", - "reth-primitives 1.0.6", - "reth-prune-types 1.0.6", - "reth-storage-api 1.0.6", - "reth-storage-errors 1.0.6", + "reth-chainspec", + "reth-consensus-common", + "reth-execution-errors", + "reth-primitives", + "reth-prune-types", + "reth-storage-api", + "reth-storage-errors", "revm", ] @@ -9589,27 +9057,27 @@ dependencies = [ "parking_lot 0.12.3", "pin-project", "rand 0.8.5", - "reth-chainspec 1.0.6", - "reth-consensus-common 1.0.6", - "reth-errors 1.0.6", - "reth-evm 1.0.6", + "reth-chainspec", + "reth-consensus-common", + "reth-errors", + "reth-evm", "reth-network-api", - "reth-network-peers 1.0.6", - "reth-network-types 1.0.6", + "reth-network-peers", + "reth-network-types", "reth-node-api", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", - "reth-revm 1.0.6", + "reth-primitives", + "reth-provider", + "reth-revm", "reth-rpc-api", "reth-rpc-engine-api", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types 1.0.6", + "reth-rpc-types", "reth-rpc-types-compat", "reth-tasks", "reth-transaction-pool", - "reth-trie 1.0.6", + "reth-trie", "revm", "revm-inspectors", "revm-primitives", @@ -9632,10 +9100,10 @@ dependencies = [ "alloy-json-rpc", "jsonrpsee 0.24.3", "reth-engine-primitives", - "reth-network-peers 1.0.6", - "reth-primitives 1.0.6", + "reth-network-peers", + "reth-primitives", "reth-rpc-eth-api", - "reth-rpc-types 1.0.6", + "reth-rpc-types", ] [[package]] @@ -9647,21 +9115,21 @@ dependencies = [ "jsonrpsee 0.24.3", "metrics", "pin-project", - "reth-chainspec 1.0.6", + "reth-chainspec", "reth-engine-primitives", - "reth-evm 1.0.6", + "reth-evm", "reth-ipc", - "reth-metrics 1.0.6", + "reth-metrics", "reth-network-api", "reth-node-core", - "reth-provider 1.0.6", + "reth-provider", "reth-rpc", "reth-rpc-api", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-layer", "reth-rpc-server-types", - "reth-rpc-types 1.0.6", + "reth-rpc-types", "reth-tasks", "reth-transaction-pool", "serde", @@ -9681,17 +9149,17 @@ dependencies = [ "jsonrpsee-types 0.24.3", "metrics", "reth-beacon-consensus", - "reth-chainspec 1.0.6", + "reth-chainspec", "reth-engine-primitives", - "reth-evm 1.0.6", - "reth-metrics 1.0.6", + "reth-evm", + "reth-metrics", "reth-payload-builder", "reth-payload-primitives", - "reth-primitives 1.0.6", + "reth-primitives", "reth-rpc-api", - "reth-rpc-types 1.0.6", + "reth-rpc-types", "reth-rpc-types-compat", - "reth-storage-api 1.0.6", + "reth-storage-api", "reth-tasks", "serde", "thiserror", @@ -9714,21 +9182,21 @@ dependencies = [ "jsonrpsee 0.24.3", "jsonrpsee-types 0.24.3", "parking_lot 0.12.3", - "reth-chainspec 1.0.6", - "reth-errors 1.0.6", - "reth-evm 1.0.6", - "reth-execution-types 1.0.6", + "reth-chainspec", + "reth-errors", + "reth-evm", + "reth-execution-types", "reth-network-api", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", - "reth-revm 1.0.6", + "reth-primitives", + "reth-provider", + "reth-revm", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types 1.0.6", + "reth-rpc-types", "reth-rpc-types-compat", "reth-tasks", "reth-transaction-pool", - "reth-trie 1.0.6", + "reth-trie", "revm", "revm-inspectors", "revm-primitives", @@ -9748,21 +9216,21 @@ dependencies = [ "jsonrpsee-types 0.24.3", "metrics", "rand 0.8.5", - "reth-chain-state 1.0.6", - "reth-chainspec 1.0.6", - "reth-errors 1.0.6", - "reth-evm 1.0.6", - "reth-execution-types 1.0.6", - "reth-metrics 1.0.6", - "reth-primitives 1.0.6", - "reth-revm 1.0.6", + "reth-chain-state", + "reth-chainspec", + "reth-errors", + "reth-evm", + "reth-execution-types", + "reth-metrics", + "reth-primitives", + "reth-revm", "reth-rpc-server-types", - "reth-rpc-types 1.0.6", + "reth-rpc-types", "reth-rpc-types-compat", - "reth-storage-api 1.0.6", + "reth-storage-api", "reth-tasks", "reth-transaction-pool", - "reth-trie 1.0.6", + "reth-trie", "revm", "revm-inspectors", "revm-primitives", @@ -9795,34 +9263,14 @@ dependencies = [ "alloy-primitives 0.8.0", "jsonrpsee-core 0.24.3", "jsonrpsee-types 0.24.3", - "reth-errors 1.0.6", + "reth-errors", "reth-network-api", - "reth-primitives 1.0.6", - "reth-rpc-types 1.0.6", + "reth-primitives", + "reth-rpc-types", "serde", "strum", ] -[[package]] -name = "reth-rpc-types" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-primitives 0.8.0", - "alloy-rpc-types", - "alloy-rpc-types-admin", - "alloy-rpc-types-anvil", - "alloy-rpc-types-beacon", - "alloy-rpc-types-engine", - "alloy-rpc-types-mev", - "alloy-rpc-types-trace", - "alloy-rpc-types-txpool", - "alloy-serde", - "jsonrpsee-types 0.24.3", - "op-alloy-rpc-types", - "op-alloy-rpc-types-engine", -] - [[package]] name = "reth-rpc-types" version = "1.0.6" @@ -9850,9 +9298,9 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18 dependencies = [ "alloy-rlp", "alloy-rpc-types", - "reth-primitives 1.0.6", - "reth-rpc-types 1.0.6", - "reth-trie-common 1.0.6", + "reth-primitives", + "reth-rpc-types", + "reth-trie-common", ] [[package]] @@ -9864,26 +9312,26 @@ dependencies = [ "itertools 0.13.0", "num-traits", "rayon", - "reth-codecs 1.0.6", + "reth-codecs", "reth-config", - "reth-consensus 1.0.6", - "reth-db 1.0.6", - "reth-db-api 1.0.6", + "reth-consensus", + "reth-db", + "reth-db-api", "reth-etl", - "reth-evm 1.0.6", - "reth-execution-types 1.0.6", + "reth-evm", + "reth-execution-types", "reth-exex", - "reth-network-p2p 1.0.6", - "reth-primitives 1.0.6", - "reth-primitives-traits 1.0.6", - "reth-provider 1.0.6", + "reth-network-p2p", + "reth-primitives", + "reth-primitives-traits", + "reth-provider", "reth-prune", - "reth-prune-types 1.0.6", - "reth-revm 1.0.6", + "reth-prune-types", + "reth-revm", "reth-stages-api", - "reth-storage-errors 1.0.6", - "reth-trie 1.0.6", - "reth-trie-db 1.0.6", + "reth-storage-errors", + "reth-trie", + "reth-trie-db", "thiserror", "tokio", "tracing", @@ -9899,36 +9347,23 @@ dependencies = [ "auto_impl", "futures-util", "metrics", - "reth-consensus 1.0.6", - "reth-db-api 1.0.6", - "reth-errors 1.0.6", - "reth-metrics 1.0.6", - "reth-network-p2p 1.0.6", - "reth-primitives-traits 1.0.6", - "reth-provider 1.0.6", + "reth-consensus", + "reth-db-api", + "reth-errors", + "reth-metrics", + "reth-network-p2p", + "reth-primitives-traits", + "reth-provider", "reth-prune", - "reth-stages-types 1.0.6", + "reth-stages-types", "reth-static-file", - "reth-static-file-types 1.0.6", + "reth-static-file-types", "reth-tokio-util", "thiserror", "tokio", "tracing", ] -[[package]] -name = "reth-stages-types" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-primitives 0.8.0", - "bytes", - "modular-bitfield", - "reth-codecs 1.0.5", - "reth-trie-common 1.0.5", - "serde", -] - [[package]] name = "reth-stages-types" version = "1.0.6" @@ -9937,8 +9372,8 @@ dependencies = [ "alloy-primitives 0.8.0", "bytes", "modular-bitfield", - "reth-codecs 1.0.6", - "reth-trie-common 1.0.6", + "reth-codecs", + "reth-trie-common", "serde", ] @@ -9950,29 +9385,18 @@ dependencies = [ "alloy-primitives 0.8.0", "parking_lot 0.12.3", "rayon", - "reth-db 1.0.6", - "reth-db-api 1.0.6", - "reth-nippy-jar 1.0.6", - "reth-provider 1.0.6", - "reth-prune-types 1.0.6", - "reth-stages-types 1.0.6", - "reth-static-file-types 1.0.6", - "reth-storage-errors 1.0.6", + "reth-db", + "reth-db-api", + "reth-nippy-jar", + "reth-provider", + "reth-prune-types", + "reth-stages-types", + "reth-static-file-types", + "reth-storage-errors", "reth-tokio-util", "tracing", ] -[[package]] -name = "reth-static-file-types" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-primitives 0.8.0", - "derive_more 1.0.0", - "serde", - "strum", -] - [[package]] name = "reth-static-file-types" version = "1.0.6" @@ -9985,47 +9409,20 @@ dependencies = [ "strum", ] -[[package]] -name = "reth-storage-api" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "auto_impl", - "reth-chainspec 1.0.5", - "reth-db-models 1.0.5", - "reth-execution-types 1.0.5", - "reth-primitives 1.0.5", - "reth-prune-types 1.0.5", - "reth-stages-types 1.0.5", - "reth-storage-errors 1.0.5", - "reth-trie 1.0.5", -] - [[package]] name = "reth-storage-api" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ "auto_impl", - "reth-chainspec 1.0.6", - "reth-db-models 1.0.6", - "reth-execution-types 1.0.6", - "reth-primitives 1.0.6", - "reth-prune-types 1.0.6", - "reth-stages-types 1.0.6", - "reth-storage-errors 1.0.6", - "reth-trie 1.0.6", -] - -[[package]] -name = "reth-storage-errors" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-rlp", - "derive_more 1.0.0", - "reth-fs-util 1.0.5", - "reth-primitives 1.0.5", + "reth-chainspec", + "reth-db-models", + "reth-execution-types", + "reth-primitives", + "reth-prune-types", + "reth-stages-types", + "reth-storage-errors", + "reth-trie", ] [[package]] @@ -10035,8 +9432,8 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18 dependencies = [ "alloy-rlp", "derive_more 1.0.0", - "reth-fs-util 1.0.6", - "reth-primitives 1.0.6", + "reth-fs-util", + "reth-primitives", ] [[package]] @@ -10050,7 +9447,7 @@ dependencies = [ "metrics", "pin-project", "rayon", - "reth-metrics 1.0.6", + "reth-metrics", "thiserror", "tokio", "tracing", @@ -10067,21 +9464,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "reth-tracing" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "clap", - "eyre", - "rolling-file", - "tracing", - "tracing-appender", - "tracing-journald", - "tracing-logfmt", - "tracing-subscriber", -] - [[package]] name = "reth-tracing" version = "1.0.6" @@ -10109,14 +9491,14 @@ dependencies = [ "futures-util", "metrics", "parking_lot 0.12.3", - "reth-chain-state 1.0.6", - "reth-chainspec 1.0.6", - "reth-eth-wire-types 1.0.6", - "reth-execution-types 1.0.6", - "reth-fs-util 1.0.6", - "reth-metrics 1.0.6", - "reth-primitives 1.0.6", - "reth-storage-api 1.0.6", + "reth-chain-state", + "reth-chainspec", + "reth-eth-wire-types", + "reth-execution-types", + "reth-fs-util", + "reth-metrics", + "reth-primitives", + "reth-storage-api", "reth-tasks", "revm", "rustc-hash 2.0.0", @@ -10129,27 +9511,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "reth-trie" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-rlp", - "auto_impl", - "derive_more 1.0.0", - "itertools 0.13.0", - "metrics", - "rayon", - "reth-execution-errors 1.0.5", - "reth-metrics 1.0.5", - "reth-primitives 1.0.5", - "reth-stages-types 1.0.5", - "reth-storage-errors 1.0.5", - "reth-trie-common 1.0.5", - "revm", - "tracing", -] - [[package]] name = "reth-trie" version = "1.0.6" @@ -10161,37 +9522,17 @@ dependencies = [ "itertools 0.13.0", "metrics", "rayon", - "reth-execution-errors 1.0.6", - "reth-metrics 1.0.6", - "reth-primitives 1.0.6", - "reth-stages-types 1.0.6", - "reth-storage-errors 1.0.6", - "reth-trie-common 1.0.6", + "reth-execution-errors", + "reth-metrics", + "reth-primitives", + "reth-stages-types", + "reth-storage-errors", + "reth-trie-common", "revm", "tracing", "triehash", ] -[[package]] -name = "reth-trie-common" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-consensus", - "alloy-genesis", - "alloy-primitives 0.8.0", - "alloy-rlp", - "alloy-trie", - "bytes", - "derive_more 1.0.0", - "itertools 0.13.0", - "nybbles", - "reth-codecs 1.0.5", - "reth-primitives-traits 1.0.5", - "revm-primitives", - "serde", -] - [[package]] name = "reth-trie-common" version = "1.0.6" @@ -10209,36 +9550,12 @@ dependencies = [ "itertools 0.13.0", "nybbles", "plain_hasher", - "reth-codecs 1.0.6", - "reth-primitives-traits 1.0.6", + "reth-codecs", + "reth-primitives-traits", "revm-primitives", "serde", ] -[[package]] -name = "reth-trie-db" -version = "1.0.5" -source = "git+https://github.com/paradigmxyz/reth?rev=ec5ce2196519dd96e9246817b7f9ff94bad129a3#ec5ce2196519dd96e9246817b7f9ff94bad129a3" -dependencies = [ - "alloy-rlp", - "auto_impl", - "derive_more 1.0.0", - "itertools 0.13.0", - "metrics", - "rayon", - "reth-db 1.0.5", - "reth-db-api 1.0.5", - "reth-execution-errors 1.0.5", - "reth-metrics 1.0.5", - "reth-primitives 1.0.5", - "reth-stages-types 1.0.5", - "reth-storage-errors 1.0.5", - "reth-trie 1.0.5", - "reth-trie-common 1.0.5", - "revm", - "tracing", -] - [[package]] name = "reth-trie-db" version = "1.0.6" @@ -10250,15 +9567,15 @@ dependencies = [ "itertools 0.13.0", "metrics", "rayon", - "reth-db 1.0.6", - "reth-db-api 1.0.6", - "reth-execution-errors 1.0.6", - "reth-metrics 1.0.6", - "reth-primitives 1.0.6", - "reth-stages-types 1.0.6", - "reth-storage-errors 1.0.6", - "reth-trie 1.0.6", - "reth-trie-common 1.0.6", + "reth-db", + "reth-db-api", + "reth-execution-errors", + "reth-metrics", + "reth-primitives", + "reth-stages-types", + "reth-storage-errors", + "reth-trie", + "reth-trie-common", "revm", "tracing", ] @@ -10273,15 +9590,15 @@ dependencies = [ "itertools 0.13.0", "metrics", "rayon", - "reth-db 1.0.6", - "reth-db-api 1.0.6", - "reth-execution-errors 1.0.6", - "reth-metrics 1.0.6", - "reth-primitives 1.0.6", - "reth-provider 1.0.6", + "reth-db", + "reth-db-api", + "reth-execution-errors", + "reth-metrics", + "reth-primitives", + "reth-provider", "reth-tasks", - "reth-trie 1.0.6", - "reth-trie-db 1.0.6", + "reth-trie", + "reth-trie-db", "thiserror", "tokio", "tracing", @@ -10476,14 +9793,14 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rayon", - "reth-chainspec 1.0.5", - "reth-db 1.0.5", - "reth-evm 1.0.5", - "reth-evm-ethereum 1.0.5", - "reth-primitives 1.0.5", - "reth-provider 1.0.5", - "reth-revm 1.0.5", - "reth-rpc-types 1.0.5", + "reth-chainspec", + "reth-db", + "reth-evm", + "reth-evm-ethereum", + "reth-primitives", + "reth-provider", + "reth-revm", + "reth-rpc-types", "revm", "revm-interpreter", "revmc", @@ -10514,14 +9831,14 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rayon", - "reth-chainspec 1.0.5", - "reth-db 1.0.5", - "reth-evm 1.0.5", - "reth-evm-ethereum 1.0.5", - "reth-primitives 1.0.5", - "reth-provider 1.0.5", - "reth-revm 1.0.5", - "reth-rpc-types 1.0.5", + "reth-chainspec", + "reth-db", + "reth-evm", + "reth-evm-ethereum", + "reth-primitives", + "reth-provider", + "reth-revm", + "reth-rpc-types", "revm", "revm-interpreter", "revmc", diff --git a/crates/rbuilder/src/bin/revmc-aot-compile.rs b/crates/rbuilder/src/bin/revmc-aot-compile.rs index eb2fec05..88d7a714 100644 --- a/crates/rbuilder/src/bin/revmc-aot-compile.rs +++ b/crates/rbuilder/src/bin/revmc-aot-compile.rs @@ -1,21 +1,20 @@ - - -use clap::Parser; +use rbuilder::live_builder::{base_config, config::Config as ConfigType}; +use revmc_toolbox_utils::{evm as evm_utils, build as build_utils}; use revmc_toolbox_sim::gas_guzzlers::GasGuzzlerConfig; -use revmc_toolbox_build::{compile_contracts_aot, CompilerOptions, OptimizationLevelDeseralizable}; -use revm::primitives::SpecId; +use revmc_toolbox_build::CompilerOptions; use std::{path::PathBuf, str::FromStr}; +use revm::primitives::SpecId; use eyre::{OptionExt, Result}; -use std::sync::Arc; -use revmc_toolbox_utils::evm as evm_utils; use tracing::debug; +use clap::Parser; -// todo: compiler opt to file - +// todo: compiler config in file instead? #[derive(Parser, Debug)] struct Cli { #[clap(flatten)] compiler_opt: CompilerOptionsCli, + #[clap(long, help = "Config file path", env = "RBUILDER_CONFIG")] + config_path: PathBuf, #[clap(subcommand)] commands: Commands, } @@ -23,7 +22,7 @@ struct Cli { #[derive(Parser, Debug)] enum Commands { #[clap(about = "Fetches contracts specified in config file.")] - FromConfig, + FromConfig { build_file_path: PathBuf }, #[clap(about = "Fetches contracts based on their historical gas usage.")] GasGuzzlers(GasGuzzlerConfigCli), } @@ -56,7 +55,6 @@ struct CompilerOptionsCli { spec_id: Option, } - macro_rules! set_if_some { ($src:ident, $dst:ident, { $( $field:ident ),+ }) => { $( @@ -102,7 +100,6 @@ impl TryFrom for CompilerOptions { } } - #[derive(Parser, Debug)] struct GasGuzzlerConfigCli { #[clap(long, help = "Start block")] @@ -130,45 +127,49 @@ impl From for GasGuzzlerConfig { } } +fn main() { + if let Err(e) = run() { + eprintln!("Error: {}", e); + std::process::exit(1); + } +} -fn main() -> Result<()> { - let Cli { compiler_opt, commands } = Cli::parse(); - - let bytecodes = match commands { - Commands::FromConfig => { - debug!("Fetching contracts from config"); - unimplemented!() // TODO +fn run() -> Result<()> { + let Cli { compiler_opt, config_path, commands } = Cli::parse(); + let provider_factory = new_provider_factory(config_path)?; + + match commands { + Commands::FromConfig { build_file_path } => { + debug!("Fetching contracts from config at {:?}", build_file_path); + let _: () = build_utils::compile_aot_from_file_path( + &provider_factory.latest()?, + &build_file_path + )?.into_iter().collect::>()?; } Commands::GasGuzzlers(gas_guzzlers_config) => { debug!("Searching for gas guzzlers"); - println!("Gas guzzlers: {:?}", gas_guzzlers_config); - let provider_factory = new_provider_factory()?; let head_size = gas_guzzlers_config.head_size; - // todo: improve this to eliminate contracts that dont have conistent gas usage - GasGuzzlerConfig::from(gas_guzzlers_config) + let bytecodes = GasGuzzlerConfig::from(gas_guzzlers_config) .find_gas_guzzlers(provider_factory)? .contract_to_bytecode()? - .into_top_guzzlers(head_size) + .into_top_guzzlers(head_size); + let compiler_opt = CompilerOptions::try_from(compiler_opt)?; + debug!("Compiling contracts to {:?}", compiler_opt.out_dir); + let _: () = build_utils::compile_aot_from_codes( + bytecodes, + Some(compiler_opt) + )?.into_iter().collect::>()?; } // todo: add remove command // todo: add command that lists top gas guzzler addresses - }; - let bytecodes = bytecodes.into_iter().map(|c| c.into()).collect(); - let compiler_opt = CompilerOptions::try_from(compiler_opt)?; - let out_dir = compiler_opt.out_dir.clone(); - debug!("Compiling contracts"); - compile_contracts_aot(bytecodes, Some(compiler_opt))? - .into_iter().collect::>()?; - debug!("Compiled contracts have been written to {out_dir:?}"); + } Ok(()) } -fn new_provider_factory() -> Result>> { - // todo: source this from toml config file instead (like the rest of the program) - dotenv::dotenv()?; - let dir_path = std::env::var("RETH_DB_PATH") - .expect("RETH_DB_PATH env var not set"); - let dir_path = PathBuf::from_str(&dir_path)?; - evm_utils::make_provider_factory(&dir_path).map(Arc::new) +fn new_provider_factory(config_path: PathBuf) -> Result> { + let config: ConfigType = base_config::load_config_toml_and_env(config_path)?; + // todo: get provider_factory straight from the config with create_provider_factory + let reth_path = config.base_config.reth_db_path.expect("RETH_DB_PATH field not set"); + evm_utils::make_provider_factory(&reth_path) } \ No newline at end of file diff --git a/crates/rbuilder/src/live_builder/base_config.rs b/crates/rbuilder/src/live_builder/base_config.rs index fafbcab5..2e893122 100644 --- a/crates/rbuilder/src/live_builder/base_config.rs +++ b/crates/rbuilder/src/live_builder/base_config.rs @@ -224,12 +224,12 @@ impl BaseConfig { } pub fn load_llvm_compiled_fns(&self) -> eyre::Result> { + // todo: consider whitelist/blacklist? if !self.use_llvm_compiled_fns { return Ok(None); } - // todo: implement config file for whitelists/blacklists and filter with EvmCompilerFnLoader::load_selected let dir_path = self.aot_compiled_fns_dir.as_ref() - .ok_or_eyre("no llvm dir specified")?; // todo: resort to default + .ok_or_eyre("no llvm dir specified")?; EvmCompilerFnLoader::new(dir_path).load_all().map(|fns| Some(fns.into())) } From 399bbe5af81810afd91d9371cbf14f70777d0a0b Mon Sep 17 00:00:00 2001 From: halo3mic <46010359+halo3mic@users.noreply.github.com> Date: Sat, 28 Sep 2024 09:50:38 +0000 Subject: [PATCH 4/5] revmc-toolkit name update --- Cargo.lock | 26 +++++++++---------- crates/rbuilder/Cargo.toml | 8 +++--- crates/rbuilder/src/backtest/execute.rs | 2 +- .../src/backtest/redistribute/cli/mod.rs | 2 +- .../rbuilder/src/backtest/redistribute/mod.rs | 2 +- .../resim_landed_block.rs | 2 +- crates/rbuilder/src/bin/revmc-aot-compile.rs | 6 ++--- crates/rbuilder/src/building/mod.rs | 2 +- crates/rbuilder/src/building/order_commit.rs | 2 +- crates/rbuilder/src/building/revmc_ext_ctx.rs | 2 +- .../rbuilder/src/live_builder/base_config.rs | 2 +- crates/rbuilder/src/live_builder/mod.rs | 2 +- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e62d6088..2a0ec003 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7123,10 +7123,10 @@ dependencies = [ "revm-inspectors", "revm-primitives", "revmc-build", - "revmc-toolbox-build", - "revmc-toolbox-load", - "revmc-toolbox-sim", - "revmc-toolbox-utils", + "revmc-toolkit-build", + "revmc-toolkit-load", + "revmc-toolkit-sim", + "revmc-toolkit-utils", "secp256k1", "serde", "serde_json", @@ -9753,7 +9753,7 @@ dependencies = [ ] [[package]] -name = "revmc-toolbox-build" +name = "revmc-toolkit-build" version = "0.1.0" dependencies = [ "eyre", @@ -9767,7 +9767,7 @@ dependencies = [ ] [[package]] -name = "revmc-toolbox-load" +name = "revmc-toolkit-load" version = "0.1.0" dependencies = [ "eyre", @@ -9779,7 +9779,7 @@ dependencies = [ ] [[package]] -name = "revmc-toolbox-sim" +name = "revmc-toolkit-sim" version = "0.1.0" dependencies = [ "cc", @@ -9807,9 +9807,9 @@ dependencies = [ "revmc-build", "revmc-builtins", "revmc-context", - "revmc-toolbox-build", - "revmc-toolbox-load", - "revmc-toolbox-utils", + "revmc-toolkit-build", + "revmc-toolkit-load", + "revmc-toolkit-utils", "serde", "serde_json", "tracing", @@ -9817,7 +9817,7 @@ dependencies = [ ] [[package]] -name = "revmc-toolbox-utils" +name = "revmc-toolkit-utils" version = "0.1.0" dependencies = [ "cc", @@ -9845,8 +9845,8 @@ dependencies = [ "revmc-build", "revmc-builtins", "revmc-context", - "revmc-toolbox-build", - "revmc-toolbox-load", + "revmc-toolkit-build", + "revmc-toolkit-load", "serde", "serde_json", "tracing", diff --git a/crates/rbuilder/Cargo.toml b/crates/rbuilder/Cargo.toml index 7bc34a4c..daab9ec9 100644 --- a/crates/rbuilder/Cargo.toml +++ b/crates/rbuilder/Cargo.toml @@ -126,10 +126,10 @@ async-trait = "0.1.80" eth-sparse-mpt = { git = "https://github.com/flashbots/eth-sparse-mpt", rev = "664759b" } -revmc-toolbox-load = { path = "../../../revmc-toolkit/crates/load" } -revmc-toolbox-sim = { path = "../../../revmc-toolkit/crates/sim" } -revmc-toolbox-build = { path = "../../../revmc-toolkit/crates/build" } -revmc-toolbox-utils = { path = "../../../revmc-toolkit/crates/utils" } +revmc-toolkit-load = { path = "../../../revmc-toolkit/crates/load" } +revmc-toolkit-sim = { path = "../../../revmc-toolkit/crates/sim" } +revmc-toolkit-build = { path = "../../../revmc-toolkit/crates/build" } +revmc-toolkit-utils = { path = "../../../revmc-toolkit/crates/utils" } dotenv = "0.15.0" [build-dependencies] diff --git a/crates/rbuilder/src/backtest/execute.rs b/crates/rbuilder/src/backtest/execute.rs index 6e0bb381..5fd3c88e 100644 --- a/crates/rbuilder/src/backtest/execute.rs +++ b/crates/rbuilder/src/backtest/execute.rs @@ -16,7 +16,7 @@ use reth::providers::ProviderFactory; use reth_chainspec::ChainSpec; use reth_db::{database::Database, DatabaseEnv}; use reth_payload_builder::database::CachedReads; -use revmc_toolbox_load::EvmCompilerFns; +use revmc_toolkit_load::EvmCompilerFns; use serde::{Deserialize, Serialize}; use std::sync::Arc; diff --git a/crates/rbuilder/src/backtest/redistribute/cli/mod.rs b/crates/rbuilder/src/backtest/redistribute/cli/mod.rs index 0b74c7f8..53d7f9b7 100644 --- a/crates/rbuilder/src/backtest/redistribute/cli/mod.rs +++ b/crates/rbuilder/src/backtest/redistribute/cli/mod.rs @@ -6,7 +6,7 @@ use crate::live_builder::base_config::load_config_toml_and_env; use crate::live_builder::cli::LiveBuilderConfig; use crate::{backtest::HistoricalDataStorage, live_builder::config::Config}; use alloy_primitives::utils::format_ether; -use revmc_toolbox_load::EvmCompilerFns; +use revmc_toolkit_load::EvmCompilerFns; use clap::Parser; use csv_output::{CSVOutputRow, CSVResultWriter}; use reth_db::DatabaseEnv; diff --git a/crates/rbuilder/src/backtest/redistribute/mod.rs b/crates/rbuilder/src/backtest/redistribute/mod.rs index f177addc..d7320e89 100644 --- a/crates/rbuilder/src/backtest/redistribute/mod.rs +++ b/crates/rbuilder/src/backtest/redistribute/mod.rs @@ -25,7 +25,7 @@ use reth_provider::ProviderFactory; use std::cmp::{max, min}; use std::sync::Arc; use tracing::{debug, info, info_span, trace, warn}; -use revmc_toolbox_load::EvmCompilerFns; +use revmc_toolkit_load::EvmCompilerFns; #[derive(Debug, Clone, Serialize)] #[serde(rename_all = "camelCase")] diff --git a/crates/rbuilder/src/backtest/restore_landed_orders/resim_landed_block.rs b/crates/rbuilder/src/backtest/restore_landed_orders/resim_landed_block.rs index 62fbb9f1..32760d85 100644 --- a/crates/rbuilder/src/backtest/restore_landed_orders/resim_landed_block.rs +++ b/crates/rbuilder/src/backtest/restore_landed_orders/resim_landed_block.rs @@ -9,7 +9,7 @@ use eyre::Context; use reth_chainspec::ChainSpec; use reth_db::DatabaseEnv; use reth_primitives::{Receipt, TransactionSignedEcRecovered, TxHash}; -use revmc_toolbox_load::EvmCompilerFns; +use revmc_toolkit_load::EvmCompilerFns; use reth_provider::ProviderFactory; use std::sync::Arc; diff --git a/crates/rbuilder/src/bin/revmc-aot-compile.rs b/crates/rbuilder/src/bin/revmc-aot-compile.rs index 88d7a714..acaba463 100644 --- a/crates/rbuilder/src/bin/revmc-aot-compile.rs +++ b/crates/rbuilder/src/bin/revmc-aot-compile.rs @@ -1,7 +1,7 @@ use rbuilder::live_builder::{base_config, config::Config as ConfigType}; -use revmc_toolbox_utils::{evm as evm_utils, build as build_utils}; -use revmc_toolbox_sim::gas_guzzlers::GasGuzzlerConfig; -use revmc_toolbox_build::CompilerOptions; +use revmc_toolkit_utils::{evm as evm_utils, build as build_utils}; +use revmc_toolkit_sim::gas_guzzlers::GasGuzzlerConfig; +use revmc_toolkit_build::CompilerOptions; use std::{path::PathBuf, str::FromStr}; use revm::primitives::SpecId; use eyre::{OptionExt, Result}; diff --git a/crates/rbuilder/src/building/mod.rs b/crates/rbuilder/src/building/mod.rs index 9018b482..c0e880b7 100644 --- a/crates/rbuilder/src/building/mod.rs +++ b/crates/rbuilder/src/building/mod.rs @@ -46,7 +46,7 @@ use revm::{ db::states::bundle_state::BundleRetention::{self, PlainState}, primitives::{BlobExcessGasAndPrice, BlockEnv, CfgEnvWithHandlerCfg, SpecId}, }; -use revmc_toolbox_load::EvmCompilerFns; +use revmc_toolkit_load::EvmCompilerFns; use serde::Deserialize; use std::{hash::Hash, str::FromStr, sync::Arc}; use thiserror::Error; diff --git a/crates/rbuilder/src/building/order_commit.rs b/crates/rbuilder/src/building/order_commit.rs index c9e737f9..e131a38c 100644 --- a/crates/rbuilder/src/building/order_commit.rs +++ b/crates/rbuilder/src/building/order_commit.rs @@ -32,7 +32,7 @@ use crate::building::evm_inspector::{RBuilderEVMInspector, UsedStateTrace}; use std::{collections::HashMap, sync::Arc}; use thiserror::Error; use crate::building::revmc_ext_ctx::RBuilderRevmcInspectorExtCtx; -use revmc_toolbox_load::{revmc_register_handler, RevmcExtCtx}; +use revmc_toolkit_load::{revmc_register_handler, RevmcExtCtx}; #[derive(Clone)] pub struct BlockState { diff --git a/crates/rbuilder/src/building/revmc_ext_ctx.rs b/crates/rbuilder/src/building/revmc_ext_ctx.rs index f8ece6a4..c249a5a0 100644 --- a/crates/rbuilder/src/building/revmc_ext_ctx.rs +++ b/crates/rbuilder/src/building/revmc_ext_ctx.rs @@ -3,7 +3,7 @@ use revm::{ primitives::{B256, U256, Address}, Database, EvmContext, Inspector, }; -use revmc_toolbox_load::{ +use revmc_toolkit_load::{ RevmcExtCtxExtTrait, RevmcExtCtx, EvmCompilerFn, diff --git a/crates/rbuilder/src/live_builder/base_config.rs b/crates/rbuilder/src/live_builder/base_config.rs index 2e893122..25d273d8 100644 --- a/crates/rbuilder/src/live_builder/base_config.rs +++ b/crates/rbuilder/src/live_builder/base_config.rs @@ -15,7 +15,7 @@ use lazy_static::lazy_static; use reth::tasks::pool::BlockingTaskPool; use reth_chainspec::ChainSpec; use reth_db::DatabaseEnv; -use revmc_toolbox_load::{EvmCompilerFns, EvmCompilerFnLoader}; +use revmc_toolkit_load::{EvmCompilerFns, EvmCompilerFnLoader}; use reth_node_core::args::utils::chain_value_parser; use reth_primitives::StaticFileSegment; use reth_provider::StaticFileProviderFactory; diff --git a/crates/rbuilder/src/live_builder/mod.rs b/crates/rbuilder/src/live_builder/mod.rs index 620612fe..aca4d5c2 100644 --- a/crates/rbuilder/src/live_builder/mod.rs +++ b/crates/rbuilder/src/live_builder/mod.rs @@ -38,7 +38,7 @@ use time::OffsetDateTime; use tokio::{sync::mpsc, task::spawn_blocking}; use tokio_util::sync::CancellationToken; use tracing::{debug, error, info, warn}; -use revmc_toolbox_load::EvmCompilerFns; +use revmc_toolkit_load::EvmCompilerFns; /// Time the proposer have to propose a block from the beginning of the slot (https://www.paradigm.xyz/2023/04/mev-boost-ethereum-consensus Slot anatomy) const SLOT_PROPOSAL_DURATION: std::time::Duration = Duration::from_secs(4); From b4b793aeffff3f5618feba78f743130141970797 Mon Sep 17 00:00:00 2001 From: halo3mic <46010359+halo3mic@users.noreply.github.com> Date: Sat, 28 Sep 2024 09:55:12 +0000 Subject: [PATCH 5/5] revmc-toolkit from path to git dep --- Cargo.lock | 4 ++++ crates/rbuilder/Cargo.toml | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a0ec003..8f800be6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9755,6 +9755,7 @@ dependencies = [ [[package]] name = "revmc-toolkit-build" version = "0.1.0" +source = "git+https://github.com/halo3mic/revmc-toolkit?branch=dev#eb23c23a7498e9cf599fcb3642eb0ce24e66920e" dependencies = [ "eyre", "hex", @@ -9769,6 +9770,7 @@ dependencies = [ [[package]] name = "revmc-toolkit-load" version = "0.1.0" +source = "git+https://github.com/halo3mic/revmc-toolkit?branch=dev#eb23c23a7498e9cf599fcb3642eb0ce24e66920e" dependencies = [ "eyre", "libloading", @@ -9781,6 +9783,7 @@ dependencies = [ [[package]] name = "revmc-toolkit-sim" version = "0.1.0" +source = "git+https://github.com/halo3mic/revmc-toolkit?branch=dev#eb23c23a7498e9cf599fcb3642eb0ce24e66920e" dependencies = [ "cc", "clap", @@ -9819,6 +9822,7 @@ dependencies = [ [[package]] name = "revmc-toolkit-utils" version = "0.1.0" +source = "git+https://github.com/halo3mic/revmc-toolkit?branch=dev#eb23c23a7498e9cf599fcb3642eb0ce24e66920e" dependencies = [ "cc", "clap", diff --git a/crates/rbuilder/Cargo.toml b/crates/rbuilder/Cargo.toml index daab9ec9..3051e5f4 100644 --- a/crates/rbuilder/Cargo.toml +++ b/crates/rbuilder/Cargo.toml @@ -126,10 +126,10 @@ async-trait = "0.1.80" eth-sparse-mpt = { git = "https://github.com/flashbots/eth-sparse-mpt", rev = "664759b" } -revmc-toolkit-load = { path = "../../../revmc-toolkit/crates/load" } -revmc-toolkit-sim = { path = "../../../revmc-toolkit/crates/sim" } -revmc-toolkit-build = { path = "../../../revmc-toolkit/crates/build" } -revmc-toolkit-utils = { path = "../../../revmc-toolkit/crates/utils" } +revmc-toolkit-load = { git = "https://github.com/halo3mic/revmc-toolkit", branch = "dev" } +revmc-toolkit-sim = { git = "https://github.com/halo3mic/revmc-toolkit", branch = "dev" } +revmc-toolkit-build = { git = "https://github.com/halo3mic/revmc-toolkit", branch = "dev" } +revmc-toolkit-utils = { git = "https://github.com/halo3mic/revmc-toolkit", branch = "dev" } dotenv = "0.15.0" [build-dependencies]