From b2de19ea0b8eb3e5aec8f5f71e1442b9c287d8f4 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Mon, 6 May 2024 17:40:08 -0600 Subject: [PATCH 01/18] relay updates for electra --- mev-relay-rs/src/auction_context.rs | 36 +++++++++++++++++++++++ mev-relay-rs/src/relay.rs | 44 +++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/mev-relay-rs/src/auction_context.rs b/mev-relay-rs/src/auction_context.rs index a26345b5..56653386 100644 --- a/mev-relay-rs/src/auction_context.rs +++ b/mev-relay-rs/src/auction_context.rs @@ -23,6 +23,7 @@ fn to_header(execution_payload: &ExecutionPayload) -> Result ExecutionPayloadHeader::Capella(payload.try_into()?), ExecutionPayload::Deneb(payload) => ExecutionPayloadHeader::Deneb(payload.try_into()?), + ExecutionPayload::Electra(payload) => ExecutionPayloadHeader::Electra(payload.try_into()?), }; Ok(header) } @@ -89,11 +90,16 @@ pub mod deneb { } } +pub mod electra { + pub use super::deneb::*; +} + #[derive(Debug, PartialEq, Eq, Hash)] pub enum AuctionContext { Bellatrix(bellatrix::AuctionContext), Capella(capella::AuctionContext), Deneb(deneb::AuctionContext), + Electra(electra::AuctionContext), } impl AuctionContext { @@ -134,6 +140,14 @@ impl AuctionContext { public_key: relay_public_key, }) } + SignedBidSubmission::Electra(ref submission) => { + BuilderBid::Electra(builder_bid::electra::BuilderBid { + header: execution_payload_header, + blob_kzg_commitments: submission.blobs_bundle.commitments.clone(), + value, + public_key: relay_public_key, + }) + } }; let signature = sign_builder_message(&bid, relay_secret_key, context)?; @@ -167,6 +181,15 @@ impl AuctionContext { value, blobs_bundle: submission.blobs_bundle, }), + SignedBidSubmission::Electra(submission) => Self::Electra(electra::AuctionContext { + builder_public_key, + bid_trace: submission.message, + receive_duration, + signed_builder_bid, + execution_payload, + value, + blobs_bundle: submission.blobs_bundle, + }), }; Ok(auction_context) @@ -177,6 +200,7 @@ impl AuctionContext { Self::Bellatrix(context) => &context.builder_public_key, Self::Capella(context) => &context.builder_public_key, Self::Deneb(context) => &context.builder_public_key, + Self::Electra(context) => &context.builder_public_key, } } @@ -185,6 +209,7 @@ impl AuctionContext { Self::Bellatrix(context) => &context.bid_trace, Self::Capella(context) => &context.bid_trace, Self::Deneb(context) => &context.bid_trace, + Self::Electra(context) => &context.bid_trace, } } @@ -193,6 +218,7 @@ impl AuctionContext { Self::Bellatrix(context) => context.receive_duration, Self::Capella(context) => context.receive_duration, Self::Deneb(context) => context.receive_duration, + Self::Electra(context) => context.receive_duration, } } @@ -201,6 +227,7 @@ impl AuctionContext { Self::Bellatrix(context) => &context.signed_builder_bid, Self::Capella(context) => &context.signed_builder_bid, Self::Deneb(context) => &context.signed_builder_bid, + Self::Electra(context) => &context.signed_builder_bid, } } @@ -209,6 +236,7 @@ impl AuctionContext { Self::Bellatrix(context) => &context.execution_payload, Self::Capella(context) => &context.execution_payload, Self::Deneb(context) => &context.execution_payload, + Self::Electra(context) => &context.execution_payload, } } @@ -217,6 +245,7 @@ impl AuctionContext { Self::Bellatrix(_) => None, Self::Capella(_) => None, Self::Deneb(context) => Some(&context.blobs_bundle), + Self::Electra(context) => Some(&context.blobs_bundle), } } @@ -225,6 +254,7 @@ impl AuctionContext { Self::Bellatrix(context) => context.value, Self::Capella(context) => context.value, Self::Deneb(context) => context.value, + Self::Electra(context) => context.value, } } @@ -240,6 +270,12 @@ impl AuctionContext { blobs_bundle: context.blobs_bundle.clone(), }) } + Self::Electra(context) => { + AuctionContents::Electra(auction_contents::electra::AuctionContents { + execution_payload: context.execution_payload.clone(), + blobs_bundle: context.blobs_bundle.clone(), + }) + } } } } diff --git a/mev-relay-rs/src/relay.rs b/mev-relay-rs/src/relay.rs index 38a32605..e7f01151 100644 --- a/mev-relay-rs/src/relay.rs +++ b/mev-relay-rs/src/relay.rs @@ -40,6 +40,7 @@ use ethereum_consensus::{ bellatrix::mainnet as bellatrix, capella::mainnet as capella, deneb::mainnet as deneb, + electra::mainnet as electra, types::mainnet::{ExecutionPayloadHeaderRef, SignedBeaconBlock}, }; #[cfg(feature = "minimal-preset")] @@ -47,6 +48,7 @@ use ethereum_consensus::{ bellatrix::minimal as bellatrix, capella::minimal as capella, deneb::minimal as deneb, + electra::minimal as electra, types::minimal::{ExecutionPayloadHeaderRef, SignedBeaconBlock}, }; @@ -80,6 +82,13 @@ fn validate_header_equality( return Err(RelayError::InvalidExecutionPayloadInBlock); } } + ExecutionPayloadHeader::Electra(local_header) => { + let provided_header = + provided_header.electra().ok_or(RelayError::InvalidExecutionPayloadInBlock)?; + if local_header != provided_header { + return Err(RelayError::InvalidExecutionPayloadInBlock); + } + } } Ok(()) } @@ -188,6 +197,41 @@ fn unblind_block( }; Ok(SignedBeaconBlock::Deneb(inner)) } + SignedBlindedBeaconBlock::Electra(blinded_block) => { + let signature = blinded_block.signature.clone(); + let block = &blinded_block.message; + let body = &block.body; + let execution_payload = execution_payload.electra().ok_or(Error::InvalidFork { + expected: Fork::Electra, + provided: execution_payload.version(), + })?; + + let inner = electra::SignedBeaconBlock { + message: electra::BeaconBlock { + slot: block.slot, + proposer_index: block.proposer_index, + parent_root: block.parent_root, + state_root: block.state_root, + body: electra::BeaconBlockBody { + randao_reveal: body.randao_reveal.clone(), + eth1_data: body.eth1_data.clone(), + graffiti: body.graffiti.clone(), + proposer_slashings: body.proposer_slashings.clone(), + attester_slashings: body.attester_slashings.clone(), + attestations: body.attestations.clone(), + deposits: body.deposits.clone(), + voluntary_exits: body.voluntary_exits.clone(), + sync_aggregate: body.sync_aggregate.clone(), + execution_payload: execution_payload.clone(), + bls_to_execution_changes: body.bls_to_execution_changes.clone(), + blob_kzg_commitments: body.blob_kzg_commitments.clone(), + consolidations: body.consolidations.clone(), + }, + }, + signature, + }; + Ok(SignedBeaconBlock::Electra(inner)) + } } } From 93d18bb9fba7324f0b6a87443689bf16181a9187 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Mon, 6 May 2024 17:48:32 -0600 Subject: [PATCH 02/18] mev-rs types updates for electra --- mev-rs/src/types/auction_contents.rs | 11 +++++++++++ mev-rs/src/types/block_submission.rs | 13 +++++++++++++ mev-rs/src/types/builder_bid.rs | 13 +++++++++++++ 3 files changed, 37 insertions(+) diff --git a/mev-rs/src/types/auction_contents.rs b/mev-rs/src/types/auction_contents.rs index ec11cef2..99a1f5cd 100644 --- a/mev-rs/src/types/auction_contents.rs +++ b/mev-rs/src/types/auction_contents.rs @@ -40,6 +40,10 @@ pub mod deneb { } } +pub mod electra { + pub use super::deneb::*; +} + #[derive(Debug)] #[cfg_attr(feature = "serde", derive(serde::Serialize))] #[serde(untagged)] @@ -47,6 +51,7 @@ pub enum AuctionContents { Bellatrix(bellatrix::AuctionContents), Capella(capella::AuctionContents), Deneb(deneb::AuctionContents), + Electra(electra::AuctionContents), } impl<'de> serde::Deserialize<'de> for AuctionContents { @@ -55,6 +60,9 @@ impl<'de> serde::Deserialize<'de> for AuctionContents { D: serde::Deserializer<'de>, { let value = serde_json::Value::deserialize(deserializer)?; + if let Ok(inner) = <_ as serde::Deserialize>::deserialize(&value) { + return Ok(Self::Electra(inner)) + } if let Ok(inner) = <_ as serde::Deserialize>::deserialize(&value) { return Ok(Self::Deneb(inner)) } @@ -74,6 +82,7 @@ impl AuctionContents { Self::Bellatrix(..) => Fork::Bellatrix, Self::Capella(..) => Fork::Capella, Self::Deneb(..) => Fork::Deneb, + Self::Electra(..) => Fork::Electra, } } @@ -82,12 +91,14 @@ impl AuctionContents { Self::Bellatrix(inner) => inner, Self::Capella(inner) => inner, Self::Deneb(inner) => &inner.execution_payload, + Self::Electra(inner) => &inner.execution_payload, } } pub fn blobs_bundle(&self) -> Option<&BlobsBundle> { match self { Self::Deneb(inner) => Some(&inner.blobs_bundle), + Self::Electra(inner) => Some(&inner.blobs_bundle), _ => None, } } diff --git a/mev-rs/src/types/block_submission.rs b/mev-rs/src/types/block_submission.rs index 94343d54..047c7c31 100644 --- a/mev-rs/src/types/block_submission.rs +++ b/mev-rs/src/types/block_submission.rs @@ -123,6 +123,10 @@ pub mod deneb { } } +pub mod electra { + pub use super::deneb::*; +} + #[derive(Debug, Clone, Serializable, HashTreeRoot)] #[cfg_attr(feature = "serde", derive(serde::Serialize))] #[serde(untagged)] @@ -131,6 +135,7 @@ pub enum SignedBidSubmission { Bellatrix(bellatrix::SignedBidSubmission), Capella(capella::SignedBidSubmission), Deneb(deneb::SignedBidSubmission), + Electra(electra::SignedBidSubmission), } impl<'de> serde::Deserialize<'de> for SignedBidSubmission { @@ -139,6 +144,9 @@ impl<'de> serde::Deserialize<'de> for SignedBidSubmission { D: serde::Deserializer<'de>, { let value = serde_json::Value::deserialize(deserializer)?; + if let Ok(inner) = <_ as serde::Deserialize>::deserialize(&value) { + return Ok(Self::Electra(inner)) + } if let Ok(inner) = <_ as serde::Deserialize>::deserialize(&value) { return Ok(Self::Deneb(inner)) } @@ -158,6 +166,7 @@ impl SignedBidSubmission { Self::Bellatrix(..) => Fork::Bellatrix, Self::Capella(..) => Fork::Capella, Self::Deneb(..) => Fork::Deneb, + Self::Electra(..) => Fork::Electra, } } @@ -166,6 +175,7 @@ impl SignedBidSubmission { Self::Bellatrix(inner) => &inner.message, Self::Capella(inner) => &inner.message, Self::Deneb(inner) => &inner.message, + Self::Electra(inner) => &inner.message, } } @@ -174,6 +184,7 @@ impl SignedBidSubmission { Self::Bellatrix(inner) => &inner.execution_payload, Self::Capella(inner) => &inner.execution_payload, Self::Deneb(inner) => &inner.execution_payload, + Self::Electra(inner) => &inner.execution_payload, } } @@ -182,6 +193,7 @@ impl SignedBidSubmission { Self::Bellatrix(inner) => &inner.signature, Self::Capella(inner) => &inner.signature, Self::Deneb(inner) => &inner.signature, + Self::Electra(inner) => &inner.signature, } } @@ -190,6 +202,7 @@ impl SignedBidSubmission { Self::Bellatrix(..) => None, Self::Capella(..) => None, Self::Deneb(inner) => Some(&inner.blobs_bundle), + Self::Electra(inner) => Some(&inner.blobs_bundle), } } } diff --git a/mev-rs/src/types/builder_bid.rs b/mev-rs/src/types/builder_bid.rs index fdb5a357..ed1eb66b 100644 --- a/mev-rs/src/types/builder_bid.rs +++ b/mev-rs/src/types/builder_bid.rs @@ -55,6 +55,10 @@ pub mod deneb { } } +pub mod electra { + pub use super::deneb::*; +} + #[derive(Debug, Clone, Serializable, HashTreeRoot, PartialEq, Eq)] #[cfg_attr(feature = "serde", derive(serde::Serialize))] #[serde(untagged)] @@ -63,6 +67,7 @@ pub enum BuilderBid { Bellatrix(bellatrix::BuilderBid), Capella(capella::BuilderBid), Deneb(deneb::BuilderBid), + Electra(electra::BuilderBid), } impl<'de> serde::Deserialize<'de> for BuilderBid { @@ -71,6 +76,9 @@ impl<'de> serde::Deserialize<'de> for BuilderBid { D: serde::Deserializer<'de>, { let value = serde_json::Value::deserialize(deserializer)?; + if let Ok(inner) = <_ as serde::Deserialize>::deserialize(&value) { + return Ok(Self::Electra(inner)) + } if let Ok(inner) = <_ as serde::Deserialize>::deserialize(&value) { return Ok(Self::Deneb(inner)) } @@ -97,6 +105,7 @@ impl BuilderBid { Self::Bellatrix(..) => Fork::Bellatrix, Self::Capella(..) => Fork::Capella, Self::Deneb(..) => Fork::Deneb, + Self::Electra(..) => Fork::Electra, } } @@ -105,6 +114,7 @@ impl BuilderBid { Self::Bellatrix(inner) => &inner.header, Self::Capella(inner) => &inner.header, Self::Deneb(inner) => &inner.header, + Self::Electra(inner) => &inner.header, } } @@ -113,6 +123,7 @@ impl BuilderBid { ) -> Option<&List> { match self { Self::Deneb(inner) => Some(&inner.blob_kzg_commitments), + Self::Electra(inner) => Some(&inner.blob_kzg_commitments), _ => None, } } @@ -122,6 +133,7 @@ impl BuilderBid { Self::Bellatrix(inner) => inner.value, Self::Capella(inner) => inner.value, Self::Deneb(inner) => inner.value, + Self::Electra(inner) => inner.value, } } @@ -130,6 +142,7 @@ impl BuilderBid { Self::Bellatrix(inner) => &inner.public_key, Self::Capella(inner) => &inner.public_key, Self::Deneb(inner) => &inner.public_key, + Self::Electra(inner) => &inner.public_key, } } From eec898a89dd5a8107259bbb4a0f697ee7baf5bbd Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Mon, 6 May 2024 17:48:42 -0600 Subject: [PATCH 03/18] builder updates for electra --- mev-build-rs/src/auctioneer/service.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mev-build-rs/src/auctioneer/service.rs b/mev-build-rs/src/auctioneer/service.rs index 2a9f620f..713b8319 100644 --- a/mev-build-rs/src/auctioneer/service.rs +++ b/mev-build-rs/src/auctioneer/service.rs @@ -83,6 +83,14 @@ fn prepare_submission( blobs_bundle: to_blobs_bundle(payload.sidecars())?, signature, }), + Fork::Electra => { + SignedBidSubmission::Electra(block_submission::electra::SignedBidSubmission { + message, + execution_payload, + blobs_bundle: to_blobs_bundle(payload.sidecars())?, + signature, + }) + } fork => return Err(Error::UnsupportedFork(fork)), }; Ok(submission) From 5c6204f4f86cbd54763ffd707aac37020ea9db53 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Tue, 7 May 2024 08:00:08 -0600 Subject: [PATCH 04/18] update for some electra support from `ethereum-consensus` --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index caad8f04..8046c3d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -963,7 +963,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "beacon-api-client" version = "0.1.0" -source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=cf3c404043230559660810bc0c9d6d5a8498d819#cf3c404043230559660810bc0c9d6d5a8498d819" +source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=8a394af6c9378b844e183cfdca3091a92b473eda#8a394af6c9378b844e183cfdca3091a92b473eda" dependencies = [ "clap", "ethereum-consensus", @@ -2563,7 +2563,7 @@ dependencies = [ [[package]] name = "ethereum-consensus" version = "0.1.1" -source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=cf3c404043230559660810bc0c9d6d5a8498d819#cf3c404043230559660810bc0c9d6d5a8498d819" +source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=8a394af6c9378b844e183cfdca3091a92b473eda#8a394af6c9378b844e183cfdca3091a92b473eda" dependencies = [ "blst", "bs58 0.4.0", diff --git a/Cargo.toml b/Cargo.toml index d188877c..635eaf60 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,8 +24,8 @@ codegen-units = 1 incremental = false [workspace.dependencies] -ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "cf3c404043230559660810bc0c9d6d5a8498d819" } -beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "cf3c404043230559660810bc0c9d6d5a8498d819" } +ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "8a394af6c9378b844e183cfdca3091a92b473eda" } +beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "8a394af6c9378b844e183cfdca3091a92b473eda" } reth = { git = "https://github.com/paradigmxyz/reth", rev = "5f82993c23164ce8ccdc7bf3ae5085205383a5c8" } reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "5f82993c23164ce8ccdc7bf3ae5085205383a5c8" } From eeccbeb9fd5f5fb060d3fd1391ec38c6b5a35ee9 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Tue, 7 May 2024 08:13:19 -0600 Subject: [PATCH 05/18] builder: support multiple forks when making block submissions --- mev-build-rs/src/compat.rs | 41 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/mev-build-rs/src/compat.rs b/mev-build-rs/src/compat.rs index 16b449b9..12d6b646 100644 --- a/mev-build-rs/src/compat.rs +++ b/mev-build-rs/src/compat.rs @@ -9,9 +9,9 @@ use mev_rs::types::{BlobsBundle, ExecutionPayload}; use reth::primitives::{Address, BlobTransactionSidecar, Bloom, SealedBlock, B256}; #[cfg(not(feature = "minimal-preset"))] -use ethereum_consensus::deneb::mainnet as deneb; +use ethereum_consensus::{deneb::mainnet as deneb, electra::mainnet as electra}; #[cfg(feature = "minimal-preset")] -use ethereum_consensus::deneb::minimal as deneb; +use ethereum_consensus::{deneb::minimal as deneb, electra::minimal as electra}; pub fn to_bytes32(value: B256) -> Bytes32 { Bytes32::try_from(value.as_ref()).unwrap() @@ -69,6 +69,43 @@ pub fn to_execution_payload(value: &SealedBlock, fork: Fork) -> Result { + let transactions = transactions + .iter() + .map(|t| electra::Transaction::try_from(t.envelope_encoded().as_ref()).unwrap()) + .collect::>(); + let withdrawals = withdrawals + .as_ref() + .unwrap() + .iter() + .map(|w| electra::Withdrawal { + index: w.index as usize, + validator_index: w.validator_index as usize, + address: to_bytes20(w.address), + amount: w.amount, + }) + .collect::>(); + let payload = electra::ExecutionPayload { + parent_hash: to_bytes32(header.parent_hash), + fee_recipient: to_bytes20(header.beneficiary), + state_root: to_bytes32(header.state_root), + receipts_root: to_bytes32(header.receipts_root), + logs_bloom: to_byte_vector(header.logs_bloom), + prev_randao: to_bytes32(header.mix_hash), + block_number: header.number, + gas_limit: header.gas_limit, + gas_used: header.gas_used, + timestamp: header.timestamp, + extra_data: ByteList::try_from(header.extra_data.as_ref()).unwrap(), + base_fee_per_gas: U256::from(header.base_fee_per_gas.unwrap_or_default()), + block_hash: to_bytes32(hash), + transactions: TryFrom::try_from(transactions).unwrap(), + withdrawals: TryFrom::try_from(withdrawals).unwrap(), + blob_gas_used: header.blob_gas_used.unwrap(), + excess_blob_gas: header.excess_blob_gas.unwrap(), + }; + Ok(ExecutionPayload::Electra(payload)) + } fork => Err(Error::UnsupportedFork(fork)), } } From e54bc5ee401152c4b9117f876b451776072e42d2 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Tue, 14 May 2024 11:17:10 +0300 Subject: [PATCH 06/18] update to `devnet-0` branch of reth --- Cargo.lock | 688 ++++++++++++++++++++++++++++------------------------- Cargo.toml | 12 +- 2 files changed, 371 insertions(+), 329 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8046c3d3..046a8150 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -133,13 +133,16 @@ dependencies = [ [[package]] name = "alloy-consensus" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", "alloy-serde", + "arbitrary", "c-kzg", + "proptest", + "proptest-derive", "serde", ] @@ -164,13 +167,14 @@ dependencies = [ [[package]] name = "alloy-eips" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ "alloy-primitives", "alloy-rlp", "alloy-serde", "arbitrary", "c-kzg", + "derive_more", "once_cell", "proptest", "proptest-derive", @@ -181,7 +185,7 @@ dependencies = [ [[package]] name = "alloy-genesis" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ "alloy-primitives", "alloy-serde", @@ -204,7 +208,7 @@ dependencies = [ [[package]] name = "alloy-json-rpc" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ "alloy-primitives", "serde", @@ -216,7 +220,7 @@ dependencies = [ [[package]] name = "alloy-network" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ "alloy-consensus", "alloy-eips", @@ -276,13 +280,13 @@ checksum = "1a047897373be4bbb0224c1afdabca92648dc57a9c9ef6e7b0be3aff7a859c83" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] name = "alloy-rpc-types" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ "alloy-consensus", "alloy-eips", @@ -291,11 +295,8 @@ dependencies = [ "alloy-rlp", "alloy-serde", "alloy-sol-types", - "arbitrary", "itertools 0.12.1", "jsonrpsee-types", - "proptest", - "proptest-derive", "serde", "serde_json", "thiserror", @@ -304,7 +305,7 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ "alloy-primitives", "alloy-serde", @@ -314,7 +315,7 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ "alloy-eips", "alloy-primitives", @@ -326,7 +327,7 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ "alloy-consensus", "alloy-eips", @@ -344,7 +345,7 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -356,7 +357,7 @@ dependencies = [ [[package]] name = "alloy-serde" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ "alloy-primitives", "serde", @@ -366,7 +367,7 @@ dependencies = [ [[package]] name = "alloy-signer" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ "alloy-primitives", "async-trait", @@ -379,7 +380,7 @@ dependencies = [ [[package]] name = "alloy-signer-wallet" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=77c1240#77c1240533b411ed0eb5533f94396eba8d7f6ab6" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ "alloy-consensus", "alloy-network", @@ -406,7 +407,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", "syn-solidity", "tiny-keccak", ] @@ -422,7 +423,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", "syn-solidity", ] @@ -548,7 +549,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -702,6 +703,12 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247" +[[package]] +name = "assert_matches" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" + [[package]] name = "async-channel" version = "1.9.0" @@ -715,9 +722,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +checksum = "9f2776ead772134d55b62dd45e59a79e21612d85d0af729b8b7d3967d601a62a" dependencies = [ "concurrent-queue", "event-listener 5.3.0", @@ -728,9 +735,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e9eabd7a98fe442131a17c316bd9349c43695e49e730c3c8e12cfb5f4da2693" +checksum = "9c90a406b4495d129f00461241616194cb8a032c8d1c53c657f0961d5f8e0498" dependencies = [ "brotli", "flate2", @@ -781,7 +788,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -819,7 +826,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -1020,7 +1027,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -1115,7 +1122,7 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ - "async-channel 2.2.1", + "async-channel 2.3.0", "async-lock", "async-task", "futures-io", @@ -1230,7 +1237,7 @@ checksum = "6be9c93793b60dac381af475b98634d4b451e28336e72218cad9a20176218dbc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", "synstructure 0.13.1", ] @@ -1270,9 +1277,9 @@ dependencies = [ [[package]] name = "brotli" -version = "5.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19483b140a7ac7174d34b5a581b406c64f84da5409d3e09cf4fff604f9270e67" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1330,9 +1337,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" dependencies = [ "bytemuck_derive", ] @@ -1345,7 +1352,7 @@ checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -1404,7 +1411,7 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", - "semver 1.0.22", + "semver 1.0.23", "serde", "serde_json", "thiserror", @@ -1527,7 +1534,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -1934,7 +1941,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -1982,7 +1989,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -2004,7 +2011,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -2111,7 +2118,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -2263,7 +2270,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -2458,7 +2465,7 @@ dependencies = [ "k256 0.13.3", "log", "rand 0.8.5", - "secp256k1", + "secp256k1 0.28.2", "serde", "sha3", "zeroize", @@ -2485,7 +2492,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -2498,7 +2505,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -2509,7 +2516,7 @@ checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -2520,9 +2527,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2760,9 +2767,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "fixed-hash" @@ -2905,7 +2912,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -3530,7 +3537,7 @@ checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -3924,7 +3931,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -4054,9 +4061,9 @@ dependencies = [ [[package]] name = "keccak-asm" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb8515fff80ed850aea4a1595f2e519c003e2a00a82fe168ebf5269196caf444" +checksum = "47a3633291834c4fbebf8673acbc1b04ec9d151418ff9b8e26dcd79129928758" dependencies = [ "digest 0.10.7", "sha3-asm", @@ -4467,7 +4474,7 @@ checksum = "38b4faf00617defe497754acde3024865bc143d44a86799b24e191ecff91354f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -4862,9 +4869,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -4876,11 +4883,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", "serde", @@ -4888,9 +4894,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -4923,11 +4929,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -4971,7 +4976,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -5066,7 +5071,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -5120,9 +5125,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.9" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arrayvec", "bitvec", @@ -5135,11 +5140,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.9" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -5201,9 +5206,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -5294,7 +5299,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -5323,7 +5328,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -5340,9 +5345,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -5441,15 +5446,6 @@ dependencies = [ "toml 0.5.11", ] -[[package]] -name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.7", -] - [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -5485,9 +5481,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -5892,8 +5888,8 @@ dependencies = [ [[package]] name = "reth" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "ahash", "alloy-rlp", @@ -5942,7 +5938,6 @@ dependencies = [ "reth-payload-validator", "reth-primitives", "reth-provider", - "reth-prune", "reth-revm", "reth-rpc", "reth-rpc-api", @@ -5967,8 +5962,8 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "futures-util", "reth-beacon-consensus", @@ -5990,8 +5985,8 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-rlp", "futures-core", @@ -6013,14 +6008,14 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "futures", "metrics", - "reth-beacon-consensus-core", "reth-db", "reth-engine-primitives", + "reth-ethereum-consensus", "reth-interfaces", "reth-metrics", "reth-payload-builder", @@ -6040,20 +6035,10 @@ dependencies = [ "tracing", ] -[[package]] -name = "reth-beacon-consensus-core" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" -dependencies = [ - "reth-consensus", - "reth-consensus-common", - "reth-primitives", -] - [[package]] name = "reth-blockchain-tree" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "aquamarine", "linked_hash_set", @@ -6077,8 +6062,8 @@ dependencies = [ [[package]] name = "reth-cli-runner" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "reth-tasks", "tokio", @@ -6087,9 +6072,10 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-genesis", "alloy-primitives", @@ -6101,19 +6087,19 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "convert_case 0.6.0", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] name = "reth-config" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "confy", "humantime-serde", @@ -6121,14 +6107,14 @@ dependencies = [ "reth-net-nat", "reth-network", "reth-primitives", - "secp256k1", + "secp256k1 0.28.2", "serde", ] [[package]] name = "reth-consensus" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "auto_impl", "reth-primitives", @@ -6137,8 +6123,8 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "reth-consensus", "reth-interfaces", @@ -6148,8 +6134,8 @@ dependencies = [ [[package]] name = "reth-db" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "arbitrary", "bytes", @@ -6179,8 +6165,8 @@ dependencies = [ [[package]] name = "reth-discv4" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-rlp", "discv5", @@ -6191,7 +6177,7 @@ dependencies = [ "reth-net-nat", "reth-network-types", "reth-primitives", - "secp256k1", + "secp256k1 0.28.2", "serde", "thiserror", "tokio", @@ -6201,8 +6187,8 @@ dependencies = [ [[package]] name = "reth-discv5" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-rlp", "derive_more", @@ -6217,7 +6203,7 @@ dependencies = [ "reth-metrics", "reth-network-types", "reth-primitives", - "secp256k1", + "secp256k1 0.28.2", "thiserror", "tokio", "tracing", @@ -6225,8 +6211,8 @@ dependencies = [ [[package]] name = "reth-dns-discovery" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "data-encoding", "enr 0.12.0", @@ -6236,7 +6222,7 @@ dependencies = [ "reth-network-types", "reth-primitives", "schnellru", - "secp256k1", + "secp256k1 0.28.2", "serde", "serde_with", "thiserror", @@ -6248,8 +6234,8 @@ dependencies = [ [[package]] name = "reth-downloaders" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-rlp", "futures", @@ -6275,8 +6261,8 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "aes 0.8.4", "alloy-rlp", @@ -6295,7 +6281,7 @@ dependencies = [ "reth-net-common", "reth-network-types", "reth-primitives", - "secp256k1", + "secp256k1 0.28.2", "sha2 0.10.8", "sha3", "thiserror", @@ -6308,8 +6294,8 @@ dependencies = [ [[package]] name = "reth-engine-primitives" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6319,8 +6305,8 @@ dependencies = [ [[package]] name = "reth-eth-wire" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-rlp", "bytes", @@ -6346,8 +6332,8 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-rlp", "bytes", @@ -6358,10 +6344,20 @@ dependencies = [ "thiserror", ] +[[package]] +name = "reth-ethereum-consensus" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +dependencies = [ + "reth-consensus", + "reth-consensus-common", + "reth-primitives", +] + [[package]] name = "reth-ethereum-engine-primitives" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-rlp", "reth-engine-primitives", @@ -6375,8 +6371,8 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6391,10 +6387,13 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "reth-basic-payload-builder", + "reth-evm", + "reth-evm-ethereum", + "reth-interfaces", "reth-payload-builder", "reth-primitives", "reth-provider", @@ -6406,8 +6405,8 @@ dependencies = [ [[package]] name = "reth-etl" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "rayon", "reth-db", @@ -6416,9 +6415,10 @@ dependencies = [ [[package]] name = "reth-evm" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ + "alloy-consensus", "futures-util", "reth-interfaces", "reth-primitives", @@ -6428,21 +6428,28 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-rlp", + "alloy-sol-types", "reth-evm", "reth-interfaces", "reth-primitives", "reth-revm", + "revm-interpreter", + "revm-precompile", "revm-primitives", + "serde_json", "tracing", ] [[package]] name = "reth-exex" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "eyre", "metrics", @@ -6462,8 +6469,8 @@ dependencies = [ [[package]] name = "reth-interfaces" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "auto_impl", "clap", @@ -6480,8 +6487,8 @@ dependencies = [ [[package]] name = "reth-ipc" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "async-trait", "bytes", @@ -6501,8 +6508,8 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "bitflags 2.5.0", "byteorder", @@ -6519,8 +6526,8 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "bindgen", "cc", @@ -6529,8 +6536,8 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "futures", "metrics", @@ -6541,20 +6548,20 @@ dependencies = [ [[package]] name = "reth-metrics-derive" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "once_cell", "proc-macro2", "quote", "regex", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] name = "reth-net-common" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "pin-project", "reth-network-types", @@ -6563,8 +6570,8 @@ dependencies = [ [[package]] name = "reth-net-nat" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "igd-next", "pin-project-lite", @@ -6577,8 +6584,8 @@ dependencies = [ [[package]] name = "reth-network" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-rlp", "aquamarine", @@ -6614,7 +6621,7 @@ dependencies = [ "reth-tokio-util", "reth-transaction-pool", "schnellru", - "secp256k1", + "secp256k1 0.28.2", "serde", "serde_json", "smallvec", @@ -6627,8 +6634,8 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "enr 0.12.0", "reth-discv4", @@ -6643,13 +6650,13 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-primitives", "alloy-rlp", "enr 0.12.0", - "secp256k1", + "secp256k1 0.28.2", "serde_with", "thiserror", "url", @@ -6657,8 +6664,8 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "anyhow", "bincode", @@ -6677,8 +6684,8 @@ dependencies = [ [[package]] name = "reth-node-api" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "reth-db", "reth-engine-primitives", @@ -6692,8 +6699,8 @@ dependencies = [ [[package]] name = "reth-node-builder" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "aquamarine", "confy", @@ -6721,6 +6728,7 @@ dependencies = [ "reth-prune", "reth-rpc", "reth-rpc-engine-api", + "reth-rpc-layer", "reth-stages", "reth-static-file", "reth-tasks", @@ -6732,8 +6740,8 @@ dependencies = [ [[package]] name = "reth-node-core" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "clap", "const-str", @@ -6773,13 +6781,14 @@ dependencies = [ "reth-rpc-api", "reth-rpc-builder", "reth-rpc-engine-api", + "reth-rpc-layer", "reth-rpc-types", "reth-rpc-types-compat", "reth-tasks", "reth-tracing", "reth-transaction-pool", "reth-trie", - "secp256k1", + "secp256k1 0.28.2", "serde", "serde_json", "shellexpand", @@ -6793,8 +6802,8 @@ dependencies = [ [[package]] name = "reth-node-ethereum" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "eyre", "reth-basic-payload-builder", @@ -6811,8 +6820,8 @@ dependencies = [ [[package]] name = "reth-node-events" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "futures", "humantime", @@ -6833,8 +6842,8 @@ dependencies = [ [[package]] name = "reth-payload-builder" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "futures-util", "metrics", @@ -6854,8 +6863,8 @@ dependencies = [ [[package]] name = "reth-payload-validator" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6864,10 +6873,11 @@ dependencies = [ [[package]] name = "reth-primitives" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-chains", + "alloy-consensus", "alloy-eips", "alloy-genesis", "alloy-primitives", @@ -6889,14 +6899,12 @@ dependencies = [ "reth-codecs", "reth-ethereum-forks", "reth-network-types", - "reth-rpc-types", "revm", "revm-primitives", "roaring", - "secp256k1", + "secp256k1 0.28.2", "serde", "serde_json", - "sha2 0.10.8", "strum", "tempfile", "thiserror", @@ -6905,10 +6913,11 @@ dependencies = [ [[package]] name = "reth-provider" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-rlp", + "alloy-rpc-types-engine", "auto_impl", "dashmap", "itertools 0.12.1", @@ -6923,7 +6932,6 @@ dependencies = [ "reth-metrics", "reth-nippy-jar", "reth-primitives", - "reth-rpc-types", "reth-trie", "revm", "strum", @@ -6934,8 +6942,8 @@ dependencies = [ [[package]] name = "reth-prune" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "itertools 0.12.1", "metrics", @@ -6955,22 +6963,24 @@ dependencies = [ [[package]] name = "reth-revm" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-rlp", "reth-consensus-common", "reth-interfaces", "reth-primitives", "reth-provider", "revm", - "revm-inspectors", "tracing", ] [[package]] name = "reth-rpc" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-dyn-abi", "alloy-primitives", @@ -7008,7 +7018,7 @@ dependencies = [ "revm-inspectors", "revm-primitives", "schnellru", - "secp256k1", + "secp256k1 0.28.2", "serde", "serde_json", "thiserror", @@ -7021,8 +7031,8 @@ dependencies = [ [[package]] name = "reth-rpc-api" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "jsonrpsee", "reth-engine-primitives", @@ -7035,8 +7045,8 @@ dependencies = [ [[package]] name = "reth-rpc-builder" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "hyper", "jsonrpsee", @@ -7050,6 +7060,7 @@ dependencies = [ "reth-provider", "reth-rpc", "reth-rpc-api", + "reth-rpc-layer", "reth-tasks", "reth-transaction-pool", "serde", @@ -7062,8 +7073,8 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "async-trait", "jsonrpsee-core", @@ -7085,10 +7096,32 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-rpc-layer" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +dependencies = [ + "assert_matches", + "http", + "http-body", + "hyper", + "jsonrpsee", + "jsonwebtoken 8.3.0", + "pin-project", + "rand 0.8.5", + "reth-primitives", + "serde", + "tempfile", + "thiserror", + "tokio", + "tower", + "tracing", +] + [[package]] name = "reth-rpc-types" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -7105,8 +7138,8 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-rlp", "alloy-rpc-types", @@ -7116,8 +7149,8 @@ dependencies = [ [[package]] name = "reth-stages" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "futures-util", "itertools 0.12.1", @@ -7143,8 +7176,8 @@ dependencies = [ [[package]] name = "reth-stages-api" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "aquamarine", "auto_impl", @@ -7156,6 +7189,7 @@ dependencies = [ "reth-metrics", "reth-primitives", "reth-provider", + "reth-prune", "reth-static-file", "reth-tokio-util", "thiserror", @@ -7166,8 +7200,8 @@ dependencies = [ [[package]] name = "reth-static-file" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "parking_lot 0.12.2", "rayon", @@ -7183,8 +7217,8 @@ dependencies = [ [[package]] name = "reth-tasks" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "dyn-clone", "futures-util", @@ -7200,8 +7234,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "tokio", "tokio-stream", @@ -7209,8 +7243,8 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "clap", "eyre", @@ -7224,8 +7258,8 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-rlp", "aquamarine", @@ -7256,8 +7290,8 @@ dependencies = [ [[package]] name = "reth-trie" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-rlp", "auto_impl", @@ -7274,8 +7308,8 @@ dependencies = [ [[package]] name = "reth-trie-parallel" -version = "0.2.0-beta.6" -source = "git+https://github.com/paradigmxyz/reth?rev=5f82993c23164ce8ccdc7bf3ae5085205383a5c8#5f82993c23164ce8ccdc7bf3ae5085205383a5c8" +version = "0.2.0-beta.7" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" dependencies = [ "alloy-rlp", "derive_more", @@ -7296,9 +7330,9 @@ dependencies = [ [[package]] name = "revm" -version = "8.0.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a454c1c650b2b2e23f0c461af09e6c31e1d15e1cbebe905a701c46b8a50afc" +checksum = "3a2c336f9921588e50871c00024feb51a521eca50ce6d01494bb9c50f837c8ed" dependencies = [ "auto_impl", "cfg-if", @@ -7312,7 +7346,7 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.1.0" -source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=7168ac5#7168ac55682fb420da7a82ed94bfb0c30a034113" +source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=3215ff5#3215ff58309feef596b0e76c664744b5bf322c8b" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -7329,9 +7363,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d322f2730cd300e99d271a1704a2dfb8973d832428f5aa282aaa40e2473b5eec" +checksum = "a58182c7454179826f9dad2ca577661963092ce9d0fd0c9d682c1e9215a72e70" dependencies = [ "revm-primitives", "serde", @@ -7339,9 +7373,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931f692f3f4fc72ec39d5d270f8e9d208c4a6008de7590ee96cf948e3b6d3f8d" +checksum = "dc8af9aa737eef0509a50d9f3cc1a631557a00ef2e70a3aa8a75d9ee0ed275bb" dependencies = [ "aurora-engine-modexp", "c-kzg", @@ -7349,16 +7383,16 @@ dependencies = [ "once_cell", "revm-primitives", "ripemd", - "secp256k1", + "secp256k1 0.29.0", "sha2 0.10.8", "substrate-bn", ] [[package]] name = "revm-primitives" -version = "3.1.1" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbbc9640790cebcb731289afb7a7d96d16ad94afeb64b5d0b66443bd151e79d6" +checksum = "b9bf5d465e64b697da6a111cb19e798b5b2ebb18e5faf2ad48e9e8d47c64add2" dependencies = [ "alloy-primitives", "auto_impl", @@ -7524,9 +7558,9 @@ checksum = "f86854cf50259291520509879a5c294c3c9a4c334e9ff65071c51e42ef1e2343" [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -7555,7 +7589,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.22", + "semver 1.0.23", ] [[package]] @@ -7643,9 +7677,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" @@ -7670,9 +7704,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" [[package]] name = "rusty-fork" @@ -7699,9 +7733,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "ryu-js" @@ -7711,9 +7745,9 @@ checksum = "ad97d4ce1560a5e27cec89519dc8300d1aa6035b099821261c651486a19e44d5" [[package]] name = "scale-info" -version = "2.11.2" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c453e59a955f81fb62ee5d596b450383d699f152d350e9d23a0db2adb78e4c0" +checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "cfg-if", "derive_more", @@ -7723,11 +7757,11 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.11.2" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18cf6c6447f813ef19eb450e985bcce6705f9ce7660db221b59093d15c79c4b7" +checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -7744,9 +7778,9 @@ dependencies = [ [[package]] name = "schnellru" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" +checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367" dependencies = [ "ahash", "cfg-if", @@ -7804,10 +7838,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ "rand 0.8.5", - "secp256k1-sys", + "secp256k1-sys 0.9.2", "serde", ] +[[package]] +name = "secp256k1" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" +dependencies = [ + "rand 0.8.5", + "secp256k1-sys 0.10.0", +] + [[package]] name = "secp256k1-sys" version = "0.9.2" @@ -7817,6 +7861,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1433bd67156263443f14d603720b082dd3121779323fce20cba2aa07b874bc1b" +dependencies = [ + "cc", +] + [[package]] name = "security-framework" version = "2.11.0" @@ -7851,9 +7904,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] @@ -7875,9 +7928,9 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" -version = "1.0.200" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" dependencies = [ "serde_derive", ] @@ -7893,20 +7946,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "indexmap 2.2.6", "itoa", @@ -7983,7 +8036,7 @@ dependencies = [ "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -8047,9 +8100,9 @@ dependencies = [ [[package]] name = "sha3-asm" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac61da6b35ad76b195eb4771210f947734321a8d81d7738e1580d953bc7a15e" +checksum = "a9b57fd861253bff08bb1919e995f90ba8f4889de2726091c8876f3a4e823b40" dependencies = [ "cc", "cfg-if", @@ -8310,7 +8363,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -8362,7 +8415,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -8407,9 +8460,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" dependencies = [ "proc-macro2", "quote", @@ -8425,7 +8478,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -8454,7 +8507,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -8504,22 +8557,22 @@ checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -8673,7 +8726,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -8764,17 +8817,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.21.1" @@ -8894,7 +8936,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -9282,9 +9324,9 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "want" @@ -9328,7 +9370,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", "wasm-bindgen-shared", ] @@ -9362,7 +9404,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -9693,28 +9735,28 @@ checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", "synstructure 0.13.1", ] [[package]] name = "zerocopy" -version = "0.7.33" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "087eca3c1eaf8c47b94d02790dd086cd594b912d2043d4de4bfdd466b3befb7c" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.33" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4b6c273f496d8fd4eaf18853e6b448760225dc030ff2c485a786859aea6393" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -9734,7 +9776,7 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", "synstructure 0.13.1", ] @@ -9755,7 +9797,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] @@ -9777,7 +9819,7 @@ checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.63", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 635eaf60..2c4f6197 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,12 +27,12 @@ incremental = false ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "8a394af6c9378b844e183cfdca3091a92b473eda" } beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "8a394af6c9378b844e183cfdca3091a92b473eda" } -reth = { git = "https://github.com/paradigmxyz/reth", rev = "5f82993c23164ce8ccdc7bf3ae5085205383a5c8" } -reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "5f82993c23164ce8ccdc7bf3ae5085205383a5c8" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "5f82993c23164ce8ccdc7bf3ae5085205383a5c8" } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "5f82993c23164ce8ccdc7bf3ae5085205383a5c8" } -alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "77c1240" } -alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "77c1240" } +reth = { git = "https://github.com/paradigmxyz/reth", branch = "devnet-0" } +reth-db = { git = "https://github.com/paradigmxyz/reth", branch = "devnet-0" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", branch = "devnet-0" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", branch = "devnet-0" } +alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "dd25769" } +alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "dd25769" } futures = "0.3.21" tokio = "1.0" From 1ccd707e24a9db744f39cea42b24cbab8121cc00 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Tue, 14 May 2024 12:23:04 +0300 Subject: [PATCH 07/18] finish mapping reth payload to execution payload for block submission --- mev-build-rs/src/compat.rs | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/mev-build-rs/src/compat.rs b/mev-build-rs/src/compat.rs index 12d6b646..37d28501 100644 --- a/mev-build-rs/src/compat.rs +++ b/mev-build-rs/src/compat.rs @@ -1,12 +1,13 @@ use crate::Error; use ethereum_consensus::{ crypto::{KzgCommitment, KzgProof}, + electra::{DepositReceipt, ExecutionLayerWithdrawalRequest}, primitives::{Bytes32, ExecutionAddress}, ssz::prelude::{ByteList, ByteVector, SimpleSerializeError, U256}, Fork, }; use mev_rs::types::{BlobsBundle, ExecutionPayload}; -use reth::primitives::{Address, BlobTransactionSidecar, Bloom, SealedBlock, B256}; +use reth::primitives::{Address, BlobTransactionSidecar, Bloom, Request, SealedBlock, B256}; #[cfg(not(feature = "minimal-preset"))] use ethereum_consensus::{deneb::mainnet as deneb, electra::mainnet as electra}; @@ -30,6 +31,7 @@ pub fn to_execution_payload(value: &SealedBlock, fork: Fork) -> Result { let transactions = transactions @@ -85,6 +87,30 @@ pub fn to_execution_payload(value: &SealedBlock, fork: Fork) -> Result>(); + let mut deposit_receipts = vec![]; + let mut withdrawal_requests = vec![]; + for request in requests.as_ref().unwrap() { + match request { + Request::DepositRequest(deposit) => { + let deposit_receipt = DepositReceipt { + public_key: deposit.pubkey, + withdrawal_credentials: deposit.withdrawal_credentials, + amount: deposit.amount, + signature: deposit.signature, + index: deposit.index, + }; + deposit_receipts.push(deposit_receipt); + } + Request::WithdrawalRequest(withdrawal) => { + let withdrawal_request = ExecutionLayerWithdrawalRequest { + source_address: withdrawal.source_address, + validator_public_key: withdrawal.validator_public_key, + amount: withdrawal.amount, + }; + withdrawal_requests.push(withdrawal_request); + } + } + } let payload = electra::ExecutionPayload { parent_hash: to_bytes32(header.parent_hash), fee_recipient: to_bytes20(header.beneficiary), @@ -103,6 +129,8 @@ pub fn to_execution_payload(value: &SealedBlock, fork: Fork) -> Result Date: Tue, 14 May 2024 12:51:02 +0300 Subject: [PATCH 08/18] set correct deps for this reth branch --- Cargo.lock | 150 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 17 ++++++ 2 files changed, 90 insertions(+), 77 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 046a8150..4e43bea1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4115,7 +4115,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.48.5", ] [[package]] @@ -4973,7 +4973,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn 2.0.63", @@ -5889,7 +5889,7 @@ dependencies = [ [[package]] name = "reth" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "ahash", "alloy-rlp", @@ -5963,7 +5963,7 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "futures-util", "reth-beacon-consensus", @@ -5986,7 +5986,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-rlp", "futures-core", @@ -6009,7 +6009,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "futures", "metrics", @@ -6038,7 +6038,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "aquamarine", "linked_hash_set", @@ -6063,7 +6063,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "reth-tasks", "tokio", @@ -6073,7 +6073,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6088,7 +6088,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -6099,7 +6099,7 @@ dependencies = [ [[package]] name = "reth-config" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "confy", "humantime-serde", @@ -6114,7 +6114,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "auto_impl", "reth-primitives", @@ -6124,7 +6124,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "reth-consensus", "reth-interfaces", @@ -6135,7 +6135,7 @@ dependencies = [ [[package]] name = "reth-db" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "arbitrary", "bytes", @@ -6166,7 +6166,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-rlp", "discv5", @@ -6188,7 +6188,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-rlp", "derive_more", @@ -6212,7 +6212,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "data-encoding", "enr 0.12.0", @@ -6235,7 +6235,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-rlp", "futures", @@ -6262,7 +6262,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "aes 0.8.4", "alloy-rlp", @@ -6295,7 +6295,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6306,7 +6306,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-rlp", "bytes", @@ -6333,7 +6333,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-rlp", "bytes", @@ -6347,7 +6347,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "reth-consensus", "reth-consensus-common", @@ -6357,7 +6357,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-rlp", "reth-engine-primitives", @@ -6372,7 +6372,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6388,7 +6388,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "reth-basic-payload-builder", "reth-evm", @@ -6406,7 +6406,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "rayon", "reth-db", @@ -6416,7 +6416,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-consensus", "futures-util", @@ -6429,7 +6429,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6449,7 +6449,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "eyre", "metrics", @@ -6470,7 +6470,7 @@ dependencies = [ [[package]] name = "reth-interfaces" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "auto_impl", "clap", @@ -6488,7 +6488,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "async-trait", "bytes", @@ -6509,7 +6509,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "bitflags 2.5.0", "byteorder", @@ -6527,7 +6527,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "bindgen", "cc", @@ -6537,7 +6537,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "futures", "metrics", @@ -6549,7 +6549,7 @@ dependencies = [ [[package]] name = "reth-metrics-derive" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "once_cell", "proc-macro2", @@ -6561,7 +6561,7 @@ dependencies = [ [[package]] name = "reth-net-common" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "pin-project", "reth-network-types", @@ -6571,7 +6571,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "igd-next", "pin-project-lite", @@ -6585,7 +6585,7 @@ dependencies = [ [[package]] name = "reth-network" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-rlp", "aquamarine", @@ -6635,7 +6635,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "enr 0.12.0", "reth-discv4", @@ -6651,7 +6651,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6665,7 +6665,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "anyhow", "bincode", @@ -6685,7 +6685,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "reth-db", "reth-engine-primitives", @@ -6700,7 +6700,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "aquamarine", "confy", @@ -6741,7 +6741,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "clap", "const-str", @@ -6803,7 +6803,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "eyre", "reth-basic-payload-builder", @@ -6821,7 +6821,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "futures", "humantime", @@ -6843,7 +6843,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "futures-util", "metrics", @@ -6864,7 +6864,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6874,7 +6874,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-chains", "alloy-consensus", @@ -6914,7 +6914,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-rlp", "alloy-rpc-types-engine", @@ -6943,7 +6943,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "itertools 0.12.1", "metrics", @@ -6964,7 +6964,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6980,7 +6980,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-dyn-abi", "alloy-primitives", @@ -7032,7 +7032,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "jsonrpsee", "reth-engine-primitives", @@ -7046,7 +7046,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "hyper", "jsonrpsee", @@ -7074,7 +7074,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "async-trait", "jsonrpsee-core", @@ -7099,7 +7099,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "assert_matches", "http", @@ -7121,7 +7121,7 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -7139,7 +7139,7 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-rlp", "alloy-rpc-types", @@ -7150,7 +7150,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "futures-util", "itertools 0.12.1", @@ -7177,7 +7177,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "aquamarine", "auto_impl", @@ -7201,7 +7201,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "parking_lot 0.12.2", "rayon", @@ -7218,7 +7218,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "dyn-clone", "futures-util", @@ -7235,7 +7235,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "tokio", "tokio-stream", @@ -7244,7 +7244,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "clap", "eyre", @@ -7259,7 +7259,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-rlp", "aquamarine", @@ -7291,7 +7291,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-rlp", "auto_impl", @@ -7309,7 +7309,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#f5ce27722bd23418e138c93a5e3500921d3fdeae" +source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" dependencies = [ "alloy-rlp", "derive_more", @@ -7331,8 +7331,7 @@ dependencies = [ [[package]] name = "revm" version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a2c336f9921588e50871c00024feb51a521eca50ce6d01494bb9c50f837c8ed" +source = "git+https://github.com/bluealloy/revm?rev=38c4d3e756291b8a11f48bdce6f4248582824890#38c4d3e756291b8a11f48bdce6f4248582824890" dependencies = [ "auto_impl", "cfg-if", @@ -7364,8 +7363,7 @@ dependencies = [ [[package]] name = "revm-interpreter" version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a58182c7454179826f9dad2ca577661963092ce9d0fd0c9d682c1e9215a72e70" +source = "git+https://github.com/bluealloy/revm?rev=38c4d3e756291b8a11f48bdce6f4248582824890#38c4d3e756291b8a11f48bdce6f4248582824890" dependencies = [ "revm-primitives", "serde", @@ -7374,8 +7372,7 @@ dependencies = [ [[package]] name = "revm-precompile" version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc8af9aa737eef0509a50d9f3cc1a631557a00ef2e70a3aa8a75d9ee0ed275bb" +source = "git+https://github.com/bluealloy/revm?rev=38c4d3e756291b8a11f48bdce6f4248582824890#38c4d3e756291b8a11f48bdce6f4248582824890" dependencies = [ "aurora-engine-modexp", "c-kzg", @@ -7391,8 +7388,7 @@ dependencies = [ [[package]] name = "revm-primitives" version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9bf5d465e64b697da6a111cb19e798b5b2ebb18e5faf2ad48e9e8d47c64add2" +source = "git+https://github.com/bluealloy/revm?rev=38c4d3e756291b8a11f48bdce6f4248582824890#38c4d3e756291b8a11f48bdce6f4248582824890" dependencies = [ "alloy-primitives", "auto_impl", diff --git a/Cargo.toml b/Cargo.toml index 2c4f6197..d3fe1e21 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,6 +34,19 @@ reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", bran alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "dd25769" } alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "dd25769" } +# revm +revm = { version = "9.0.0", features = [ + "std", + "secp256k1", +], default-features = false } +revm-primitives = { version = "4.0.0", features = [ + "std", +], default-features = false } +revm-interpreter = { version = "5.0.0", features = [ + "std", +], default-features = false } +revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "3215ff5" } + futures = "0.3.21" tokio = "1.0" tokio-stream = "0.1.15" @@ -65,3 +78,7 @@ clap = "4.1.4" [patch.crates-io] libffi-sys = { git = "https://github.com/tov/libffi-rs", rev = "d0704d634b6f3ffef5b6fc7e07fe965a1cff5c7b" } +revm = { git = "https://github.com/bluealloy/revm", rev = "38c4d3e756291b8a11f48bdce6f4248582824890" } +revm-interpreter = { git = "https://github.com/bluealloy/revm", rev = "38c4d3e756291b8a11f48bdce6f4248582824890" } +revm-precompile = { git = "https://github.com/bluealloy/revm", rev = "38c4d3e756291b8a11f48bdce6f4248582824890" } +revm-primitives = { git = "https://github.com/bluealloy/revm", rev = "38c4d3e756291b8a11f48bdce6f4248582824890" } From 42ecb8021e7d23be63216e9b9650790ecf2c0464 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Tue, 14 May 2024 15:15:20 +0300 Subject: [PATCH 09/18] update to latest reth devnet-0 --- Cargo.lock | 134 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 8 ++-- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4e43bea1..c1bc68e4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5889,7 +5889,7 @@ dependencies = [ [[package]] name = "reth" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "ahash", "alloy-rlp", @@ -5963,7 +5963,7 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "futures-util", "reth-beacon-consensus", @@ -5986,7 +5986,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-rlp", "futures-core", @@ -6009,7 +6009,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "futures", "metrics", @@ -6038,7 +6038,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "aquamarine", "linked_hash_set", @@ -6063,7 +6063,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "reth-tasks", "tokio", @@ -6073,7 +6073,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6088,7 +6088,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -6099,7 +6099,7 @@ dependencies = [ [[package]] name = "reth-config" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "confy", "humantime-serde", @@ -6114,7 +6114,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "auto_impl", "reth-primitives", @@ -6124,7 +6124,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "reth-consensus", "reth-interfaces", @@ -6135,7 +6135,7 @@ dependencies = [ [[package]] name = "reth-db" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "arbitrary", "bytes", @@ -6166,7 +6166,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-rlp", "discv5", @@ -6188,7 +6188,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-rlp", "derive_more", @@ -6212,7 +6212,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "data-encoding", "enr 0.12.0", @@ -6235,7 +6235,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-rlp", "futures", @@ -6262,7 +6262,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "aes 0.8.4", "alloy-rlp", @@ -6295,7 +6295,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6306,7 +6306,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-rlp", "bytes", @@ -6333,7 +6333,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-rlp", "bytes", @@ -6347,7 +6347,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "reth-consensus", "reth-consensus-common", @@ -6357,7 +6357,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-rlp", "reth-engine-primitives", @@ -6372,7 +6372,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6388,7 +6388,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "reth-basic-payload-builder", "reth-evm", @@ -6406,7 +6406,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "rayon", "reth-db", @@ -6416,7 +6416,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-consensus", "futures-util", @@ -6429,7 +6429,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6449,7 +6449,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "eyre", "metrics", @@ -6470,7 +6470,7 @@ dependencies = [ [[package]] name = "reth-interfaces" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "auto_impl", "clap", @@ -6488,7 +6488,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "async-trait", "bytes", @@ -6509,7 +6509,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "bitflags 2.5.0", "byteorder", @@ -6527,7 +6527,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "bindgen", "cc", @@ -6537,7 +6537,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "futures", "metrics", @@ -6549,7 +6549,7 @@ dependencies = [ [[package]] name = "reth-metrics-derive" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "once_cell", "proc-macro2", @@ -6561,7 +6561,7 @@ dependencies = [ [[package]] name = "reth-net-common" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "pin-project", "reth-network-types", @@ -6571,7 +6571,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "igd-next", "pin-project-lite", @@ -6585,7 +6585,7 @@ dependencies = [ [[package]] name = "reth-network" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-rlp", "aquamarine", @@ -6635,7 +6635,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "enr 0.12.0", "reth-discv4", @@ -6651,7 +6651,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6665,7 +6665,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "anyhow", "bincode", @@ -6685,7 +6685,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "reth-db", "reth-engine-primitives", @@ -6700,7 +6700,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "aquamarine", "confy", @@ -6741,7 +6741,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "clap", "const-str", @@ -6803,7 +6803,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "eyre", "reth-basic-payload-builder", @@ -6821,7 +6821,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "futures", "humantime", @@ -6843,7 +6843,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "futures-util", "metrics", @@ -6864,7 +6864,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6874,7 +6874,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-chains", "alloy-consensus", @@ -6914,7 +6914,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-rlp", "alloy-rpc-types-engine", @@ -6943,7 +6943,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "itertools 0.12.1", "metrics", @@ -6964,7 +6964,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6980,7 +6980,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-dyn-abi", "alloy-primitives", @@ -7032,7 +7032,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "jsonrpsee", "reth-engine-primitives", @@ -7046,7 +7046,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "hyper", "jsonrpsee", @@ -7074,7 +7074,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "async-trait", "jsonrpsee-core", @@ -7099,7 +7099,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "assert_matches", "http", @@ -7121,7 +7121,7 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -7139,7 +7139,7 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-rlp", "alloy-rpc-types", @@ -7150,7 +7150,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "futures-util", "itertools 0.12.1", @@ -7177,7 +7177,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "aquamarine", "auto_impl", @@ -7201,7 +7201,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "parking_lot 0.12.2", "rayon", @@ -7218,7 +7218,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "dyn-clone", "futures-util", @@ -7235,7 +7235,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "tokio", "tokio-stream", @@ -7244,7 +7244,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "clap", "eyre", @@ -7259,7 +7259,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-rlp", "aquamarine", @@ -7291,7 +7291,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-rlp", "auto_impl", @@ -7309,7 +7309,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?branch=devnet-0#6ffe739bb5017046abaefbea5255f58619eec450" +source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" dependencies = [ "alloy-rlp", "derive_more", diff --git a/Cargo.toml b/Cargo.toml index d3fe1e21..79acc0a4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,10 +27,10 @@ incremental = false ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "8a394af6c9378b844e183cfdca3091a92b473eda" } beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "8a394af6c9378b844e183cfdca3091a92b473eda" } -reth = { git = "https://github.com/paradigmxyz/reth", branch = "devnet-0" } -reth-db = { git = "https://github.com/paradigmxyz/reth", branch = "devnet-0" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", branch = "devnet-0" } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", branch = "devnet-0" } +reth = { git = "https://github.com/paradigmxyz/reth", rev = "48066652ff5436eafcbf21b448543b86174c625d" } +reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "48066652ff5436eafcbf21b448543b86174c625d" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "48066652ff5436eafcbf21b448543b86174c625d" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "48066652ff5436eafcbf21b448543b86174c625d" } alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "dd25769" } alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "dd25769" } From a8fde8348efc21ccb4992f845e09e7c1f1d4740b Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Tue, 14 May 2024 15:20:42 +0300 Subject: [PATCH 10/18] reth electra payload support --- mev-build-rs/src/compat.rs | 23 ++++++++++++++--------- mev-build-rs/src/node.rs | 3 ++- mev-build-rs/src/payload/builder.rs | 4 ++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/mev-build-rs/src/compat.rs b/mev-build-rs/src/compat.rs index 37d28501..d6a9a245 100644 --- a/mev-build-rs/src/compat.rs +++ b/mev-build-rs/src/compat.rs @@ -2,7 +2,7 @@ use crate::Error; use ethereum_consensus::{ crypto::{KzgCommitment, KzgProof}, electra::{DepositReceipt, ExecutionLayerWithdrawalRequest}, - primitives::{Bytes32, ExecutionAddress}, + primitives::{BlsPublicKey, BlsSignature, Bytes32, ExecutionAddress}, ssz::prelude::{ByteList, ByteVector, SimpleSerializeError, U256}, Fork, }; @@ -89,26 +89,31 @@ pub fn to_execution_payload(value: &SealedBlock, fork: Fork) -> Result>(); let mut deposit_receipts = vec![]; let mut withdrawal_requests = vec![]; - for request in requests.as_ref().unwrap() { + let requests = requests.as_ref().cloned().unwrap(); + for request in requests { match request { Request::DepositRequest(deposit) => { let deposit_receipt = DepositReceipt { - public_key: deposit.pubkey, - withdrawal_credentials: deposit.withdrawal_credentials, + public_key: BlsPublicKey::try_from(deposit.pubkey.as_ref()).unwrap(), + withdrawal_credentials: to_bytes32(deposit.withdrawal_credentials), amount: deposit.amount, - signature: deposit.signature, + signature: BlsSignature::try_from(deposit.signature.as_ref()).unwrap(), index: deposit.index, }; deposit_receipts.push(deposit_receipt); } Request::WithdrawalRequest(withdrawal) => { let withdrawal_request = ExecutionLayerWithdrawalRequest { - source_address: withdrawal.source_address, - validator_public_key: withdrawal.validator_public_key, + source_address: to_bytes20(withdrawal.source_address), + validator_public_key: BlsPublicKey::try_from( + withdrawal.validator_public_key.as_ref(), + ) + .unwrap(), amount: withdrawal.amount, }; withdrawal_requests.push(withdrawal_request); } + _ => unreachable!("struct is non-exhaustive, but all variants are matched"), } } let payload = electra::ExecutionPayload { @@ -129,8 +134,8 @@ pub fn to_execution_payload(value: &SealedBlock, fork: Fork) -> Result( drop(evm); db.commit(state); - let Block { mut header, mut body, ommers, withdrawals } = block.unseal(); + let Block { mut header, mut body, ommers, withdrawals, requests } = block.unseal(); // Verify we reserved the correct amount of gas for the payment transaction let gas_limit = header.gas_limit + result.gas_used(); @@ -181,7 +181,7 @@ fn append_payment( header.gas_used = cumulative_gas_used; header.gas_limit = gas_limit; - let block = Block { header, body, ommers, withdrawals }; + let block = Block { header, body, ommers, withdrawals, requests }; Ok(block.seal_slow()) } From f11f7724aefabdcb5990cf87044d1a14c1d343a3 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Tue, 14 May 2024 20:59:48 +0300 Subject: [PATCH 11/18] update payload builder for electra --- Cargo.lock | 286 +++++++++++++++++----------- Cargo.toml | 10 +- mev-build-rs/Cargo.toml | 2 + mev-build-rs/src/payload/builder.rs | 134 ++++++++++--- 4 files changed, 293 insertions(+), 139 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c1bc68e4..33e40693 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -133,12 +133,12 @@ dependencies = [ [[package]] name = "alloy-consensus" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" dependencies = [ - "alloy-eips", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "arbitrary", "c-kzg", "proptest", @@ -146,6 +146,19 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-consensus" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +dependencies = [ + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "c-kzg", + "serde", +] + [[package]] name = "alloy-dyn-abi" version = "0.7.2" @@ -167,11 +180,11 @@ dependencies = [ [[package]] name = "alloy-eips" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" dependencies = [ "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "arbitrary", "c-kzg", "derive_more", @@ -182,13 +195,38 @@ dependencies = [ "sha2 0.10.8", ] +[[package]] +name = "alloy-eips" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "c-kzg", + "once_cell", + "serde", + "sha2 0.10.8", +] + +[[package]] +name = "alloy-genesis" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" +dependencies = [ + "alloy-primitives", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "serde", + "serde_json", +] + [[package]] name = "alloy-genesis" version = "0.1.0" source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ "alloy-primitives", - "alloy-serde", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", "serde", "serde_json", ] @@ -222,11 +260,11 @@ name = "alloy-network" version = "0.1.0" source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", "alloy-json-rpc", "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", "alloy-signer", "alloy-sol-types", "async-trait", @@ -286,14 +324,14 @@ dependencies = [ [[package]] name = "alloy-rpc-types" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-genesis", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-sol-types", "itertools 0.12.1", "jsonrpsee-types", @@ -303,21 +341,39 @@ dependencies = [ ] [[package]] -name = "alloy-rpc-types-anvil" +name = "alloy-rpc-types" version = "0.1.0" source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +dependencies = [ + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "alloy-sol-types", + "itertools 0.12.1", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "alloy-rpc-types-anvil" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" dependencies = [ "alloy-primitives", - "alloy-serde", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "serde", ] [[package]] name = "alloy-rpc-types-beacon" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" dependencies = [ - "alloy-eips", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-primitives", "alloy-rpc-types-engine", "serde", @@ -327,14 +383,14 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types", - "alloy-serde", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "jsonrpsee-types", "jsonwebtoken 9.3.0", "rand 0.8.5", @@ -345,11 +401,21 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-serde" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" dependencies = [ "alloy-primitives", - "alloy-rpc-types", - "alloy-serde", "serde", "serde_json", ] @@ -382,7 +448,7 @@ name = "alloy-signer-wallet" version = "0.1.0" source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", "alloy-network", "alloy-primitives", "alloy-signer", @@ -4569,6 +4635,8 @@ dependencies = [ "reth", "reth-basic-payload-builder", "reth-db", + "reth-evm-ethereum", + "reth-interfaces", "reth-node-ethereum", "serde", "sha2 0.10.8", @@ -5889,7 +5957,7 @@ dependencies = [ [[package]] name = "reth" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "ahash", "alloy-rlp", @@ -5963,7 +6031,7 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "futures-util", "reth-beacon-consensus", @@ -5986,7 +6054,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "futures-core", @@ -6009,7 +6077,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "futures", "metrics", @@ -6038,7 +6106,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "aquamarine", "linked_hash_set", @@ -6063,7 +6131,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "reth-tasks", "tokio", @@ -6073,11 +6141,11 @@ dependencies = [ [[package]] name = "reth-codecs" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-genesis", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-primitives", "bytes", "modular-bitfield", @@ -6088,7 +6156,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -6099,7 +6167,7 @@ dependencies = [ [[package]] name = "reth-config" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "confy", "humantime-serde", @@ -6114,7 +6182,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "auto_impl", "reth-primitives", @@ -6124,7 +6192,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "reth-consensus", "reth-interfaces", @@ -6135,7 +6203,7 @@ dependencies = [ [[package]] name = "reth-db" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "arbitrary", "bytes", @@ -6166,7 +6234,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "discv5", @@ -6188,7 +6256,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "derive_more", @@ -6212,7 +6280,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "data-encoding", "enr 0.12.0", @@ -6235,7 +6303,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "futures", @@ -6262,7 +6330,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "aes 0.8.4", "alloy-rlp", @@ -6295,7 +6363,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6306,7 +6374,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "bytes", @@ -6333,7 +6401,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "bytes", @@ -6347,7 +6415,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "reth-consensus", "reth-consensus-common", @@ -6357,7 +6425,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "reth-engine-primitives", @@ -6372,7 +6440,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6388,7 +6456,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "reth-basic-payload-builder", "reth-evm", @@ -6406,7 +6474,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "rayon", "reth-db", @@ -6416,9 +6484,9 @@ dependencies = [ [[package]] name = "reth-evm" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "futures-util", "reth-interfaces", "reth-primitives", @@ -6429,10 +6497,10 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-rlp", "alloy-sol-types", "reth-evm", @@ -6449,7 +6517,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "eyre", "metrics", @@ -6470,7 +6538,7 @@ dependencies = [ [[package]] name = "reth-interfaces" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "auto_impl", "clap", @@ -6488,7 +6556,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "async-trait", "bytes", @@ -6509,7 +6577,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "bitflags 2.5.0", "byteorder", @@ -6527,7 +6595,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "bindgen", "cc", @@ -6537,7 +6605,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "futures", "metrics", @@ -6549,7 +6617,7 @@ dependencies = [ [[package]] name = "reth-metrics-derive" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "once_cell", "proc-macro2", @@ -6561,7 +6629,7 @@ dependencies = [ [[package]] name = "reth-net-common" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "pin-project", "reth-network-types", @@ -6571,7 +6639,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "igd-next", "pin-project-lite", @@ -6585,7 +6653,7 @@ dependencies = [ [[package]] name = "reth-network" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "aquamarine", @@ -6635,7 +6703,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "enr 0.12.0", "reth-discv4", @@ -6651,7 +6719,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6665,7 +6733,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "anyhow", "bincode", @@ -6685,7 +6753,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "reth-db", "reth-engine-primitives", @@ -6700,7 +6768,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "aquamarine", "confy", @@ -6741,7 +6809,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "clap", "const-str", @@ -6803,7 +6871,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "eyre", "reth-basic-payload-builder", @@ -6821,7 +6889,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "futures", "humantime", @@ -6843,7 +6911,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "futures-util", "metrics", @@ -6864,7 +6932,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6874,12 +6942,12 @@ dependencies = [ [[package]] name = "reth-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-chains", - "alloy-consensus", - "alloy-eips", - "alloy-genesis", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-primitives", "alloy-rlp", "alloy-trie", @@ -6914,7 +6982,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "alloy-rpc-types-engine", @@ -6943,7 +7011,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "itertools 0.12.1", "metrics", @@ -6964,10 +7032,10 @@ dependencies = [ [[package]] name = "reth-revm" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-rlp", "reth-consensus-common", "reth-interfaces", @@ -6980,7 +7048,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-dyn-abi", "alloy-primitives", @@ -7032,7 +7100,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "jsonrpsee", "reth-engine-primitives", @@ -7046,7 +7114,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "hyper", "jsonrpsee", @@ -7074,7 +7142,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "async-trait", "jsonrpsee-core", @@ -7099,7 +7167,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "assert_matches", "http", @@ -7121,10 +7189,10 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-rpc-types-anvil", "alloy-rpc-types-beacon", "alloy-rpc-types-engine", @@ -7139,10 +7207,10 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", - "alloy-rpc-types", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "reth-primitives", "reth-rpc-types", ] @@ -7150,7 +7218,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "futures-util", "itertools 0.12.1", @@ -7177,7 +7245,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "aquamarine", "auto_impl", @@ -7201,7 +7269,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "parking_lot 0.12.2", "rayon", @@ -7218,7 +7286,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "dyn-clone", "futures-util", @@ -7235,7 +7303,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "tokio", "tokio-stream", @@ -7244,7 +7312,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "clap", "eyre", @@ -7259,7 +7327,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "aquamarine", @@ -7291,7 +7359,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "auto_impl", @@ -7309,7 +7377,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=48066652ff5436eafcbf21b448543b86174c625d#48066652ff5436eafcbf21b448543b86174c625d" +source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" dependencies = [ "alloy-rlp", "derive_more", @@ -7345,10 +7413,10 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.1.0" -source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=3215ff5#3215ff58309feef596b0e76c664744b5bf322c8b" +source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=8a3c338#8a3c338276daa51570f16a4ad0c177604648520c" dependencies = [ "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", "alloy-rpc-types-trace", "alloy-sol-types", "anstyle", diff --git a/Cargo.toml b/Cargo.toml index 79acc0a4..8cb04cc4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,10 +27,12 @@ incremental = false ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "8a394af6c9378b844e183cfdca3091a92b473eda" } beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "8a394af6c9378b844e183cfdca3091a92b473eda" } -reth = { git = "https://github.com/paradigmxyz/reth", rev = "48066652ff5436eafcbf21b448543b86174c625d" } -reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "48066652ff5436eafcbf21b448543b86174c625d" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "48066652ff5436eafcbf21b448543b86174c625d" } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "48066652ff5436eafcbf21b448543b86174c625d" } +reth = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } +reth-interfaces = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } +reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } +reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "dd25769" } alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "dd25769" } diff --git a/mev-build-rs/Cargo.toml b/mev-build-rs/Cargo.toml index 30b21bd0..bd255569 100644 --- a/mev-build-rs/Cargo.toml +++ b/mev-build-rs/Cargo.toml @@ -28,8 +28,10 @@ beacon-api-client = { workspace = true } mev-rs = { path = "../mev-rs" } reth = { workspace = true } +reth-interfaces = { workspace = true } reth-db = { workspace = true } reth-node-ethereum = { workspace = true } +reth-evm-ethereum = { workspace = true } reth-basic-payload-builder = { workspace = true } alloy-signer = { workspace = true } alloy-signer-wallet = { workspace = true, features = ["mnemonic"] } diff --git a/mev-build-rs/src/payload/builder.rs b/mev-build-rs/src/payload/builder.rs index 181181d4..4fb7fed0 100644 --- a/mev-build-rs/src/payload/builder.rs +++ b/mev-build-rs/src/payload/builder.rs @@ -2,33 +2,36 @@ use crate::payload::{attributes::BuilderPayloadBuilderAttributes, job::PayloadFi use alloy_signer::SignerSync; use alloy_signer_wallet::LocalWallet; use reth::{ - api::PayloadBuilderAttributes, + api::{ConfigureEvm, PayloadBuilderAttributes}, payload::{error::PayloadBuilderError, EthBuiltPayload, PayloadId}, primitives::{ constants::{ eip4844::MAX_DATA_GAS_PER_BLOCK, BEACON_NONCE, EMPTY_RECEIPTS, EMPTY_TRANSACTIONS, }, eip4844::calculate_excess_blob_gas, - proofs, + proofs::{self, calculate_requests_root}, revm::env::tx_env_with_recovered, Address, Block, ChainId, Header, IntoRecoveredTransaction, Receipt, Receipts, SealedBlock, Signature, Transaction, TransactionSigned, TransactionSignedEcRecovered, TxEip1559, TxKind, EMPTY_OMMER_ROOT_HASH, U256, }, - providers::{BundleStateWithReceipts, StateProviderFactory}, + providers::{BundleStateWithReceipts, StateProviderFactory, StateRootProvider}, revm::{ - self, database::StateProviderDatabase, db::states::bundle_state::BundleRetention, primitives::{EVMError, EnvWithHandlerCfg, InvalidTransaction, ResultAndState}, + state_change::apply_blockhashes_update, DatabaseCommit, State, }, transaction_pool::{BestTransactionsAttributes, TransactionPool}, }; use reth_basic_payload_builder::{ - commit_withdrawals, is_better_payload, pre_block_beacon_root_contract_call, BuildArguments, - BuildOutcome, PayloadConfig, WithdrawalsOutcome, + commit_withdrawals, is_better_payload, post_block_withdrawal_requests_contract_call, + pre_block_beacon_root_contract_call, BuildArguments, BuildOutcome, PayloadConfig, + WithdrawalsOutcome, }; +use reth_evm_ethereum::{eip6110::parse_deposits_from_receipts, EthEvmConfig}; +use reth_interfaces::RethError; use std::{ collections::HashMap, ops::Deref, @@ -85,6 +88,7 @@ fn append_payment( chain_id: ChainId, block: SealedBlock, value: U256, + evm_config: EthEvmConfig, ) -> Result { let state_provider = client.state_by_block_hash(block.header.header().parent_hash)?; let state = StateProviderDatabase::new(&state_provider); @@ -130,7 +134,7 @@ fn append_payment( ); // NOTE: adjust gas limit to allow for payment transaction env.block.gas_limit += U256::from(BASE_TX_GAS_LIMIT); - let mut evm = revm::Evm::builder().with_db(&mut db).with_env_with_handler_cfg(env).build(); + let mut evm = evm_config.evm_with_env(&mut db, env); let ResultAndState { result, state } = evm.transact().map_err(PayloadBuilderError::EvmExecutionError)?; @@ -171,7 +175,10 @@ fn append_payment( let receipts_root = bundle.receipts_root_slow(block_number).expect("Number is in range"); let logs_bloom = bundle.block_logs_bloom(block_number).expect("Number is in range"); - let state_root = state_provider.state_root(bundle.state())?; + let state_root = { + let state_provider = db.database.0; + state_provider.0.state_root(bundle.state())? + }; let transactions_root = proofs::calculate_transaction_root(&body); header.state_root = state_root; @@ -203,6 +210,7 @@ pub struct Inner { signer: LocalWallet, pub fee_recipient: Address, chain_id: ChainId, + evm_config: EthEvmConfig, states: Mutex>, } @@ -213,7 +221,9 @@ impl PayloadBuilder { fee_recipient: Address, chain_id: ChainId, ) -> Self { - let inner = Inner { bids, signer, fee_recipient, chain_id, states: Default::default() }; + let evm_config = EthEvmConfig::default(); + let inner = + Inner { bids, signer, fee_recipient, chain_id, evm_config, states: Default::default() }; Self(Arc::new(inner)) } @@ -269,6 +279,7 @@ impl PayloadBuilder { self.chain_id, block, payment_amount, + self.evm_config.clone(), )?; Ok(EthBuiltPayload::new(payload_id, block, payment_amount)) } @@ -287,7 +298,7 @@ where args: BuildArguments, ) -> Result, PayloadBuilderError> { let payload_id = args.config.payload_id(); - let (outcome, bundle) = default_ethereum_payload_builder(args)?; + let (outcome, bundle) = default_ethereum_payload_builder(self.evm_config.clone(), args)?; if let Some(bundle) = bundle { let mut states = self.states.lock().expect("can lock"); states.insert(payload_id, bundle); @@ -318,7 +329,7 @@ where err })?; let mut db = State::builder() - .with_database_boxed(Box::new(StateProviderDatabase::new(&state))) + .with_database(StateProviderDatabase::new(state)) .with_bundle_update() .build(); @@ -339,22 +350,57 @@ where err })?; + // apply eip-2935 blockhashes update + apply_blockhashes_update( + &chain_spec, + initialized_block_env.timestamp.to::(), + block_number, + &mut db, + ).map_err(|err| { + warn!(target: "payload_builder", parent_hash=%parent_block.hash(), %err, "failed to update blockhashes for empty payload"); + PayloadBuilderError::Internal(err.into()) + })?; + let WithdrawalsOutcome { withdrawals_root, withdrawals } = commit_withdrawals(&mut db, &chain_spec, attributes.timestamp(), attributes.withdrawals().clone()).map_err(|err| { warn!(target: "payload_builder", parent_hash=%parent_block.hash(), %err, "failed to commit withdrawals for empty payload"); err })?; + // Calculate the requests and the requests root. + let (requests, requests_root) = + if chain_spec.is_prague_active_at_timestamp(attributes.timestamp()) { + // We do not calculate the EIP-6110 deposit requests because there are no + // transactions in an empty payload. + let withdrawal_requests = post_block_withdrawal_requests_contract_call( + &mut db, + &chain_spec, + &initialized_cfg, + &initialized_block_env, + &attributes, + )?; + + let requests = withdrawal_requests; + let requests_root = calculate_requests_root(&requests); + (Some(requests.into()), Some(requests_root)) + } else { + (None, None) + }; + // merge all transitions into bundle state, this would apply the withdrawal balance // changes and 4788 contract call db.merge_transitions(BundleRetention::PlainState); // calculate the state root let bundle_state = db.take_bundle(); - let state_root = state.state_root(&bundle_state).map_err(|err| { - warn!(target: "payload_builder", parent_hash=%parent_block.hash(), %err, "failed to calculate state root for empty payload"); - err - })?; + let state_root = db.database.state_root(&bundle_state).map_err(|err| { + warn!(target: "payload_builder", + parent_hash=%parent_block.hash(), + %err, + "failed to calculate state root for empty payload" + ); + err + })?; let mut excess_blob_gas = None; let mut blob_gas_used = None; @@ -394,9 +440,10 @@ where blob_gas_used, excess_blob_gas, parent_beacon_block_root: attributes.parent_beacon_block_root(), + requests_root, }; - let block = Block { header, body: vec![], ommers: vec![], withdrawals }; + let block = Block { header, body: vec![], ommers: vec![], withdrawals, requests }; let sealed_block = block.seal_slow(); Ok(EthBuiltPayload::new(attributes.payload_id(), sealed_block, U256::ZERO)) @@ -410,6 +457,7 @@ where /// a result indicating success with the payload or an error in case of failure. #[inline] pub fn default_ethereum_payload_builder( + evm_config: EthEvmConfig, args: BuildArguments, ) -> Result<(BuildOutcome, Option), PayloadBuilderError> where @@ -459,6 +507,15 @@ where &attributes, )?; + // apply eip-2935 blockhashes update + apply_blockhashes_update( + &chain_spec, + initialized_block_env.timestamp.to::(), + block_number, + &mut db, + ) + .map_err(|err| PayloadBuilderError::Internal(err.into()))?; + let mut receipts = Vec::new(); while let Some(pool_tx) = best_txs.next() { // ensure we still have capacity for this transaction @@ -493,15 +550,14 @@ where } } + let env = EnvWithHandlerCfg::new_with_cfg_env( + initialized_cfg.clone(), + initialized_block_env.clone(), + tx_env_with_recovered(&tx), + ); + // Configure the environment for the block. - let mut evm = revm::Evm::builder() - .with_db(&mut db) - .with_env_with_handler_cfg(EnvWithHandlerCfg::new_with_cfg_env( - initialized_cfg.clone(), - initialized_block_env.clone(), - tx_env_with_recovered(&tx), - )) - .build(); + let mut evm = evm_config.evm_with_env(&mut db, env); let ResultAndState { result, state } = match evm.transact() { Ok(res) => res, @@ -574,6 +630,28 @@ where return Ok((BuildOutcome::Aborted { fees: total_fees, cached_reads }, None)) } + // calculate the requests and the requests root + let (requests, requests_root) = if chain_spec + .is_prague_active_at_timestamp(attributes.timestamp()) + { + let deposit_requests = parse_deposits_from_receipts(&chain_spec, receipts.iter().flatten()) + .map_err(|err| PayloadBuilderError::Internal(RethError::Execution(err.into())))?; + + let withdrawal_requests = post_block_withdrawal_requests_contract_call( + &mut db, + &chain_spec, + &initialized_cfg, + &initialized_block_env, + &attributes, + )?; + + let requests = [deposit_requests, withdrawal_requests].concat(); + let requests_root = calculate_requests_root(&requests); + (Some(requests.into()), Some(requests_root)) + } else { + (None, None) + }; + let WithdrawalsOutcome { withdrawals_root, withdrawals } = commit_withdrawals( &mut db, &chain_spec, @@ -594,7 +672,10 @@ where let logs_bloom = bundle.block_logs_bloom(block_number).expect("Number is in range"); // calculate the state root - let state_root = state_provider.state_root(bundle.state())?; + let state_root = { + let state_provider = db.database.0.inner.borrow_mut(); + state_provider.db.state_root(bundle.state())? + }; // create the block header let transactions_root = proofs::calculate_transaction_root(&executed_txs); @@ -645,10 +726,11 @@ where parent_beacon_block_root: attributes.parent_beacon_block_root(), blob_gas_used, excess_blob_gas, + requests_root, }; // seal the block - let block = Block { header, body: executed_txs, ommers: vec![], withdrawals }; + let block = Block { header, body: executed_txs, ommers: vec![], withdrawals, requests }; let sealed_block = block.seal_slow(); debug!(target: "payload_builder", ?sealed_block, "sealed built block"); From eafdc1295a4b26030acd6e0ca672e711485e15ad Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Wed, 15 May 2024 09:41:01 +0300 Subject: [PATCH 12/18] update to latest reth --- Cargo.lock | 303 +++++++++++++++++++++-------------------------------- Cargo.toml | 16 +-- 2 files changed, 125 insertions(+), 194 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 33e40693..b0a46940 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -133,12 +133,12 @@ dependencies = [ [[package]] name = "alloy-consensus" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" +source = "git+https://github.com/alloy-rs/alloy?rev=07611cf#07611cfc9f277dc5bbfd7d21e9d70ad37b441a51" dependencies = [ - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-serde", "arbitrary", "c-kzg", "proptest", @@ -146,19 +146,6 @@ dependencies = [ "serde", ] -[[package]] -name = "alloy-consensus" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" -dependencies = [ - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", - "alloy-primitives", - "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", - "c-kzg", - "serde", -] - [[package]] name = "alloy-dyn-abi" version = "0.7.2" @@ -180,11 +167,11 @@ dependencies = [ [[package]] name = "alloy-eips" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" +source = "git+https://github.com/alloy-rs/alloy?rev=07611cf#07611cfc9f277dc5bbfd7d21e9d70ad37b441a51" dependencies = [ "alloy-primitives", "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-serde", "arbitrary", "c-kzg", "derive_more", @@ -195,38 +182,13 @@ dependencies = [ "sha2 0.10.8", ] -[[package]] -name = "alloy-eips" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" -dependencies = [ - "alloy-primitives", - "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", - "c-kzg", - "once_cell", - "serde", - "sha2 0.10.8", -] - -[[package]] -name = "alloy-genesis" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" -dependencies = [ - "alloy-primitives", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", - "serde", - "serde_json", -] - [[package]] name = "alloy-genesis" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=07611cf#07611cfc9f277dc5bbfd7d21e9d70ad37b441a51" dependencies = [ "alloy-primitives", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "alloy-serde", "serde", "serde_json", ] @@ -246,7 +208,7 @@ dependencies = [ [[package]] name = "alloy-json-rpc" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=07611cf#07611cfc9f277dc5bbfd7d21e9d70ad37b441a51" dependencies = [ "alloy-primitives", "serde", @@ -258,13 +220,13 @@ dependencies = [ [[package]] name = "alloy-network" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=07611cf#07611cfc9f277dc5bbfd7d21e9d70ad37b441a51" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "alloy-consensus", + "alloy-eips", "alloy-json-rpc", "alloy-primitives", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "alloy-rpc-types", "alloy-signer", "alloy-sol-types", "async-trait", @@ -324,14 +286,14 @@ dependencies = [ [[package]] name = "alloy-rpc-types" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" +source = "git+https://github.com/alloy-rs/alloy?rev=07611cf#07611cfc9f277dc5bbfd7d21e9d70ad37b441a51" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-consensus", + "alloy-eips", + "alloy-genesis", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-serde", "alloy-sol-types", "itertools 0.12.1", "jsonrpsee-types", @@ -340,40 +302,22 @@ dependencies = [ "thiserror", ] -[[package]] -name = "alloy-rpc-types" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" -dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", - "alloy-primitives", - "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", - "alloy-sol-types", - "itertools 0.12.1", - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "alloy-rpc-types-anvil" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" +source = "git+https://github.com/alloy-rs/alloy?rev=07611cf#07611cfc9f277dc5bbfd7d21e9d70ad37b441a51" dependencies = [ "alloy-primitives", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-serde", "serde", ] [[package]] name = "alloy-rpc-types-beacon" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" +source = "git+https://github.com/alloy-rs/alloy?rev=07611cf#07611cfc9f277dc5bbfd7d21e9d70ad37b441a51" dependencies = [ - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", "serde", @@ -383,14 +327,14 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" +source = "git+https://github.com/alloy-rs/alloy?rev=07611cf#07611cfc9f277dc5bbfd7d21e9d70ad37b441a51" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-consensus", + "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-rpc-types", + "alloy-serde", "jsonrpsee-types", "jsonwebtoken 9.3.0", "rand 0.8.5", @@ -401,11 +345,11 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" +source = "git+https://github.com/alloy-rs/alloy?rev=07611cf#07611cfc9f277dc5bbfd7d21e9d70ad37b441a51" dependencies = [ "alloy-primitives", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-rpc-types", + "alloy-serde", "serde", "serde_json", ] @@ -413,17 +357,7 @@ dependencies = [ [[package]] name = "alloy-serde" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=c914fc0#c914fc0564d4d9019177dcd8b54f037d912bbf40" -dependencies = [ - "alloy-primitives", - "serde", - "serde_json", -] - -[[package]] -name = "alloy-serde" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=07611cf#07611cfc9f277dc5bbfd7d21e9d70ad37b441a51" dependencies = [ "alloy-primitives", "serde", @@ -433,7 +367,7 @@ dependencies = [ [[package]] name = "alloy-signer" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=07611cf#07611cfc9f277dc5bbfd7d21e9d70ad37b441a51" dependencies = [ "alloy-primitives", "async-trait", @@ -446,9 +380,9 @@ dependencies = [ [[package]] name = "alloy-signer-wallet" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=dd25769#dd25769df2089063e84a557c6844d20fba2eb315" +source = "git+https://github.com/alloy-rs/alloy?rev=07611cf#07611cfc9f277dc5bbfd7d21e9d70ad37b441a51" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=dd25769)", + "alloy-consensus", "alloy-network", "alloy-primitives", "alloy-signer", @@ -516,9 +450,9 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb28aa4ecd32fdfa1b1bdd111ff7357dd562c6b2372694cf9e613434fcba659" +checksum = "d55bd16fdb7ff4bd74cc4c878eeac7e8a27c0d7ba9df4ab58d9310aaafb62d43" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -530,7 +464,6 @@ dependencies = [ "proptest", "proptest-derive", "serde", - "smallvec", "tracing", ] @@ -5957,7 +5890,7 @@ dependencies = [ [[package]] name = "reth" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "ahash", "alloy-rlp", @@ -6031,7 +5964,7 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "futures-util", "reth-beacon-consensus", @@ -6054,7 +5987,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-rlp", "futures-core", @@ -6077,7 +6010,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "futures", "metrics", @@ -6106,7 +6039,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "aquamarine", "linked_hash_set", @@ -6131,7 +6064,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "reth-tasks", "tokio", @@ -6141,11 +6074,11 @@ dependencies = [ [[package]] name = "reth-codecs" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-consensus", + "alloy-eips", + "alloy-genesis", "alloy-primitives", "bytes", "modular-bitfield", @@ -6156,7 +6089,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -6167,7 +6100,7 @@ dependencies = [ [[package]] name = "reth-config" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "confy", "humantime-serde", @@ -6182,7 +6115,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "auto_impl", "reth-primitives", @@ -6192,18 +6125,16 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "reth-consensus", - "reth-interfaces", "reth-primitives", - "reth-provider", ] [[package]] name = "reth-db" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "arbitrary", "bytes", @@ -6234,7 +6165,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-rlp", "discv5", @@ -6256,7 +6187,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-rlp", "derive_more", @@ -6280,7 +6211,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "data-encoding", "enr 0.12.0", @@ -6303,7 +6234,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-rlp", "futures", @@ -6330,7 +6261,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "aes 0.8.4", "alloy-rlp", @@ -6363,7 +6294,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6374,7 +6305,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-rlp", "bytes", @@ -6401,7 +6332,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-rlp", "bytes", @@ -6415,7 +6346,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "reth-consensus", "reth-consensus-common", @@ -6425,7 +6356,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-rlp", "reth-engine-primitives", @@ -6440,7 +6371,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6456,7 +6387,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "reth-basic-payload-builder", "reth-evm", @@ -6474,7 +6405,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "rayon", "reth-db", @@ -6484,9 +6415,9 @@ dependencies = [ [[package]] name = "reth-evm" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-consensus", "futures-util", "reth-interfaces", "reth-primitives", @@ -6497,10 +6428,10 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-consensus", + "alloy-eips", "alloy-rlp", "alloy-sol-types", "reth-evm", @@ -6517,7 +6448,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "eyre", "metrics", @@ -6538,7 +6469,7 @@ dependencies = [ [[package]] name = "reth-interfaces" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "auto_impl", "clap", @@ -6556,7 +6487,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "async-trait", "bytes", @@ -6577,7 +6508,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "bitflags 2.5.0", "byteorder", @@ -6595,7 +6526,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "bindgen", "cc", @@ -6605,7 +6536,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "futures", "metrics", @@ -6617,7 +6548,7 @@ dependencies = [ [[package]] name = "reth-metrics-derive" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "once_cell", "proc-macro2", @@ -6629,7 +6560,7 @@ dependencies = [ [[package]] name = "reth-net-common" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "pin-project", "reth-network-types", @@ -6639,7 +6570,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "igd-next", "pin-project-lite", @@ -6653,7 +6584,7 @@ dependencies = [ [[package]] name = "reth-network" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-rlp", "aquamarine", @@ -6703,7 +6634,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "enr 0.12.0", "reth-discv4", @@ -6719,7 +6650,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6733,7 +6664,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "anyhow", "bincode", @@ -6753,7 +6684,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "reth-db", "reth-engine-primitives", @@ -6768,7 +6699,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "aquamarine", "confy", @@ -6809,7 +6740,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "clap", "const-str", @@ -6871,7 +6802,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "eyre", "reth-basic-payload-builder", @@ -6889,7 +6820,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "futures", "humantime", @@ -6911,7 +6842,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "futures-util", "metrics", @@ -6932,7 +6863,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6942,12 +6873,12 @@ dependencies = [ [[package]] name = "reth-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-chains", - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-consensus", + "alloy-eips", + "alloy-genesis", "alloy-primitives", "alloy-rlp", "alloy-trie", @@ -6982,7 +6913,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-rlp", "alloy-rpc-types-engine", @@ -7011,7 +6942,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "itertools 0.12.1", "metrics", @@ -7032,10 +6963,10 @@ dependencies = [ [[package]] name = "reth-revm" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-consensus", + "alloy-eips", "alloy-rlp", "reth-consensus-common", "reth-interfaces", @@ -7048,7 +6979,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-dyn-abi", "alloy-primitives", @@ -7100,7 +7031,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "jsonrpsee", "reth-engine-primitives", @@ -7114,7 +7045,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "hyper", "jsonrpsee", @@ -7142,7 +7073,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "async-trait", "jsonrpsee-core", @@ -7167,7 +7098,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "assert_matches", "http", @@ -7189,10 +7120,10 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-primitives", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-rpc-types", "alloy-rpc-types-anvil", "alloy-rpc-types-beacon", "alloy-rpc-types-engine", @@ -7207,10 +7138,10 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-rlp", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-rpc-types", "reth-primitives", "reth-rpc-types", ] @@ -7218,7 +7149,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "futures-util", "itertools 0.12.1", @@ -7245,7 +7176,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "aquamarine", "auto_impl", @@ -7269,7 +7200,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "parking_lot 0.12.2", "rayon", @@ -7286,7 +7217,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "dyn-clone", "futures-util", @@ -7303,7 +7234,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "tokio", "tokio-stream", @@ -7312,7 +7243,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "clap", "eyre", @@ -7327,7 +7258,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-rlp", "aquamarine", @@ -7359,7 +7290,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-rlp", "auto_impl", @@ -7377,7 +7308,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=71a97e3c429955a3c4125337019c2553039f1fbd#71a97e3c429955a3c4125337019c2553039f1fbd" +source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" dependencies = [ "alloy-rlp", "derive_more", @@ -7413,10 +7344,10 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.1.0" -source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=8a3c338#8a3c338276daa51570f16a4ad0c177604648520c" +source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=fb5d095#fb5d0958216df62d57bac1a609e379a505e562e1" dependencies = [ "alloy-primitives", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=c914fc0)", + "alloy-rpc-types", "alloy-rpc-types-trace", "alloy-sol-types", "anstyle", diff --git a/Cargo.toml b/Cargo.toml index 8cb04cc4..edc180e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,14 +27,14 @@ incremental = false ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "8a394af6c9378b844e183cfdca3091a92b473eda" } beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "8a394af6c9378b844e183cfdca3091a92b473eda" } -reth = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } -reth-interfaces = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } -reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } -reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "71a97e3c429955a3c4125337019c2553039f1fbd" } -alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "dd25769" } -alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "dd25769" } +reth = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } +reth-interfaces = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } +reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } +reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } +alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "07611cf" } +alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "07611cf" } # revm revm = { version = "9.0.0", features = [ From 5d9ed770c63487e64e52090acab042a8f658ee39 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Wed, 15 May 2024 18:19:31 +0300 Subject: [PATCH 13/18] update dep for bugfix --- Cargo.lock | 264 +++++++++++++++++++++++++++++------------------------ Cargo.toml | 4 +- 2 files changed, 145 insertions(+), 123 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b0a46940..f63b3cdb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -280,7 +280,7 @@ checksum = "1a047897373be4bbb0224c1afdabca92648dc57a9c9ef6e7b0be3aff7a859c83" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -407,7 +407,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", "syn-solidity", "tiny-keccak", ] @@ -423,7 +423,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", "syn-solidity", ] @@ -548,7 +548,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -721,9 +721,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.3.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2776ead772134d55b62dd45e59a79e21612d85d0af729b8b7d3967d601a62a" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", "event-listener 5.3.0", @@ -734,9 +734,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.10" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c90a406b4495d129f00461241616194cb8a032c8d1c53c657f0961d5f8e0498" +checksum = "4e9eabd7a98fe442131a17c316bd9349c43695e49e730c3c8e12cfb5f4da2693" dependencies = [ "brotli", "flate2", @@ -787,7 +787,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -825,7 +825,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -969,7 +969,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "beacon-api-client" version = "0.1.0" -source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=8a394af6c9378b844e183cfdca3091a92b473eda#8a394af6c9378b844e183cfdca3091a92b473eda" +source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=98ca171#98ca171508273a8de3eca06d471978c7d4cf6ae0" dependencies = [ "clap", "ethereum-consensus", @@ -1026,7 +1026,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -1121,7 +1121,7 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ - "async-channel 2.3.0", + "async-channel 2.2.1", "async-lock", "async-task", "futures-io", @@ -1236,7 +1236,7 @@ checksum = "6be9c93793b60dac381af475b98634d4b451e28336e72218cad9a20176218dbc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", "synstructure 0.13.1", ] @@ -1276,9 +1276,9 @@ dependencies = [ [[package]] name = "brotli" -version = "6.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" +checksum = "19483b140a7ac7174d34b5a581b406c64f84da5409d3e09cf4fff604f9270e67" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1336,9 +1336,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] @@ -1351,7 +1351,7 @@ checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -1410,7 +1410,7 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", - "semver 1.0.23", + "semver 1.0.22", "serde", "serde_json", "thiserror", @@ -1533,7 +1533,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -1940,7 +1940,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -1988,7 +1988,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -2010,7 +2010,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -2117,7 +2117,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -2269,7 +2269,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -2491,7 +2491,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -2504,7 +2504,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -2515,7 +2515,7 @@ checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -2526,9 +2526,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2569,7 +2569,7 @@ dependencies = [ [[package]] name = "ethereum-consensus" version = "0.1.1" -source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=8a394af6c9378b844e183cfdca3091a92b473eda#8a394af6c9378b844e183cfdca3091a92b473eda" +source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=98ca171#98ca171508273a8de3eca06d471978c7d4cf6ae0" dependencies = [ "blst", "bs58 0.4.0", @@ -2766,9 +2766,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.9" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" +checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" [[package]] name = "fixed-hash" @@ -2911,7 +2911,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -3536,7 +3536,7 @@ checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -3930,7 +3930,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -4060,9 +4060,9 @@ dependencies = [ [[package]] name = "keccak-asm" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47a3633291834c4fbebf8673acbc1b04ec9d151418ff9b8e26dcd79129928758" +checksum = "bb8515fff80ed850aea4a1595f2e519c003e2a00a82fe168ebf5269196caf444" dependencies = [ "digest 0.10.7", "sha3-asm", @@ -4114,7 +4114,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -4473,7 +4473,7 @@ checksum = "38b4faf00617defe497754acde3024865bc143d44a86799b24e191ecff91354f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -4870,9 +4870,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41" dependencies = [ "num-bigint", "num-complex", @@ -4884,10 +4884,11 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ + "autocfg", "num-integer", "num-traits", "serde", @@ -4895,9 +4896,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] @@ -4930,10 +4931,11 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ + "autocfg", "num-bigint", "num-integer", "num-traits", @@ -4974,10 +4976,10 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -5072,7 +5074,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -5126,9 +5128,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.12" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" +checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" dependencies = [ "arrayvec", "bitvec", @@ -5141,11 +5143,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.12" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" +checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 1.0.109", @@ -5207,9 +5209,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.15" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pbkdf2" @@ -5300,7 +5302,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -5329,7 +5331,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -5346,9 +5348,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -5447,6 +5449,15 @@ dependencies = [ "toml 0.5.11", ] +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", +] + [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -5482,9 +5493,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -6094,7 +6105,7 @@ dependencies = [ "convert_case 0.6.0", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -6554,7 +6565,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -7553,9 +7564,9 @@ checksum = "f86854cf50259291520509879a5c294c3c9a4c334e9ff65071c51e42ef1e2343" [[package]] name = "rustc-demangle" -version = "0.1.24" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -7584,7 +7595,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.23", + "semver 1.0.22", ] [[package]] @@ -7672,9 +7683,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" [[package]] name = "rustls-webpki" @@ -7699,9 +7710,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.16" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "rusty-fork" @@ -7728,9 +7739,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "ryu-js" @@ -7740,9 +7751,9 @@ checksum = "ad97d4ce1560a5e27cec89519dc8300d1aa6035b099821261c651486a19e44d5" [[package]] name = "scale-info" -version = "2.11.3" +version = "2.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" +checksum = "7c453e59a955f81fb62ee5d596b450383d699f152d350e9d23a0db2adb78e4c0" dependencies = [ "cfg-if", "derive_more", @@ -7752,11 +7763,11 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.11.3" +version = "2.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" +checksum = "18cf6c6447f813ef19eb450e985bcce6705f9ce7660db221b59093d15c79c4b7" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn 1.0.109", @@ -7773,9 +7784,9 @@ dependencies = [ [[package]] name = "schnellru" -version = "0.2.3" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367" +checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" dependencies = [ "ahash", "cfg-if", @@ -7899,9 +7910,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.23" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] @@ -7923,9 +7934,9 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" -version = "1.0.201" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] @@ -7941,20 +7952,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.201" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "indexmap 2.2.6", "itoa", @@ -8031,7 +8042,7 @@ dependencies = [ "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -8095,9 +8106,9 @@ dependencies = [ [[package]] name = "sha3-asm" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b57fd861253bff08bb1919e995f90ba8f4889de2726091c8876f3a4e823b40" +checksum = "bac61da6b35ad76b195eb4771210f947734321a8d81d7738e1580d953bc7a15e" dependencies = [ "cc", "cfg-if", @@ -8358,7 +8369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a" dependencies = [ "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -8410,7 +8421,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -8455,9 +8466,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.63" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -8473,7 +8484,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -8502,7 +8513,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -8552,22 +8563,22 @@ checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -8721,7 +8732,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -8812,6 +8823,17 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + [[package]] name = "toml_edit" version = "0.21.1" @@ -8931,7 +8953,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -9319,9 +9341,9 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.2.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "want" @@ -9365,7 +9387,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -9399,7 +9421,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -9730,28 +9752,28 @@ checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", "synstructure 0.13.1", ] [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "087eca3c1eaf8c47b94d02790dd086cd594b912d2043d4de4bfdd466b3befb7c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "6f4b6c273f496d8fd4eaf18853e6b448760225dc030ff2c485a786859aea6393" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -9771,7 +9793,7 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", "synstructure 0.13.1", ] @@ -9792,7 +9814,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] @@ -9814,7 +9836,7 @@ checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.60", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index edc180e1..6348da86 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,8 +24,8 @@ codegen-units = 1 incremental = false [workspace.dependencies] -ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "8a394af6c9378b844e183cfdca3091a92b473eda" } -beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "8a394af6c9378b844e183cfdca3091a92b473eda" } +ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "98ca171" } +beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "98ca171" } reth = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } reth-interfaces = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } From 316ca4951f8123364fb1071a6019e61cc8f3e6dc Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Wed, 15 May 2024 21:57:47 +0300 Subject: [PATCH 14/18] bugfix: deserialize electra/deneb messages correctly --- mev-rs/src/types/builder_bid.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mev-rs/src/types/builder_bid.rs b/mev-rs/src/types/builder_bid.rs index ed1eb66b..d027d31d 100644 --- a/mev-rs/src/types/builder_bid.rs +++ b/mev-rs/src/types/builder_bid.rs @@ -77,7 +77,14 @@ impl<'de> serde::Deserialize<'de> for BuilderBid { { let value = serde_json::Value::deserialize(deserializer)?; if let Ok(inner) = <_ as serde::Deserialize>::deserialize(&value) { - return Ok(Self::Electra(inner)) + let builder_bid = Self::Electra(inner); + match builder_bid.header().version() { + Fork::Deneb => match builder_bid { + Self::Electra(inner) => return Ok(Self::Deneb(inner)), + _ => unreachable!(), + }, + _ => return Ok(builder_bid), + } } if let Ok(inner) = <_ as serde::Deserialize>::deserialize(&value) { return Ok(Self::Deneb(inner)) From a2b369ecbd5384546b17e5eaf73cf0cd151b2447 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Thu, 16 May 2024 09:57:08 +0300 Subject: [PATCH 15/18] hotfix for short slots --- mev-build-rs/src/auctioneer/service.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mev-build-rs/src/auctioneer/service.rs b/mev-build-rs/src/auctioneer/service.rs index 713b8319..27f20b7d 100644 --- a/mev-build-rs/src/auctioneer/service.rs +++ b/mev-build-rs/src/auctioneer/service.rs @@ -286,7 +286,12 @@ impl< } async fn submit_payload(&self, payload: EthBuiltPayload) { - let auction = self.open_auctions.get(&payload.id()).expect("has auction"); + // TODO: resolve hot fix for short slot timings + let auction = self.open_auctions.get(&payload.id()); + if auction.is_none() { + return + } + let auction = auction.unwrap(); let mut successful_relays_for_submission = Vec::with_capacity(auction.relays.len()); match prepare_submission( &payload, From e7445e8deed27262df94f4f55b4c888ca116ee66 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Thu, 16 May 2024 12:52:05 +0300 Subject: [PATCH 16/18] electra fixes with attestation types --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- mev-relay-rs/src/relay.rs | 15 +++++++++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f63b3cdb..26018205 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -969,7 +969,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "beacon-api-client" version = "0.1.0" -source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=98ca171#98ca171508273a8de3eca06d471978c7d4cf6ae0" +source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=269ba9b#269ba9be9b06f5bf00c78cbd21932e2233a5d5a8" dependencies = [ "clap", "ethereum-consensus", @@ -2569,7 +2569,7 @@ dependencies = [ [[package]] name = "ethereum-consensus" version = "0.1.1" -source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=98ca171#98ca171508273a8de3eca06d471978c7d4cf6ae0" +source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=269ba9b#269ba9be9b06f5bf00c78cbd21932e2233a5d5a8" dependencies = [ "blst", "bs58 0.4.0", diff --git a/Cargo.toml b/Cargo.toml index 6348da86..bf70c85a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,8 +24,8 @@ codegen-units = 1 incremental = false [workspace.dependencies] -ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "98ca171" } -beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "98ca171" } +ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "269ba9b" } +beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "269ba9b" } reth = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } reth-interfaces = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } diff --git a/mev-relay-rs/src/relay.rs b/mev-relay-rs/src/relay.rs index e7f01151..13a55c74 100644 --- a/mev-relay-rs/src/relay.rs +++ b/mev-relay-rs/src/relay.rs @@ -637,8 +637,19 @@ impl BlindedBlockProvider for Relay { match unblind_block(signed_block, auction_context.execution_payload()) { Ok(signed_block) => { let version = signed_block.version(); - let block_root = - signed_block.message().hash_tree_root().map_err(ConsensusError::from)?; + let block_root = match version { + Fork::Deneb => { + signed_block.message().hash_tree_root().map_err(ConsensusError::from)? + } + Fork::Electra => match signed_block { + SignedBeaconBlock::Electra(ref inner) => { + inner.message.hash_tree_root().map_err(ConsensusError::from)? + } + _ => unreachable!(), + }, + _ => unreachable!(), + }; + let request = SubmitSignedBeaconBlock { signed_block: &signed_block, kzg_proofs: auction_context.blobs_bundle().map(|bundle| bundle.proofs.as_ref()), From fc33c037d34daaf4f5eba1ccebacf4197ecabed2 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Thu, 16 May 2024 13:02:28 +0300 Subject: [PATCH 17/18] set dockerfile default profile to `release` --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a25d9270..f54d7aa7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN cargo chef prepare --recipe-path recipe.json FROM chef AS builder COPY --from=planner /app/recipe.json recipe.json -ARG BUILD_PROFILE=maxperf +ARG BUILD_PROFILE=release ENV BUILD_PROFILE ${BUILD_PROFILE} ARG FEATURES="" ENV FEATURES ${FEATURES} From b6b155b0dcf1a7e15a05cd7cc20a4c487ab87be9 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Fri, 17 May 2024 15:54:54 +0300 Subject: [PATCH 18/18] rebase to latest reth --- Cargo.lock | 152 +++++++++++++++++++++++++---------------------------- Cargo.toml | 20 +++---- 2 files changed, 81 insertions(+), 91 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 26018205..34371c41 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -702,12 +702,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247" -[[package]] -name = "assert_matches" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" - [[package]] name = "async-channel" version = "1.9.0" @@ -5901,7 +5895,7 @@ dependencies = [ [[package]] name = "reth" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "ahash", "alloy-rlp", @@ -5975,7 +5969,7 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "futures-util", "reth-beacon-consensus", @@ -5998,7 +5992,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "futures-core", @@ -6021,7 +6015,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "futures", "metrics", @@ -6050,7 +6044,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "aquamarine", "linked_hash_set", @@ -6075,7 +6069,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "reth-tasks", "tokio", @@ -6085,7 +6079,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6100,7 +6094,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -6111,7 +6105,7 @@ dependencies = [ [[package]] name = "reth-config" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "confy", "humantime-serde", @@ -6126,7 +6120,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "auto_impl", "reth-primitives", @@ -6136,7 +6130,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "reth-consensus", "reth-primitives", @@ -6145,7 +6139,7 @@ dependencies = [ [[package]] name = "reth-db" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "arbitrary", "bytes", @@ -6176,7 +6170,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "discv5", @@ -6198,7 +6192,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "derive_more", @@ -6222,7 +6216,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "data-encoding", "enr 0.12.0", @@ -6245,7 +6239,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "futures", @@ -6272,7 +6266,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "aes 0.8.4", "alloy-rlp", @@ -6305,7 +6299,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6316,7 +6310,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "bytes", @@ -6343,7 +6337,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "bytes", @@ -6357,7 +6351,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "reth-consensus", "reth-consensus-common", @@ -6367,7 +6361,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "reth-engine-primitives", @@ -6382,7 +6376,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6398,7 +6392,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "reth-basic-payload-builder", "reth-evm", @@ -6416,7 +6410,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "rayon", "reth-db", @@ -6426,7 +6420,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-consensus", "futures-util", @@ -6439,7 +6433,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6459,7 +6453,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "eyre", "metrics", @@ -6480,7 +6474,7 @@ dependencies = [ [[package]] name = "reth-interfaces" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "auto_impl", "clap", @@ -6498,7 +6492,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "async-trait", "bytes", @@ -6519,7 +6513,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "bitflags 2.5.0", "byteorder", @@ -6537,7 +6531,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "bindgen", "cc", @@ -6547,7 +6541,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "futures", "metrics", @@ -6559,7 +6553,7 @@ dependencies = [ [[package]] name = "reth-metrics-derive" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "once_cell", "proc-macro2", @@ -6571,7 +6565,7 @@ dependencies = [ [[package]] name = "reth-net-common" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "pin-project", "reth-network-types", @@ -6581,7 +6575,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "igd-next", "pin-project-lite", @@ -6595,7 +6589,7 @@ dependencies = [ [[package]] name = "reth-network" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "aquamarine", @@ -6645,7 +6639,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "enr 0.12.0", "reth-discv4", @@ -6661,7 +6655,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6675,7 +6669,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "anyhow", "bincode", @@ -6695,7 +6689,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "reth-db", "reth-engine-primitives", @@ -6710,7 +6704,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "aquamarine", "confy", @@ -6751,7 +6745,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "clap", "const-str", @@ -6813,7 +6807,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "eyre", "reth-basic-payload-builder", @@ -6831,7 +6825,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "futures", "humantime", @@ -6853,7 +6847,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "futures-util", "metrics", @@ -6874,7 +6868,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "reth-primitives", "reth-rpc-types", @@ -6884,7 +6878,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-chains", "alloy-consensus", @@ -6924,7 +6918,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "alloy-rpc-types-engine", @@ -6953,7 +6947,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "itertools 0.12.1", "metrics", @@ -6974,7 +6968,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6990,7 +6984,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-dyn-abi", "alloy-primitives", @@ -7042,7 +7036,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "jsonrpsee", "reth-engine-primitives", @@ -7056,7 +7050,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "hyper", "jsonrpsee", @@ -7084,7 +7078,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "async-trait", "jsonrpsee-core", @@ -7109,21 +7103,17 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ - "assert_matches", "http", "http-body", "hyper", - "jsonrpsee", "jsonwebtoken 8.3.0", "pin-project", "rand 0.8.5", "reth-primitives", "serde", - "tempfile", "thiserror", - "tokio", "tower", "tracing", ] @@ -7131,7 +7121,7 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -7149,7 +7139,7 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "alloy-rpc-types", @@ -7160,7 +7150,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "futures-util", "itertools 0.12.1", @@ -7187,7 +7177,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "aquamarine", "auto_impl", @@ -7211,7 +7201,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "parking_lot 0.12.2", "rayon", @@ -7228,7 +7218,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "dyn-clone", "futures-util", @@ -7245,7 +7235,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "tokio", "tokio-stream", @@ -7254,7 +7244,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "clap", "eyre", @@ -7269,7 +7259,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "aquamarine", @@ -7301,7 +7291,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "auto_impl", @@ -7319,7 +7309,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "0.2.0-beta.7" -source = "git+https://github.com/paradigmxyz/reth?rev=017cfa60c222aa93cf4e7dbe1f085e0d60f2096a#017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" +source = "git+https://github.com/paradigmxyz/reth?rev=3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9#3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" dependencies = [ "alloy-rlp", "derive_more", @@ -7341,7 +7331,7 @@ dependencies = [ [[package]] name = "revm" version = "9.0.0" -source = "git+https://github.com/bluealloy/revm?rev=38c4d3e756291b8a11f48bdce6f4248582824890#38c4d3e756291b8a11f48bdce6f4248582824890" +source = "git+https://github.com/bluealloy/revm?rev=276cdfb#276cdfb5ed7654d70b3fc2bd9eeb7fbe643853cd" dependencies = [ "auto_impl", "cfg-if", @@ -7373,7 +7363,7 @@ dependencies = [ [[package]] name = "revm-interpreter" version = "5.0.0" -source = "git+https://github.com/bluealloy/revm?rev=38c4d3e756291b8a11f48bdce6f4248582824890#38c4d3e756291b8a11f48bdce6f4248582824890" +source = "git+https://github.com/bluealloy/revm?rev=276cdfb#276cdfb5ed7654d70b3fc2bd9eeb7fbe643853cd" dependencies = [ "revm-primitives", "serde", @@ -7382,7 +7372,7 @@ dependencies = [ [[package]] name = "revm-precompile" version = "7.0.0" -source = "git+https://github.com/bluealloy/revm?rev=38c4d3e756291b8a11f48bdce6f4248582824890#38c4d3e756291b8a11f48bdce6f4248582824890" +source = "git+https://github.com/bluealloy/revm?rev=276cdfb#276cdfb5ed7654d70b3fc2bd9eeb7fbe643853cd" dependencies = [ "aurora-engine-modexp", "c-kzg", @@ -7398,7 +7388,7 @@ dependencies = [ [[package]] name = "revm-primitives" version = "4.0.0" -source = "git+https://github.com/bluealloy/revm?rev=38c4d3e756291b8a11f48bdce6f4248582824890#38c4d3e756291b8a11f48bdce6f4248582824890" +source = "git+https://github.com/bluealloy/revm?rev=276cdfb#276cdfb5ed7654d70b3fc2bd9eeb7fbe643853cd" dependencies = [ "alloy-primitives", "auto_impl", diff --git a/Cargo.toml b/Cargo.toml index bf70c85a..4973f50c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,12 +27,12 @@ incremental = false ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "269ba9b" } beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "269ba9b" } -reth = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } -reth-interfaces = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } -reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } -reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "017cfa60c222aa93cf4e7dbe1f085e0d60f2096a" } +reth = { git = "https://github.com/paradigmxyz/reth", rev = "3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" } +reth-interfaces = { git = "https://github.com/paradigmxyz/reth", rev = "3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" } +reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" } +reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "3736d8f9aa7c5cf46edc1e5d1dbd9dcf6f50b9c9" } alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "07611cf" } alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "07611cf" } @@ -80,7 +80,7 @@ clap = "4.1.4" [patch.crates-io] libffi-sys = { git = "https://github.com/tov/libffi-rs", rev = "d0704d634b6f3ffef5b6fc7e07fe965a1cff5c7b" } -revm = { git = "https://github.com/bluealloy/revm", rev = "38c4d3e756291b8a11f48bdce6f4248582824890" } -revm-interpreter = { git = "https://github.com/bluealloy/revm", rev = "38c4d3e756291b8a11f48bdce6f4248582824890" } -revm-precompile = { git = "https://github.com/bluealloy/revm", rev = "38c4d3e756291b8a11f48bdce6f4248582824890" } -revm-primitives = { git = "https://github.com/bluealloy/revm", rev = "38c4d3e756291b8a11f48bdce6f4248582824890" } +revm = { git = "https://github.com/bluealloy/revm", rev = "276cdfb" } +revm-interpreter = { git = "https://github.com/bluealloy/revm", rev = "276cdfb" } +revm-precompile = { git = "https://github.com/bluealloy/revm", rev = "276cdfb" } +revm-primitives = { git = "https://github.com/bluealloy/revm", rev = "276cdfb" }