Mallory - Single commit

2026-06-30 19:34:37 +00:00 · 2025-03-25 16:53:10 +11:00
parent b8178515cd
commit e2acce9468
118 changed files with 4753 additions and 3938 deletions
--- a/common/eth2_network_config/built_in_network_configs/holesky/config.yaml
+++ b/common/eth2_network_config/built_in_network_configs/holesky/config.yaml
@@ -38,7 +38,7 @@ ELECTRA_FORK_VERSION: 0x06017000
 ELECTRA_FORK_EPOCH: 115968
 # Fulu
 FULU_FORK_VERSION: 0x07017000
-FULU_FORK_EPOCH: 18446744073709551615
+FULU_FORK_EPOCH: 165120
 # Gloas
 GLOAS_FORK_VERSION: 0x08017000
 GLOAS_FORK_EPOCH: 18446744073709551615
@@ -47,6 +47,8 @@ GLOAS_FORK_EPOCH: 18446744073709551615
 # ---------------------------------------------------------------
 # 12 seconds
 SECONDS_PER_SLOT: 12
+# 1200 milliseconds
+SLOT_DURATION_MS: 12000
 # 14 (estimate from Eth1 mainnet)
 SECONDS_PER_ETH1_BLOCK: 14
 # 2**8 (= 256) epochs ~27 hours
@@ -55,6 +57,18 @@ MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
 SHARD_COMMITTEE_PERIOD: 256
 # 2**11 (= 2,048) Eth1 blocks ~8 hours
 ETH1_FOLLOW_DISTANCE: 2048
+# 1667 basis points, ~17% of SLOT_DURATION_MS
+PROPOSER_REORG_CUTOFF_BPS: 1667
+# 3333 basis points, ~33% of SLOT_DURATION_MS
+ATTESTATION_DUE_BPS: 3333
+# 6667 basis points, ~67% of SLOT_DURATION_MS
+AGGREGATE_DUE_BPS: 6667
+
+# Altair
+# 3333 basis points, ~33% of SLOT_DURATION_MS
+SYNC_MESSAGE_DUE_BPS: 3333
+# 6667 basis points, ~67% of SLOT_DURATION_MS
+CONTRIBUTION_DUE_BPS: 6667

 # Validator cycle
 # ---------------------------------------------------------------
@@ -141,13 +155,30 @@ MAX_BLOBS_PER_BLOCK_ELECTRA: 9
 MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152

 # Fulu
+# 2**7 (= 128) groups
 NUMBER_OF_CUSTODY_GROUPS: 128
+# 2**7 (= 128) subnets
 DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
+# MAX_REQUEST_BLOCKS_DENEB * NUMBER_OF_COLUMNS (= 128 * 128) sidecars
 MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
+# 2**3 (= 8) samples
 SAMPLES_PER_SLOT: 8
+# 2**2 (= 4) sidecars
 CUSTODY_REQUIREMENT: 4
+# 2**3 (= 8) sidecars
 VALIDATOR_CUSTODY_REQUIREMENT: 8
+# 2**5 * 10**9 (= 32,000,000,000) Gwei
 BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000
+# 2**12 (= 4,096) epochs
 MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096

+# Blob Scheduling
+# ---------------------------------------------------------------
+
+BLOB_SCHEDULE:
+  - EPOCH: 166400
+    MAX_BLOBS_PER_BLOCK: 15
+  - EPOCH: 167936
+    MAX_BLOBS_PER_BLOCK: 21
+
 # Gloas
--- a/common/eth2_network_config/built_in_network_configs/hoodi/config.yaml
+++ b/common/eth2_network_config/built_in_network_configs/hoodi/config.yaml
@@ -42,7 +42,7 @@ ELECTRA_FORK_EPOCH: 2048

 # Fulu
 FULU_FORK_VERSION: 0x70000910
-FULU_FORK_EPOCH: 18446744073709551615
+FULU_FORK_EPOCH: 50688

 # Gloas
 GLOAS_FORK_VERSION: 0x80000910
@@ -53,6 +53,8 @@ GLOAS_FORK_EPOCH: 18446744073709551615
 # ---------------------------------------------------------------
 # 12 seconds
 SECONDS_PER_SLOT: 12
+# 12000 milliseconds
+SLOT_DURATION_MS: 12000
 # 14 (estimate from Eth1 mainnet)
 SECONDS_PER_ETH1_BLOCK: 12
 # 2**8 (= 256) epochs ~27 hours
@@ -61,6 +63,18 @@ MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
 SHARD_COMMITTEE_PERIOD: 256
 # 2**11 (= 2,048) Eth1 blocks ~8 hours
 ETH1_FOLLOW_DISTANCE: 2048
+# 1667 basis points, ~17% of SLOT_DURATION_MS
+PROPOSER_REORG_CUTOFF_BPS: 1667
+# 3333 basis points, ~33% of SLOT_DURATION_MS
+ATTESTATION_DUE_BPS: 3333
+# 6667 basis points, ~67% of SLOT_DURATION_MS
+AGGREGATE_DUE_BPS: 6667
+
+# Altair
+# 3333 basis points, ~33% of SLOT_DURATION_MS
+SYNC_MESSAGE_DUE_BPS: 3333
+# 6667 basis points, ~67% of SLOT_DURATION_MS
+CONTRIBUTION_DUE_BPS: 6667

 # Validator cycle
 # ---------------------------------------------------------------
@@ -154,15 +168,33 @@ WHISK_EPOCHS_PER_SHUFFLING_PHASE: 256
 WHISK_PROPOSER_SELECTION_GAP: 2

 # Fulu
+# 2**7 (= 128) groups
 NUMBER_OF_CUSTODY_GROUPS: 128
+# 2**7 (= 128) subnets
 DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
+# MAX_REQUEST_BLOCKS_DENEB * NUMBER_OF_COLUMNS (= 128 * 128) sidecars
 MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
+# 2**3 (= 8) samples
 SAMPLES_PER_SLOT: 8
+# 2**2 (= 4) sidecars
 CUSTODY_REQUIREMENT: 4
+# 2**3 (= 8) sidecars
 VALIDATOR_CUSTODY_REQUIREMENT: 8
+# 2**5 * 10**9 (= 32,000,000,000) Gwei
 BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000
+# 2**12 (= 4,096) epochs
 MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096

+
+# Blob Scheduling
+# ---------------------------------------------------------------
+
+BLOB_SCHEDULE:
+  - EPOCH: 52480
+    MAX_BLOBS_PER_BLOCK: 15
+  - EPOCH: 54016
+    MAX_BLOBS_PER_BLOCK: 21
+
 # Gloas

 # EIP7732
--- a/common/eth2_network_config/built_in_network_configs/sepolia/config.yaml
+++ b/common/eth2_network_config/built_in_network_configs/sepolia/config.yaml
@@ -42,7 +42,7 @@ ELECTRA_FORK_EPOCH: 222464

 # Fulu
 FULU_FORK_VERSION: 0x90000075
-FULU_FORK_EPOCH: 18446744073709551615
+FULU_FORK_EPOCH: 272640

 # Gloas
 GLOAS_FORK_VERSION: 0x90000076
@@ -52,6 +52,8 @@ GLOAS_FORK_EPOCH: 18446744073709551615
 # ---------------------------------------------------------------
 # 12 seconds
 SECONDS_PER_SLOT: 12
+# 12000 milliseconds
+SLOT_DURATION_MS: 12000
 # 14 (estimate from Eth1 mainnet)
 SECONDS_PER_ETH1_BLOCK: 14
 # 2**8 (= 256) epochs ~27 hours
@@ -60,6 +62,18 @@ MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
 SHARD_COMMITTEE_PERIOD: 256
 # 2**11 (= 2,048) Eth1 blocks ~8 hours
 ETH1_FOLLOW_DISTANCE: 2048
+# 1667 basis points, ~17% of SLOT_DURATION_MS
+PROPOSER_REORG_CUTOFF_BPS: 1667
+# 3333 basis points, ~33% of SLOT_DURATION_MS
+ATTESTATION_DUE_BPS: 3333
+# 6667 basis points, ~67% of SLOT_DURATION_MS
+AGGREGATE_DUE_BPS: 6667
+
+# Altair
+# 3333 basis points, ~33% of SLOT_DURATION_MS
+SYNC_MESSAGE_DUE_BPS: 3333
+# 6667 basis points, ~67% of SLOT_DURATION_MS
+CONTRIBUTION_DUE_BPS: 6667


 # Validator cycle
@@ -147,13 +161,31 @@ MAX_BLOBS_PER_BLOCK_ELECTRA: 9
 MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152

 # Fulu
+# 2**7 (= 128) groups
 NUMBER_OF_CUSTODY_GROUPS: 128
+# 2**7 (= 128) subnets
 DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
+# MAX_REQUEST_BLOCKS_DENEB * NUMBER_OF_COLUMNS (= 128 * 128) sidecars
 MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
+# 2**3 (= 8) samples
 SAMPLES_PER_SLOT: 8
+# 2**2 (= 4) sidecars
 CUSTODY_REQUIREMENT: 4
+# 2**3 (= 8) sidecars
 VALIDATOR_CUSTODY_REQUIREMENT: 8
+# 2**5 * 10**9 (= 32,000,000,000) Gwei
 BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000
+# 2**12 (= 4,096) epochs
 MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096

+
+# Blob Scheduling
+# ---------------------------------------------------------------
+
+BLOB_SCHEDULE:
+  - EPOCH: 274176
+    MAX_BLOBS_PER_BLOCK: 15
+  - EPOCH: 275712
+    MAX_BLOBS_PER_BLOCK: 21
+
 # Gloas
--- a/common/eth2_network_config/src/lib.rs
+++ b/common/eth2_network_config/src/lib.rs
@@ -244,7 +244,7 @@ impl Eth2NetworkConfig {
        }
    }

-    fn get_genesis_state_from_bytes<E: EthSpec>(&self) -> Result<BeaconState<E>, String> {
+    pub fn get_genesis_state_from_bytes<E: EthSpec>(&self) -> Result<BeaconState<E>, String> {
        let spec = self.chain_spec::<E>()?;
        self.genesis_state_bytes
            .as_ref()