add electra updated preset values

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigElectra.java

@@ -39,6 +39,10 @@ static SpecConfigElectra required(final SpecConfig specConfig) {
 
   int getMaxExecutionLayerExits();
 
+  int getMaxAttesterSlashingsElectra();
+
+  int getMaxAttestationsElectra();
+
   @Override
   Optional<SpecConfigElectra> toVersionElectra();
 }

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigElectraImpl.java

@@ -25,18 +25,24 @@ public class SpecConfigElectraImpl extends DelegatingSpecConfigDeneb implements
 
   private final int maxDepositReceiptsPerPayload;
   private final int maxExecutionLayerExits;
+  private final int maxAttesterSlashingsElectra;
+  private final int maxAttestationsElectra;
 
   public SpecConfigElectraImpl(
       final SpecConfigDeneb specConfig,
       final Bytes4 electraForkVersion,
       final UInt64 electraForkEpoch,
       final int maxDepositReceiptsPerPayload,
-      final int maxExecutionLayerExits) {
+      final int maxExecutionLayerExits,
+      final int maxAttesterSlashingsElectra,
+      final int maxAttestationsElectra) {
     super(specConfig);
     this.electraForkVersion = electraForkVersion;
     this.electraForkEpoch = electraForkEpoch;
     this.maxDepositReceiptsPerPayload = maxDepositReceiptsPerPayload;
     this.maxExecutionLayerExits = maxExecutionLayerExits;
+    this.maxAttesterSlashingsElectra = maxAttesterSlashingsElectra;
+    this.maxAttestationsElectra = maxAttestationsElectra;
   }
 
   @Override
@@ -59,6 +65,16 @@ public int getMaxExecutionLayerExits() {
     return maxExecutionLayerExits;
   }
 
+  @Override
+  public int getMaxAttesterSlashingsElectra() {
+    return maxAttesterSlashingsElectra;
+  }
+
+  @Override
+  public int getMaxAttestationsElectra() {
+    return maxAttestationsElectra;
+  }
+
   @Override
   public Optional<SpecConfigElectra> toVersionElectra() {
     return Optional.of(this);
@@ -77,7 +93,9 @@ public boolean equals(final Object o) {
         && Objects.equals(electraForkVersion, that.electraForkVersion)
         && Objects.equals(electraForkEpoch, that.electraForkEpoch)
         && maxDepositReceiptsPerPayload == that.maxDepositReceiptsPerPayload
-        && maxExecutionLayerExits == that.maxExecutionLayerExits;
+        && maxExecutionLayerExits == that.maxExecutionLayerExits
+        && maxAttesterSlashingsElectra == that.maxAttesterSlashingsElectra
+        && maxAttestationsElectra == that.maxAttestationsElectra;
   }
 
   @Override
@@ -87,6 +105,8 @@ public int hashCode() {
         electraForkVersion,
         electraForkEpoch,
         maxDepositReceiptsPerPayload,
-        maxExecutionLayerExits);
+        maxDepositReceiptsPerPayload,
+        maxAttesterSlashingsElectra,
+        maxAttestationsElectra);
   }
 }

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/builder/ElectraBuilder.java

@@ -32,6 +32,8 @@ public class ElectraBuilder implements ForkConfigBuilder<SpecConfigDeneb, SpecCo
   private UInt64 electraForkEpoch;
   private Integer maxDepositReceiptsPerPayload;
   private Integer maxExecutionLayerExits;
+  private Integer maxAttesterSlashingsElectra;
+  private Integer maxAttestationsElectra;
 
   ElectraBuilder() {}
 
@@ -42,7 +44,9 @@ public SpecConfigElectra build(final SpecConfigDeneb specConfig) {
         electraForkVersion,
         electraForkEpoch,
         maxDepositReceiptsPerPayload,
-        maxExecutionLayerExits);
+        maxExecutionLayerExits,
+        maxAttesterSlashingsElectra,
+        maxAttestationsElectra);
   }
 
   public ElectraBuilder electraForkEpoch(final UInt64 electraForkEpoch) {
@@ -69,6 +73,18 @@ public ElectraBuilder maxExecutionLayerExits(final Integer maxExecutionLayerExit
     return this;
   }
 
+  public ElectraBuilder maxAttesterSlashingsElectra(final Integer maxAttesterSlashingsElectra) {
+    checkNotNull(maxAttesterSlashingsElectra);
+    this.maxAttesterSlashingsElectra = maxAttesterSlashingsElectra;
+    return this;
+  }
+
+  public ElectraBuilder maxAttestationsElectra(final Integer maxAttestationsElectra) {
+    checkNotNull(maxAttestationsElectra);
+    this.maxAttestationsElectra = maxAttestationsElectra;
+    return this;
+  }
+
   @Override
   public void validate() {
     if (electraForkEpoch == null) {
@@ -91,6 +107,8 @@ public Map<String, Object> getValidationMap() {
     constants.put("electraForkEpoch", electraForkEpoch);
     constants.put("electraForkVersion", electraForkVersion);
     constants.put("maxDepositReceiptsPerPayload", maxDepositReceiptsPerPayload);
+    constants.put("maxAttesterSlashingsElectra", maxAttesterSlashingsElectra);
+    constants.put("maxAttestationsElectra", maxAttestationsElectra);
 
     return constants;
   }

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/blocks/blockbody/versions/electra/BeaconBlockBodySchemaElectraImpl.java

@@ -111,11 +111,12 @@ public static BeaconBlockBodySchemaElectraImpl create(
                 ProposerSlashing.SSZ_SCHEMA, specConfig.getMaxProposerSlashings())),
         namedSchema(
             BlockBodyFields.ATTESTER_SLASHINGS,
-            SszListSchema.create(attesterSlashingSchema, specConfig.getMaxAttesterSlashings())),
+            SszListSchema.create(
+                attesterSlashingSchema, specConfig.getMaxAttesterSlashingsElectra())),
         namedSchema(
             BlockBodyFields.ATTESTATIONS,
             SszListSchema.create(
-                new AttestationSchema(specConfig), specConfig.getMaxAttestations())),
+                new AttestationSchema(specConfig), specConfig.getMaxAttestationsElectra())),
         namedSchema(
             BlockBodyFields.DEPOSITS,
             SszListSchema.create(Deposit.SSZ_SCHEMA, specConfig.getMaxDeposits())),

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/blocks/blockbody/versions/electra/BlindedBeaconBlockBodySchemaElectraImpl.java

@@ -110,11 +110,12 @@ public static BlindedBeaconBlockBodySchemaElectraImpl create(
                 ProposerSlashing.SSZ_SCHEMA, specConfig.getMaxProposerSlashings())),
         namedSchema(
             BlockBodyFields.ATTESTER_SLASHINGS,
-            SszListSchema.create(attesterSlashingSchema, specConfig.getMaxAttesterSlashings())),
+            SszListSchema.create(
+                attesterSlashingSchema, specConfig.getMaxAttesterSlashingsElectra())),
         namedSchema(
             BlockBodyFields.ATTESTATIONS,
             SszListSchema.create(
-                new AttestationSchema(specConfig), specConfig.getMaxAttestations())),
+                new AttestationSchema(specConfig), specConfig.getMaxAttestationsElectra())),
         namedSchema(
             BlockBodyFields.DEPOSITS,
             SszListSchema.create(Deposit.SSZ_SCHEMA, specConfig.getMaxDeposits())),

ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/electra.yaml

@@ -5,4 +5,11 @@
 # 2**13 (= 8192) receipts
 MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD: 8192
 # 2**4 (= 16) exits
-MAX_EXECUTION_LAYER_EXITS: 16
+MAX_EXECUTION_LAYER_EXITS: 16
+
+# Updated max operations per block
+# ---------------------------------------------------------------
+# 2**0 (= 1)
+MAX_ATTESTER_SLASHINGS_ELECTRA: 1
+# 2**3 (= 8)
+MAX_ATTESTATIONS_ELECTRA: 8

ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/electra.yaml

@@ -5,4 +5,11 @@
 # [customized]
 MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD: 4
 # 2**4 (= 16) exits
-MAX_EXECUTION_LAYER_EXITS: 16
+MAX_EXECUTION_LAYER_EXITS: 16
+
+# Updated max operations per block
+# ---------------------------------------------------------------
+# 2**0 (= 1)
+MAX_ATTESTER_SLASHINGS_ELECTRA: 1
+# 2**3 (= 8)
+MAX_ATTESTATIONS_ELECTRA: 8

ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/electra.yaml

@@ -8,4 +8,11 @@ MAX_EXECUTION_LAYER_EXITS: 16
 # Execution
 # ---------------------------------------------------------------
 # [customized]
-MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD: 4
+MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD: 4
+
+# Updated max operations per block
+# ---------------------------------------------------------------
+# 2**0 (= 1)
+MAX_ATTESTER_SLASHINGS_ELECTRA: 1
+# 2**3 (= 8)
+MAX_ATTESTATIONS_ELECTRA: 8

ethereum/spec/src/test/java/tech/pegasys/teku/spec/config/SpecConfigElectraTest.java

@@ -83,6 +83,8 @@ private SpecConfigElectra createRandomElectraConfig(
         dataStructureUtil.randomBytes4(),
         dataStructureUtil.randomUInt64(999_999),
         dataStructureUtil.randomPositiveInt(16),
-        dataStructureUtil.randomPositiveInt(16)) {};
+        dataStructureUtil.randomPositiveInt(16),
+        dataStructureUtil.randomPositiveInt(1),
+        dataStructureUtil.randomPositiveInt(8)) {};
   }
 }

ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/electra.yaml

@@ -0,0 +1,8 @@
+# Minimal preset - Electra
+
+# Updated max operations per block
+# ---------------------------------------------------------------
+# 2**0 (= 1)
+MAX_ATTESTER_SLASHINGS_ELECTRA: 1
+# 2**3 (= 8)
+MAX_ATTESTATIONS_ELECTRA: 8