From 132f1abd9b038a65335d585ba647ca221be94ae0 Mon Sep 17 00:00:00 2001 From: Simon Dudley Date: Fri, 16 Feb 2024 12:16:44 +1000 Subject: [PATCH 1/5] Upgrade teku to 24.2.0 and fixup compilation error --- .../web3signer/dsl/utils/DataStructureUtilAdapter.java | 7 +++---- gradle/versions.gradle | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) 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/versions.gradle b/gradle/versions.gradle index 8dc278384..f1e9ecbe6 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -90,7 +90,7 @@ dependencyManagement { 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' } From 860456fa7eee1f1f7a5263f5d1408bb684c56c85 Mon Sep 17 00:00:00 2001 From: Simon Dudley Date: Fri, 16 Feb 2024 12:23:08 +1000 Subject: [PATCH 2/5] Update changelog and prep for release --- CHANGELOG.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06d2456f4..323097928 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # 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 +- Add Deneb configuration for Mainnet [#971](https://github.com/Consensys/web3signer/pull/971) ### Bugs fixed - Ensure that Web3Signer stops the http server when a sigterm is received From baf8967638dd9bfda0c1ad9d734aab1e16cbe4d4 Mon Sep 17 00:00:00 2001 From: Simon Dudley Date: Fri, 16 Feb 2024 12:42:02 +1000 Subject: [PATCH 3/5] Upgrade besu version --- gradle.properties | 2 +- gradle/versions.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 f1e9ecbe6..beb4c91ed 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -85,8 +85,8 @@ 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' From de9016c6999c110f4256f5d1322b351a6037b0b7 Mon Sep 17 00:00:00 2001 From: Simon Dudley Date: Fri, 16 Feb 2024 14:09:26 +1000 Subject: [PATCH 4/5] Add keymanager api improvement to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 323097928..d36783253 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ This is a required update for Mainnet users containing the configuration for the ### Features Added - 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 From e1e00abcc5d4aaead790b9cfd3aadd82754a653a Mon Sep 17 00:00:00 2001 From: Usman Saleem Date: Fri, 16 Feb 2024 14:17:59 +1000 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1c155b46..d36783253 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,9 +11,6 @@ This is a required update for Mainnet users containing the configuration for the - 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 -### Features Added -- 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