Merge branch 'master' into indexed-attestation-validation-optimization

Consensys · Jan 12, 2025 · 3835cb6 · 3835cb6
2 parents ce8b901 + 89caf92
commit 3835cb6
Show file tree

Hide file tree

Showing 92 changed files with 553 additions and 1,772 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,13 @@
 ## Unreleased Changes
 
 ### Breaking Changes
+`--Xvalidators-builder-registration-default-gas-limit` is removed in favour of `--validators-builder-registration-default-gas-limit`
 
 ### Additions and Improvements
+- Default the gas limit to 36 million for externally produced blocks
 - Optimized blobs validation pipeline
+- Remove delay when fetching blobs from the local EL on block arrival
 
-### Bug Fixes
+### Bug Fixes
+- Fix `--version` command output [#8960](https://github.com/Consensys/teku/issues/8960)
+- Fix issue (introduced in `24.12.1`) with peer stability when the upperbound is set to a high number
diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle
@@ -1,4 +1,6 @@
 dependencies {
+  testImplementation 'io.tmio:tuweni-units'
+
   acceptanceTestImplementation project(":infrastructure:bls")
   acceptanceTestImplementation project(':infrastructure:time')
   acceptanceTestImplementation project(':data:serializer')

diff --git a/...eptance-test/java/tech/pegasys/teku/test/acceptance/LocalValidatorKeysAcceptanceTest.java b/...eptance-test/java/tech/pegasys/teku/test/acceptance/LocalValidatorKeysAcceptanceTest.java
@@ -83,7 +83,7 @@ void shouldMaintainValidatorsInMutableClient() throws Exception {
     api.assertLocalValidatorListing(validatorKeystores.getPublicKeys());
 
     api.assertValidatorGasLimit(
-        validatorKeystores.getPublicKeys().get(1), UInt64.valueOf(30000000));
+        validatorKeystores.getPublicKeys().get(1), UInt64.valueOf(36_000_000));
 
     // generate voluntary exit
     api.generateVoluntaryExitAndCheckValidatorIndex(validatorKeystores.getPublicKeys().get(1), 1);

diff --git a/...n/pow/src/main/java/tech/pegasys/teku/beacon/pow/api/MinGenesisTimeBlockEventChannel.java b/...n/pow/src/main/java/tech/pegasys/teku/beacon/pow/api/MinGenesisTimeBlockEventChannel.java
diff --git a/build.gradle b/build.gradle
@@ -984,7 +984,6 @@ subprojects {
     runtimeOnly 'org.apache.logging.log4j:log4j-core'
     runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'
 
-    testImplementation 'io.tmio:tuweni-junit'
     testImplementation 'org.assertj:assertj-core'
     testImplementation 'org.mockito:mockito-core'
     testImplementation 'org.junit.jupiter:junit-jupiter-api'

diff --git a/data/serializer/build.gradle b/data/serializer/build.gradle
@@ -3,11 +3,9 @@ dependencies {
   api 'io.swagger.core.v3:swagger-annotations'
 
   implementation project(':ethereum:execution-types')
-  implementation project(':ethereum:jackson-deserializers')
   implementation project(':ethereum:spec')
   implementation project(':infrastructure:bls')
   implementation project(':infrastructure:bytes')
-  implementation project(':infrastructure:jackson')
   implementation project(':infrastructure:async')
 
   implementation 'io.tmio:tuweni-units'

diff --git a/.../serializer/src/main/java/tech/pegasys/teku/api/schema/interfaces/SignedBlindedBlock.java b/.../serializer/src/main/java/tech/pegasys/teku/api/schema/interfaces/SignedBlindedBlock.java
diff --git a/eth-reference-tests/build.gradle b/eth-reference-tests/build.gradle
@@ -25,7 +25,6 @@ dependencies {
   referenceTestImplementation 'com.fasterxml.jackson.core:jackson-databind'
   referenceTestImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
   referenceTestImplementation 'io.tmio:tuweni-bytes'
-  referenceTestImplementation 'io.tmio:tuweni-junit'
   referenceTestImplementation 'io.tmio:tuweni-ssz'
   referenceTestImplementation 'org.xerial.snappy:snappy-java'
 }

diff --git a/ethereum/execution-types/build.gradle b/ethereum/execution-types/build.gradle
@@ -3,7 +3,7 @@ dependencies {
     implementation project(':infrastructure:crypto')
     implementation project(':infrastructure:json')
 
-    testFixturesApi project(':infrastructure:jackson')
+    testFixturesApi 'com.fasterxml.jackson.core:jackson-databind'
     testImplementation project(':ethereum:json-types')
 
     testImplementation testFixtures(project(':infrastructure:json'))

diff --git a/...ent/src/main/java/tech/pegasys/teku/ethereum/executionclient/methods/EngineApiMethod.java b/...ent/src/main/java/tech/pegasys/teku/ethereum/executionclient/methods/EngineApiMethod.java
@@ -16,8 +16,7 @@
 public enum EngineApiMethod {
   ENGINE_NEW_PAYLOAD("engine_newPayload"),
   ENGINE_GET_PAYLOAD("engine_getPayload"),
-  ENGINE_FORK_CHOICE_UPDATED("engine_forkchoiceUpdated"),
-  ENGINE_GET_BLOBS("engine_getBlobs");
+  ENGINE_FORK_CHOICE_UPDATED("engine_forkchoiceUpdated");
 
   private final String name;
 

diff --git a/...nt/src/main/java/tech/pegasys/teku/ethereum/executionclient/methods/EngineGetBlobsV1.java b/...nt/src/main/java/tech/pegasys/teku/ethereum/executionclient/methods/EngineGetBlobsV1.java
diff --git a/...src/main/java/tech/pegasys/teku/ethereum/executionclient/methods/EngineJsonRpcMethod.java b/...src/main/java/tech/pegasys/teku/ethereum/executionclient/methods/EngineJsonRpcMethod.java
@@ -28,12 +28,6 @@ default boolean isDeprecated() {
     return false;
   }
 
-  // TODO should be remove once all ELs implement engine_getBlobsV1. It has been added only to
-  // better handle the use case when the method is missing in the EL side
-  default boolean isOptional() {
-    return false;
-  }
-
   default String getVersionedName() {
     return getVersion() == 0 ? getName() : getName() + "V" + getVersion();
   }

diff --git a/...lient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/BlobAndProofV1.java b/...lient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/BlobAndProofV1.java
@@ -52,11 +52,6 @@ public BlobAndProof asInternalBlobsAndProofs(final BlobSchema blobSchema) {
     return new BlobAndProof(new Blob(blobSchema, blob), new KZGProof(proof));
   }
 
-  public static BlobAndProofV1 fromInternalBlobsBundle(final BlobAndProof blobAndProof) {
-    return new BlobAndProofV1(
-        blobAndProof.blob().getBytes(), blobAndProof.proof().getBytesCompressed());
-  }
-
   @Override
   public boolean equals(final Object o) {
     if (this == o) {

diff --git a/...c/main/java/tech/pegasys/teku/ethereum/executionclient/schema/ConsolidationRequestV1.java b/...c/main/java/tech/pegasys/teku/ethereum/executionclient/schema/ConsolidationRequestV1.java