From 4c23696dc6403843338703566ad5f68b8a92f1d3 Mon Sep 17 00:00:00 2001 From: Etan Kissling Date: Sat, 10 Aug 2024 01:42:39 +0200 Subject: [PATCH] resolve merge conflicts --- beacon_chain/spec/helpers.nim | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/beacon_chain/spec/helpers.nim b/beacon_chain/spec/helpers.nim index 83ef67e02b..2828038411 100644 --- a/beacon_chain/spec/helpers.nim +++ b/beacon_chain/spec/helpers.nim @@ -395,29 +395,19 @@ func is_merge_transition_complete*( default(typeof(state.latest_execution_payload_header)) state.latest_execution_payload_header != defaultExecutionPayloadHeader -<<<<<<< HEAD -# https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.3/sync/optimistic.md#helpers +# https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.4/sync/optimistic.md#helpers func is_execution_block*(body: SomeForkyBeaconBlockBody): bool = when typeof(body).kind >= ConsensusFork.Bellatrix: -======= -# https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.4/sync/optimistic.md#helpers -func is_execution_block*(blck: SomeForkyBeaconBlock): bool = - when typeof(blck).kind >= ConsensusFork.Bellatrix: ->>>>>>> unstable const defaultExecutionPayload = default(typeof(body.execution_payload)) body.execution_payload != defaultExecutionPayload else: false -<<<<<<< HEAD func is_execution_block*(blck: SomeForkyBeaconBlock): bool = blck.body.is_execution_block -# https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.3/specs/bellatrix/beacon-chain.md#is_merge_transition_block -======= # https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.4/specs/bellatrix/beacon-chain.md#is_merge_transition_block ->>>>>>> unstable func is_merge_transition_block( state: bellatrix.BeaconState | capella.BeaconState | deneb.BeaconState | electra.BeaconState,