From df902fd00f631e17adca6aafc167d78ee1024beb Mon Sep 17 00:00:00 2001 From: tersec Date: Sun, 10 Dec 2023 00:25:51 +0000 Subject: [PATCH] log execution payload (header) block_hash and parent_hash in block shortLogs (#5660) --- beacon_chain/spec/datatypes/altair.nim | 4 +++- beacon_chain/spec/datatypes/bellatrix.nim | 2 ++ beacon_chain/spec/datatypes/capella.nim | 2 ++ beacon_chain/spec/datatypes/deneb.nim | 2 ++ beacon_chain/spec/datatypes/phase0.nim | 4 +++- beacon_chain/spec/mev/bellatrix_mev.nim | 2 ++ beacon_chain/spec/mev/capella_mev.nim | 2 ++ beacon_chain/spec/mev/deneb_mev.nim | 2 ++ 8 files changed, 18 insertions(+), 2 deletions(-) diff --git a/beacon_chain/spec/datatypes/altair.nim b/beacon_chain/spec/datatypes/altair.nim index c337cdb6c..afc97b6c5 100644 --- a/beacon_chain/spec/datatypes/altair.nim +++ b/beacon_chain/spec/datatypes/altair.nim @@ -605,7 +605,9 @@ func shortLog*(v: SomeBeaconBlock): auto = voluntary_exits_len: v.body.voluntary_exits.len(), sync_committee_participants: v.body.sync_aggregate.num_active_participants, block_number: 0'u64, # Bellatrix compat - fee_recipient: "", + block_hash: "", # Bellatrix compat + parent_hash: "", # Bellatrix compat + fee_recipient: "", # Bellatrix compat bls_to_execution_changes_len: 0, # Capella compat blob_kzg_commitments_len: 0, # Deneb compat ) diff --git a/beacon_chain/spec/datatypes/bellatrix.nim b/beacon_chain/spec/datatypes/bellatrix.nim index 33bc15375..61db9676f 100644 --- a/beacon_chain/spec/datatypes/bellatrix.nim +++ b/beacon_chain/spec/datatypes/bellatrix.nim @@ -401,6 +401,8 @@ func shortLog*(v: SomeBeaconBlock): auto = sync_committee_participants: v.body.sync_aggregate.num_active_participants, block_number: v.body.execution_payload.block_number, # TODO checksum hex? shortlog? + block_hash: to0xHex(v.body.execution_payload.block_hash.data), + parent_hash: to0xHex(v.body.execution_payload.parent_hash.data), fee_recipient: to0xHex(v.body.execution_payload.fee_recipient.data), bls_to_execution_changes_len: 0, # Capella compat blob_kzg_commitments_len: 0, # Deneb compat diff --git a/beacon_chain/spec/datatypes/capella.nim b/beacon_chain/spec/datatypes/capella.nim index 2570f7e39..278dc54fc 100644 --- a/beacon_chain/spec/datatypes/capella.nim +++ b/beacon_chain/spec/datatypes/capella.nim @@ -608,6 +608,8 @@ func shortLog*(v: SomeBeaconBlock): auto = sync_committee_participants: v.body.sync_aggregate.num_active_participants, block_number: v.body.execution_payload.block_number, # TODO checksum hex? shortlog? + block_hash: to0xHex(v.body.execution_payload.block_hash.data), + parent_hash: to0xHex(v.body.execution_payload.parent_hash.data), fee_recipient: to0xHex(v.body.execution_payload.fee_recipient.data), bls_to_execution_changes_len: v.body.bls_to_execution_changes.len(), blob_kzg_commitments_len: 0, # Deneb compat diff --git a/beacon_chain/spec/datatypes/deneb.nim b/beacon_chain/spec/datatypes/deneb.nim index b293211fb..a025a6ee5 100644 --- a/beacon_chain/spec/datatypes/deneb.nim +++ b/beacon_chain/spec/datatypes/deneb.nim @@ -526,6 +526,8 @@ func shortLog*(v: SomeBeaconBlock): auto = sync_committee_participants: v.body.sync_aggregate.num_active_participants, block_number: v.body.execution_payload.block_number, # TODO checksum hex? shortlog? + block_hash: to0xHex(v.body.execution_payload.block_hash.data), + parent_hash: to0xHex(v.body.execution_payload.parent_hash.data), fee_recipient: to0xHex(v.body.execution_payload.fee_recipient.data), bls_to_execution_changes_len: v.body.bls_to_execution_changes.len(), blob_kzg_commitments_len: v.body.blob_kzg_commitments.len(), diff --git a/beacon_chain/spec/datatypes/phase0.nim b/beacon_chain/spec/datatypes/phase0.nim index bfa207aca..fb924836d 100644 --- a/beacon_chain/spec/datatypes/phase0.nim +++ b/beacon_chain/spec/datatypes/phase0.nim @@ -297,7 +297,9 @@ func shortLog*(v: SomeBeaconBlock): auto = voluntary_exits_len: v.body.voluntary_exits.len(), sync_committee_participants: -1, # Altair logging compatibility block_number: 0'u64, # Bellatrix compat - fee_recipient: "", + block_hash: "", # Bellatrix compat + parent_hash: "", # Bellatrix compat + fee_recipient: "", # Bellatrix compat bls_to_execution_changes_len: 0, # Capella compat blob_kzg_commitments_len: 0, # Deneb compat ) diff --git a/beacon_chain/spec/mev/bellatrix_mev.nim b/beacon_chain/spec/mev/bellatrix_mev.nim index 91dee2c0e..1a37bd04c 100644 --- a/beacon_chain/spec/mev/bellatrix_mev.nim +++ b/beacon_chain/spec/mev/bellatrix_mev.nim @@ -28,6 +28,8 @@ func shortLog*(v: BlindedBeaconBlock): auto = voluntary_exits_len: 0, sync_committee_participants: 0, block_number: 0'u64, + block_hash: "", + parent_hash: "", fee_recipient: "", bls_to_execution_changes_len: 0, # Capella compat blob_kzg_commitments_len: 0, # Deneb compat diff --git a/beacon_chain/spec/mev/capella_mev.nim b/beacon_chain/spec/mev/capella_mev.nim index e3786d7c7..82f70231d 100644 --- a/beacon_chain/spec/mev/capella_mev.nim +++ b/beacon_chain/spec/mev/capella_mev.nim @@ -104,6 +104,8 @@ func shortLog*(v: BlindedBeaconBlock): auto = sync_committee_participants: v.body.sync_aggregate.num_active_participants, block_number: v.body.execution_payload_header.block_number, # TODO checksum hex? shortlog? + block_hash: to0xHex(v.body.execution_payload_header.block_hash.data), + parent_hash: to0xHex(v.body.execution_payload_header.parent_hash.data), fee_recipient: to0xHex(v.body.execution_payload_header.fee_recipient.data), bls_to_execution_changes_len: v.body.bls_to_execution_changes.len(), blob_kzg_commitments_len: 0, # Deneb compat diff --git a/beacon_chain/spec/mev/deneb_mev.nim b/beacon_chain/spec/mev/deneb_mev.nim index 0e4455da1..ff914dbeb 100644 --- a/beacon_chain/spec/mev/deneb_mev.nim +++ b/beacon_chain/spec/mev/deneb_mev.nim @@ -94,6 +94,8 @@ func shortLog*(v: BlindedBeaconBlock): auto = sync_committee_participants: v.body.sync_aggregate.num_active_participants, block_number: v.body.execution_payload_header.block_number, # TODO checksum hex? shortlog? + block_hash: to0xHex(v.body.execution_payload_header.block_hash.data), + parent_hash: to0xHex(v.body.execution_payload_header.parent_hash.data), fee_recipient: to0xHex(v.body.execution_payload_header.fee_recipient.data), bls_to_execution_changes_len: v.body.bls_to_execution_changes.len(), blob_kzg_commitments_len: 0, # Deneb compat