mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-01 03:33:47 +00:00
Add Gloas boilerplate (#7728)
Adds the required boilerplate code for the Gloas (Glamsterdam) hard fork. This allows PRs testing Gloas-candidate features to test fork transition. This also includes de-duplication of post-Bellatrix readiness notifiers from #6797 (credit to @dapplion)
This commit is contained in:
@@ -1140,7 +1140,7 @@ impl<'de> ContextDeserialize<'de, ForkName> for SsePayloadAttributes {
|
||||
ForkName::Capella => {
|
||||
Self::V2(Deserialize::deserialize(deserializer).map_err(convert_err)?)
|
||||
}
|
||||
ForkName::Deneb | ForkName::Electra | ForkName::Fulu => {
|
||||
ForkName::Deneb | ForkName::Electra | ForkName::Fulu | ForkName::Gloas => {
|
||||
Self::V3(Deserialize::deserialize(deserializer).map_err(convert_err)?)
|
||||
}
|
||||
})
|
||||
@@ -2405,6 +2405,9 @@ mod test {
|
||||
rng,
|
||||
)),
|
||||
ExecutionPayload::Fulu(ExecutionPayloadFulu::<MainnetEthSpec>::random_for_test(rng)),
|
||||
ExecutionPayload::Gloas(ExecutionPayloadGloas::<MainnetEthSpec>::random_for_test(
|
||||
rng,
|
||||
)),
|
||||
];
|
||||
let merged_forks = &ForkName::list_all()[2..];
|
||||
assert_eq!(
|
||||
@@ -2459,6 +2462,17 @@ mod test {
|
||||
blobs_bundle,
|
||||
}
|
||||
},
|
||||
{
|
||||
let execution_payload =
|
||||
ExecutionPayload::Gloas(
|
||||
ExecutionPayloadGloas::<MainnetEthSpec>::random_for_test(rng),
|
||||
);
|
||||
let blobs_bundle = BlobsBundle::random_for_test(rng);
|
||||
ExecutionPayloadAndBlobs {
|
||||
execution_payload,
|
||||
blobs_bundle,
|
||||
}
|
||||
},
|
||||
];
|
||||
let blob_forks = &ForkName::list_all()[4..];
|
||||
|
||||
|
||||
@@ -50,6 +50,9 @@ ELECTRA_FORK_EPOCH: 948224 # Thu Mar 6 2025 09:43:40 GMT+0000
|
||||
# Fulu
|
||||
FULU_FORK_VERSION: 0x0600006f
|
||||
FULU_FORK_EPOCH: 18446744073709551615
|
||||
# Gloas
|
||||
GLOAS_FORK_VERSION: 0x0700006f
|
||||
GLOAS_FORK_EPOCH: 18446744073709551615
|
||||
|
||||
# Time parameters
|
||||
# ---------------------------------------------------------------
|
||||
@@ -154,3 +157,4 @@ DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
|
||||
SAMPLES_PER_SLOT: 8
|
||||
CUSTODY_REQUIREMENT: 4
|
||||
MAX_BLOBS_PER_BLOCK_FULU: 12
|
||||
# Gloas
|
||||
|
||||
@@ -47,6 +47,9 @@ ELECTRA_FORK_EPOCH: 1337856 # 2025-04-30T14:03:40.000Z
|
||||
# Fulu
|
||||
FULU_FORK_VERSION: 0x06000064
|
||||
FULU_FORK_EPOCH: 18446744073709551615
|
||||
# Gloas
|
||||
GLOAS_FORK_VERSION: 0x07000064
|
||||
GLOAS_FORK_EPOCH: 18446744073709551615
|
||||
|
||||
# Time parameters
|
||||
# ---------------------------------------------------------------
|
||||
@@ -138,3 +141,5 @@ DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
|
||||
SAMPLES_PER_SLOT: 8
|
||||
CUSTODY_REQUIREMENT: 4
|
||||
MAX_BLOBS_PER_BLOCK_FULU: 12
|
||||
|
||||
# Gloas
|
||||
@@ -39,6 +39,9 @@ ELECTRA_FORK_EPOCH: 115968
|
||||
# Fulu
|
||||
FULU_FORK_VERSION: 0x07017000
|
||||
FULU_FORK_EPOCH: 18446744073709551615
|
||||
# Gloas
|
||||
GLOAS_FORK_VERSION: 0x08017000
|
||||
GLOAS_FORK_EPOCH: 18446744073709551615
|
||||
|
||||
# Time parameters
|
||||
# ---------------------------------------------------------------
|
||||
@@ -145,4 +148,6 @@ SAMPLES_PER_SLOT: 8
|
||||
CUSTODY_REQUIREMENT: 4
|
||||
VALIDATOR_CUSTODY_REQUIREMENT: 8
|
||||
BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000
|
||||
MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
|
||||
MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
|
||||
|
||||
# Gloas
|
||||
@@ -44,6 +44,10 @@ ELECTRA_FORK_EPOCH: 2048
|
||||
FULU_FORK_VERSION: 0x70000910
|
||||
FULU_FORK_EPOCH: 18446744073709551615
|
||||
|
||||
# Gloas
|
||||
GLOAS_FORK_VERSION: 0x80000910
|
||||
GLOAS_FORK_EPOCH: 18446744073709551615
|
||||
|
||||
|
||||
# Time parameters
|
||||
# ---------------------------------------------------------------
|
||||
@@ -159,5 +163,7 @@ VALIDATOR_CUSTODY_REQUIREMENT: 8
|
||||
BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000
|
||||
MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
|
||||
|
||||
# Gloas
|
||||
|
||||
# EIP7732
|
||||
MAX_REQUEST_PAYLOADS: 128
|
||||
|
||||
@@ -53,6 +53,9 @@ ELECTRA_FORK_EPOCH: 364032 # May 7, 2025, 10:05:11am UTC
|
||||
# Fulu
|
||||
FULU_FORK_VERSION: 0x06000000
|
||||
FULU_FORK_EPOCH: 18446744073709551615
|
||||
# Gloas
|
||||
GLOAS_FORK_VERSION: 0x07000000
|
||||
GLOAS_FORK_EPOCH: 18446744073709551615
|
||||
|
||||
# Time parameters
|
||||
# ---------------------------------------------------------------
|
||||
@@ -161,3 +164,5 @@ CUSTODY_REQUIREMENT: 4
|
||||
VALIDATOR_CUSTODY_REQUIREMENT: 8
|
||||
BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000
|
||||
MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
|
||||
|
||||
# Gloas
|
||||
@@ -40,6 +40,14 @@ DENEB_FORK_EPOCH: 132608
|
||||
ELECTRA_FORK_VERSION: 0x90000074
|
||||
ELECTRA_FORK_EPOCH: 222464
|
||||
|
||||
# Fulu
|
||||
FULU_FORK_VERSION: 0x90000075
|
||||
FULU_FORK_EPOCH: 18446744073709551615
|
||||
|
||||
# Gloas
|
||||
GLOAS_FORK_VERSION: 0x90000076
|
||||
GLOAS_FORK_EPOCH: 18446744073709551615
|
||||
|
||||
# Time parameters
|
||||
# ---------------------------------------------------------------
|
||||
# 12 seconds
|
||||
@@ -147,3 +155,5 @@ CUSTODY_REQUIREMENT: 4
|
||||
VALIDATOR_CUSTODY_REQUIREMENT: 8
|
||||
BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000
|
||||
MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
|
||||
|
||||
# Gloas
|
||||
Reference in New Issue
Block a user