From 41a0ca9b008a3938685a46bb45ef205e1e3f3ade Mon Sep 17 00:00:00 2001 From: Paul Harris Date: Mon, 31 Oct 2022 09:51:55 +1000 Subject: [PATCH] Added capella configuration files Used mainnet file as the basis for gnosis, and minimal as the basis for swift. partially addresses #5680 Signed-off-by: Paul Harris --- .../teku/spec/config/configs/gnosis.yaml | 5 +++- .../teku/spec/config/configs/less-swift.yaml | 5 +++- .../spec/config/presets/gnosis/capella.yaml | 24 +++++++++++++++++ .../spec/config/presets/mainnet/capella.yaml | 24 +++++++++++++++++ .../spec/config/presets/minimal/capella.yaml | 26 +++++++++++++++++++ .../spec/config/presets/swift/capella.yaml | 24 +++++++++++++++++ .../teku/spec/config/standard/minimal.yaml | 5 +++- .../standard/presets/mainnet/capella.yaml | 24 +++++++++++++++++ .../standard/presets/minimal/capella.yaml | 24 +++++++++++++++++ .../standard/presets/swift/capella.yaml | 24 +++++++++++++++++ 10 files changed, 182 insertions(+), 3 deletions(-) create mode 100644 ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/capella.yaml create mode 100644 ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/capella.yaml create mode 100644 ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/capella.yaml create mode 100644 ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/capella.yaml create mode 100644 ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/mainnet/capella.yaml create mode 100644 ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/minimal/capella.yaml create mode 100644 ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/capella.yaml diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/gnosis.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/gnosis.yaml index 6af24ea2226..f786e941117 100644 --- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/gnosis.yaml +++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/gnosis.yaml @@ -39,8 +39,11 @@ ALTAIR_FORK_EPOCH: 512 # Merge BELLATRIX_FORK_VERSION: 0x02000064 BELLATRIX_FORK_EPOCH: 18446744073709551615 +# Capella +CAPELLA_FORK_VERSION: 0x03000064 +CAPELLA_FORK_EPOCH: 18446744073709551615 # Sharding -SHARDING_FORK_VERSION: 0x03000064 +SHARDING_FORK_VERSION: 0x04000064 SHARDING_FORK_EPOCH: 18446744073709551615 # TBD, 2**32 is a placeholder. Merge transition approach is in active R&D. diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/less-swift.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/less-swift.yaml index 5bbb33036af..2cb2ff430e6 100644 --- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/less-swift.yaml +++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/less-swift.yaml @@ -29,8 +29,11 @@ ALTAIR_FORK_EPOCH: 0 # Bellatrix BELLATRIX_FORK_VERSION: 0x02000001 BELLATRIX_FORK_EPOCH: 18446744073709551615 +# Capella +CAPELLA_FORK_VERSION: 0x03000001 +CAPELLA_FORK_EPOCH: 18446744073709551615 # Sharding -SHARDING_FORK_VERSION: 0x03000001 +SHARDING_FORK_VERSION: 0x04000001 SHARDING_FORK_EPOCH: 18446744073709551615 # Transition diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/capella.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/capella.yaml new file mode 100644 index 00000000000..86dd7fa5f7e --- /dev/null +++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/capella.yaml @@ -0,0 +1,24 @@ +# Mainnet preset - Capella + +# Misc +# --------------------------------------------------------------- +# 2**8 (= 256) withdrawals +MAX_PARTIAL_WITHDRAWALS_PER_EPOCH: 256 + + +# State list lengths +# --------------------------------------------------------------- +# 2**40 (= 1,099,511,627,776) withdrawals +WITHDRAWAL_QUEUE_LIMIT: 1099511627776 + + +# Max operations per block +# --------------------------------------------------------------- +# 2**4 (= 16) +MAX_BLS_TO_EXECUTION_CHANGES: 16 + + +# Execution +# --------------------------------------------------------------- +# 2**4 (= 16) withdrawals +MAX_WITHDRAWALS_PER_PAYLOAD: 16 \ No newline at end of file diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/capella.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/capella.yaml new file mode 100644 index 00000000000..86dd7fa5f7e --- /dev/null +++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/capella.yaml @@ -0,0 +1,24 @@ +# Mainnet preset - Capella + +# Misc +# --------------------------------------------------------------- +# 2**8 (= 256) withdrawals +MAX_PARTIAL_WITHDRAWALS_PER_EPOCH: 256 + + +# State list lengths +# --------------------------------------------------------------- +# 2**40 (= 1,099,511,627,776) withdrawals +WITHDRAWAL_QUEUE_LIMIT: 1099511627776 + + +# Max operations per block +# --------------------------------------------------------------- +# 2**4 (= 16) +MAX_BLS_TO_EXECUTION_CHANGES: 16 + + +# Execution +# --------------------------------------------------------------- +# 2**4 (= 16) withdrawals +MAX_WITHDRAWALS_PER_PAYLOAD: 16 \ No newline at end of file diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/capella.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/capella.yaml new file mode 100644 index 00000000000..a494ea75951 --- /dev/null +++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/capella.yaml @@ -0,0 +1,26 @@ + + +# Minimal preset - Capella + +# Misc +# --------------------------------------------------------------- +# [customized] 16 for more interesting tests at low validator count +MAX_PARTIAL_WITHDRAWALS_PER_EPOCH: 16 + + +# State list lengths +# --------------------------------------------------------------- +# 2**40 (= 1,099,511,627,776) withdrawals +WITHDRAWAL_QUEUE_LIMIT: 1099511627776 + + +# Max operations per block +# --------------------------------------------------------------- +# 2**4 (= 16) +MAX_BLS_TO_EXECUTION_CHANGES: 16 + + +# Execution +# --------------------------------------------------------------- +# [customized] Lower than MAX_PARTIAL_WITHDRAWALS_PER_EPOCH so not all processed in one block +MAX_WITHDRAWALS_PER_PAYLOAD: 8 \ No newline at end of file diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/capella.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/capella.yaml new file mode 100644 index 00000000000..5da3257b91c --- /dev/null +++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/capella.yaml @@ -0,0 +1,24 @@ +# Minimal preset - Capella + +# Misc +# --------------------------------------------------------------- +# [customized] 16 for more interesting tests at low validator count +MAX_PARTIAL_WITHDRAWALS_PER_EPOCH: 16 + + +# State list lengths +# --------------------------------------------------------------- +# 2**40 (= 1,099,511,627,776) withdrawals +WITHDRAWAL_QUEUE_LIMIT: 1099511627776 + + +# Max operations per block +# --------------------------------------------------------------- +# 2**4 (= 16) +MAX_BLS_TO_EXECUTION_CHANGES: 16 + + +# Execution +# --------------------------------------------------------------- +# [customized] Lower than MAX_PARTIAL_WITHDRAWALS_PER_EPOCH so not all processed in one block +MAX_WITHDRAWALS_PER_PAYLOAD: 8 \ No newline at end of file diff --git a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/minimal.yaml b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/minimal.yaml index de38e790e6c..44b99f1f883 100644 --- a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/minimal.yaml +++ b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/minimal.yaml @@ -26,8 +26,11 @@ ALTAIR_FORK_EPOCH: 18446744073709551615 # Bellatrix BELLATRIX_FORK_VERSION: 0x02000001 BELLATRIX_FORK_EPOCH: 18446744073709551615 +# Capella +CAPELLA_FORK_VERSION: 0x03000001 +CAPELLA_FORK_EPOCH: 18446744073709551615 # Sharding -SHARDING_FORK_VERSION: 0x03000001 +SHARDING_FORK_VERSION: 0x04000001 SHARDING_FORK_EPOCH: 18446744073709551615 # Transition diff --git a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/mainnet/capella.yaml b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/mainnet/capella.yaml new file mode 100644 index 00000000000..86dd7fa5f7e --- /dev/null +++ b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/mainnet/capella.yaml @@ -0,0 +1,24 @@ +# Mainnet preset - Capella + +# Misc +# --------------------------------------------------------------- +# 2**8 (= 256) withdrawals +MAX_PARTIAL_WITHDRAWALS_PER_EPOCH: 256 + + +# State list lengths +# --------------------------------------------------------------- +# 2**40 (= 1,099,511,627,776) withdrawals +WITHDRAWAL_QUEUE_LIMIT: 1099511627776 + + +# Max operations per block +# --------------------------------------------------------------- +# 2**4 (= 16) +MAX_BLS_TO_EXECUTION_CHANGES: 16 + + +# Execution +# --------------------------------------------------------------- +# 2**4 (= 16) withdrawals +MAX_WITHDRAWALS_PER_PAYLOAD: 16 \ No newline at end of file diff --git a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/minimal/capella.yaml b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/minimal/capella.yaml new file mode 100644 index 00000000000..5da3257b91c --- /dev/null +++ b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/minimal/capella.yaml @@ -0,0 +1,24 @@ +# Minimal preset - Capella + +# Misc +# --------------------------------------------------------------- +# [customized] 16 for more interesting tests at low validator count +MAX_PARTIAL_WITHDRAWALS_PER_EPOCH: 16 + + +# State list lengths +# --------------------------------------------------------------- +# 2**40 (= 1,099,511,627,776) withdrawals +WITHDRAWAL_QUEUE_LIMIT: 1099511627776 + + +# Max operations per block +# --------------------------------------------------------------- +# 2**4 (= 16) +MAX_BLS_TO_EXECUTION_CHANGES: 16 + + +# Execution +# --------------------------------------------------------------- +# [customized] Lower than MAX_PARTIAL_WITHDRAWALS_PER_EPOCH so not all processed in one block +MAX_WITHDRAWALS_PER_PAYLOAD: 8 \ No newline at end of file diff --git a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/capella.yaml b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/capella.yaml new file mode 100644 index 00000000000..5da3257b91c --- /dev/null +++ b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/capella.yaml @@ -0,0 +1,24 @@ +# Minimal preset - Capella + +# Misc +# --------------------------------------------------------------- +# [customized] 16 for more interesting tests at low validator count +MAX_PARTIAL_WITHDRAWALS_PER_EPOCH: 16 + + +# State list lengths +# --------------------------------------------------------------- +# 2**40 (= 1,099,511,627,776) withdrawals +WITHDRAWAL_QUEUE_LIMIT: 1099511627776 + + +# Max operations per block +# --------------------------------------------------------------- +# 2**4 (= 16) +MAX_BLS_TO_EXECUTION_CHANGES: 16 + + +# Execution +# --------------------------------------------------------------- +# [customized] Lower than MAX_PARTIAL_WITHDRAWALS_PER_EPOCH so not all processed in one block +MAX_WITHDRAWALS_PER_PAYLOAD: 8 \ No newline at end of file