Rename PEER_DAS_EPOCH to EIP7594_FORK_EPOCH for client interop. (#…

…5750)
sigp · May 9, 2024 · fe9e5dd · fe9e5dd
1 parent 42d97d3
commit fe9e5dd
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 21 deletions.
diff --git a/beacon_node/beacon_chain/src/block_verification.rs b/beacon_node/beacon_chain/src/block_verification.rs
@@ -738,8 +738,10 @@ impl<T: BeaconChainTypes> IntoGossipVerifiedBlockContents<T> for PublishBlockReq
 
         let peer_das_enabled = chain
             .spec
-            .peer_das_epoch
-            .map_or(false, |peer_das_epoch| block.epoch() >= peer_das_epoch);
+            .eip7594_fork_epoch
+            .map_or(false, |eip7594_fork_epoch| {
+                block.epoch() >= eip7594_fork_epoch
+            });
 
         let gossip_verified_data_columns = if peer_das_enabled {
             build_gossip_verified_data_columns(chain, &block, gossip_verified_blobs.as_ref())?

diff --git a/beacon_node/beacon_chain/src/data_availability_checker.rs b/beacon_node/beacon_chain/src/data_availability_checker.rs
@@ -439,11 +439,13 @@ impl<T: BeaconChainTypes> DataAvailabilityChecker<T> {
         block.num_expected_blobs() > 0 && self.data_columns_required_for_epoch(block.epoch())
     }
 
-    /// Returns true if the given epoch is greater than or equal to the `PEER_DAS_EPOCH`.
+    /// Returns true if the given epoch is greater than or equal to the `EIP7594_FORK_EPOCH`.
     fn is_peer_das_enabled_for_epoch(&self, block_epoch: Epoch) -> bool {
         self.spec
-            .peer_das_epoch
-            .map_or(false, |peer_das_epoch| block_epoch >= peer_das_epoch)
+            .eip7594_fork_epoch
+            .map_or(false, |eip7594_fork_epoch| {
+                block_epoch >= eip7594_fork_epoch
+            })
     }
 
     /// The epoch at which we require a data availability check in block processing.

diff --git a/beacon_node/beacon_chain/src/data_availability_checker/overflow_lru_cache.rs b/beacon_node/beacon_chain/src/data_availability_checker/overflow_lru_cache.rs
@@ -792,8 +792,8 @@ impl<T: BeaconChainTypes> OverflowLRUCache<T> {
 
         let peer_das_enabled = self
             .spec
-            .peer_das_epoch
-            .map_or(false, |peer_das_epoch| epoch >= peer_das_epoch);
+            .eip7594_fork_epoch
+            .map_or(false, |eip7594_fork_epoch| epoch >= eip7594_fork_epoch);
         if peer_das_enabled {
             Ok(BlockImportRequirement::CustodyColumns(
                 self.custody_column_count,

diff --git a/beacon_node/network/src/network_beacon_processor/gossip_methods.rs b/beacon_node/network/src/network_beacon_processor/gossip_methods.rs
@@ -1277,8 +1277,10 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
             if self
                 .chain
                 .spec
-                .peer_das_epoch
-                .map_or(false, |peer_das_epoch| block.epoch() >= peer_das_epoch)
+                .eip7594_fork_epoch
+                .map_or(false, |eip7594_fork_epoch| {
+                    block.epoch() >= eip7594_fork_epoch
+                })
             {
                 self.send_sync_message(SyncMessage::SampleBlock(block_root, block.slot()));
             }

diff --git a/beacon_node/network/src/service.rs b/beacon_node/network/src/service.rs
@@ -754,7 +754,7 @@ impl<T: BeaconChainTypes> NetworkService<T> {
                         }
                     }
                 } else {
-                    // TODO(das): subscribe after `PEER_DAS_EPOCH`
+                    // TODO(das): subscribe after `EIP7594_FORK_EPOCH`
                     for column_subnet in DataColumnSubnetId::compute_custody_subnets::<T::EthSpec>(
                         self.network_globals.local_enr().node_id().raw().into(),
                         self.network_globals

diff --git a/beacon_node/network/src/sync/block_lookups/tests.rs b/beacon_node/network/src/sync/block_lookups/tests.rs
@@ -102,7 +102,7 @@ impl TestRig {
 
         if let Some(config) = config {
             if config.peer_das_enabled {
-                spec.peer_das_epoch = Some(Epoch::new(0));
+                spec.eip7594_fork_epoch = Some(Epoch::new(0));
             }
         }
 

diff --git a/common/eth2_network_config/built_in_network_configs/mainnet/config.yaml b/common/eth2_network_config/built_in_network_configs/mainnet/config.yaml
@@ -54,7 +54,7 @@ DENEB_FORK_EPOCH: 269568  # March 13, 2024, 01:55:35pm UTC
 ELECTRA_FORK_VERSION: 0x05000000
 ELECTRA_FORK_EPOCH: 18446744073709551615
 # PeerDAS
-PEER_DAS_EPOCH: 18446744073709551615
+EIP7594_FORK_EPOCH: 18446744073709551615
 
 
 # Time parameters

diff --git a/consensus/types/src/chain_spec.rs b/consensus/types/src/chain_spec.rs
@@ -194,7 +194,7 @@ pub struct ChainSpec {
     /*
      * DAS params
      */
-    pub peer_das_epoch: Option<Epoch>,
+    pub eip7594_fork_epoch: Option<Epoch>,
     pub custody_requirement: u64,
 
     /*
@@ -764,7 +764,7 @@ impl ChainSpec {
             /*
              * DAS params
              */
-            peer_das_epoch: None,
+            eip7594_fork_epoch: None,
             custody_requirement: 1,
 
             /*
@@ -872,7 +872,7 @@ impl ChainSpec {
             max_pending_partials_per_withdrawals_sweep: u64::checked_pow(2, 0)
                 .expect("pow does not overflow"),
             // PeerDAS
-            peer_das_epoch: None,
+            eip7594_fork_epoch: None,
             // Other
             network_id: 2, // lighthouse testnet network id
             deposit_chain_id: 5,
@@ -1077,7 +1077,7 @@ impl ChainSpec {
             /*
              * DAS params
              */
-            peer_das_epoch: None,
+            eip7594_fork_epoch: None,
             custody_requirement: 1,
             /*
              * Network specific
@@ -1216,7 +1216,7 @@ pub struct Config {
     #[serde(default)]
     #[serde(serialize_with = "serialize_fork_epoch")]
     #[serde(deserialize_with = "deserialize_fork_epoch")]
-    pub peer_das_epoch: Option<MaybeQuoted<Epoch>>,
+    pub eip7594_fork_epoch: Option<MaybeQuoted<Epoch>>,
 
     #[serde(with = "serde_utils::quoted_u64")]
     seconds_per_slot: u64,
@@ -1608,8 +1608,8 @@ impl Config {
                 .electra_fork_epoch
                 .map(|epoch| MaybeQuoted { value: epoch }),
 
-            peer_das_epoch: spec
-                .peer_das_epoch
+            eip7594_fork_epoch: spec
+                .eip7594_fork_epoch
                 .map(|epoch| MaybeQuoted { value: epoch }),
 
             seconds_per_slot: spec.seconds_per_slot,
@@ -1689,7 +1689,7 @@ impl Config {
             deneb_fork_version,
             electra_fork_epoch,
             electra_fork_version,
-            peer_das_epoch,
+            eip7594_fork_epoch,
             seconds_per_slot,
             seconds_per_eth1_block,
             min_validator_withdrawability_delay,
@@ -1751,7 +1751,7 @@ impl Config {
             deneb_fork_version,
             electra_fork_epoch: electra_fork_epoch.map(|q| q.value),
             electra_fork_version,
-            peer_das_epoch: peer_das_epoch.map(|q| q.value),
+            eip7594_fork_epoch: eip7594_fork_epoch.map(|q| q.value),
             seconds_per_slot,
             seconds_per_eth1_block,
             min_validator_withdrawability_delay,