Release version 2.3.0

.circleci/config.yml

@@ -245,7 +245,7 @@ jobs:
           path: /tmp/artifacts
   build-macos:
     macos:
-      xcode: 12.4.0
+      xcode: 13.4.1
     working_directory: ~/repo
     steps:
       - run: xcodebuild -version

README.md

@@ -1,5 +1,7 @@
 # staking-deposit-cli
 
+[![GitPOAP Badge](https://public-api.gitpoap.io/v1/repo/ethereum/staking-deposit-cli/badge)](https://www.gitpoap.io/gh/ethereum/staking-deposit-cli)
+
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name="staking_deposit",
-    version='2.2.0',
+    version='2.3.0',
     py_modules=["staking_deposit"],
     packages=find_packages(exclude=('tests', 'docs')),
     python_requires=">=3.8,<4",

staking_deposit/cli/generate_keys.py

@@ -34,6 +34,7 @@
 from staking_deposit.settings import (
     ALL_CHAINS,
     MAINNET,
+    PRATER,
     get_chain_setting,
 )
 
@@ -87,7 +88,8 @@ 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'),
-                list(ALL_CHAINS.keys())
+                # 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)
             ),
         ),
         jit_option(

staking_deposit/settings.py

@@ -1,7 +1,7 @@
 from typing import Dict, NamedTuple
 
 
-DEPOSIT_CLI_VERSION = '2.2.0'
+DEPOSIT_CLI_VERSION = '2.3.0'
 
 
 class BaseChainSetting(NamedTuple):
@@ -10,30 +10,28 @@ class BaseChainSetting(NamedTuple):
 
 
 MAINNET = 'mainnet'
+ROPSTEN = 'ropsten'
+GOERLI = 'goerli'
 PRATER = 'prater'
-KINTSUGI = 'kintsugi'
 KILN = 'kiln'
-ROPSTEN = 'ropsten'
 
 
 # Mainnet setting
 MainnetSetting = BaseChainSetting(NETWORK_NAME=MAINNET, GENESIS_FORK_VERSION=bytes.fromhex('00000000'))
 # Ropsten setting
 RopstenSetting = BaseChainSetting(NETWORK_NAME=ROPSTEN, GENESIS_FORK_VERSION=bytes.fromhex('80000069'))
-# Testnet (spec v1.0.1)
-PraterSetting = BaseChainSetting(NETWORK_NAME=PRATER, GENESIS_FORK_VERSION=bytes.fromhex('00001020'))
-# Merge Testnet (spec v1.1.4)
-KintsugiSetting = BaseChainSetting(NETWORK_NAME=KINTSUGI, GENESIS_FORK_VERSION=bytes.fromhex('60000069'))
+# Goreli setting
+GoerliSetting = BaseChainSetting(NETWORK_NAME=GOERLI, GENESIS_FORK_VERSION=bytes.fromhex('00001020'))
 # Merge Testnet (spec v1.1.9)
 KilnSetting = BaseChainSetting(NETWORK_NAME=KILN, GENESIS_FORK_VERSION=bytes.fromhex('70000069'))
 
 
 ALL_CHAINS: Dict[str, BaseChainSetting] = {
     MAINNET: MainnetSetting,
-    PRATER: PraterSetting,
-    KINTSUGI: KintsugiSetting,
-    KILN: KilnSetting,
     ROPSTEN: RopstenSetting,
+    GOERLI: GoerliSetting,
+    PRATER: GoerliSetting,  # Prater is the old name of the Prater/Goerli testnet
+    KILN: KilnSetting,
 }