From be7c2c380e902fac92dacb2e6f62982ab257c52e Mon Sep 17 00:00:00 2001
From: Matt Nelson <85905982+non-fungible-nelson@users.noreply.github.com>
Date: Mon, 31 Jul 2023 23:01:45 -0400
Subject: [PATCH] Bumping Teku Version for Gnosis Capella fork (#865)

---
 CHANGELOG.md                                  |  1 +
 .../test/resources/eth2/network_config.yaml   | 42 ++++++++++++++++++-
 gradle/versions.gradle                        |  2 +-
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c59517adc..66e3877ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Add eth_sendTransaction RPC method under the eth1 subcommand [#835](https://github.com/Consensys/web3signer/pull/835)
 - Add EIP-1559 support for eth1 public transactions for eth_sendTransaction and eth_signTransaction [#836](https://github.com/Consensys/web3signer/pull/836)
 - Add Azure bulk loading for secp256k1 keys in eth1 mode [#850](https://github.com/Consensys/web3signer/pull/850)
+- Added Gnosis configuration for the 🦉 CAPELLA 🦉 network fork due at epoch 648704, UTC Tue 01/08/2023, 11:34:20
 
 ### Bugs fixed
 - Support long name aliases in environment variables and YAML configuration [#825](https://github.com/Consensys/web3signer/pull/825)
diff --git a/acceptance-tests/src/test/resources/eth2/network_config.yaml b/acceptance-tests/src/test/resources/eth2/network_config.yaml
index 080f33c45..7670724db 100644
--- a/acceptance-tests/src/test/resources/eth2/network_config.yaml
+++ b/acceptance-tests/src/test/resources/eth2/network_config.yaml
@@ -16,6 +16,36 @@ MAX_SEED_LOOKAHEAD: 1
 EJECTION_BALANCE: 16000000000
 MIN_PER_EPOCH_CHURN_LIMIT: 4
 
+# Networking
+# `10 * 2**20` (= 10485760, 10 MiB)
+GOSSIP_MAX_SIZE: 10485760
+# `2**10` (= 1024)
+MAX_REQUEST_BLOCKS: 1024
+## [customized] `MIN_VALIDATOR_WITHDRAWABILITY_DELAY + CHURN_LIMIT_QUOTIENT // 2` (= 272)
+#MIN_EPOCHS_FOR_BLOCK_REQUESTS: 272
+# `10 * 2**20` (=10485760, 10 MiB)
+EPOCHS_PER_SUBNET_SUBSCRIPTION: 256
+## [customized] `MIN_VALIDATOR_WITHDRAWABILITY_DELAY + CHURN_LIMIT_QUOTIENT // 2` (= 272)
+#MIN_EPOCHS_FOR_BLOCK_REQUESTS: 272
+# `10 * 2**20` (=10485760, 10 MiB)
+MAX_CHUNK_SIZE: 10485760
+# 5s
+TTFB_TIMEOUT: 5
+# 10s
+RESP_TIMEOUT: 10
+ATTESTATION_PROPAGATION_SLOT_RANGE: 32
+# 500ms
+MAXIMUM_GOSSIP_CLOCK_DISPARITY: 500
+MESSAGE_DOMAIN_INVALID_SNAPPY: 0x00000000
+MESSAGE_DOMAIN_VALID_SNAPPY: 0x01000000
+# 2 subnets per node
+SUBNETS_PER_NODE: 2
+# 2**8 (= 64)
+ATTESTATION_SUBNET_COUNT: 64
+ATTESTATION_SUBNET_EXTRA_BITS: 0
+# ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
+ATTESTATION_SUBNET_PREFIX_BITS: 6
+
 DEPOSIT_CHAIN_ID: 1337
 DEPOSIT_NETWORK_ID: 1337
 # Configured on a per testnet basis
@@ -33,4 +63,14 @@ INACTIVITY_SCORE_BIAS: 4
 INACTIVITY_SCORE_RECOVERY_RATE: 16
 TERMINAL_TOTAL_DIFFICULTY: 616
 TERMINAL_BLOCK_HASH: 0x0000000000000000000000000000000000000000000000000000000000000000
-TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: 18446744073709551615
\ No newline at end of file
+TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: 18446744073709551615
+
+# Deneb
+# `2**7` (=128)
+MAX_REQUEST_BLOCKS_DENEB: 128
+# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
+MAX_REQUEST_BLOB_SIDECARS: 768
+# `2**12` (= 4096 epochs, ~18 days)
+MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
+# `6`
+BLOB_SIDECAR_SUBNET_COUNT: 6
\ No newline at end of file
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index a5d04441b..210489dcb 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.6.0') {
+    dependencySet(group: 'tech.pegasys.teku.internal', version: '23.6.2') {
       entry ('bls') {
         exclude group: 'org.bouncycastle', name: 'bcprov-jdk15on'
       }