Merge pull request #3485 from dapplion/whisk-config-move

Whisk: update preset and config files with moved values
ethereum · Aug 22, 2023 · e3a939e · e3a939e
2 parents eef6144 + 6a944a6
commit e3a939e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml
@@ -140,3 +140,9 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+
+# Whisk
+# `Epoch(2**8)`
+WHISK_EPOCHS_PER_SHUFFLING_PHASE: 256
+# `Epoch(2)`
+WHISK_PROPOSER_SELECTION_GAP: 2
diff --git a/configs/minimal.yaml b/configs/minimal.yaml
@@ -141,3 +141,7 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+
+# Whisk
+WHISK_EPOCHS_PER_SHUFFLING_PHASE: 4
+WHISK_PROPOSER_SELECTION_GAP: 1
diff --git a/presets/mainnet/whisk.yaml b/presets/mainnet/whisk.yaml
@@ -8,12 +8,8 @@ CURDLEPROOFS_N_BLINDERS: 4
 WHISK_CANDIDATE_TRACKERS_COUNT: 16384
 # `uint64(2**13)` must be < WHISK_CANDIDATE_TRACKERS_COUNT
 WHISK_PROPOSER_TRACKERS_COUNT: 8192
-# `Epoch(2**8)`
-WHISK_EPOCHS_PER_SHUFFLING_PHASE: 256
 # `uint64(2**7 - CURDLEPROOFS_N_BLINDERS)`
 WHISK_VALIDATORS_PER_SHUFFLE: 124
-# `Epoch(2)`
-WHISK_PROPOSER_SELECTION_GAP: 2
 # `uint64(2**15)` TODO: will be replaced by a fix format once there's a serialized format
 WHISK_MAX_SHUFFLE_PROOF_SIZE: 32768
 # `uint64(2**10)` TODO: will be replaced by a fix format once there's a serialized format

diff --git a/presets/minimal/whisk.yaml b/presets/minimal/whisk.yaml
@@ -9,11 +9,7 @@ WHISK_CANDIDATE_TRACKERS_COUNT: 32
 # [customized]
 WHISK_PROPOSER_TRACKERS_COUNT: 16
 # [customized]
-WHISK_EPOCHS_PER_SHUFFLING_PHASE: 4
-# [customized]
 WHISK_VALIDATORS_PER_SHUFFLE: 4
-# [customized]
-WHISK_PROPOSER_SELECTION_GAP: 1
 # `uint64(2**15)` TODO: will be replaced by a fix format once there's a serialized format
 WHISK_MAX_SHUFFLE_PROOF_SIZE: 32768
 # `uint64(2**10)` TODO: will be replaced by a fix format once there's a serialized format