From 4df8a144ac5c466034553cfdb4a4dd2c17434c59 Mon Sep 17 00:00:00 2001 From: joshieDo <93316087+joshieDo@users.noreply.github.com> Date: Tue, 26 Nov 2024 20:06:29 +0000 Subject: [PATCH] chore: bump reth (#98) introduces [StorageRootProvider::storage_multiproof](https://github.com/paradigmxyz/reth/pull/12879) that can be used on https://github.com/ithacaxyz/odyssey/pull/97 --- Cargo.lock | 266 ++++++++++++++++++++++------------------ Cargo.toml | 60 ++++----- crates/node/src/node.rs | 17 ++- 3 files changed, 189 insertions(+), 154 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f475a04..e811f2b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5570,7 +5570,7 @@ dependencies = [ [[package]] name = "reth" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5643,7 +5643,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5672,7 +5672,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5683,6 +5683,8 @@ dependencies = [ "metrics 0.24.0", "reth-blockchain-tree-api", "reth-chainspec", + "reth-codecs", + "reth-db-api", "reth-engine-primitives", "reth-errors", "reth-ethereum-consensus", @@ -5694,6 +5696,7 @@ dependencies = [ "reth-payload-primitives", "reth-payload-validator", "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-prune", "reth-stages-api", @@ -5710,7 +5713,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5743,7 +5746,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5757,12 +5760,11 @@ dependencies = [ [[package]] name = "reth-chain-state" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", - "auto_impl", "derive_more", "metrics 0.24.0", "parking_lot", @@ -5772,6 +5774,7 @@ dependencies = [ "reth-execution-types", "reth-metrics", "reth-primitives", + "reth-primitives-traits", "reth-storage-api", "reth-trie", "tokio", @@ -5782,7 +5785,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5802,7 +5805,7 @@ dependencies = [ [[package]] name = "reth-cli" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-genesis", "clap", @@ -5816,7 +5819,7 @@ dependencies = [ [[package]] name = "reth-cli-commands" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "ahash", "alloy-consensus", @@ -5877,7 +5880,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "reth-tasks", "tokio", @@ -5887,7 +5890,7 @@ dependencies = [ [[package]] name = "reth-cli-util" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5905,7 +5908,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5922,7 +5925,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "convert_case", "proc-macro2", @@ -5933,7 +5936,7 @@ dependencies = [ [[package]] name = "reth-config" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "eyre", "humantime-serde", @@ -5947,7 +5950,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5961,7 +5964,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5975,7 +5978,7 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5999,7 +6002,7 @@ dependencies = [ [[package]] name = "reth-db" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -6008,7 +6011,6 @@ dependencies = [ "eyre", "metrics 0.24.0", "page_size", - "paste", "reth-db-api", "reth-fs-util", "reth-libmdbx", @@ -6031,7 +6033,7 @@ dependencies = [ [[package]] name = "reth-db-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -6055,7 +6057,7 @@ dependencies = [ [[package]] name = "reth-db-common" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -6083,7 +6085,7 @@ dependencies = [ [[package]] name = "reth-db-models" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6097,7 +6099,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6123,7 +6125,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6147,7 +6149,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-primitives", "data-encoding", @@ -6171,7 +6173,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6204,7 +6206,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "aes", "alloy-primitives", @@ -6235,7 +6237,7 @@ dependencies = [ [[package]] name = "reth-engine-local" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -6267,7 +6269,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -6286,7 +6288,7 @@ dependencies = [ [[package]] name = "reth-engine-service" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "futures", "pin-project", @@ -6310,11 +6312,12 @@ dependencies = [ [[package]] name = "reth-engine-tree" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", + "alloy-rlp", "alloy-rpc-types-engine", "futures", "metrics 0.24.0", @@ -6334,7 +6337,6 @@ dependencies = [ "reth-payload-primitives", "reth-payload-validator", "reth-primitives", - "reth-primitives-traits", "reth-provider", "reth-prune", "reth-revm", @@ -6342,6 +6344,7 @@ dependencies = [ "reth-tasks", "reth-trie", "reth-trie-parallel", + "reth-trie-sparse", "revm-primitives", "thiserror 1.0.69", "tokio", @@ -6351,7 +6354,7 @@ dependencies = [ [[package]] name = "reth-engine-util" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6383,7 +6386,7 @@ dependencies = [ [[package]] name = "reth-errors" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "reth-blockchain-tree-api", "reth-consensus", @@ -6396,7 +6399,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6424,7 +6427,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-chains", "alloy-consensus", @@ -6444,7 +6447,7 @@ dependencies = [ [[package]] name = "reth-ethereum-cli" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "eyre", "reth-chainspec", @@ -6454,7 +6457,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6470,7 +6473,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6489,7 +6492,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6506,7 +6509,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6533,7 +6536,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "rayon", "reth-db-api", @@ -6543,7 +6546,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6569,7 +6572,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6588,7 +6591,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6604,14 +6607,16 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "reth-execution-errors", "reth-primitives", "reth-primitives-traits", "reth-trie", + "reth-trie-common", "revm", "serde", "serde_with", @@ -6620,8 +6625,9 @@ dependencies = [ [[package]] name = "reth-exex" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "eyre", @@ -6655,7 +6661,7 @@ dependencies = [ [[package]] name = "reth-exex-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6669,7 +6675,7 @@ dependencies = [ [[package]] name = "reth-fs-util" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "serde", "serde_json", @@ -6679,7 +6685,7 @@ dependencies = [ [[package]] name = "reth-invalid-block-hooks" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -6693,6 +6699,7 @@ dependencies = [ "reth-engine-primitives", "reth-evm", "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-revm", "reth-rpc-api", @@ -6705,7 +6712,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "async-trait", "bytes", @@ -6726,7 +6733,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "bitflags 2.6.0", "byteorder", @@ -6743,7 +6750,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "bindgen", "cc", @@ -6752,7 +6759,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "futures", "metrics 0.24.0", @@ -6764,7 +6771,7 @@ dependencies = [ [[package]] name = "reth-net-banlist" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-primitives", ] @@ -6772,7 +6779,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "futures-util", "if-addrs", @@ -6786,7 +6793,7 @@ dependencies = [ [[package]] name = "reth-network" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6841,7 +6848,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-primitives", "alloy-rpc-types-admin", @@ -6864,7 +6871,7 @@ dependencies = [ [[package]] name = "reth-network-p2p" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6886,7 +6893,7 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6901,7 +6908,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "humantime-serde", "reth-ethereum-forks", @@ -6915,7 +6922,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "anyhow", "bincode", @@ -6932,7 +6939,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-rpc-types-engine", @@ -6954,7 +6961,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7018,7 +7025,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7067,7 +7074,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "eyre", @@ -7096,7 +7103,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7120,7 +7127,7 @@ dependencies = [ [[package]] name = "reth-node-metrics" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "eyre", "http", @@ -7142,7 +7149,7 @@ dependencies = [ [[package]] name = "reth-node-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "reth-chainspec", "reth-db-api", @@ -7154,7 +7161,7 @@ dependencies = [ [[package]] name = "reth-optimism-chainspec" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-chains", "alloy-consensus", @@ -7175,7 +7182,7 @@ dependencies = [ [[package]] name = "reth-optimism-cli" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7224,7 +7231,7 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7242,7 +7249,7 @@ dependencies = [ [[package]] name = "reth-optimism-evm" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7269,7 +7276,7 @@ dependencies = [ [[package]] name = "reth-optimism-forks" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-chains", "alloy-primitives", @@ -7281,7 +7288,7 @@ dependencies = [ [[package]] name = "reth-optimism-node" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7326,7 +7333,7 @@ dependencies = [ [[package]] name = "reth-optimism-payload-builder" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7364,7 +7371,7 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7374,7 +7381,6 @@ dependencies = [ "derive_more", "op-alloy-consensus", "reth-codecs", - "reth-node-types", "reth-primitives", "reth-primitives-traits", "serde", @@ -7383,7 +7389,7 @@ dependencies = [ [[package]] name = "reth-optimism-rpc" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7409,6 +7415,7 @@ dependencies = [ "reth-optimism-evm", "reth-optimism-forks", "reth-optimism-payload-builder", + "reth-optimism-primitives", "reth-primitives", "reth-provider", "reth-rpc", @@ -7428,7 +7435,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-rpc-types", "async-trait", @@ -7447,7 +7454,7 @@ dependencies = [ [[package]] name = "reth-payload-builder-primitives" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-rpc-types-engine", "async-trait", @@ -7461,7 +7468,7 @@ dependencies = [ [[package]] name = "reth-payload-primitives" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7480,7 +7487,7 @@ dependencies = [ [[package]] name = "reth-payload-util" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7490,7 +7497,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-rpc-types", "reth-chainspec", @@ -7501,7 +7508,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7534,7 +7541,7 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7556,7 +7563,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7601,8 +7608,9 @@ dependencies = [ [[package]] name = "reth-prune" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ + "alloy-eips", "alloy-primitives", "itertools 0.13.0", "metrics 0.24.0", @@ -7627,7 +7635,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-primitives", "bytes", @@ -7641,7 +7649,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7658,7 +7666,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -7701,6 +7709,7 @@ dependencies = [ "reth-network-types", "reth-payload-validator", "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-revm", "reth-rpc-api", @@ -7728,7 +7737,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-eips", "alloy-json-rpc", @@ -7753,7 +7762,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "http", @@ -7768,6 +7777,7 @@ dependencies = [ "reth-metrics", "reth-network-api", "reth-node-core", + "reth-primitives", "reth-provider", "reth-rpc", "reth-rpc-api", @@ -7789,7 +7799,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7822,7 +7832,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -7865,7 +7875,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7886,6 +7896,7 @@ dependencies = [ "reth-execution-types", "reth-metrics", "reth-primitives", + "reth-primitives-traits", "reth-revm", "reth-rpc-server-types", "reth-rpc-types-compat", @@ -7907,7 +7918,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-rpc-types-engine", "http", @@ -7921,7 +7932,7 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7937,7 +7948,7 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7955,9 +7966,10 @@ dependencies = [ [[package]] name = "reth-stages" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", + "alloy-eips", "alloy-primitives", "bincode", "futures-util", @@ -7992,7 +8004,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-primitives", "aquamarine", @@ -8018,7 +8030,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-primitives", "bytes", @@ -8031,13 +8043,15 @@ dependencies = [ [[package]] name = "reth-static-file" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-primitives", "parking_lot", "rayon", + "reth-codecs", "reth-db", "reth-db-api", + "reth-primitives-traits", "reth-provider", "reth-prune-types", "reth-stages-types", @@ -8050,7 +8064,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-primitives", "clap", @@ -8062,7 +8076,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8080,12 +8094,13 @@ dependencies = [ "reth-stages-types", "reth-storage-errors", "reth-trie", + "reth-trie-db", ] [[package]] name = "reth-storage-errors" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-eips", "alloy-primitives", @@ -8098,7 +8113,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "auto_impl", "dyn-clone", @@ -8116,7 +8131,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "tokio", "tokio-stream", @@ -8126,7 +8141,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "clap", "eyre", @@ -8141,7 +8156,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8179,7 +8194,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8196,15 +8211,13 @@ dependencies = [ "reth-storage-errors", "reth-trie-common", "revm", - "serde", - "serde_with", "tracing", ] [[package]] name = "reth-trie-common" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -8219,12 +8232,13 @@ dependencies = [ "reth-primitives-traits", "revm-primitives", "serde", + "serde_with", ] [[package]] name = "reth-trie-db" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8237,7 +8251,6 @@ dependencies = [ "reth-primitives", "reth-storage-errors", "reth-trie", - "reth-trie-common", "revm", "serde", "tracing", @@ -8246,7 +8259,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth.git?rev=f211aac#f211aacf551afbf707b7fb6a40d17c8d2264110e" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8266,6 +8279,19 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-trie-sparse" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth.git?rev=38cf6c9#38cf6c900ddd2a2266acf01c97abc159db314a07" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "reth-tracing", + "reth-trie-common", + "smallvec", + "thiserror 1.0.69", +] + [[package]] name = "revm" version = "18.0.0" @@ -9257,9 +9283,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.31.4" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" +checksum = "e3b5ae3f4f7d64646c46c4cae4e3f01d1c5d255c7406fdd7c7f999a94e488791" dependencies = [ "core-foundation-sys", "libc", diff --git a/Cargo.toml b/Cargo.toml index dab5fde..d763557 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -158,48 +158,48 @@ alloy-signer-local = { version = "0.6.4", features = ["mnemonic"] } tokio = { version = "1.21", default-features = false } # reth -reth-chainspec = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-cli = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-cli-util = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-errors = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-evm = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-node-api = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-node-builder = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-node-core = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac", features = [ +reth-chainspec = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-cli = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-cli-util = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-errors = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-evm = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-node-api = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-node-builder = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-node-core = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9", features = [ "optimism", ] } -reth-optimism-node = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac", features = [ +reth-optimism-node = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9", features = [ "optimism", ] } -reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac", features = [ +reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9", features = [ "optimism", ] } -reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac", features = [ +reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9", features = [ "optimism", ] } -reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-payload-builder = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-primitives = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac", features = [ +reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-payload-builder = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-primitives = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9", features = [ "optimism", ] } -reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-provider = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac", features = [ +reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-provider = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9", features = [ "optimism", ] } -reth-revm = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-storage-api = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-tracing = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-trie-common = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-trie-db = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-network = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-network-types = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } -reth-chain-state = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" } +reth-revm = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-storage-api = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-tracing = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-trie-common = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-trie-db = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-network = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-network-types = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } +reth-chain-state = { git = "https://github.com/paradigmxyz/reth.git", rev = "38cf6c9" } revm-primitives = { version = "14.0.0" } revm-precompile = { version = "15.0.0", features = ["secp256r1"] } diff --git a/crates/node/src/node.rs b/crates/node/src/node.rs index 68eb7c2..637b88e 100644 --- a/crates/node/src/node.rs +++ b/crates/node/src/node.rs @@ -59,7 +59,11 @@ impl OdysseyNode { > where Node: FullNodeTypes< - Types: NodeTypesWithEngine, + Types: NodeTypesWithEngine< + Engine = OpEngineTypes, + ChainSpec = OpChainSpec, + Primitives = OpPrimitives, + >, >, { ComponentsBuilder::default() @@ -173,8 +177,13 @@ impl OdysseyPayloadBuilder { impl PayloadServiceBuilder for OdysseyPayloadBuilder where - Node: - FullNodeTypes>, + Node: FullNodeTypes< + Types: NodeTypesWithEngine< + Engine = OpEngineTypes, + ChainSpec = OpChainSpec, + Primitives = OpPrimitives, + >, + >, Pool: TransactionPool + Unpin + 'static, { async fn spawn_payload_service( @@ -201,7 +210,7 @@ impl OdysseyNetworkBuilder { impl NetworkBuilder for OdysseyNetworkBuilder where - Node: FullNodeTypes>, + Node: FullNodeTypes>, Pool: TransactionPool + Unpin + 'static, { async fn build_network(