Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use super::DEFAULT_TERMINAL_BLOCK;
const TEST_BLOB_BUNDLE: &[u8] = include_bytes!("fixtures/mainnet/test_blobs_bundle.ssz");
const TEST_BLOB_BUNDLE_V2: &[u8] = include_bytes!("fixtures/mainnet/test_blobs_bundle_v2.ssz");

pub const DEFAULT_GAS_LIMIT: u64 = 30_000_000;
pub const DEFAULT_GAS_LIMIT: u64 = 45_000_000;
const GAS_USED: u64 = DEFAULT_GAS_LIMIT - 1;

#[derive(Clone, Debug, PartialEq)]
Expand Down
2 changes: 1 addition & 1 deletion beacon_node/execution_layer/src/test_utils/mock_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ use warp::reply::{self, Reply};
use warp::{Filter, Rejection};

pub const DEFAULT_FEE_RECIPIENT: Address = Address::repeat_byte(42);
pub const DEFAULT_GAS_LIMIT: u64 = 30_000_000;
pub const DEFAULT_GAS_LIMIT: u64 = 45_000_000;
pub const DEFAULT_BUILDER_PRIVATE_KEY: &str =
"607a11b45a7219cc61a3d9c5fd08c7eebd602a6a19a977f8d3771d5711a550f2";

Expand Down
4 changes: 2 additions & 2 deletions beacon_node/http_api/tests/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4669,7 +4669,7 @@ impl ApiTester {
self.mock_builder
.as_ref()
.unwrap()
.add_operation(Operation::GasLimit(30_000_000));
.add_operation(Operation::GasLimit(DEFAULT_GAS_LIMIT as usize));

let slot = self.chain.slot().unwrap();
let epoch = self.chain.epoch().unwrap();
Expand All @@ -4692,7 +4692,7 @@ impl ApiTester {

let expected_fee_recipient = Address::from_low_u64_be(proposer_index);
assert_eq!(payload.fee_recipient(), expected_fee_recipient);
assert_eq!(payload.gas_limit(), 30_000_000);
assert_eq!(payload.gas_limit(), DEFAULT_GAS_LIMIT);

self
}
Expand Down
2 changes: 1 addition & 1 deletion book/src/help_vc.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Options:
The gas limit to be used in all builder proposals for all validators
managed by this validator client. Note this will not necessarily be
used if the gas limit set here moves too far from the previous block's
gas limit. [default: 36000000]
gas limit. [default: 45000000]
--genesis-state-url <URL>
A URL of a beacon-API compatible server from which to download the
genesis state. Checkpoint sync server URLs can generally be used with
Expand Down
2 changes: 1 addition & 1 deletion lighthouse/tests/validator_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ fn no_doppelganger_protection_flag() {
fn no_gas_limit_flag() {
CommandLineTest::new()
.run()
.with_config(|config| assert!(config.validator_store.gas_limit == Some(36_000_000)));
.with_config(|config| assert!(config.validator_store.gas_limit == Some(45_000_000)));
}
#[test]
fn gas_limit_flag() {
Expand Down
4 changes: 2 additions & 2 deletions validator_client/lighthouse_validator_store/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ const SLASHING_PROTECTION_HISTORY_EPOCHS: u64 = 512;

/// Currently used as the default gas limit in execution clients.
///
/// https://ethresear.ch/t/on-increasing-the-block-gas-limit-technical-considerations-path-forward/21225.
pub const DEFAULT_GAS_LIMIT: u64 = 36_000_000;
/// https://ethpandaops.io/posts/gaslimit-scaling/.
pub const DEFAULT_GAS_LIMIT: u64 = 45_000_000;

pub struct LighthouseValidatorStore<T, E> {
validators: Arc<RwLock<InitializedValidators>>,
Expand Down
2 changes: 1 addition & 1 deletion validator_client/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ pub struct ValidatorClient {
#[clap(
long,
value_name = "INTEGER",
default_value_t = 36_000_000,
default_value_t = 45_000_000,
requires = "builder_proposals",
help = "The gas limit to be used in all builder proposals for all validators managed \
by this validator client. Note this will not necessarily be used if the gas limit \
Expand Down