Update Teku and Besu version to 24.10.3 and 24.10.0 respectively (#1044)

* Update Teku and Besu version -- Teku 24.10.3 -- Besu 24.10.0 * Use Teku DataStructureUtil in Acceptance Test
Consensys · Nov 27, 2024 · d5bb7c0 · d5bb7c0
1 parent f27d7ea
commit d5bb7c0
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 238 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Java 21 for build and runtime. [#995](https://github.com/Consensys/web3signer/pull/995)
 - Electra fork support. [#1020](https://github.com/Consensys/web3signer/pull/1020) and [#1023](https://github.com/Consensys/web3signer/pull/1023)
 - Commit boost API - Get Public Keys. [#1031](https://github.com/Consensys/web3signer/pull/1031)
+- Teku and Besu libraries updated to 24.10.3 and 24.10.0 respectively.
 
 ### Bugs fixed
 - Override protobuf-java to 3.25.5 which is a transitive dependency from google-cloud-secretmanager. It fixes CVE-2024-7254.

diff --git a/...tance-tests/src/test/java/tech/pegasys/web3signer/dsl/utils/DataStructureUtilAdapter.java b/...tance-tests/src/test/java/tech/pegasys/web3signer/dsl/utils/DataStructureUtilAdapter.java
diff --git a/...ce-tests/src/test/java/tech/pegasys/web3signer/dsl/utils/Eth2BlockSigningRequestUtil.java b/...ce-tests/src/test/java/tech/pegasys/web3signer/dsl/utils/Eth2BlockSigningRequestUtil.java
@@ -24,6 +24,7 @@
 import tech.pegasys.teku.spec.datastructures.blocks.BeaconBlock;
 import tech.pegasys.teku.spec.datastructures.state.ForkInfo;
 import tech.pegasys.teku.spec.signatures.SigningRootUtil;
+import tech.pegasys.teku.spec.util.DataStructureUtil;
 import tech.pegasys.web3signer.core.service.http.ArtifactType;
 import tech.pegasys.web3signer.core.service.http.handlers.signing.eth2.BlockRequest;
 import tech.pegasys.web3signer.core.service.http.handlers.signing.eth2.Eth2SigningRequestBody;
@@ -32,7 +33,7 @@
 
 public class Eth2BlockSigningRequestUtil {
   private final SpecMilestone specMilestone;
-  private final DataStructureUtilAdapter beaconBlockUtil;
+  private final DataStructureUtil beaconBlockUtil;
   private final SigningRootUtil signingRootUtil;
   private final ForkInfo tekuForkInfo;
   private final Fork tekuFork;
@@ -41,23 +42,13 @@ public class Eth2BlockSigningRequestUtil {
   private final Bytes signingRoot;
 
   public Eth2BlockSigningRequestUtil(final SpecMilestone specMilestone) {
-    final Spec spec = TestSpecFactory.createMinimal(specMilestone);
-    this.specMilestone = specMilestone;
-    beaconBlockUtil = new DataStructureUtilAdapter(spec);
-    signingRootUtil = new SigningRootUtil(spec);
-    tekuForkInfo = Eth2RequestUtils.forkInfo().asInternalForkInfo();
-    tekuFork = new Fork(tekuForkInfo.getFork());
-    forkInfo =
-        new tech.pegasys.web3signer.core.service.http.handlers.signing.eth2.ForkInfo(
-            tekuFork, tekuForkInfo.getGenesisValidatorsRoot());
-    beaconBlock = beaconBlockUtil.randomBeaconBlock(UInt64.valueOf(0L));
-    signingRoot = signingRootUtil.signingRootForSignBlock(beaconBlock, tekuForkInfo);
+    this(TestSpecFactory.createMinimal(specMilestone), UInt64.ONE, UInt64.ZERO);
   }
 
   public Eth2BlockSigningRequestUtil(
       final Spec spec, final UInt64 forkEpoch, final UInt64 beaconBlockSlot) {
     specMilestone = spec.atEpoch(forkEpoch).getMilestone();
-    beaconBlockUtil = new DataStructureUtilAdapter(spec);
+    beaconBlockUtil = new DataStructureUtil(spec);
     signingRootUtil = new SigningRootUtil(spec);
     tekuForkInfo = Eth2RequestUtils.forkInfo(forkEpoch.longValue()).asInternalForkInfo();
     tekuFork = new Fork(tekuForkInfo.getFork());
@@ -69,19 +60,12 @@ public Eth2BlockSigningRequestUtil(
   }
 
   public Eth2SigningRequestBody createBlockV2Request() {
-    switch (specMilestone) {
-      case PHASE0:
-      case ALTAIR:
-        return createBlockV2Request(new BlockRequest(specMilestone, getBeaconBlock()));
-      case BELLATRIX:
-      case CAPELLA:
-      case DENEB:
-      case ELECTRA:
-        return createBlockV2Request(new BlockRequest(specMilestone, getBeaconBlockHeader()));
-      default:
-        throw new IllegalStateException(
-            "Spec not yet implemented for BLOCKV2 Signing AT: " + specMilestone);
-    }
+    return switch (specMilestone) {
+      case PHASE0, ALTAIR ->
+          createBlockV2Request(new BlockRequest(specMilestone, getBeaconBlock()));
+      case BELLATRIX, CAPELLA, DENEB, ELECTRA ->
+          createBlockV2Request(new BlockRequest(specMilestone, getBeaconBlockHeader()));
+    };
   }
 
   public Eth2SigningRequestBody createBlockV2Request(final BlockRequest blockRequest) {
@@ -117,19 +101,18 @@ private BeaconBlockHeader getBeaconBlockHeader() {
   }
 
   private tech.pegasys.teku.api.schema.BeaconBlock getBeaconBlock() {
-    switch (specMilestone) {
-      case PHASE0:
-        return new BeaconBlockPhase0(beaconBlock);
-      case ALTAIR:
-        return new BeaconBlockAltair(
-            beaconBlock.getSlot(),
-            beaconBlock.getProposerIndex(),
-            beaconBlock.getParentRoot(),
-            beaconBlock.getStateRoot(),
-            getBeaconBlockBodyAltair(beaconBlock.getBody()));
-      default:
-        throw new IllegalStateException("BeaconBlock only supported for PHASE0 and ALTAIR in AT");
-    }
+    return switch (specMilestone) {
+      case PHASE0 -> new BeaconBlockPhase0(beaconBlock);
+      case ALTAIR ->
+          new BeaconBlockAltair(
+              beaconBlock.getSlot(),
+              beaconBlock.getProposerIndex(),
+              beaconBlock.getParentRoot(),
+              beaconBlock.getStateRoot(),
+              getBeaconBlockBodyAltair(beaconBlock.getBody()));
+      default ->
+          throw new IllegalStateException("BeaconBlock only supported for PHASE0 and ALTAIR in AT");
+    };
   }
 
   private BeaconBlockBodyAltair getBeaconBlockBodyAltair(

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-besuVersion=24.7.0
+besuVersion=24.10.0
 besuDistroUrl=https://github.com/hyperledger/besu/releases/download/${besuVersion}/besu-${besuVersion}.tar.gz
 
 hashicorpVaultVersion=1.9.2

diff --git a/gradle/license-report-config/allowed-licenses.json b/gradle/license-report-config/allowed-licenses.json
@@ -107,6 +107,10 @@
       "moduleName": "jakarta.validation:jakarta.validation-api",
       "moduleLicense": "Apache License, Version 2.0"
     },
+    {
+      "moduleName": "jakarta.inject:jakarta.inject-api",
+      "moduleLicense": "Apache License, Version 2.0"
+    },
     {
       "moduleName": "javax.xml.bind:jaxb-api",
       "moduleLicense": "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1"

diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -92,7 +92,7 @@ dependencyManagement {
 
     dependency 'org.xipki.iaik:sunpkcs11-wrapper:1.4.10'
 
-    dependencySet(group: 'tech.pegasys.teku.internal', version: '24.8.0') {
+    dependencySet(group: 'tech.pegasys.teku.internal', version: '24.10.3') {
       entry ('bls') {
         exclude group: 'org.bouncycastle', name: 'bcprov-jdk15on'
       }