From 6edeae371e3dd87f294109ddadde7942698b1c13 Mon Sep 17 00:00:00 2001 From: Simon Dudley Date: Fri, 16 Feb 2024 14:41:46 +1000 Subject: [PATCH] Upgrade teku to 24.2.0 and prep for release (#971) --------- Co-authored-by: Usman Saleem --- CHANGELOG.md | 10 ++++++++-- .../web3signer/dsl/utils/DataStructureUtilAdapter.java | 7 +++---- gradle.properties | 2 +- gradle/versions.gradle | 6 +++--- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12090868b..d36783253 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,15 @@ # Changelog -## Next version +## 24.2.0 + +This is a required update for Mainnet users containing the configuration for the Deneb upgrade on March 13th. This update is required for Gnosis Deneb network upgrade on March 11th. For all other networks, this update is optional. + +### Upcoming Breaking Changes +- `--Xworker-pool-size` cli option will be removed in a future release. This option has been replaced with `--vertx-worker-pool-size` ### Features Added -- Improve Key Manager API import operation to use parallel processing instead of serial processing. +- Add Deneb configuration for Mainnet [#971](https://github.com/Consensys/web3signer/pull/971) +- Improve Key Manager API import operation to use parallel processing instead of serial processing ### Bugs fixed - Ensure that Web3Signer stops the http server when a sigterm is received diff --git a/acceptance-tests/src/test/java/tech/pegasys/web3signer/dsl/utils/DataStructureUtilAdapter.java b/acceptance-tests/src/test/java/tech/pegasys/web3signer/dsl/utils/DataStructureUtilAdapter.java index 23c68f187..fdfa1f0e6 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/web3signer/dsl/utils/DataStructureUtilAdapter.java +++ b/acceptance-tests/src/test/java/tech/pegasys/web3signer/dsl/utils/DataStructureUtilAdapter.java @@ -97,17 +97,16 @@ private BeaconBlockBody randomBeaconBlockBody(final UInt64 slotNum) { builder.syncAggregate(util.randomSyncAggregateIfRequiredBySchema(schema)); } if (builder.supportsExecutionPayload()) { - builder.executionPayload( - SafeFuture.completedFuture(randomExecutionPayload(spec.atSlot(slotNum)))); + builder.executionPayload(randomExecutionPayload(spec.atSlot(slotNum))); } if (builder.supportsBlsToExecutionChanges()) { builder.blsToExecutionChanges( randomSignedBlsToExecutionChangesList(spec.atSlot(slotNum))); } if (builder.supportsKzgCommitments()) { - builder.blobKzgCommitments( - SafeFuture.completedFuture(util.randomBlobKzgCommitments())); + builder.blobKzgCommitments(util.randomBlobKzgCommitments()); } + return SafeFuture.completedFuture(builder).toVoid(); }) .join(); } diff --git a/gradle.properties b/gradle.properties index 1cc41005f..a791f18dd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -besuVersion=24.1.0 +besuVersion=24.1.2 besuDistroUrl=https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/${besuVersion}/besu-${besuVersion}.tar.gz hashicorpVaultVersion=1.9.2 diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 8dc278384..beb4c91ed 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -85,12 +85,12 @@ dependencyManagement { entry 'mockito-junit-jupiter' } - dependency 'org.hyperledger.besu:plugin-api:24.1.0' - dependency 'org.hyperledger.besu.internal:metrics-core:24.1.0' + dependency 'org.hyperledger.besu:plugin-api:24.1.2' + dependency 'org.hyperledger.besu.internal:metrics-core:24.1.2' dependency 'org.xipki.iaik:sunpkcs11-wrapper:1.4.10' - dependencySet(group: 'tech.pegasys.teku.internal', version: '24.1.1') { + dependencySet(group: 'tech.pegasys.teku.internal', version: '24.2.0') { entry ('bls') { exclude group: 'org.bouncycastle', name: 'bcprov-jdk15on' }