Merge pull request #189 from ethereum/prater_testnet

* Adds Prater Testnet Support * Removes support for old testnets (Witti, Altona, Medalla, Spadina, Zinken)
ethereum · Mar 22, 2021 · 32c60c0 · 32c60c0
2 parents d45d894 + 388191d
commit 32c60c0
Show file tree

Hide file tree

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

diff --git a/eth2deposit/settings.py b/eth2deposit/settings.py
@@ -1,7 +1,7 @@
 from typing import Dict, NamedTuple
 
 
-DEPOSIT_CLI_VERSION = '1.1.0'
+DEPOSIT_CLI_VERSION = '1.1.1'
 
 
 class BaseChainSetting(NamedTuple):
@@ -10,38 +10,22 @@ class BaseChainSetting(NamedTuple):
 
 
 MAINNET = 'mainnet'
-WITTI = 'witti'
-ALTONA = 'altona'
-MEDALLA = 'medalla'
-SPADINA = 'spadina'
-ZINKEN = 'zinken'
 PYRMONT = 'pyrmont'
+PRATER = 'prater'
 
 
 # Eth2 Mainnet setting
 MainnetSetting = BaseChainSetting(ETH2_NETWORK_NAME=MAINNET, GENESIS_FORK_VERSION=bytes.fromhex('00000000'))
-# Eth2 spec v0.11.3 testnet
-WittiSetting = BaseChainSetting(ETH2_NETWORK_NAME=WITTI, GENESIS_FORK_VERSION=bytes.fromhex('00000113'))
-# Eth2 spec v0.12.1 testnet
-AltonaSetting = BaseChainSetting(ETH2_NETWORK_NAME=ALTONA, GENESIS_FORK_VERSION=bytes.fromhex('00000121'))
-# Eth2 "official" public testnet (spec v0.12.2)
-MedallaSetting = BaseChainSetting(ETH2_NETWORK_NAME=MEDALLA, GENESIS_FORK_VERSION=bytes.fromhex('00000001'))
-# Eth2 "dress rehearsal" testnet (spec v0.12.3)
-SpadinaSetting = BaseChainSetting(ETH2_NETWORK_NAME=SPADINA, GENESIS_FORK_VERSION=bytes.fromhex('00000002'))
-# Eth2 "dress rehearsal" testnet (spec v0.12.3)
-ZinkenSetting = BaseChainSetting(ETH2_NETWORK_NAME=ZINKEN, GENESIS_FORK_VERSION=bytes.fromhex('00000003'))
 # Eth2 pre-launch testnet (spec v1.0.0)
 PyrmontSetting = BaseChainSetting(ETH2_NETWORK_NAME=PYRMONT, GENESIS_FORK_VERSION=bytes.fromhex('00002009'))
+# Eth2 testnet (spec v1.0.1)
+PraterSetting = BaseChainSetting(ETH2_NETWORK_NAME=PRATER, GENESIS_FORK_VERSION=bytes.fromhex('00001020'))
 
 
 ALL_CHAINS: Dict[str, BaseChainSetting] = {
     MAINNET: MainnetSetting,
-    WITTI: WittiSetting,
-    ALTONA: AltonaSetting,
-    MEDALLA: MedallaSetting,
-    SPADINA: SpadinaSetting,
-    ZINKEN: ZinkenSetting,
     PYRMONT: PyrmontSetting,
+    PRATER: PraterSetting,
 }
 
 

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name="eth2deposit",
-    version='1.1.0',
+    version='1.1.1',
     py_modules=["eth2deposit"],
     packages=find_packages(exclude=('tests', 'docs')),
     python_requires=">=3.7,<4",

diff --git a/tests/test_credentials.py b/tests/test_credentials.py
@@ -1,7 +1,7 @@
 import pytest
 
 from eth2deposit.credentials import CredentialList
-from eth2deposit.settings import MedallaSetting
+from eth2deposit.settings import MainnetSetting
 
 
 def test_from_mnemonic() -> None:
@@ -11,6 +11,6 @@ def test_from_mnemonic() -> None:
             mnemonic_password="",
             num_keys=1,
             amounts=[32, 32],
-            chain_setting=MedallaSetting,
+            chain_setting=MainnetSetting,
             start_index=1,
         )