From 2406699ed3ddd4f4a1499355c05bbfd912b13d97 Mon Sep 17 00:00:00 2001 From: Roman Krasiuk Date: Wed, 18 Sep 2024 08:02:26 +0200 Subject: [PATCH 1/2] feat: pectra --- Cargo.lock | 107 +++++++++++------- Cargo.toml | 7 +- crates/rbuilder/src/building/mod.rs | 34 +++++- crates/rbuilder/src/mev_boost/mod.rs | 10 +- crates/rbuilder/src/mev_boost/sign_payload.rs | 54 +++++++-- crates/rbuilder/src/validation_api_client.rs | 1 + 6 files changed, 152 insertions(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 84ed2ac7..7d3d9317 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -118,12 +118,25 @@ dependencies = [ "alloy-eips", "alloy-primitives 0.8.0", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.3.1", "arbitrary", "c-kzg", "serde", ] +[[package]] +name = "alloy-consensus" +version = "0.3.5" +source = "git+https://github.com/alloy-rs/alloy?branch=rkrasiuk/bid-submission-v4#a2055294a698964b6b438982d0a22114a4d0538b" +dependencies = [ + "alloy-eips", + "alloy-primitives 0.8.0", + "alloy-rlp", + "alloy-serde 0.3.5", + "c-kzg", + "serde", +] + [[package]] name = "alloy-dyn-abi" version = "0.8.0" @@ -171,15 +184,14 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "499ee14d296a133d142efd215eb36bf96124829fe91cf8f5d4e5ccdd381eae00" +version = "0.3.5" +source = "git+https://github.com/alloy-rs/alloy?branch=rkrasiuk/bid-submission-v4#a2055294a698964b6b438982d0a22114a4d0538b" dependencies = [ "alloy-eip2930", "alloy-eip7702", "alloy-primitives 0.8.0", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.3.5", "arbitrary", "c-kzg", "derive_more 1.0.0", @@ -197,7 +209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b85dfc693e4a1193f0372a8f789df12ab51fcbe7be0733baa04939a86dd813b" dependencies = [ "alloy-primitives 0.8.0", - "alloy-serde", + "alloy-serde 0.3.1", "serde", ] @@ -233,13 +245,13 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfbe2802d5b8c632f18d68c352073378f02a3407c1b6a4487194e7d21ab0f002" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.3.1", "alloy-eips", "alloy-json-rpc", "alloy-network-primitives", "alloy-primitives 0.8.0", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 0.3.1", "alloy-signer", "alloy-sol-types", "async-trait", @@ -255,7 +267,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396c07726030fa0f9dab5da8c71ccd69d5eb74a7fe1072b7ae453a67e4fe553e" dependencies = [ "alloy-primitives 0.8.0", - "alloy-serde", + "alloy-serde 0.3.1", "serde", ] @@ -330,7 +342,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1376948df782ffee83a54cac4b2aba14134edd997229a3db97da0a606586eb5c" dependencies = [ "alloy-chains", - "alloy-consensus", + "alloy-consensus 0.3.1", "alloy-eips", "alloy-json-rpc", "alloy-network", @@ -435,7 +447,7 @@ dependencies = [ "alloy-rpc-types-engine", "alloy-rpc-types-eth", "alloy-rpc-types-trace", - "alloy-serde", + "alloy-serde 0.3.1", "serde", ] @@ -458,15 +470,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "140b079c6fda14d9586432bf988b46ac0e04871ca313c9e00aa85cc808105e8a" dependencies = [ "alloy-primitives 0.8.0", - "alloy-serde", + "alloy-serde 0.3.1", "serde", ] [[package]] name = "alloy-rpc-types-beacon" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abbd9b6764423821bd6874477791ca68cfd0e946958d611319b57b006edf0113" +version = "0.3.5" +source = "git+https://github.com/alloy-rs/alloy?branch=rkrasiuk/bid-submission-v4#a2055294a698964b6b438982d0a22114a4d0538b" dependencies = [ "alloy-eips", "alloy-primitives 0.8.0", @@ -480,23 +491,21 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d79cadb52e32d40afa04847647eb50a332559d7870e66e46a0c32c33bf1c801d" +version = "0.3.5" +source = "git+https://github.com/alloy-rs/alloy?branch=rkrasiuk/bid-submission-v4#a2055294a698964b6b438982d0a22114a4d0538b" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.3.5", "alloy-eips", "alloy-primitives 0.8.0", "alloy-rlp", - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 0.3.5", + "derive_more 1.0.0", "ethereum_ssz", "ethereum_ssz_derive", "jsonrpsee-types 0.24.3", "jsonwebtoken", "rand 0.8.5", "serde", - "thiserror", ] [[package]] @@ -505,12 +514,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15bb3506ab1cf415d4752778c93e102050399fb8de97b7da405a5bf3e31f5f3b" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.3.1", "alloy-eips", "alloy-network-primitives", "alloy-primitives 0.8.0", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.3.1", "alloy-sol-types", "itertools 0.13.0", "jsonrpsee-types 0.24.3", @@ -527,7 +536,7 @@ checksum = "19e8cb848b66617f7d58b576bfc416854c4e9ae8d35e14f5077c0c779048f280" dependencies = [ "alloy-eips", "alloy-primitives 0.8.0", - "alloy-serde", + "alloy-serde 0.3.1", "serde", "serde_json", ] @@ -540,7 +549,7 @@ checksum = "16cca915e0aab3b2657b4f9efe02eb88e5483905fb6d244749652aae14e5f92e" dependencies = [ "alloy-primitives 0.8.0", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 0.3.1", "serde", "serde_json", "thiserror", @@ -554,7 +563,7 @@ checksum = "68eede4bd722bb872222efbbfbccc8f9b86e597143934b8ce556d3e0487bb662" dependencies = [ "alloy-primitives 0.8.0", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 0.3.1", "serde", ] @@ -563,6 +572,16 @@ name = "alloy-serde" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae417978015f573b4a8c02af17f88558fb22e3fccd12e8a910cf6a2ff331cfcb" +dependencies = [ + "alloy-primitives 0.8.0", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-serde" +version = "0.3.5" +source = "git+https://github.com/alloy-rs/alloy?branch=rkrasiuk/bid-submission-v4#a2055294a698964b6b438982d0a22114a4d0538b" dependencies = [ "alloy-primitives 0.8.0", "arbitrary", @@ -590,7 +609,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c640f9343e8f741f837c345c5ea30239ba77938b3691b884c736834853bd16c" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.3.1", "alloy-network", "alloy-primitives 0.8.0", "alloy-signer", @@ -4801,7 +4820,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -5637,7 +5656,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.72", @@ -5699,11 +5718,11 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3041068147bb9abce8973644991e11c075fa8a7931a272bc8eb935971a2d03d7" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.3.1", "alloy-eips", "alloy-primitives 0.8.0", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.3.1", "derive_more 1.0.0", "serde", "spin", @@ -5715,7 +5734,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf926fccb35a1ad784cf8c2771a3a7b2c891379fcc78bc7cdc23dec1b57a6459" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.3.1", "alloy-eips", "alloy-network", "alloy-primitives 0.8.0", @@ -5733,7 +5752,7 @@ dependencies = [ "alloy-network", "alloy-primitives 0.8.0", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 0.3.1", "op-alloy-consensus", "serde", "serde_json", @@ -5747,7 +5766,7 @@ checksum = "5ea246be3da604d2f68e86cc510cf05219db0ed24273ebd59d86065971ba0e3f" dependencies = [ "alloy-primitives 0.8.0", "alloy-rpc-types-engine", - "alloy-serde", + "alloy-serde 0.3.1", "serde", ] @@ -6972,7 +6991,7 @@ version = "0.1.0" dependencies = [ "ahash", "alloy-chains", - "alloy-consensus", + "alloy-consensus 0.3.1", "alloy-eips", "alloy-json-rpc", "alloy-network", @@ -6985,7 +7004,7 @@ dependencies = [ "alloy-rpc-types-beacon", "alloy-rpc-types-engine", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 0.3.1", "alloy-signer-local", "alloy-transport", "alloy-transport-http", @@ -7614,7 +7633,7 @@ name = "reth-codecs" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.3.1", "alloy-eips", "alloy-genesis", "alloy-primitives 0.8.0", @@ -7675,7 +7694,7 @@ name = "reth-consensus-debug-client" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.3.1", "alloy-eips", "alloy-provider", "auto_impl", @@ -8802,13 +8821,13 @@ name = "reth-primitives" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.3.1", "alloy-eips", "alloy-genesis", "alloy-primitives 0.8.0", "alloy-rlp", "alloy-rpc-types", - "alloy-serde", + "alloy-serde 0.3.1", "arbitrary", "bytes", "c-kzg", @@ -8838,7 +8857,7 @@ name = "reth-primitives-traits" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.3.1", "alloy-eips", "alloy-genesis", "alloy-primitives 0.8.0", @@ -9200,7 +9219,7 @@ dependencies = [ "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", - "alloy-serde", + "alloy-serde 0.3.1", "jsonrpsee-types 0.24.3", "op-alloy-rpc-types", "op-alloy-rpc-types-engine", @@ -9453,7 +9472,7 @@ name = "reth-trie-common" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.3.1", "alloy-genesis", "alloy-primitives 0.8.0", "alloy-rlp", diff --git a/Cargo.toml b/Cargo.toml index cf448b64..c800efd3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,4 +74,9 @@ alloy-rpc-types-engine = { version = "0.3.0", features = [ "ssz", ] } alloy-rpc-types-eth = { version = "0.3.0" } -alloy-signer-local = { version = "0.3.0" } \ No newline at end of file +alloy-signer-local = { version = "0.3.0" } + +[patch.crates-io] +alloy-eips = { git = "https://github.com/alloy-rs/alloy", branch = "rkrasiuk/bid-submission-v4" } +alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", branch = "rkrasiuk/bid-submission-v4" } +alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", branch = "rkrasiuk/bid-submission-v4" } diff --git a/crates/rbuilder/src/building/mod.rs b/crates/rbuilder/src/building/mod.rs index c785cef5..cf93170c 100644 --- a/crates/rbuilder/src/building/mod.rs +++ b/crates/rbuilder/src/building/mod.rs @@ -35,7 +35,8 @@ use reth_basic_payload_builder::{commit_withdrawals, WithdrawalsOutcome}; use reth_chainspec::{ChainSpec, EthereumHardforks}; use reth_errors::ProviderError; use reth_evm::system_calls::{ - post_block_withdrawal_requests_contract_call, pre_block_beacon_root_contract_call, + post_block_consolidation_requests_contract_call, post_block_withdrawal_requests_contract_call, + pre_block_beacon_root_contract_call, pre_block_blockhashes_contract_call, }; use reth_evm_ethereum::{eip6110::parse_deposits_from_receipts, revm_spec, EthEvmConfig}; use reth_node_api::PayloadBuilderAttributes; @@ -577,18 +578,30 @@ impl PartialBlock { .chain_spec .is_prague_active_at_timestamp(ctx.attributes.timestamp()) { - let deposit_requests = - parse_deposits_from_receipts(&ctx.chain_spec, self.receipts.iter())?; + let evm_config = EthEvmConfig::default(); let mut db = state.new_db_ref(); + let deposit_requests = + parse_deposits_from_receipts(&ctx.chain_spec, self.receipts.iter())?; let withdrawal_requests = post_block_withdrawal_requests_contract_call( - &EthEvmConfig::default(), + &evm_config, + db.as_mut(), + &ctx.initialized_cfg, + &ctx.block_env, + )?; + let consolidation_requests = post_block_consolidation_requests_contract_call( + &evm_config, db.as_mut(), &ctx.initialized_cfg, &ctx.block_env, )?; - let requests = [deposit_requests, withdrawal_requests].concat(); + let requests = [ + deposit_requests, + withdrawal_requests, + consolidation_requests, + ] + .concat(); let requests_root = calculate_requests_root(&requests); (Some(requests.into()), Some(requests_root)) } else { @@ -701,15 +714,24 @@ impl PartialBlock { ctx: &BlockBuildingContext, state: &mut BlockState, ) -> eyre::Result<()> { + let evm_config = EthEvmConfig::default(); let mut db = state.new_db_ref(); pre_block_beacon_root_contract_call( db.as_mut(), - &EthEvmConfig::default(), + &evm_config, &ctx.chain_spec, &ctx.initialized_cfg, &ctx.block_env, ctx.attributes.parent_beacon_block_root(), )?; + pre_block_blockhashes_contract_call( + db.as_mut(), + &evm_config, + &ctx.chain_spec, + &ctx.initialized_cfg, + &ctx.block_env, + ctx.attributes.parent, + )?; db.as_mut().merge_transitions(BundleRetention::Reverts); Ok(()) } diff --git a/crates/rbuilder/src/mev_boost/mod.rs b/crates/rbuilder/src/mev_boost/mod.rs index 28a0d149..e968b442 100644 --- a/crates/rbuilder/src/mev_boost/mod.rs +++ b/crates/rbuilder/src/mev_boost/mod.rs @@ -6,7 +6,9 @@ pub mod sign_payload; use super::utils::u256decimal_serde_helper; use alloy_primitives::{Address, BlockHash, Bytes, U256}; -use alloy_rpc_types_beacon::relay::{BidTrace, SignedBidSubmissionV2, SignedBidSubmissionV3}; +use alloy_rpc_types_beacon::relay::{ + BidTrace, SignedBidSubmissionV2, SignedBidSubmissionV3, SignedBidSubmissionV4, +}; use flate2::{write::GzEncoder, Compression}; use primitive_types::H384; use reqwest::{ @@ -455,6 +457,7 @@ impl RelayClient { match data { SubmitBlockRequest::Capella(data) => data.0.as_ssz_bytes(), SubmitBlockRequest::Deneb(data) => data.0.as_ssz_bytes(), + SubmitBlockRequest::Electra(data) => data.0.as_ssz_bytes(), }, SSZ_CONTENT_TYPE, ) @@ -582,6 +585,9 @@ impl RelayClient { } } +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] +pub struct ElectraSubmitBlockRequest(SignedBidSubmissionV4); + #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] pub struct DenebSubmitBlockRequest(SignedBidSubmissionV3); @@ -599,6 +605,7 @@ pub struct CapellaSubmitBlockRequest(SignedBidSubmissionV2); pub enum SubmitBlockRequest { Capella(CapellaSubmitBlockRequest), Deneb(DenebSubmitBlockRequest), + Electra(ElectraSubmitBlockRequest), } impl SubmitBlockRequest { @@ -606,6 +613,7 @@ impl SubmitBlockRequest { match self { SubmitBlockRequest::Capella(req) => req.0.message.clone(), SubmitBlockRequest::Deneb(req) => req.0.message.clone(), + SubmitBlockRequest::Electra(req) => req.0.message.clone(), } } } diff --git a/crates/rbuilder/src/mev_boost/sign_payload.rs b/crates/rbuilder/src/mev_boost/sign_payload.rs index 313d7887..acf56dee 100644 --- a/crates/rbuilder/src/mev_boost/sign_payload.rs +++ b/crates/rbuilder/src/mev_boost/sign_payload.rs @@ -1,12 +1,15 @@ -use super::{CapellaSubmitBlockRequest, DenebSubmitBlockRequest, SubmitBlockRequest}; +use super::{ + CapellaSubmitBlockRequest, DenebSubmitBlockRequest, ElectraSubmitBlockRequest, + SubmitBlockRequest, +}; use crate::utils::u256decimal_serde_helper; use alloy_primitives::{Address, BlockHash, FixedBytes, B256, U256}; use alloy_rpc_types_beacon::{ - relay::{BidTrace, SignedBidSubmissionV2, SignedBidSubmissionV3}, + relay::{BidTrace, SignedBidSubmissionV2, SignedBidSubmissionV3, SignedBidSubmissionV4}, BlsPublicKey, }; use alloy_rpc_types_engine::{ - BlobsBundleV1, ExecutionPayloadV1, ExecutionPayloadV2, ExecutionPayloadV3, + BlobsBundleV1, ExecutionPayloadV1, ExecutionPayloadV2, ExecutionPayloadV3, ExecutionPayloadV4, }; use alloy_rpc_types_eth::Withdrawal; use ethereum_consensus::{ @@ -178,12 +181,45 @@ pub fn sign_block_for_relay( let blobs_bundle = marshal_txs_blobs_sidecars(blobs_bundle); - SubmitBlockRequest::Deneb(DenebSubmitBlockRequest(SignedBidSubmissionV3 { - message, - execution_payload, - blobs_bundle: blobs_bundle.clone(), - signature, - })) + if chain_spec.is_prague_active_at_timestamp(sealed_block.timestamp) { + let mut deposit_requests = Vec::new(); + let mut withdrawal_requests = Vec::new(); + let mut consolidation_requests = Vec::new(); + for request in sealed_block.requests.iter().flat_map(|r| &r.0) { + match request { + alloy_consensus::Request::DepositRequest(r) => { + deposit_requests.push(*r); + } + alloy_consensus::Request::WithdrawalRequest(r) => { + withdrawal_requests.push(*r); + } + alloy_consensus::Request::ConsolidationRequest(r) => { + consolidation_requests.push(*r); + } + _ => {} + }; + } + + let execution_payload = ExecutionPayloadV4 { + payload_inner: execution_payload, + deposit_requests, + withdrawal_requests, + consolidation_requests, + }; + SubmitBlockRequest::Electra(ElectraSubmitBlockRequest(SignedBidSubmissionV4 { + message, + execution_payload, + blobs_bundle, + signature, + })) + } else { + SubmitBlockRequest::Deneb(DenebSubmitBlockRequest(SignedBidSubmissionV3 { + message, + execution_payload, + blobs_bundle, + signature, + })) + } } else { let execution_payload = capella_payload; SubmitBlockRequest::Capella(CapellaSubmitBlockRequest(SignedBidSubmissionV2 { diff --git a/crates/rbuilder/src/validation_api_client.rs b/crates/rbuilder/src/validation_api_client.rs index 797fbd40..ce668db3 100644 --- a/crates/rbuilder/src/validation_api_client.rs +++ b/crates/rbuilder/src/validation_api_client.rs @@ -77,6 +77,7 @@ impl ValidationAPIClient { let method = match req { SubmitBlockRequest::Capella(_) => "flashbots_validateBuilderSubmissionV2", SubmitBlockRequest::Deneb(_) => "flashbots_validateBuilderSubmissionV3", + SubmitBlockRequest::Electra(_) => "flashbots_validateBuilderSubmissionV4", }; let request = ValidRequest { req: req.clone(), From 51f90b48f91348a4c0f305cec7e91476757ea7c2 Mon Sep 17 00:00:00 2001 From: Roman Krasiuk Date: Mon, 30 Sep 2024 10:03:36 +0200 Subject: [PATCH 2/2] remove dep overrides --- Cargo.lock | 100 +++++++++++++++++++++-------------------------------- Cargo.toml | 5 --- 2 files changed, 40 insertions(+), 65 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7d3d9317..82e782fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -118,25 +118,12 @@ dependencies = [ "alloy-eips", "alloy-primitives 0.8.0", "alloy-rlp", - "alloy-serde 0.3.1", + "alloy-serde", "arbitrary", "c-kzg", "serde", ] -[[package]] -name = "alloy-consensus" -version = "0.3.5" -source = "git+https://github.com/alloy-rs/alloy?branch=rkrasiuk/bid-submission-v4#a2055294a698964b6b438982d0a22114a4d0538b" -dependencies = [ - "alloy-eips", - "alloy-primitives 0.8.0", - "alloy-rlp", - "alloy-serde 0.3.5", - "c-kzg", - "serde", -] - [[package]] name = "alloy-dyn-abi" version = "0.8.0" @@ -184,14 +171,15 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.3.5" -source = "git+https://github.com/alloy-rs/alloy?branch=rkrasiuk/bid-submission-v4#a2055294a698964b6b438982d0a22114a4d0538b" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f923dd5fca5f67a43d81ed3ebad0880bd41f6dd0ada930030353ac356c54cd0f" dependencies = [ "alloy-eip2930", "alloy-eip7702", "alloy-primitives 0.8.0", "alloy-rlp", - "alloy-serde 0.3.5", + "alloy-serde", "arbitrary", "c-kzg", "derive_more 1.0.0", @@ -209,7 +197,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b85dfc693e4a1193f0372a8f789df12ab51fcbe7be0733baa04939a86dd813b" dependencies = [ "alloy-primitives 0.8.0", - "alloy-serde 0.3.1", + "alloy-serde", "serde", ] @@ -245,13 +233,13 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfbe2802d5b8c632f18d68c352073378f02a3407c1b6a4487194e7d21ab0f002" dependencies = [ - "alloy-consensus 0.3.1", + "alloy-consensus", "alloy-eips", "alloy-json-rpc", "alloy-network-primitives", "alloy-primitives 0.8.0", "alloy-rpc-types-eth", - "alloy-serde 0.3.1", + "alloy-serde", "alloy-signer", "alloy-sol-types", "async-trait", @@ -267,7 +255,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396c07726030fa0f9dab5da8c71ccd69d5eb74a7fe1072b7ae453a67e4fe553e" dependencies = [ "alloy-primitives 0.8.0", - "alloy-serde 0.3.1", + "alloy-serde", "serde", ] @@ -342,7 +330,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1376948df782ffee83a54cac4b2aba14134edd997229a3db97da0a606586eb5c" dependencies = [ "alloy-chains", - "alloy-consensus 0.3.1", + "alloy-consensus", "alloy-eips", "alloy-json-rpc", "alloy-network", @@ -447,7 +435,7 @@ dependencies = [ "alloy-rpc-types-engine", "alloy-rpc-types-eth", "alloy-rpc-types-trace", - "alloy-serde 0.3.1", + "alloy-serde", "serde", ] @@ -470,14 +458,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "140b079c6fda14d9586432bf988b46ac0e04871ca313c9e00aa85cc808105e8a" dependencies = [ "alloy-primitives 0.8.0", - "alloy-serde 0.3.1", + "alloy-serde", "serde", ] [[package]] name = "alloy-rpc-types-beacon" -version = "0.3.5" -source = "git+https://github.com/alloy-rs/alloy?branch=rkrasiuk/bid-submission-v4#a2055294a698964b6b438982d0a22114a4d0538b" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e7081d2206dca51ce23a06338d78d9b536931cc3f15134fc1c6535eb2b77f18" dependencies = [ "alloy-eips", "alloy-primitives 0.8.0", @@ -491,14 +480,15 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.3.5" -source = "git+https://github.com/alloy-rs/alloy?branch=rkrasiuk/bid-submission-v4#a2055294a698964b6b438982d0a22114a4d0538b" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1464c4dd646e1bdfde86ae65ce5ba168dbb29180b478011fe87117ae46b1629b" dependencies = [ - "alloy-consensus 0.3.5", + "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.0", "alloy-rlp", - "alloy-serde 0.3.5", + "alloy-serde", "derive_more 1.0.0", "ethereum_ssz", "ethereum_ssz_derive", @@ -514,12 +504,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15bb3506ab1cf415d4752778c93e102050399fb8de97b7da405a5bf3e31f5f3b" dependencies = [ - "alloy-consensus 0.3.1", + "alloy-consensus", "alloy-eips", "alloy-network-primitives", "alloy-primitives 0.8.0", "alloy-rlp", - "alloy-serde 0.3.1", + "alloy-serde", "alloy-sol-types", "itertools 0.13.0", "jsonrpsee-types 0.24.3", @@ -536,7 +526,7 @@ checksum = "19e8cb848b66617f7d58b576bfc416854c4e9ae8d35e14f5077c0c779048f280" dependencies = [ "alloy-eips", "alloy-primitives 0.8.0", - "alloy-serde 0.3.1", + "alloy-serde", "serde", "serde_json", ] @@ -549,7 +539,7 @@ checksum = "16cca915e0aab3b2657b4f9efe02eb88e5483905fb6d244749652aae14e5f92e" dependencies = [ "alloy-primitives 0.8.0", "alloy-rpc-types-eth", - "alloy-serde 0.3.1", + "alloy-serde", "serde", "serde_json", "thiserror", @@ -563,7 +553,7 @@ checksum = "68eede4bd722bb872222efbbfbccc8f9b86e597143934b8ce556d3e0487bb662" dependencies = [ "alloy-primitives 0.8.0", "alloy-rpc-types-eth", - "alloy-serde 0.3.1", + "alloy-serde", "serde", ] @@ -572,16 +562,6 @@ name = "alloy-serde" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae417978015f573b4a8c02af17f88558fb22e3fccd12e8a910cf6a2ff331cfcb" -dependencies = [ - "alloy-primitives 0.8.0", - "serde", - "serde_json", -] - -[[package]] -name = "alloy-serde" -version = "0.3.5" -source = "git+https://github.com/alloy-rs/alloy?branch=rkrasiuk/bid-submission-v4#a2055294a698964b6b438982d0a22114a4d0538b" dependencies = [ "alloy-primitives 0.8.0", "arbitrary", @@ -609,7 +589,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c640f9343e8f741f837c345c5ea30239ba77938b3691b884c736834853bd16c" dependencies = [ - "alloy-consensus 0.3.1", + "alloy-consensus", "alloy-network", "alloy-primitives 0.8.0", "alloy-signer", @@ -5718,11 +5698,11 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3041068147bb9abce8973644991e11c075fa8a7931a272bc8eb935971a2d03d7" dependencies = [ - "alloy-consensus 0.3.1", + "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.0", "alloy-rlp", - "alloy-serde 0.3.1", + "alloy-serde", "derive_more 1.0.0", "serde", "spin", @@ -5734,7 +5714,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf926fccb35a1ad784cf8c2771a3a7b2c891379fcc78bc7cdc23dec1b57a6459" dependencies = [ - "alloy-consensus 0.3.1", + "alloy-consensus", "alloy-eips", "alloy-network", "alloy-primitives 0.8.0", @@ -5752,7 +5732,7 @@ dependencies = [ "alloy-network", "alloy-primitives 0.8.0", "alloy-rpc-types-eth", - "alloy-serde 0.3.1", + "alloy-serde", "op-alloy-consensus", "serde", "serde_json", @@ -5766,7 +5746,7 @@ checksum = "5ea246be3da604d2f68e86cc510cf05219db0ed24273ebd59d86065971ba0e3f" dependencies = [ "alloy-primitives 0.8.0", "alloy-rpc-types-engine", - "alloy-serde 0.3.1", + "alloy-serde", "serde", ] @@ -6991,7 +6971,7 @@ version = "0.1.0" dependencies = [ "ahash", "alloy-chains", - "alloy-consensus 0.3.1", + "alloy-consensus", "alloy-eips", "alloy-json-rpc", "alloy-network", @@ -7004,7 +6984,7 @@ dependencies = [ "alloy-rpc-types-beacon", "alloy-rpc-types-engine", "alloy-rpc-types-eth", - "alloy-serde 0.3.1", + "alloy-serde", "alloy-signer-local", "alloy-transport", "alloy-transport-http", @@ -7633,7 +7613,7 @@ name = "reth-codecs" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "alloy-consensus 0.3.1", + "alloy-consensus", "alloy-eips", "alloy-genesis", "alloy-primitives 0.8.0", @@ -7694,7 +7674,7 @@ name = "reth-consensus-debug-client" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "alloy-consensus 0.3.1", + "alloy-consensus", "alloy-eips", "alloy-provider", "auto_impl", @@ -8821,13 +8801,13 @@ name = "reth-primitives" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "alloy-consensus 0.3.1", + "alloy-consensus", "alloy-eips", "alloy-genesis", "alloy-primitives 0.8.0", "alloy-rlp", "alloy-rpc-types", - "alloy-serde 0.3.1", + "alloy-serde", "arbitrary", "bytes", "c-kzg", @@ -8857,7 +8837,7 @@ name = "reth-primitives-traits" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "alloy-consensus 0.3.1", + "alloy-consensus", "alloy-eips", "alloy-genesis", "alloy-primitives 0.8.0", @@ -9219,7 +9199,7 @@ dependencies = [ "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", - "alloy-serde 0.3.1", + "alloy-serde", "jsonrpsee-types 0.24.3", "op-alloy-rpc-types", "op-alloy-rpc-types-engine", @@ -9472,7 +9452,7 @@ name = "reth-trie-common" version = "1.0.6" source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a" dependencies = [ - "alloy-consensus 0.3.1", + "alloy-consensus", "alloy-genesis", "alloy-primitives 0.8.0", "alloy-rlp", diff --git a/Cargo.toml b/Cargo.toml index c800efd3..c6390ed3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -75,8 +75,3 @@ alloy-rpc-types-engine = { version = "0.3.0", features = [ ] } alloy-rpc-types-eth = { version = "0.3.0" } alloy-signer-local = { version = "0.3.0" } - -[patch.crates-io] -alloy-eips = { git = "https://github.com/alloy-rs/alloy", branch = "rkrasiuk/bid-submission-v4" } -alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", branch = "rkrasiuk/bid-submission-v4" } -alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", branch = "rkrasiuk/bid-submission-v4" }