Merge remote-tracking branch 'origin/unstable' into decouple-subnets

consensus/types/src/chain_spec.rs

@@ -1899,6 +1899,7 @@ impl Config {
 
             min_per_epoch_churn_limit_electra,
             max_per_epoch_activation_exit_churn_limit,
+            max_blobs_per_block_electra,
             number_of_columns,
             number_of_custody_groups,
             data_column_sidecar_subnet_count,

testing/ef_tests/Makefile

@@ -1,4 +1,4 @@
-TESTS_TAG := v1.5.0-alpha.10
+TESTS_TAG := v1.5.0-beta.0
 TESTS = general minimal mainnet
 TARBALLS = $(patsubst %,%-$(TESTS_TAG).tar.gz,$(TESTS))
 

testing/ef_tests/src/cases.rs

@@ -105,19 +105,6 @@ impl FeatureName {
     }
 }
 
-impl FeatureName {
-    pub fn list_all() -> Vec<FeatureName> {
-        vec![FeatureName::Eip7594]
-    }
-
-    /// `ForkName` to use when running the feature tests.
-    pub fn fork_name(&self) -> ForkName {
-        match self {
-            FeatureName::Eip7594 => ForkName::Deneb,
-        }
-    }
-}
-
 impl Display for FeatureName {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {

testing/ef_tests/src/handler.rs

@@ -355,11 +355,11 @@ where
     }
 
     fn is_enabled_for_feature(&self, feature_name: FeatureName) -> bool {
-        // This ensures we only run the tests **once** for `Eip7594`, using the types matching the
-        // correct fork, e.g. `Eip7594` uses SSZ types from `Deneb` as of spec test version
-        // `v1.5.0-alpha.8`, therefore the `Eip7594` tests should get included when testing Deneb types.
+        // This ensures we only run the tests **once** for the feature, using the types matching the
+        // correct fork, e.g. `Fulu` uses SSZ types from `Electra` fork as of spec test version
+        // `v1.5.0-beta.0`, therefore the `Fulu` tests should get included when testing Electra types.
         //
-        // e.g. Eip7594 test vectors are executed in the first line below, but excluded in the 2nd
+        // e.g. Fulu test vectors are executed in the first line below, but excluded in the 2nd
         // line when testing the type `AttestationElectra`:
         //
         // ```

testing/ef_tests/tests/tests.rs

@@ -622,7 +622,6 @@ mod ssz_static {
         SszStaticHandler::<HistoricalSummary, MainnetEthSpec>::capella_and_later().run();
     }
 
-    /* FIXME(das): re-enable
     #[test]
     fn data_column_sidecar() {
         SszStaticHandler::<DataColumnSidecar<MinimalEthSpec>, MinimalEthSpec>::deneb_only()
@@ -638,7 +637,6 @@ mod ssz_static {
         SszStaticHandler::<DataColumnIdentifier, MainnetEthSpec>::deneb_only()
             .run_for_feature(FeatureName::Fulu);
     }
-    */
 
     #[test]
     fn consolidation() {
@@ -899,7 +897,6 @@ fn kzg_verify_kzg_proof() {
     KZGVerifyKZGProofHandler::<MainnetEthSpec>::default().run();
 }
 
-/* FIXME(das): re-enable these tests
 #[test]
 fn kzg_compute_cells_and_proofs() {
     KZGComputeCellsAndKZGProofHandler::<MainnetEthSpec>::default()
@@ -917,7 +914,6 @@ fn kzg_recover_cells_and_proofs() {
     KZGRecoverCellsAndKZGProofHandler::<MainnetEthSpec>::default()
         .run_for_feature(FeatureName::Fulu);
 }
-*/
 
 #[test]
 fn beacon_state_merkle_proof_validity() {
@@ -949,10 +945,8 @@ fn rewards() {
     }
 }
 
-/* FIXME(das): re-enable these tests
 #[test]
 fn get_custody_columns() {
     GetCustodyColumnsHandler::<MainnetEthSpec>::default().run_for_feature(FeatureName::Fulu);
     GetCustodyColumnsHandler::<MinimalEthSpec>::default().run_for_feature(FeatureName::Fulu);
 }
-*/