From b2f415cbe54b5a7e789d05a4ca906e6570985dd8 Mon Sep 17 00:00:00 2001 From: tersec Date: Mon, 30 Jan 2023 20:22:05 +0100 Subject: [PATCH] remove merge cruft (#4559) --- beacon_chain/spec/network.nim | 5 ++--- beacon_chain/validators/validator_duties.nim | 7 +------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/beacon_chain/spec/network.nim b/beacon_chain/spec/network.nim index 6e5218c58..4f80848bc 100644 --- a/beacon_chain/spec/network.nim +++ b/beacon_chain/spec/network.nim @@ -15,8 +15,8 @@ export base const # https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.1/specs/phase0/p2p-interface.md#topics-and-messages - # https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.0/specs/capella/p2p-interface.md#topics-and-messages - # https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.0/specs/eip4844/p2p-interface.md#topics-and-messages + # https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.1/specs/capella/p2p-interface.md#topics-and-messages + # https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.1/specs/eip4844/p2p-interface.md#topics-and-messages topicBeaconBlocksSuffix* = "beacon_block/ssz_snappy" topicVoluntaryExitsSuffix* = "voluntary_exit/ssz_snappy" topicProposerSlashingsSuffix* = "proposer_slashing/ssz_snappy" @@ -26,7 +26,6 @@ const topicBeaconBlockAndBlobsSidecarTopicSuffix* = "beacon_block_and_blobs_sidecar/ssz_snappy" # https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.1/specs/phase0/p2p-interface.md#configuration - TTFB_TIMEOUT* = 5.seconds RESP_TIMEOUT* = 10.seconds # https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.1/specs/bellatrix/p2p-interface.md#configuration diff --git a/beacon_chain/validators/validator_duties.nim b/beacon_chain/validators/validator_duties.nim index b29f0b06b..fd7f37eb9 100644 --- a/beacon_chain/validators/validator_duties.nim +++ b/beacon_chain/validators/validator_duties.nim @@ -846,12 +846,7 @@ proc proposeBlock(node: BeaconNode, return head res.get() - # https://github.com/ethereum/builder-specs/blob/v0.2.0/specs/validator.md#responsibilites-during-the-merge-transition - # "Honest validators will not utilize the external builder network until - # after the transition from the proof-of-work chain to the proof-of-stake - # beacon chain has been finalized by the proof-of-stake validators." - if node.config.payloadBuilderEnable and - not node.dag.loadExecutionBlockRoot(node.dag.finalizedHead.blck).isZero: + if node.config.payloadBuilderEnable: let newBlockMEV = await node.proposeBlockMEV( head, validator, slot, randao, validator_index)