Skip to content

Commit 3e016d2

Browse files
Tomi-3-0Tomi-3-0
committed
Update copyright headers, and add execution
payload signature tests, update toSignedBlindedBeaconBlock for eip-7732
1 parent 25c31c2 commit 3e016d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+195
-93
lines changed

‎beacon_chain/beacon_chain_db_immutable.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2021-2024 Status Research & Development GmbH
2+
# Copyright (c) 2021-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/beacon_node_light_client.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2022-2024 Status Research & Development GmbH
2+
# Copyright (c) 2022-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/consensus_object_pools/blob_quarantine.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/consensus_object_pools/block_dag.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/consensus_object_pools/blockchain_dag.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/consensus_object_pools/blockchain_list.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/consensus_object_pools/data_column_quarantine.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/el/el_manager.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/el/engine_api_conversions.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2024 Status Research & Development GmbH
2+
# Copyright (c) 2024-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/gossip_processing/block_processor.nim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -302,7 +302,7 @@ proc newExecutionPayload*(
302302
blck.body.execution_payload
303303
else:
304304
debug "Block body does not support execution payload"
305-
nil
305+
default(electra.ExecutionPayload)
306306
307307
if not elManager.hasProperlyConfiguredConnection:
308308
if elManager.hasConnection:

‎beacon_chain/gossip_processing/gossip_validation.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2019-2024 Status Research & Development GmbH
2+
# Copyright (c) 2019-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at http://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at http://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/nimbus_beacon_node.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/nimbus_light_client.nim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ programMain:
111111
signedBlock: ForkedSignedBeaconBlock
112112
): Future[void] {.async: (raises: [CancelledError]).} =
113113
withBlck(signedBlock):
114-
when consensusFork >= ConsensusFork.Bellatrix:
114+
when consensusFork >= ConsensusFork.Bellatrix and
115+
consensusFork < ConsensusFork.Fulu:
115116
if forkyBlck.message.is_execution_block:
116117
template payload(): auto = forkyBlck.message.body.execution_payload
117118
if elManager != nil and not payload.block_hash.isZero:

‎beacon_chain/spec/beacon_time.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/spec/beaconstate.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/spec/datatypes/constants.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2022-2024 Status Research & Development GmbH
2+
# Copyright (c) 2022-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/spec/datatypes/fulu.nim

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2024 Status Research & Development GmbH
2+
# Copyright (c) 2024-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -20,7 +20,6 @@ import
2020
ssz_serialization/[merkleization, proofs],
2121
ssz_serialization/types as sszTypes,
2222
kzg4844/[kzg, kzg_abi],
23-
std/typetraits,
2423
chronicles,
2524
../digest,
2625
"."/[base, phase0, electra],
@@ -36,11 +35,6 @@ from ./capella import
3635
ExecutionBranch, HistoricalSummary, SignedBLSToExecutionChangeList,
3736
Withdrawal, EXECUTION_PAYLOAD_GINDEX
3837
from ./deneb import Blobs, BlobsBundle, KzgCommitments, KzgProofs
39-
from ./electra import
40-
PendingDeposit, PendingPartialWithdrawal,
41-
PendingConsolidation, ExecutionPayload, Attestation, TrustedAttestation,
42-
ElectraCommitteeValidatorsBits,AttesterSlashing, AttestationCommitteeBits,
43-
FINALIZED_ROOT_GINDEX_ELECTRA, ExecutionRequests
4438

4539
export json_serialization, base, kzg4844
4640

@@ -130,16 +124,16 @@ const
130124
PTC_SIZE* = 512
131125

132126
# https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.4/specs/_features/eip7732/beacon-chain.md#max-operations-per-block
133-
MAX_PAYLOAD_ATTESTATIONS = 4
127+
MAX_PAYLOAD_ATTESTATIONS* = 4
134128
type
135129

136130
PTCStatus* = distinct uint64
137131

138132
# https://github.com/ethereum/consensus-specs/blob/dev/specs/_features/eip7732/beacon-chain.md#payloadattestationdata
139133
PayloadAttestationData* = object
140-
beaconBlockRoot*: Eth2Digest
134+
beacon_block_root*: Eth2Digest
141135
slot*: Slot
142-
payload_Status*: uint8
136+
payload_status*: uint8
143137

144138
# https://github.com/ethereum/consensus-specs/blob/dev/specs/_features/eip7732/beacon-chain.md#payloadattestation
145139
PayloadAttestation* = object
@@ -155,7 +149,7 @@ type
155149

156150
# https://github.com/ethereum/consensus-specs/blob/dev/specs/_features/eip7732/beacon-chain.md#indexedpayloadattestation
157151
IndexedPayloadAttestation* = object
158-
attestingIndices*: List[ValidatorIndex, Limit PTC_SIZE]
152+
attesting_indices*: List[ValidatorIndex, Limit PTC_SIZE]
159153
data*: PayloadAttestationData
160154
signature*: ValidatorSig
161155

@@ -630,9 +624,9 @@ func initHashedBeaconState*(s: BeaconState): HashedBeaconState =
630624

631625
func shortLog*(v: PayloadAttestationData): auto =
632626
(
633-
beaconBlockRoot: shortLog(v.beaconBlockRoot),
627+
beacon_block_root: shortLog(v.beacon_block_root),
634628
slot: shortLog(v.slot),
635-
payload_Status: $v.payload_Status
629+
payload_status: $v.payload_status
636630
)
637631

638632
func shortLog*(v: SomeBeaconBlock): auto =

‎beacon_chain/spec/eip7594_helpers.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/spec/eip7732_helpers.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2024 Status Research & Development GmbH
2+
# Copyright (c) 2024-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/spec/eth2_apis/eth2_rest_serialization.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/spec/forks_light_client.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2023-2024 Status Research & Development GmbH
2+
# Copyright (c) 2023-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/spec/helpers.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/spec/helpers_el.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2024 Status Research & Development GmbH
2+
# Copyright (c) 2024-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/spec/mev/fulu_mev.nim

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2024 Status Research & Development GmbH
2+
# Copyright (c) 2024-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -40,10 +40,10 @@ type
4040
deposits*: List[Deposit, Limit MAX_DEPOSITS]
4141
voluntary_exits*: List[SignedVoluntaryExit, Limit MAX_VOLUNTARY_EXITS]
4242
sync_aggregate*: SyncAggregate
43-
signed_execution_payload_header*: SignedExecutionPayloadHeader
4443
bls_to_execution_changes*:
45-
List[SignedBLSToExecutionChange,
46-
Limit MAX_BLS_TO_EXECUTION_CHANGES]
44+
List[SignedBLSToExecutionChange, Limit MAX_BLS_TO_EXECUTION_CHANGES]
45+
signed_execution_payload_header*: SignedExecutionPayloadHeader
46+
payload_attestations*: List[PayloadAttestation, Limit MAX_PAYLOAD_ATTESTATIONS]
4747
# blob_kzg_commitments*: KzgCommitments # [New in Deneb]
4848
# execution_requests*: ExecutionRequests # [New in Electra]
4949

@@ -124,6 +124,7 @@ func toSignedBlindedBeaconBlock*(blck: fulu.SignedBeaconBlock):
124124
deposits: blck.message.body.deposits,
125125
voluntary_exits: blck.message.body.voluntary_exits,
126126
sync_aggregate: blck.message.body.sync_aggregate,
127+
bls_to_execution_changes: blck.message.body.bls_to_execution_changes,
127128
signed_execution_payload_header: SignedExecutionPayloadHeader(
128129
message: ExecutionPayloadHeader(
129130
parent_block_hash: blck.message.body.signed_execution_payload_header.message.parent_block_hash,
@@ -135,6 +136,6 @@ func toSignedBlindedBeaconBlock*(blck: fulu.SignedBeaconBlock):
135136
blob_kzg_commitments_root: blck.message.body.signed_execution_payload_header.message.blob_kzg_commitments_root,
136137
block_hash: blck.message.body.signed_execution_payload_header.message.block_hash
137138
),
138-
signature: blck.signature),
139-
bls_to_execution_changes: blck.message.body.bls_to_execution_changes)),
139+
signature: blck.message.body.signed_execution_payload_header.signature),
140+
payload_attestations: blck.message.body.payload_attestations)),
140141
signature: blck.signature)

‎beacon_chain/spec/network.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/spec/signatures.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/spec/state_transition.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/spec/state_transition_block.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/sync/request_manager.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/sync/sync_manager.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/validators/beacon_validators.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/validators/message_router.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎beacon_chain/validators/message_router_mev.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2022-2024 Status Research & Development GmbH
2+
# Copyright (c) 2022-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎ncli/ncli_testnet.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).

‎research/mev_mock.nim

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,27 @@ proc getParentBlock(restClient: RestClientRef):
5050
return Opt.none ParentHeaderInfo
5151

5252
withBlck(resp):
53-
when consensusFork >= ConsensusFork.Capella:
54-
return Opt.some ParentHeaderInfo(
55-
block_number: forkyBlck.message.body.execution_payload.block_number,
56-
timestamp: forkyBlck.message.body.execution_payload.timestamp)
53+
when consensusFork >= ConsensusFork.Capella and
54+
consensusFork < ConsensusFork.Fulu:
55+
return Opt.some ParentHeaderInfo(
56+
block_number: forkyBlck.message.body.execution_payload.block_number,
57+
timestamp: forkyBlck.message.body.execution_payload.timestamp)
5758
else:
5859
discard
5960

61+
# TODO {what is expected of eip-7732 blocks}
62+
# withBlck(resp):
63+
# when consensusFork >= ConsensusFork.Fulu:
64+
# return Opt.some ParentHeaderInfo(
65+
# block_: forkyBlck.message.body.signed_execution_payload_header.message,
66+
# timestamp: forkyBlck.message.signed_execution_payload_header.message)
67+
# elif consensusFork >= ConsensusFork.Capella:
68+
# return Opt.some ParentHeaderInfo(
69+
# block_number: forkyBlck.message.body.execution_payload.block_number,
70+
# timestamp: forkyBlck.message.body.execution_payload.timestamp)
71+
# else:
72+
# discard
73+
6074
proc getWithdrawals(restClient: RestClientRef):
6175
Future[Opt[seq[Withdrawal]]] {.async.} =
6276
let resp: RestResponse[rest_types.GetNextWithdrawalsResponse] =

0 commit comments

Comments
 (0)