From 9a805b06db7f15d5dfc6b68d4f45031106c23568 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Wed, 12 Feb 2025 11:15:10 +0100 Subject: [PATCH] chore: bump alloy 0.11.1 (#14439) --- Cargo.lock | 113 +++++++++--------- Cargo.toml | 56 ++++----- crates/chain-state/src/test_utils.rs | 4 +- crates/engine/tree/src/backfill.rs | 4 +- crates/engine/tree/src/download.rs | 4 +- crates/ethereum/payload/src/config.rs | 4 +- crates/node/core/src/args/payload_builder.rs | 6 +- crates/node/core/src/args/txpool.rs | 6 +- crates/rpc/rpc-builder/tests/it/auth.rs | 2 +- crates/rpc/rpc-server-types/src/constants.rs | 4 +- crates/rpc/rpc/src/eth/helpers/state.rs | 6 +- crates/rpc/rpc/src/eth/helpers/transaction.rs | 4 +- crates/transaction-pool/src/config.rs | 4 +- crates/transaction-pool/src/noop.rs | 4 +- crates/transaction-pool/src/pool/txpool.rs | 4 +- crates/transaction-pool/src/validate/eth.rs | 5 +- crates/transaction-pool/tests/it/evict.rs | 8 +- 17 files changed, 122 insertions(+), 116 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 63cd4dc71..0657f6a63 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,9 +121,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce20c85f6b24a5da40b2350a748e348417f0465dedbb523a4d149143bc4a41ce" +checksum = "69e32ef5c74bbeb1733c37f4ac7f866f8c8af208b7b4265e21af609dcac5bd5e" dependencies = [ "alloy-eips", "alloy-primitives", @@ -155,9 +155,9 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c7a59f261333db00fa10a3de9480f31121bb919ad38487040d7833d5982203" +checksum = "ee6180fb232becdea70fad57c63b6967f01f74ab9595671b870f504116dd29de" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -237,9 +237,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7149e011edbd588f6df6564b369c75f6b538d76db14053d95e0b43b2d92e4266" +checksum = "5591581ca2ab0b3e7226a4047f9a1bfcf431da1d0cce3752fda609fea3c27e37" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -260,9 +260,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acaec0cc4c1489d61d6f33d0c3dd522c750025f4b5c8f59cd546221e4df660e5" +checksum = "0cded3a2d4bd7173f696458c5d4c98c18a628dfcc9f194385e80a486e412e2e0" dependencies = [ "alloy-eips", "alloy-primitives", @@ -285,9 +285,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0c5c9651fd20a2fd4a57606b6a570d1c17ab86e686b962b2f1ecac68b51e020" +checksum = "762414662d793d7aaa36ee3af6928b6be23227df1681ce9c039f6f11daadef64" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -299,9 +299,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b02ed56783fb2c086a4ac8961175dd6d3ad163e6cf6125f0b83f7de03379b607" +checksum = "8be03f2ebc00cf88bd06d3c6caf387dceaa9c7e6b268216779fa68a9bf8ab4e6" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -337,12 +337,15 @@ dependencies = [ [[package]] name = "alloy-node-bindings" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c96f1a87e3b2842d6a35bbebedf2bd48a49ee757ec63d0cfc1f3cb86338e972c" +checksum = "81a3906afb50446392eb798dae4b918ba4ffcca47542efda7215776ddc8b5037" dependencies = [ "alloy-genesis", + "alloy-network", "alloy-primitives", + "alloy-signer", + "alloy-signer-local", "k256", "rand 0.8.5", "serde_json", @@ -385,9 +388,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c68df5354225da542efeb6d9388b65773b3304309b437416146e9d1e2bc1bd" +checksum = "cbe0a2acff0c4bd1669c71251ce10fc455cbffa1b4d0a817d5ea4ba7e5bb3db7" dependencies = [ "alloy-chains", "alloy-consensus", @@ -401,6 +404,7 @@ dependencies = [ "alloy-rpc-types-admin", "alloy-rpc-types-engine", "alloy-rpc-types-eth", + "alloy-sol-types", "alloy-transport", "alloy-transport-http", "alloy-transport-ipc", @@ -426,9 +430,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef6ef167ea24e7aac569dfd90b668c1f7dca0e48214e70364586d5341a89431" +checksum = "de3a68996f193f542f9e29c88dfa8ed1369d6ee04fa764c1bf23dc11b2f9e4a2" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -467,9 +471,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0371aae9b44a35e374c94c7e1df5cbccf0f52b2ef7c782291ed56e86d88ec106" +checksum = "b37cc3c7883dc41be1b01460127ad7930466d0a4bb6ba15a02ee34d2745e2d7c" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -493,9 +497,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1428d64569961b00373c503a3de306656e94ef1f2a474e93fd41a6daae0d6ac7" +checksum = "6f18e68a3882f372e045ddc89eb455469347767d17878ca492cfbac81e71a111" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -506,9 +510,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d25e16c2be6518be9274ab16fe19190666d4330d0713aa14938f593ddb0098" +checksum = "b4e30339fff15d53a3a258a7add476c7d24b61d6f4a71476cc39c8b567666772" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -518,9 +522,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721727cc493a58bd197a3ebbd42b88c0393c1f30da905bb7a31686c820f4c2d" +checksum = "10d06300df4a87d960add35909240fc72da355dd2ac926fa6999f9efafbdc5a7" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -541,9 +545,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9deadb4c8927dc702b58c8fb675f9fb88782c4c9c95096682058c1574141b8b7" +checksum = "799103aa44270c7bea076ec5d3d7b6c6d29557ab5485c91a74d3068327adb485" dependencies = [ "alloy-eips", "alloy-primitives", @@ -557,9 +561,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea98e1c4ac005ffe5f8691164f5f2ef5ee8dda50b1fdba173d44892141909e2" +checksum = "2834b7012054cb2f90ee9893b7cc97702edca340ec1ef386c30c42e55e6cd691" dependencies = [ "alloy-primitives", "serde", @@ -567,9 +571,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b582c59b6f493d9b15bea32f44f662fa6749e5464ef5305d8429a864ace60684" +checksum = "e83dde9fcf1ccb9b815cc0c89bba26bbbbaae5150a53ae624ed0fc63cb3676c1" dependencies = [ "alloy-consensus", "alloy-eips", @@ -588,9 +592,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4a43d8b1344e3ef115ed7a2cee934876e4a64d2b9d9bee8738f9806900757e" +checksum = "8b4dbee4d82f8a22dde18c28257bed759afeae7ba73da4a1479a039fd1445d04" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -610,9 +614,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076b5ed023c0b0e025566cfc570b51a6fd975935c982617c130ca98dcb0c1390" +checksum = "418eb6584edd695dfe496dda85a19102c1ae4838f142efce11e2463ed2288d71" dependencies = [ "alloy-eips", "alloy-primitives", @@ -624,9 +628,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac383c60b09660b7695a4f210cd11ab05887d058dfc669efd814904dbbaead82" +checksum = "7bd951155515fa452a2ca4b5434d4b3ab742bcd3d1d1b9a91704bcef5b8d2604" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -638,9 +642,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac39b1a583bb59dcf7d856604867acf704a7cf70b76a42f895652d566aa6f17c" +checksum = "21d8dd5bd94993eda3d56a8c4c0d693548183a35462523ffc4385c0b020d3b0c" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -650,9 +654,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86aa42c36e3c0db5bd9a7314e98aa261a61d5e3d6a0bd7e51fb8b0a3d6438481" +checksum = "8732058f5ca28c1d53d241e8504620b997ef670315d7c8afab856b3e3b80d945" dependencies = [ "alloy-primitives", "arbitrary", @@ -662,13 +666,14 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c613222abd016e03ba548f41db938a2c99108b59c0c66ca105eab1b7a2e6b40a" +checksum = "f96b3526fdd779a4bd0f37319cfb4172db52a7ac24cdbb8804b72091c18e1701" dependencies = [ "alloy-primitives", "async-trait", "auto_impl", + "either", "elliptic-curve", "k256", "thiserror 2.0.11", @@ -676,9 +681,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39163b956c81e8fd9605194d6b5b92dd93b0e0252810e69f9a4cebe3a8614f46" +checksum = "fe8f78cd6b7501c7e813a1eb4a087b72d23af51f5bb66d4e948dc840bdd207d8" dependencies = [ "alloy-consensus", "alloy-network", @@ -764,9 +769,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40e2f34fcd849676c8fe274a6e72f0664dfede7ce06d12daa728d2e72f1b4393" +checksum = "5a8d762eadce3e9b65eac09879430c6f4fce3736cac3cac123f9b1bf435ddd13" dependencies = [ "alloy-json-rpc", "base64 0.22.1", @@ -783,9 +788,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e291c97c3c0ebb5d03c34e3a55c0f7c5bfa307536a2efaaa6fae4b3a4d09851" +checksum = "20819c4cb978fb39ce6ac31991ba90f386d595f922f42ef888b4a18be190713e" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -798,9 +803,9 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3e991f40d2d81c6ee036a34d81127bfec5fadf7e649791b5225181126c1959" +checksum = "5e88304aa8b796204e5e2500dfe235933ed692745e3effd94c3733643db6d218" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -818,9 +823,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc8c544f7dc764735664756805f8b8b770020cc295a0b96b09cbefd099c172c7" +checksum = "b9653ea9aa06d0e02fcbe2f04f1c47f35a85c378ccefa98e54ae85210bc8bbfa" dependencies = [ "alloy-pubsub", "alloy-transport", diff --git a/Cargo.toml b/Cargo.toml index 51df5ffd2..e834963e9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -440,34 +440,34 @@ alloy-rlp = { version = "0.3.10", default-features = false } alloy-sol-types = "0.8.15" alloy-trie = { version = "0.7", default-features = false } -alloy-consensus = { version = "0.11.0", default-features = false } -alloy-contract = { version = "0.11.0", default-features = false } -alloy-eips = { version = "0.11.0", default-features = false } -alloy-genesis = { version = "0.11.0", default-features = false } -alloy-json-rpc = { version = "0.11.0", default-features = false } -alloy-network = { version = "0.11.0", default-features = false } -alloy-network-primitives = { version = "0.11.0", default-features = false } -alloy-node-bindings = { version = "0.11.0", default-features = false } -alloy-provider = { version = "0.11.0", features = ["reqwest"], default-features = false } -alloy-pubsub = { version = "0.11.0", default-features = false } -alloy-rpc-client = { version = "0.11.0", default-features = false } -alloy-rpc-types = { version = "0.11.0", features = ["eth"], default-features = false } -alloy-rpc-types-admin = { version = "0.11.0", default-features = false } -alloy-rpc-types-anvil = { version = "0.11.0", default-features = false } -alloy-rpc-types-beacon = { version = "0.11.0", default-features = false } -alloy-rpc-types-debug = { version = "0.11.0", default-features = false } -alloy-rpc-types-engine = { version = "0.11.0", default-features = false } -alloy-rpc-types-eth = { version = "0.11.0", default-features = false } -alloy-rpc-types-mev = { version = "0.11.0", default-features = false } -alloy-rpc-types-trace = { version = "0.11.0", default-features = false } -alloy-rpc-types-txpool = { version = "0.11.0", default-features = false } -alloy-serde = { version = "0.11.0", default-features = false } -alloy-signer = { version = "0.11.0", default-features = false } -alloy-signer-local = { version = "0.11.0", default-features = false } -alloy-transport = { version = "0.11.0" } -alloy-transport-http = { version = "0.11.0", features = ["reqwest-rustls-tls"], default-features = false } -alloy-transport-ipc = { version = "0.11.0", default-features = false } -alloy-transport-ws = { version = "0.11.0", default-features = false } +alloy-consensus = { version = "0.11.1", default-features = false } +alloy-contract = { version = "0.11.1", default-features = false } +alloy-eips = { version = "0.11.1", default-features = false } +alloy-genesis = { version = "0.11.1", default-features = false } +alloy-json-rpc = { version = "0.11.1", default-features = false } +alloy-network = { version = "0.11.1", default-features = false } +alloy-network-primitives = { version = "0.11.1", default-features = false } +alloy-node-bindings = { version = "0.11.1", default-features = false } +alloy-provider = { version = "0.11.1", features = ["reqwest"], default-features = false } +alloy-pubsub = { version = "0.11.1", default-features = false } +alloy-rpc-client = { version = "0.11.1", default-features = false } +alloy-rpc-types = { version = "0.11.1", features = ["eth"], default-features = false } +alloy-rpc-types-admin = { version = "0.11.1", default-features = false } +alloy-rpc-types-anvil = { version = "0.11.1", default-features = false } +alloy-rpc-types-beacon = { version = "0.11.1", default-features = false } +alloy-rpc-types-debug = { version = "0.11.1", default-features = false } +alloy-rpc-types-engine = { version = "0.11.1", default-features = false } +alloy-rpc-types-eth = { version = "0.11.1", default-features = false } +alloy-rpc-types-mev = { version = "0.11.1", default-features = false } +alloy-rpc-types-trace = { version = "0.11.1", default-features = false } +alloy-rpc-types-txpool = { version = "0.11.1", default-features = false } +alloy-serde = { version = "0.11.1", default-features = false } +alloy-signer = { version = "0.11.1", default-features = false } +alloy-signer-local = { version = "0.11.1", default-features = false } +alloy-transport = { version = "0.11.1" } +alloy-transport-http = { version = "0.11.1", features = ["reqwest-rustls-tls"], default-features = false } +alloy-transport-ipc = { version = "0.11.1", default-features = false } +alloy-transport-ws = { version = "0.11.1", default-features = false } # op op-alloy-rpc-types = { version = "0.10.3", default-features = false } diff --git a/crates/chain-state/src/test_utils.rs b/crates/chain-state/src/test_utils.rs index 368e68089..4bbb88be7 100644 --- a/crates/chain-state/src/test_utils.rs +++ b/crates/chain-state/src/test_utils.rs @@ -8,7 +8,7 @@ use alloy_consensus::{ Header, SignableTransaction, Transaction as _, TxEip1559, TxReceipt, EMPTY_ROOT_HASH, }; use alloy_eips::{ - eip1559::{ETHEREUM_BLOCK_GAS_LIMIT, INITIAL_BASE_FEE}, + eip1559::{ETHEREUM_BLOCK_GAS_LIMIT_30M, INITIAL_BASE_FEE}, eip7685::Requests, }; use alloy_primitives::{Address, BlockNumber, B256, U256}; @@ -146,7 +146,7 @@ impl TestBlockBuilder { parent_hash, gas_used: transactions.len() as u64 * MIN_TRANSACTION_GAS, mix_hash: B256::random(), - gas_limit: ETHEREUM_BLOCK_GAS_LIMIT, + gas_limit: ETHEREUM_BLOCK_GAS_LIMIT_30M, base_fee_per_gas: Some(INITIAL_BASE_FEE), transactions_root: calculate_transaction_root( &transactions.clone().into_iter().map(|tx| tx.into_tx()).collect::>(), diff --git a/crates/engine/tree/src/backfill.rs b/crates/engine/tree/src/backfill.rs index 5d5d83d1a..8fa3c0994 100644 --- a/crates/engine/tree/src/backfill.rs +++ b/crates/engine/tree/src/backfill.rs @@ -231,7 +231,7 @@ mod tests { use super::*; use crate::test_utils::{insert_headers_into_client, TestPipelineBuilder}; use alloy_consensus::Header; - use alloy_eips::eip1559::ETHEREUM_BLOCK_GAS_LIMIT; + use alloy_eips::eip1559::ETHEREUM_BLOCK_GAS_LIMIT_30M; use alloy_primitives::{BlockNumber, B256}; use assert_matches::assert_matches; use futures::poll; @@ -271,7 +271,7 @@ mod tests { let client = TestFullBlockClient::default(); let header = Header { base_fee_per_gas: Some(7), - gas_limit: ETHEREUM_BLOCK_GAS_LIMIT, + gas_limit: ETHEREUM_BLOCK_GAS_LIMIT_30M, ..Default::default() }; let header = SealedHeader::seal_slow(header); diff --git a/crates/engine/tree/src/download.rs b/crates/engine/tree/src/download.rs index 5b7acea63..66407ea06 100644 --- a/crates/engine/tree/src/download.rs +++ b/crates/engine/tree/src/download.rs @@ -313,7 +313,7 @@ mod tests { use super::*; use crate::test_utils::insert_headers_into_client; use alloy_consensus::Header; - use alloy_eips::eip1559::ETHEREUM_BLOCK_GAS_LIMIT; + use alloy_eips::eip1559::ETHEREUM_BLOCK_GAS_LIMIT_30M; use assert_matches::assert_matches; use reth_chainspec::{ChainSpecBuilder, MAINNET}; use reth_ethereum_consensus::EthBeaconConsensus; @@ -340,7 +340,7 @@ mod tests { let client = TestFullBlockClient::default(); let header = Header { base_fee_per_gas: Some(7), - gas_limit: ETHEREUM_BLOCK_GAS_LIMIT, + gas_limit: ETHEREUM_BLOCK_GAS_LIMIT_30M, ..Default::default() }; let header = SealedHeader::seal_slow(header); diff --git a/crates/ethereum/payload/src/config.rs b/crates/ethereum/payload/src/config.rs index 0e625d557..866ce3928 100644 --- a/crates/ethereum/payload/src/config.rs +++ b/crates/ethereum/payload/src/config.rs @@ -1,4 +1,4 @@ -use alloy_eips::eip1559::ETHEREUM_BLOCK_GAS_LIMIT; +use alloy_eips::eip1559::ETHEREUM_BLOCK_GAS_LIMIT_30M; use alloy_primitives::Bytes; use reth_primitives_traits::constants::GAS_LIMIT_BOUND_DIVISOR; @@ -14,7 +14,7 @@ pub struct EthereumBuilderConfig { impl EthereumBuilderConfig { /// Create new payload builder config. pub const fn new(extra_data: Bytes) -> Self { - Self { extra_data, desired_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT } + Self { extra_data, desired_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT_30M } } /// Set desired gas limit. diff --git a/crates/node/core/src/args/payload_builder.rs b/crates/node/core/src/args/payload_builder.rs index 58b7e93ca..96de9970a 100644 --- a/crates/node/core/src/args/payload_builder.rs +++ b/crates/node/core/src/args/payload_builder.rs @@ -1,6 +1,6 @@ use crate::{cli::config::PayloadBuilderConfig, version::default_extra_data}; use alloy_consensus::constants::MAXIMUM_EXTRA_DATA_SIZE; -use alloy_eips::{eip1559::ETHEREUM_BLOCK_GAS_LIMIT, merge::SLOT_DURATION}; +use alloy_eips::{eip1559::ETHEREUM_BLOCK_GAS_LIMIT_30M, merge::SLOT_DURATION}; use clap::{ builder::{RangedU64ValueParser, TypedValueParser}, Arg, Args, Command, @@ -17,7 +17,7 @@ pub struct PayloadBuilderArgs { pub extra_data: String, /// Target gas limit for built blocks. - #[arg(long = "builder.gaslimit", default_value_t = ETHEREUM_BLOCK_GAS_LIMIT, value_name = "GAS_LIMIT")] + #[arg(long = "builder.gaslimit", default_value_t = ETHEREUM_BLOCK_GAS_LIMIT_30M, value_name = "GAS_LIMIT")] pub gas_limit: u64, /// The interval at which the job should build a new payload after the last. @@ -41,7 +41,7 @@ impl Default for PayloadBuilderArgs { fn default() -> Self { Self { extra_data: default_extra_data(), - gas_limit: ETHEREUM_BLOCK_GAS_LIMIT, + gas_limit: ETHEREUM_BLOCK_GAS_LIMIT_30M, interval: Duration::from_secs(1), deadline: SLOT_DURATION, max_payload_tasks: 3, diff --git a/crates/node/core/src/args/txpool.rs b/crates/node/core/src/args/txpool.rs index 6886aa483..59c2ff2bf 100644 --- a/crates/node/core/src/args/txpool.rs +++ b/crates/node/core/src/args/txpool.rs @@ -1,7 +1,7 @@ //! Transaction pool arguments use crate::cli::config::RethTransactionPoolConfig; -use alloy_eips::eip1559::{ETHEREUM_BLOCK_GAS_LIMIT, MIN_PROTOCOL_BASE_FEE}; +use alloy_eips::eip1559::{ETHEREUM_BLOCK_GAS_LIMIT_30M, MIN_PROTOCOL_BASE_FEE}; use alloy_primitives::Address; use clap::Args; use reth_cli_util::parse_duration_from_secs_or_ms; @@ -62,7 +62,7 @@ pub struct TxPoolArgs { pub minimal_protocol_basefee: u64, /// The default enforced gas limit for transactions entering the pool - #[arg(long = "txpool.gas-limit", default_value_t = ETHEREUM_BLOCK_GAS_LIMIT)] + #[arg(long = "txpool.gas-limit", default_value_t = ETHEREUM_BLOCK_GAS_LIMIT_30M)] pub enforced_gas_limit: u64, /// Price bump percentage to replace an already existing blob transaction @@ -122,7 +122,7 @@ impl Default for TxPoolArgs { max_account_slots: TXPOOL_MAX_ACCOUNT_SLOTS_PER_SENDER, price_bump: DEFAULT_PRICE_BUMP, minimal_protocol_basefee: MIN_PROTOCOL_BASE_FEE, - enforced_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT, + enforced_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT_30M, blob_transaction_price_bump: REPLACE_BLOB_PRICE_BUMP, max_tx_input_bytes: DEFAULT_MAX_TX_INPUT_BYTES, max_cached_entries: DEFAULT_MAX_CACHED_BLOBS, diff --git a/crates/rpc/rpc-builder/tests/it/auth.rs b/crates/rpc/rpc-builder/tests/it/auth.rs index 12b533938..87d8cf4be 100644 --- a/crates/rpc/rpc-builder/tests/it/auth.rs +++ b/crates/rpc/rpc-builder/tests/it/auth.rs @@ -27,7 +27,7 @@ where EngineApiClient::new_payload_v2( client, ExecutionPayloadInputV2 { - execution_payload: ExecutionPayloadV1::from_block_slow::( + execution_payload: ExecutionPayloadV1::from_block_slow::( &block.into_block(), ), withdrawals: None, diff --git a/crates/rpc/rpc-server-types/src/constants.rs b/crates/rpc/rpc-server-types/src/constants.rs index 89b496da0..ebdfb9f53 100644 --- a/crates/rpc/rpc-server-types/src/constants.rs +++ b/crates/rpc/rpc-server-types/src/constants.rs @@ -80,8 +80,8 @@ pub mod gas_oracle { /// The default gas limit for `eth_call` and adjacent calls. /// - /// This is different from the default to regular 30M block gas limit `ETHEREUM_BLOCK_GAS_LIMIT` - /// to allow for more complex calls. + /// This is different from the default to regular 30M block gas limit + /// `ETHEREUM_BLOCK_GAS_LIMIT_30M` to allow for more complex calls. pub const RPC_DEFAULT_GAS_CAP: u64 = 50_000_000; /// Allowed error ratio for gas estimation diff --git a/crates/rpc/rpc/src/eth/helpers/state.rs b/crates/rpc/rpc/src/eth/helpers/state.rs index 99d2856ad..b007e93f8 100644 --- a/crates/rpc/rpc/src/eth/helpers/state.rs +++ b/crates/rpc/rpc/src/eth/helpers/state.rs @@ -36,7 +36,7 @@ where #[cfg(test)] mod tests { use super::*; - use alloy_eips::eip1559::ETHEREUM_BLOCK_GAS_LIMIT; + use alloy_eips::eip1559::ETHEREUM_BLOCK_GAS_LIMIT_30M; use alloy_primitives::{Address, StorageKey, StorageValue, U256}; use reth_chainspec::MAINNET; use reth_evm_ethereum::EthEvmConfig; @@ -64,7 +64,7 @@ mod tests { NoopNetwork::default(), cache.clone(), GasPriceOracle::new(NoopProvider::default(), Default::default(), cache), - ETHEREUM_BLOCK_GAS_LIMIT, + ETHEREUM_BLOCK_GAS_LIMIT_30M, DEFAULT_MAX_SIMULATE_BLOCKS, DEFAULT_ETH_PROOF_WINDOW, BlockingTaskPool::build().expect("failed to build tracing pool"), @@ -90,7 +90,7 @@ mod tests { (), cache.clone(), GasPriceOracle::new(mock_provider, Default::default(), cache), - ETHEREUM_BLOCK_GAS_LIMIT, + ETHEREUM_BLOCK_GAS_LIMIT_30M, DEFAULT_MAX_SIMULATE_BLOCKS, DEFAULT_ETH_PROOF_WINDOW + 1, BlockingTaskPool::build().expect("failed to build tracing pool"), diff --git a/crates/rpc/rpc/src/eth/helpers/transaction.rs b/crates/rpc/rpc/src/eth/helpers/transaction.rs index 33c8849be..03b63ec4d 100644 --- a/crates/rpc/rpc/src/eth/helpers/transaction.rs +++ b/crates/rpc/rpc/src/eth/helpers/transaction.rs @@ -56,7 +56,7 @@ where #[cfg(test)] mod tests { use super::*; - use alloy_eips::eip1559::ETHEREUM_BLOCK_GAS_LIMIT; + use alloy_eips::eip1559::ETHEREUM_BLOCK_GAS_LIMIT_30M; use alloy_primitives::{hex_literal::hex, Bytes}; use reth_chainspec::ChainSpecProvider; use reth_evm_ethereum::EthEvmConfig; @@ -88,7 +88,7 @@ mod tests { noop_network_provider, cache.clone(), GasPriceOracle::new(noop_provider, Default::default(), cache.clone()), - ETHEREUM_BLOCK_GAS_LIMIT, + ETHEREUM_BLOCK_GAS_LIMIT_30M, DEFAULT_MAX_SIMULATE_BLOCKS, DEFAULT_ETH_PROOF_WINDOW, BlockingTaskPool::build().expect("failed to build tracing pool"), diff --git a/crates/transaction-pool/src/config.rs b/crates/transaction-pool/src/config.rs index fc902b859..2e429ffad 100644 --- a/crates/transaction-pool/src/config.rs +++ b/crates/transaction-pool/src/config.rs @@ -4,7 +4,7 @@ use crate::{ PoolSize, TransactionOrigin, }; use alloy_consensus::constants::EIP4844_TX_TYPE_ID; -use alloy_eips::eip1559::{ETHEREUM_BLOCK_GAS_LIMIT, MIN_PROTOCOL_BASE_FEE}; +use alloy_eips::eip1559::{ETHEREUM_BLOCK_GAS_LIMIT_30M, MIN_PROTOCOL_BASE_FEE}; use alloy_primitives::Address; use std::{collections::HashSet, ops::Mul, time::Duration}; @@ -84,7 +84,7 @@ impl Default for PoolConfig { max_account_slots: TXPOOL_MAX_ACCOUNT_SLOTS_PER_SENDER, price_bumps: Default::default(), minimal_protocol_basefee: MIN_PROTOCOL_BASE_FEE, - gas_limit: ETHEREUM_BLOCK_GAS_LIMIT, + gas_limit: ETHEREUM_BLOCK_GAS_LIMIT_30M, local_transactions_config: Default::default(), pending_tx_listener_buffer_size: PENDING_TX_LISTENER_BUFFER_SIZE, new_tx_listener_buffer_size: NEW_TX_LISTENER_BUFFER_SIZE, diff --git a/crates/transaction-pool/src/noop.rs b/crates/transaction-pool/src/noop.rs index 9a064c56e..6f6de31b1 100644 --- a/crates/transaction-pool/src/noop.rs +++ b/crates/transaction-pool/src/noop.rs @@ -17,7 +17,7 @@ use crate::{ TransactionValidationOutcome, TransactionValidator, ValidPoolTransaction, }; use alloy_eips::{ - eip1559::ETHEREUM_BLOCK_GAS_LIMIT, + eip1559::ETHEREUM_BLOCK_GAS_LIMIT_30M, eip4844::{BlobAndProofV1, BlobTransactionSidecar}, }; use alloy_primitives::{Address, TxHash, B256, U256}; @@ -43,7 +43,7 @@ impl TransactionPool for NoopTransactionPool { fn block_info(&self) -> BlockInfo { BlockInfo { - block_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT, + block_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT_30M, last_seen_block_hash: Default::default(), last_seen_block_number: 0, pending_basefee: 0, diff --git a/crates/transaction-pool/src/pool/txpool.rs b/crates/transaction-pool/src/pool/txpool.rs index cfe09a139..6e73bdf4c 100644 --- a/crates/transaction-pool/src/pool/txpool.rs +++ b/crates/transaction-pool/src/pool/txpool.rs @@ -23,7 +23,7 @@ use alloy_consensus::constants::{ LEGACY_TX_TYPE_ID, }; use alloy_eips::{ - eip1559::{ETHEREUM_BLOCK_GAS_LIMIT, MIN_PROTOCOL_BASE_FEE}, + eip1559::{ETHEREUM_BLOCK_GAS_LIMIT_30M, MIN_PROTOCOL_BASE_FEE}, eip4844::BLOB_TX_MIN_BLOB_GASPRICE, Typed2718, }; @@ -1832,7 +1832,7 @@ impl Default for AllTransactions { Self { max_account_slots: TXPOOL_MAX_ACCOUNT_SLOTS_PER_SENDER, minimal_protocol_basefee: MIN_PROTOCOL_BASE_FEE, - block_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT, + block_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT_30M, by_hash: Default::default(), txs: Default::default(), tx_counter: Default::default(), diff --git a/crates/transaction-pool/src/validate/eth.rs b/crates/transaction-pool/src/validate/eth.rs index 26174a6b5..c8edbf52d 100644 --- a/crates/transaction-pool/src/validate/eth.rs +++ b/crates/transaction-pool/src/validate/eth.rs @@ -19,7 +19,8 @@ use alloy_consensus::{ BlockHeader, }; use alloy_eips::{ - eip1559::ETHEREUM_BLOCK_GAS_LIMIT, eip4844::env_settings::EnvKzgSettings, eip7840::BlobParams, + eip1559::ETHEREUM_BLOCK_GAS_LIMIT_30M, eip4844::env_settings::EnvKzgSettings, + eip7840::BlobParams, }; use reth_chainspec::{ChainSpecProvider, EthChainSpec, EthereumHardforks}; use reth_primitives::{InvalidTransactionError, SealedBlock}; @@ -591,7 +592,7 @@ impl EthTransactionValidatorBuilder { /// - EIP-4844 pub fn new(client: Client) -> Self { Self { - block_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT.into(), + block_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT_30M.into(), client, minimum_priority_fee: None, additional_tasks: 1, diff --git a/crates/transaction-pool/tests/it/evict.rs b/crates/transaction-pool/tests/it/evict.rs index eb677a6de..9dd2a621e 100644 --- a/crates/transaction-pool/tests/it/evict.rs +++ b/crates/transaction-pool/tests/it/evict.rs @@ -1,7 +1,7 @@ //! Transaction pool eviction tests. use alloy_consensus::Transaction; -use alloy_eips::eip1559::{ETHEREUM_BLOCK_GAS_LIMIT, MIN_PROTOCOL_BASE_FEE}; +use alloy_eips::eip1559::{ETHEREUM_BLOCK_GAS_LIMIT_30M, MIN_PROTOCOL_BASE_FEE}; use alloy_primitives::{Address, B256}; use rand::distributions::Uniform; use reth_transaction_pool::{ @@ -28,7 +28,7 @@ async fn only_blobs_eviction() { let pool: TestPool = TestPoolBuilder::default().with_config(pool_config.clone()).into(); let block_info = BlockInfo { - block_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT, + block_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT_30M, last_seen_block_hash: B256::ZERO, last_seen_block_number: 0, pending_basefee: 10, @@ -141,7 +141,7 @@ async fn mixed_eviction() { let pool: TestPool = TestPoolBuilder::default().with_config(pool_config.clone()).into(); let block_info = BlockInfo { - block_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT, + block_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT_30M, last_seen_block_hash: B256::ZERO, last_seen_block_number: 0, pending_basefee: 10, @@ -243,7 +243,7 @@ async fn nonce_gaps_eviction() { let pool: TestPool = TestPoolBuilder::default().with_config(pool_config.clone()).into(); let block_info = BlockInfo { - block_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT, + block_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT_30M, last_seen_block_hash: B256::ZERO, last_seen_block_number: 0, pending_basefee: 10,