From 254ec59fc981850ce6351337f53e3b85ced0c3c9 Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Mon, 25 Sep 2023 12:17:16 +1000 Subject: [PATCH] Update teku to 23.9.1 to include revised holesky config (#917) --- CHANGELOG.md | 3 ++- acceptance-tests/build.gradle | 5 ++--- acceptance-tests/src/test/resources/eth2/network_config.yaml | 1 + gradle/versions.gradle | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7632a997e..f05127d74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Next Release +## 23.9.1 ### Breaking Changes - Remove --validator-ids option from watermark-repair subcommand [#909](https://github.com/Consensys/web3signer/pull/909) @@ -10,6 +10,7 @@ - Add High Watermark functionality [#696](https://github.com/Consensys/web3signer/issues/696) - Update `watermark-repair` subcommand with new options `--set-high-watermark`, `--remove-high-watermark` [#912](https://github.com/Consensys/web3signer/pull/912) - Add GET `/highWatermark` to eth2 endpoints [#908](https://github.com/Consensys/web3signer/pull/908) +- Add network configuration for revised Holesky testnet ## 23.9.0 diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle index 42d3efbb8..ab8cdf840 100644 --- a/acceptance-tests/build.gradle +++ b/acceptance-tests/build.gradle @@ -52,9 +52,8 @@ dependencies { testImplementation 'tech.pegasys.teku.internal:networks' testImplementation 'tech.pegasys.teku.internal:json' testImplementation 'tech.pegasys.teku.internal:jackson' - // Use test fixtures from Teku 23.8.0 as latest version doesn't include any test fixtures - testImplementation (group: 'tech.pegasys.teku.internal', name: 'spec', classifier: 'test-fixtures', version: '23.8.0') - testImplementation (group: 'tech.pegasys.teku.internal', name: 'bls', classifier: 'test-fixtures', version: '23.8.0') + testImplementation (group: 'tech.pegasys.teku.internal', name: 'spec', classifier: 'test-fixtures') + testImplementation (group: 'tech.pegasys.teku.internal', name: 'bls', classifier: 'test-fixtures') testImplementation 'tech.pegasys.teku.internal:serializer' testImplementation 'tech.pegasys.teku.internal:unsigned' testImplementation 'tech.pegasys.teku.internal:async' diff --git a/acceptance-tests/src/test/resources/eth2/network_config.yaml b/acceptance-tests/src/test/resources/eth2/network_config.yaml index 4bc447b4e..9ccf28bc5 100644 --- a/acceptance-tests/src/test/resources/eth2/network_config.yaml +++ b/acceptance-tests/src/test/resources/eth2/network_config.yaml @@ -15,6 +15,7 @@ MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256 MAX_SEED_LOOKAHEAD: 1 EJECTION_BALANCE: 16000000000 MIN_PER_EPOCH_CHURN_LIMIT: 4 +MAX_PER_EPOCH_ACTIVATION_CHURN_LIMIT: 4 # Networking # `10 * 2**20` (= 10485760, 10 MiB) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index aa728110b..47b7f92b9 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -90,7 +90,7 @@ dependencyManagement { dependency 'org.xipki.iaik:sunpkcs11-wrapper:1.4.9' - dependencySet(group: 'tech.pegasys.teku.internal', version: '23.9.0') { + dependencySet(group: 'tech.pegasys.teku.internal', version: '23.9.1') { entry ('bls') { exclude group: 'org.bouncycastle', name: 'bcprov-jdk15on' }