Merge remote-tracking branch 'origin/unstable' into startup-stuff

Author: arnetheduck

.github/workflows/ci.yml

@@ -246,11 +246,6 @@ jobs:
             nim c --passC:-fsyntax-only --noLinking:on -d:chronicles_log_level=TRACE "${executable}"
           done
 
-      - name: Build with custom SECONDS_PER_SLOT
-        run: |
-          source env.sh
-          nim c --passC:-fsyntax-only --noLinking:on -d:chronicles_log_level=TRACE -d:SECONDS_PER_SLOT=1 beacon_chain/nimbus_beacon_node
-
   lint:
     name: "Lint"
     runs-on: ubuntu-latest

AllTests-mainnet.md

@@ -3798,6 +3798,8 @@ ConsensusSpecPreset-mainnet
 ```
 ## EF - Gloas - Operations - Execution Payload  [Preset: mainnet]
 ```diff
++ [Invalid] EF - Gloas - Operations - Execution Payload - invalid_correct_input__execution_i OK
++ [Invalid] EF - Gloas - Operations - Execution Payload - invalid_exceed_max_blobs_per_block OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_executio OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_invalid_ OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_wrong_be OK
@@ -3809,12 +3811,24 @@ ConsensusSpecPreset-mainnet
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_wrong_pr OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_wrong_sl OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_wrong_ti OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_blob_tx_type             OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_block_hash               OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_commitment               OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_commitments_order        OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_transaction_length_1_byt OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_transaction_length_1_ext OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_transaction_length_32_ex OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_transaction_length_empty OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_transaction_no_blobs_but OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - no_commitments_for_transactions    OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - no_transactions_with_commitments   OK
 + [Valid]   EF - Gloas - Operations - Execution Payload - process_execution_payload_large_pa OK
 + [Valid]   EF - Gloas - Operations - Execution Payload - process_execution_payload_max_blob OK
 + [Valid]   EF - Gloas - Operations - Execution Payload - process_execution_payload_self_bui OK
 + [Valid]   EF - Gloas - Operations - Execution Payload - process_execution_payload_valid    OK
 + [Valid]   EF - Gloas - Operations - Execution Payload - process_execution_payload_with_blo OK
 + [Valid]   EF - Gloas - Operations - Execution Payload - process_execution_payload_with_exe OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - zeroed_commitment                  OK
 ```
 ## EF - Gloas - Operations - Execution Payload Bid  [Preset: mainnet]
 ```diff

ConsensusSpecPreset-mainnet.md

@@ -4052,6 +4052,8 @@ ConsensusSpecPreset-minimal
 ```
 ## EF - Gloas - Operations - Execution Payload  [Preset: minimal]
 ```diff
++ [Invalid] EF - Gloas - Operations - Execution Payload - invalid_correct_input__execution_i OK
++ [Invalid] EF - Gloas - Operations - Execution Payload - invalid_exceed_max_blobs_per_block OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_executio OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_invalid_ OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_wrong_be OK
@@ -4063,12 +4065,24 @@ ConsensusSpecPreset-minimal
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_wrong_pr OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_wrong_sl OK
 + [Invalid] EF - Gloas - Operations - Execution Payload - process_execution_payload_wrong_ti OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_blob_tx_type             OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_block_hash               OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_commitment               OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_commitments_order        OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_transaction_length_1_byt OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_transaction_length_1_ext OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_transaction_length_32_ex OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_transaction_length_empty OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - incorrect_transaction_no_blobs_but OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - no_commitments_for_transactions    OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - no_transactions_with_commitments   OK
 + [Valid]   EF - Gloas - Operations - Execution Payload - process_execution_payload_large_pa OK
 + [Valid]   EF - Gloas - Operations - Execution Payload - process_execution_payload_max_blob OK
 + [Valid]   EF - Gloas - Operations - Execution Payload - process_execution_payload_self_bui OK
 + [Valid]   EF - Gloas - Operations - Execution Payload - process_execution_payload_valid    OK
 + [Valid]   EF - Gloas - Operations - Execution Payload - process_execution_payload_with_blo OK
 + [Valid]   EF - Gloas - Operations - Execution Payload - process_execution_payload_with_exe OK
++ [Valid]   EF - Gloas - Operations - Execution Payload - zeroed_commitment                  OK
 ```
 ## EF - Gloas - Operations - Execution Payload Bid  [Preset: minimal]
 ```diff
@@ -4430,7 +4444,7 @@ ConsensusSpecPreset-minimal
 + Light client - Data collection - minimal/capella/light_client/data_collection/pyspec_tests OK
 + Light client - Data collection - minimal/deneb/light_client/data_collection/pyspec_tests/l OK
 + Light client - Data collection - minimal/electra/light_client/data_collection/pyspec_tests OK
-+ Light client - Data collection - minimal/fulu/light_client/data_collection/pyspec_tests/li OK
+  Light client - Data collection - minimal/fulu/light_client/data_collection/pyspec_tests/li Skip
 ```
 ## EF - Light client - Single merkle proof [Preset: minimal]
 ```diff
@@ -4494,10 +4508,10 @@ ConsensusSpecPreset-minimal
 + Light client - Sync - minimal/electra/light_client/sync/pyspec_tests/light_client_sync     OK
 + Light client - Sync - minimal/electra/light_client/sync/pyspec_tests/light_client_sync_no_ OK
 + Light client - Sync - minimal/electra/light_client/sync/pyspec_tests/supply_sync_committee OK
-+ Light client - Sync - minimal/fulu/light_client/sync/pyspec_tests/advance_finality_without OK
-+ Light client - Sync - minimal/fulu/light_client/sync/pyspec_tests/light_client_sync        OK
-+ Light client - Sync - minimal/fulu/light_client/sync/pyspec_tests/light_client_sync_no_for OK
-+ Light client - Sync - minimal/fulu/light_client/sync/pyspec_tests/supply_sync_committee_fr OK
+  Light client - Sync - minimal/fulu/light_client/sync/pyspec_tests/advance_finality_without Skip
+  Light client - Sync - minimal/fulu/light_client/sync/pyspec_tests/light_client_sync        Skip
+  Light client - Sync - minimal/fulu/light_client/sync/pyspec_tests/light_client_sync_no_for Skip
+  Light client - Sync - minimal/fulu/light_client/sync/pyspec_tests/supply_sync_committee_fr Skip
 ```
 ## EF - Light client - Update ranking [Preset: minimal]
 ```diff

ConsensusSpecPreset-minimal.md

@@ -41,22 +41,22 @@ proc init*(
     timeParams: TimeParams,
     genesis_time: uint64): Opt[T] =
   let
-    SECONDS_PER_SLOT = timeParams.SECONDS_PER_SLOT
-    MIN_GENESIS_TIME = GENESIS_SLOT * SECONDS_PER_SLOT
+    MIN_GENESIS_TIME = GENESIS_SLOT * timeParams.SLOT_DURATION.seconds.uint64
     MAX_GENESIS_TIME =
       # Since we'll be converting beacon time differences to nanoseconds,
       # the time can't be outrageously far from now
       getTime().toUnix().uint64 +
       100'u64 * 365'u64 * 24'u64 * 60'u64 * 60'u64
-  if SECONDS_PER_SLOT notin MIN_SECONDS_PER_SLOT .. MAX_SECONDS_PER_SLOT or
+  if timeParams.SLOT_DURATION notin MIN_SLOT_DURATION .. MAX_SLOT_DURATION or
       genesis_time notin MIN_GENESIS_TIME .. MAX_GENESIS_TIME:
     Opt.none(BeaconClock)
   else:
     let
       unixGenesis = fromUnix(genesis_time.int64)
       # GENESIS_SLOT offsets slot time, but to simplify calculations, we apply
       # that offset to genesis instead of applying it at every time conversion
-      unixGenesisOffset = times.seconds(int(GENESIS_SLOT * SECONDS_PER_SLOT))
+      unixGenesisOffset = times.seconds(
+        (GENESIS_SLOT.int64 * timeParams.SLOT_DURATION).seconds)
 
     Opt.some T(
       timeParams: timeParams,

beacon_chain/beacon_clock.nim

@@ -196,7 +196,7 @@ func contains*(self: ForkChoiceBackend, block_root: Eth2Digest): bool =
 proc update_time*(
     self: var ForkChoice, dag: ChainDAGRef, time: BeaconTime): FcResult[void] =
   # `time` is the wall time, meaning it changes on every call typically
-  let step_size = seconds(dag.timeParams.SECONDS_PER_SLOT.int64)
+  let step_size = dag.timeParams.SLOT_DURATION
   if time > self.checkpoints.time:
     let
       preSlot = self.checkpoints.time.slotOrZero(dag.timeParams)

beacon_chain/fork_choice/fork_choice.nim

@@ -285,7 +285,7 @@ proc processBatch(
 
   let
     startTick = Moment.now()
-    slotDuration = batchCrypto.timeParams.SECONDS_PER_SLOT.int64.seconds
+    slotDuration = batchCrypto.timeParams.SLOT_DURATION
 
   # If the hardware is too slow to keep up or an event caused a temporary
   # buildup of signature verification tasks, the batch will be dropped so as to

beacon_chain/gossip_processing/batch_validation.nim

@@ -600,7 +600,7 @@ proc validateDataColumnSidecar*(
   template block_header: untyped = data_column_sidecar.signed_block_header.message
   # [REJECT] The sidecar is valid as verified by verify_data_column_sidecar(sidecar)
   block:
-    let v = verify_data_column_sidecar(data_column_sidecar)
+    let v = verify_data_column_sidecar(dag.cfg, data_column_sidecar)
     if v.isErr:
       return dag.checkedReject(v.error)
 
@@ -732,7 +732,7 @@ proc validateDataColumnSidecar*(
 
   # [REJECT] The sidecar is valid as verified by verify_data_column_sidecar
   block:
-    let v = verify_data_column_sidecar(data_column_sidecar)
+    let v = verify_data_column_sidecar(dag.cfg, data_column_sidecar)
     if v.isErr:
       return dag.checkedReject(v.error)
 
@@ -751,6 +751,9 @@ proc validateDataColumnSidecar*(
   # [IGNORE] The sidecar's beacon_block_root has been seen via a valid signed
   # execution payload header (builder's bid).
   #
+  # _[REJECT]_ The sidecars's `slot` matches the slot of the block with root
+  # `beacon_block_root`.
+  #
   # [REJECT] The hash of the sidecar's kzg_commitments matches the
   # blob_kzg_commitments_root in the corresponding builder's bid for
   # sidecar.beacon_block_root.

beacon_chain/gossip_processing/gossip_validation.nim

@@ -2438,8 +2438,7 @@ proc createEth2Node*(
       historyGossip = 3,
       fanoutTTL = chronos.seconds(60),
       # 2 epochs matching maximum valid attestation lifetime
-      seenTTL = chronos.seconds(int(
-        cfg.timeParams.SECONDS_PER_SLOT * SLOTS_PER_EPOCH * 2)),
+      seenTTL = cfg.timeParams.SLOT_DURATION * (SLOTS_PER_EPOCH * 2).int64,
       gossipThreshold = -4000,
       publishThreshold = -8000,
       graylistThreshold = -16000, # also disconnect threshold

beacon_chain/networking/eth2_network.nim

@@ -29,10 +29,10 @@ type
     dampeningFactor: float64
 
 func slotsDuration(timeParams: TimeParams, number: int): chronos.Duration =
-  chronos.seconds(int64(timeParams.SECONDS_PER_SLOT) * number)
+  timeParams.SLOT_DURATION * number
 
 func epochsDuration(timeParams: TimeParams, number: int): chronos.Duration =
-  chronos.seconds(int64(timeParams.SECONDS_PER_SLOT * SLOTS_PER_EPOCH) * number)
+  timeParams.SLOT_DURATION * (SLOTS_PER_EPOCH.int64 * number)
 
 const
   GossipD = 8
@@ -90,7 +90,7 @@ const
      BlsToExecutionChangeWeight)
 
 func DecayInterval(timeParams: TimeParams): Duration =
-  chronos.seconds(int64(timeParams.SECONDS_PER_SLOT))
+  timeParams.SLOT_DURATION
 
 func InvalidMessageDecayPeriod(timeParams: TimeParams): Duration =
   timeParams.epochsDuration(50)
@@ -152,7 +152,7 @@ func topicParams(
     meshMessageInfo: Opt[MeshMessageInfo] = Opt.none(MeshMessageInfo)
 ): TopicParams =
   let
-    timeInMeshCap = float64(3600) / float64(timeParams.SECONDS_PER_SLOT)
+    timeInMeshCap = float64(3600) / float64(timeParams.SLOT_DURATION.seconds)
     firstMessageDeliveriesDecay =
       timeParams.scoreParameterDecay(firstMessageDecayTime)
     firstMessageDeliveriesCap =
@@ -165,7 +165,7 @@ func topicParams(
       timeInMeshWeight:
         MaxInMeshScore / timeInMeshCap,
       timeInMeshQuantum:
-        chronos.seconds(int64(timeParams.SECONDS_PER_SLOT)),
+        timeParams.SLOT_DURATION,
       timeInMeshCap:
         timeInMeshCap,
       firstMessageDeliveriesDecay:
@@ -228,7 +228,7 @@ func topicParams(
       timeInMeshWeight:
         MaxInMeshScore / timeInMeshCap,
       timeInMeshQuantum:
-        chronos.seconds(int64(timeParams.SECONDS_PER_SLOT)),
+        timeParams.SLOT_DURATION,
       timeInMeshCap:
         timeInMeshCap,
       firstMessageDeliveriesDecay: