From f5b2445d09d62c5ff8258ecabe4a8dab2655e7b0 Mon Sep 17 00:00:00 2001 From: Michael Sproul Date: Wed, 1 Apr 2026 16:46:02 +1100 Subject: [PATCH] Remove stupid GLOAS comments --- beacon_node/beacon_chain/src/beacon_chain.rs | 4 ++-- beacon_node/http_api/src/validator/mod.rs | 2 +- consensus/fork_choice/src/fork_choice.rs | 10 +++++----- consensus/fork_choice/tests/tests.rs | 4 ++-- .../src/fork_choice_test_definition/gloas_payload.rs | 8 ++++---- consensus/proto_array/src/proto_array.rs | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs index 3c8ea30779..f05b972679 100644 --- a/beacon_node/beacon_chain/src/beacon_chain.rs +++ b/beacon_node/beacon_chain/src/beacon_chain.rs @@ -4855,8 +4855,8 @@ impl BeaconChain { return Err(Box::new(DoNotReOrg::NotProposing.into())); } - // TODO(gloas): reorg weight logic needs updating for GLOAS. For now use - // total weight which is correct for pre-GLOAS and conservative for post-GLOAS. + // TODO(gloas): reorg weight logic needs updating for Gloas. For now use + // total weight which is correct for pre-Gloas and conservative for post-Gloas. let head_weight = info.head_node.weight(); let parent_weight = info.parent_node.weight(); diff --git a/beacon_node/http_api/src/validator/mod.rs b/beacon_node/http_api/src/validator/mod.rs index 3d96b85870..412851233e 100644 --- a/beacon_node/http_api/src/validator/mod.rs +++ b/beacon_node/http_api/src/validator/mod.rs @@ -671,7 +671,7 @@ pub fn post_validator_prepare_beacon_proposer( .await; // TODO(gloas): verify this is correct. We skip proposer preparation for - // GLOAS because the execution payload is no longer embedded in the beacon + // Gloas because the execution payload is no longer embedded in the beacon // block (it's in the payload envelope), so the head block's // execution_payload() is unavailable. let next_slot = current_slot + 1; diff --git a/consensus/fork_choice/src/fork_choice.rs b/consensus/fork_choice/src/fork_choice.rs index 7e189b0a1b..cedd42cf01 100644 --- a/consensus/fork_choice/src/fork_choice.rs +++ b/consensus/fork_choice/src/fork_choice.rs @@ -170,11 +170,11 @@ pub enum InvalidAttestation { /// The attestation is attesting to a state that is later than itself. (Viz., attesting to the /// future). AttestsToFutureBlock { block: Slot, attestation: Slot }, - /// Post-GLOAS: attestation index must be 0 or 1. + /// Post-Gloas: attestation index must be 0 or 1. InvalidAttestationIndex { index: u64 }, - /// A same-slot attestation has a non-zero index, which is invalid post-GLOAS. + /// A same-slot attestation has a non-zero index, which is invalid post-Gloas. InvalidSameSlotAttestationIndex { slot: Slot }, - /// Post-GLOAS: attestation with index == 1 (payload_present) requires the block's + /// Post-Gloas: attestation with index == 1 (payload_present) requires the block's /// payload to have been received (`root in store.payload_states`). PayloadNotReceived { beacon_block_root: Hash256 }, /// A payload attestation votes payload_present for a block in the current slot, which is @@ -256,7 +256,7 @@ pub struct QueuedAttestation { attesting_indices: Vec, block_root: Hash256, target_epoch: Epoch, - /// Per GLOAS spec: `payload_present = attestation.data.index == 1`. + /// Per Gloas spec: `payload_present = attestation.data.index == 1`. payload_present: bool, } @@ -1125,7 +1125,7 @@ where { let index = indexed_attestation.data().index; - // Post-GLOAS: attestation index must be 0 or 1. + // Post-Gloas: attestation index must be 0 or 1. if index > 1 { return Err(InvalidAttestation::InvalidAttestationIndex { index }); } diff --git a/consensus/fork_choice/tests/tests.rs b/consensus/fork_choice/tests/tests.rs index 839d0f4c5c..241e25d3e2 100644 --- a/consensus/fork_choice/tests/tests.rs +++ b/consensus/fork_choice/tests/tests.rs @@ -73,9 +73,9 @@ impl ForkChoiceTest { Self { harness } } - /// Creates a new tester with the GLOAS fork active at epoch 1. + /// Creates a new tester with the Gloas fork active at epoch 1. /// Genesis is a standard Fulu block (epoch 0), so block production works normally. - /// Tests that need GLOAS semantics should advance the chain into epoch 1 first. + /// Tests that need Gloas semantics should advance the chain into epoch 1 first. /// Get a value from the `ForkChoice` instantiation. fn get(&self, func: T) -> U where diff --git a/consensus/proto_array/src/fork_choice_test_definition/gloas_payload.rs b/consensus/proto_array/src/fork_choice_test_definition/gloas_payload.rs index e3f81fb3ff..18d7a40b82 100644 --- a/consensus/proto_array/src/fork_choice_test_definition/gloas_payload.rs +++ b/consensus/proto_array/src/fork_choice_test_definition/gloas_payload.rs @@ -52,7 +52,7 @@ pub fn get_gloas_chain_following_test_definition() -> ForkChoiceTestDefinition { }); // Mark root_1 as having received its execution payload so that - // its FULL virtual node exists in the GLOAS fork choice tree. + // its FULL virtual node exists in the Gloas fork choice tree. ops.push(Operation::ProcessExecutionPayload { block_root: get_root(1), }); @@ -262,7 +262,7 @@ pub fn get_gloas_find_head_vote_transition_test_definition() -> ForkChoiceTestDe }); // Mark root_1 as having received its execution payload so that - // its FULL virtual node exists in the GLOAS fork choice tree. + // its FULL virtual node exists in the Gloas fork choice tree. ops.push(Operation::ProcessExecutionPayload { block_root: get_root(1), }); @@ -367,7 +367,7 @@ pub fn get_gloas_weight_priority_over_payload_preference_test_definition() }); // Mark root_1 as having received its execution payload so that - // its FULL virtual node exists in the GLOAS fork choice tree. + // its FULL virtual node exists in the Gloas fork choice tree. ops.push(Operation::ProcessExecutionPayload { block_root: get_root(1), }); @@ -537,7 +537,7 @@ pub fn get_gloas_interleaved_attestations_test_definition() -> ForkChoiceTestDef }); // Mark root_1 as having received its execution payload so that - // its FULL virtual node exists in the GLOAS fork choice tree. + // its FULL virtual node exists in the Gloas fork choice tree. ops.push(Operation::ProcessExecutionPayload { block_root: get_root(1), }); diff --git a/consensus/proto_array/src/proto_array.rs b/consensus/proto_array/src/proto_array.rs index 412e217bf8..361e4a86e2 100644 --- a/consensus/proto_array/src/proto_array.rs +++ b/consensus/proto_array/src/proto_array.rs @@ -642,7 +642,7 @@ impl ProtoArray { block_timeliness_attestation_threshold: is_genesis || (is_current_slot && time_into_slot < spec.get_unaggregated_attestation_due()), - // TODO(gloas): use GLOAS-specific PTC due threshold once + // TODO(gloas): use Gloas-specific PTC due threshold once // `get_payload_attestation_due_ms` is on ChainSpec. block_timeliness_ptc_threshold: is_genesis || (is_current_slot && time_into_slot < spec.get_slot_duration() / 2),