Merge branch 'unstable' into column-syncer

agnxsh · web-flow · commit 3d1038c394e6 · 2025-05-20T17:58:58.000+05:30
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -89,23 +89,6 @@ jobs:
           7z x -y "external/mingw-${{ matrix.target.cpu }}.zip" -oexternal/mingw-${{ matrix.target.cpu }}/
           mv external/mingw-${{ matrix.target.cpu }}/**/* ./external/mingw-${{ matrix.target.cpu }}
 
-      - name: Restore Nim DLLs dependencies (Windows) from cache
-        if: runner.os == 'Windows'
-        id: windows-dlls-cache
-        uses: actions/cache@v4
-        with:
-          path: external/dlls-${{ matrix.target.cpu }}
-          key: 'dlls-${{ matrix.target.cpu }}'
-
-      - name: Install DLLs dependencies (Windows)
-        if: >
-          steps.windows-dlls-cache.outputs.cache-hit != 'true' &&
-          runner.os == 'Windows'
-        run: |
-          mkdir -p external
-          curl -L "https://nim-lang.org/download/windeps.zip" -o external/windeps.zip
-          7z x -y external/windeps.zip -oexternal/dlls-${{ matrix.target.cpu }}
-
       - name: Path to cached dependencies (Windows)
         if: >
           runner.os == 'Windows'
diff --git a/AllTests-mainnet.md b/AllTests-mainnet.md
diff --git a/ConsensusSpecPreset-mainnet.md b/ConsensusSpecPreset-mainnet.md
diff --git a/ConsensusSpecPreset-minimal.md b/ConsensusSpecPreset-minimal.md
diff --git a/beacon_chain/rpc/rest_config_api.nim b/beacon_chain/rpc/rest_config_api.nim
@@ -302,6 +302,7 @@ proc installConfigApiHandlers*(router: var RestRouter, node: BeaconNode) =
             Base10.toString(cfg.BALANCE_PER_ADDITIONAL_CUSTODY_GROUP),
           # MAX_BLOBS_PER_BLOCK_FULU:
           #   Base10.toString(cfg.MAX_BLOBS_PER_BLOCK_FULU),
+            Base10.toString(BALANCE_PER_ADDITIONAL_CUSTODY_GROUP),
           # MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS:
           #   Base10.toString(cfg.MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS),
 
diff --git a/beacon_chain/spec/datatypes/base.nim b/beacon_chain/spec/datatypes/base.nim
@@ -74,7 +74,7 @@ export
   tables, results, endians2, json_serialization, sszTypes, beacon_time, crypto,
   digest, presets
 
-const SPEC_VERSION* = "1.5.0-beta.5"
+const SPEC_VERSION* = "1.6.0-alpha.0"
 ## Spec version we're aiming to be compatible with, right now
 
 const
diff --git a/beacon_chain/spec/presets.nim b/beacon_chain/spec/presets.nim
@@ -38,6 +38,9 @@ const
 type
   Version* = distinct array[4, byte]
   Eth1Address* = web3types.Address
+  BPOForkInfo* = object
+    EPOCH*: Epoch
+    MAX_BLOBS_PER_BLOCK*: uint64
 
   RuntimeConfig* = object
     ## https://github.com/ethereum/consensus-specs/tree/v1.5.0-beta.2/configs
@@ -136,6 +139,7 @@ type
     BALANCE_PER_ADDITIONAL_CUSTODY_GROUP*: uint64
     MAX_BLOBS_PER_BLOCK_FULU*: uint64
     MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS*: uint64
+    BLOB_SCHEDULE*: seq[BPOForkInfo]
 
   PresetFile* = object
     values*: Table[string, string]
@@ -325,6 +329,11 @@ when const_preset == "mainnet":
     BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000'u64,
     MAX_BLOBS_PER_BLOCK_FULU: 12,
     MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
+    # https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.0/specs/fulu/das-core.md#get_max_blobs_per_block
+    # provides sorting rules.
+    BLOB_SCHEDULE: @[
+      BPOForkInfo(EPOCH: 364032.Epoch, MAX_BLOBS_PER_BLOCK: 9),
+      BPOForkInfo(EPOCH: 269568.Epoch, MAX_BLOBS_PER_BLOCK: 6)],
   )
 
 elif const_preset == "gnosis":
@@ -660,6 +669,11 @@ elif const_preset == "minimal":
     BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000'u64,
     MAX_BLOBS_PER_BLOCK_FULU: 12,
     MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
+    # https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.0/specs/fulu/das-core.md#get_max_blobs_per_block
+    # provides sorting rules.
+    BLOB_SCHEDULE: @[
+      BPOForkInfo(EPOCH: FAR_FUTURE_EPOCH, MAX_BLOBS_PER_BLOCK: 6),
+      BPOForkInfo(EPOCH: FAR_FUTURE_EPOCH, MAX_BLOBS_PER_BLOCK: 9)],
   )
 
 else:
@@ -887,11 +901,14 @@ proc readRuntimeConfig*(
 
   for name, field in cfg.fieldPairs():
     if name in values:
-      try:
-        field = parse(typeof(field), values[name])
-        values.del name
-      except ValueError:
-        raise (ref PresetFileError)(msg: "Unable to parse " & name)
+      when field is seq[BPOForkInfo]:
+        discard
+      else:
+        try:
+          field = parse(typeof(field), values[name])
+          values.del name
+        except ValueError:
+          raise (ref PresetFileError)(msg: "Unable to parse " & name)
 
   if cfg.PRESET_BASE != const_preset:
     raise (ref PresetIncompatibleError)(
diff --git a/beacon_chain/spec/presets/minimal/electra_preset.nim b/beacon_chain/spec/presets/minimal/electra_preset.nim
@@ -1,5 +1,5 @@
 # beacon_chain
-# Copyright (c) 2024 Status Research & Development GmbH
+# Copyright (c) 2024-2025 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -44,10 +44,10 @@ const
 
   # Execution
   # ---------------------------------------------------------------
-  # [customized]
-  MAX_DEPOSIT_REQUESTS_PER_PAYLOAD* = 4
-  # [customized] 2**1 (= 2) withdrawal requests
-  MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD* = 2
+  # 2**13 (= 8,192) deposit requests
+  MAX_DEPOSIT_REQUESTS_PER_PAYLOAD* = 8192
+  # 2**4 (= 16) withdrawal requests
+  MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD* = 16
 
   # Withdrawals processing
   # ---------------------------------------------------------------
diff --git a/beacon_chain/spec/state_transition_block.nim b/beacon_chain/spec/state_transition_block.nim
@@ -32,7 +32,7 @@ import
   kzg4844/kzg_abi, kzg4844/kzg
 
 from std/algorithm import fill, sorted
-from std/sequtils import count, filterIt, mapIt
+from std/sequtils import count, foldl, filterIt, mapIt
 from ./datatypes/capella import
   BeaconState, MAX_WITHDRAWALS_PER_PAYLOAD, SignedBLSToExecutionChange,
   Withdrawal
@@ -687,6 +687,24 @@ type
     proposer_slashings*: Gwei
     attester_slashings*: Gwei
 
+# https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.0/specs/fulu/das-core.md#get_max_blobs_per_block
+func get_max_blobs_per_block(cfg: RuntimeConfig, epoch: Epoch): Opt[uint64] =
+  ## Return the maximum number of blobs that can be included in a block for a
+  ## given epoch.
+  if not len(cfg.BLOB_SCHEDULE) > 0:
+    return Opt.none(uint64)
+
+  # Spec version of function sorts every time, which should happen only once at
+  # loading.
+  for entry in cfg.BLOB_SCHEDULE:
+    if epoch >= entry.EPOCH:
+      return Opt.some entry.MAX_BLOBS_PER_BLOCK
+
+  # This is effectively a constant per node instance.
+  Opt.some foldl(
+    cfg.BLOB_SCHEDULE, min(a, b.MAX_BLOBS_PER_BLOCK),
+    cfg.BLOB_SCHEDULE[0].MAX_BLOBS_PER_BLOCK)
+
 # https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.8/specs/phase0/beacon-chain.md#operations
 # https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.5/specs/capella/beacon-chain.md#modified-process_operations
 # https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.8/specs/electra/beacon-chain.md#modified-process_operations
@@ -1064,7 +1082,7 @@ type SomeFuluBeaconBlockBody =
   fulu.BeaconBlockBody | fulu.SigVerifiedBeaconBlockBody |
   fulu.TrustedBeaconBlockBody
 
-# https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.3/specs/electra/beacon-chain.md#modified-process_execution_payload
+# https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.0/specs/fulu/beacon-chain.md#modified-process_execution_payload
 proc process_execution_payload*(
     cfg: RuntimeConfig, state: var fulu.BeaconState,
     body: SomeFuluBeaconBlockBody,
@@ -1085,8 +1103,11 @@ proc process_execution_payload*(
   if not (payload.timestamp == compute_timestamp_at_slot(state, state.slot)):
     return err("process_execution_payload: invalid timestamp")
 
-  # [New in Deneb] Verify commitments are under limit
-  if not (lenu64(body.blob_kzg_commitments) <= cfg.MAX_BLOBS_PER_BLOCK_FULU):
+  # Verify commitments are under limit
+  let max_blobs_per_block =
+    cfg.get_max_blobs_per_block(get_current_epoch(state)).valueOr:
+      return err("process_execution_payload: missing blob schedule")
+  if not (lenu64(body.blob_kzg_commitments) <= max_blobs_per_block):
     return err("process_execution_payload: too many KZG commitments")
 
   # Verify the execution payload is valid
diff --git a/scripts/mainnet-non-overriden-config.yaml b/scripts/mainnet-non-overriden-config.yaml
@@ -173,5 +173,4 @@ SAMPLES_PER_SLOT: 8
 CUSTODY_REQUIREMENT: 4
 VALIDATOR_CUSTODY_REQUIREMENT: 8
 BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000
-MAX_BLOBS_PER_BLOCK_FULU: 12
 MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
diff --git a/scripts/minimal-non-overriden-config.yaml b/scripts/minimal-non-overriden-config.yaml
@@ -174,5 +174,4 @@ SAMPLES_PER_SLOT: 8
 CUSTODY_REQUIREMENT: 4
 VALIDATOR_CUSTODY_REQUIREMENT: 8
 BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000
-MAX_BLOBS_PER_BLOCK_FULU: 12
 MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
diff --git a/tests/consensus_spec/fulu/test_fixture_ssz_consensus_objects.nim b/tests/consensus_spec/fulu/test_fixture_ssz_consensus_objects.nim
@@ -1,5 +1,5 @@
 # beacon_chain
-# Copyright (c) 2022-2024 Status Research & Development GmbH
+# Copyright (c) 2024-2025 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -133,7 +133,8 @@ suite "EF - Fulu - SSZ consensus objects " & preset():
           of "ConsolidationRequest": checkSSZ(ConsolidationRequest, path, hash)
           of "ContributionAndProof": checkSSZ(ContributionAndProof, path, hash)
           of "DataColumnSidecar": checkSSZ(DataColumnSidecar, path, hash)
-          of "DataColumnIdentifier": checkSSZ(DataColumnIdentifier, path, hash)
+          of "DataColumnsByRootIdentifier":
+            checkSSZ(DataColumnsByRootIdentifier, path, hash)
           of "Deposit": checkSSZ(Deposit, path, hash)
           of "DepositData": checkSSZ(DepositData, path, hash)
           of "DepositMessage": checkSSZ(DepositMessage, path, hash)
diff --git a/tests/consensus_spec/test_fixture_fork_choice.nim b/tests/consensus_spec/test_fixture_fork_choice.nim
@@ -411,6 +411,8 @@ template fcSuite(suiteName: static[string], testPathElem: static[string]) =
       let testsPath = presetPath/path/testPathElem
       if kind != pcDir or not os_ops.dirExists(testsPath):
         continue
+      if path.contains("eip7732") or path.contains("eip7805"):
+        continue
       let fork = forkForPathComponent(path).valueOr:
         raiseAssert "Unknown test fork: " & testsPath
       for kind, path in walkDir(testsPath, relative = true, checkDir = true):
diff --git a/vendor/nim-eth2-scenarios b/vendor/nim-eth2-scenarios
@@ -1 +1 @@
-Subproject commit 5d3b8726503b591e9132cabf5d6da3cb8f819d88
+Subproject commit 738debb152be39b3871511a2938d358ee8e6070f
