Merge pull request #426 from ethereum/update_chain_configs

Update testnet chain configs
ethereum · Nov 26, 2024 · 5ce328c · 5ce328c
2 parents 639ccb2 + 26146a7
commit 5ce328c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -349,10 +349,10 @@ You can also run the tool with optional arguments:
 docker run -it --rm -v $(pwd)/validator_keys:/app/validator_keys ethereum/staking-deposit-cli new-mnemonic --num_validators=<NUM_VALIDATORS> --mnemonic_language=english --folder=<YOUR_FOLDER_PATH>
 ```
 
-Example for 1 validator on the [Prater testnet](https://prater.launchpad.ethereum.org/) using english:
+Example for 1 validator on the [Holesky testnet](https://holesky.launchpad.ethereum.org/) using english:
 
 ```sh
-docker run -it --rm -v $(pwd)/validator_keys:/app/validator_keys ethereum/staking-deposit-cli new-mnemonic --num_validators=1 --mnemonic_language=english --chain=prater
+docker run -it --rm -v $(pwd)/validator_keys:/app/validator_keys ethereum/staking-deposit-cli new-mnemonic --num_validators=1 --mnemonic_language=english --chain=holesky
 ```
 
 ###### Arguments

diff --git a/staking_deposit/cli/generate_bls_to_execution_change.py b/staking_deposit/cli/generate_bls_to_execution_change.py
@@ -36,7 +36,6 @@
 from staking_deposit.settings import (
     ALL_CHAINS,
     MAINNET,
-    PRATER,
     get_chain_setting,
     get_devnet_chain_setting,
 )
@@ -74,8 +73,7 @@ def get_password(text: str) -> str:
     param_decls='--chain',
     prompt=choice_prompt_func(
         lambda: load_text(['arg_chain', 'prompt'], func=FUNC_NAME),
-        # Since `prater` is alias of `goerli`, do not show `prater` in the prompt message.
-        list(key for key in ALL_CHAINS.keys() if key != PRATER)
+        list(ALL_CHAINS.keys())
     ),
 )
 @load_mnemonic_arguments_decorator

diff --git a/staking_deposit/cli/generate_keys.py b/staking_deposit/cli/generate_keys.py
@@ -33,7 +33,6 @@
 from staking_deposit.settings import (
     ALL_CHAINS,
     MAINNET,
-    PRATER,
     get_chain_setting,
 )
 
@@ -76,8 +75,7 @@ def generate_keys_arguments_decorator(function: Callable[..., Any]) -> Callable[
             param_decls='--chain',
             prompt=choice_prompt_func(
                 lambda: load_text(['chain', 'prompt'], func='generate_keys_arguments_decorator'),
-                # Since `prater` is alias of `goerli`, do not show `prater` in the prompt message.
-                list(key for key in ALL_CHAINS.keys() if key != PRATER)
+                list(ALL_CHAINS.keys())
             ),
         ),
         jit_option(

diff --git a/staking_deposit/settings.py b/staking_deposit/settings.py
@@ -11,41 +11,33 @@ class BaseChainSetting(NamedTuple):
 
 
 MAINNET = 'mainnet'
-GOERLI = 'goerli'
-PRATER = 'prater'
 SEPOLIA = 'sepolia'
-ZHEJIANG = 'zhejiang'
 HOLESKY = 'holesky'
+MEKONG = 'mekong'
 
 # Mainnet setting
 MainnetSetting = BaseChainSetting(
     NETWORK_NAME=MAINNET, GENESIS_FORK_VERSION=bytes.fromhex('00000000'),
     GENESIS_VALIDATORS_ROOT=bytes.fromhex('4b363db94e286120d76eb905340fdd4e54bfe9f06bf33ff6cf5ad27f511bfe95'))
-# Goerli setting
-GoerliSetting = BaseChainSetting(
-    NETWORK_NAME=GOERLI, GENESIS_FORK_VERSION=bytes.fromhex('00001020'),
-    GENESIS_VALIDATORS_ROOT=bytes.fromhex('043db0d9a83813551ee2f33450d23797757d430911a9320530ad8a0eabc43efb'))
 # Sepolia setting
 SepoliaSetting = BaseChainSetting(
     NETWORK_NAME=SEPOLIA, GENESIS_FORK_VERSION=bytes.fromhex('90000069'),
     GENESIS_VALIDATORS_ROOT=bytes.fromhex('d8ea171f3c94aea21ebc42a1ed61052acf3f9209c00e4efbaaddac09ed9b8078'))
-# Zhejiang setting
-ZhejiangSetting = BaseChainSetting(
-    NETWORK_NAME=ZHEJIANG, GENESIS_FORK_VERSION=bytes.fromhex('00000069'),
-    GENESIS_VALIDATORS_ROOT=bytes.fromhex('53a92d8f2bb1d85f62d16a156e6ebcd1bcaba652d0900b2c2f387826f3481f6f'))
 # Holesky setting
 HoleskySetting = BaseChainSetting(
     NETWORK_NAME=HOLESKY, GENESIS_FORK_VERSION=bytes.fromhex('01017000'),
     GENESIS_VALIDATORS_ROOT=bytes.fromhex('9143aa7c615a7f7115e2b6aac319c03529df8242ae705fba9df39b79c59fa8b1'))
+# Mekong setting
+MekongSetting = BaseChainSetting(
+    NETWORK_NAME=MEKONG, GENESIS_FORK_VERSION=bytes.fromhex('10637624'),
+    GENESIS_VALIDATORS_ROOT=bytes.fromhex('9838240bca889c52818d7502179b393a828f61f15119d9027827c36caeb67db7'))
 
 
 ALL_CHAINS: Dict[str, BaseChainSetting] = {
     MAINNET: MainnetSetting,
-    GOERLI: GoerliSetting,
-    PRATER: GoerliSetting,  # Prater is the old name of the Prater/Goerli testnet
     SEPOLIA: SepoliaSetting,
-    ZHEJIANG: ZhejiangSetting,
     HOLESKY: HoleskySetting,
+    MEKONG: MekongSetting,
 }