Merge pull request #372 from ethereum/dev

Release v2.6.0

Author: CarlBeek

.circleci/config.yml

@@ -5,18 +5,18 @@ tox_common: &tox_common
   steps:
     - checkout
     - restore_cache:
-        key: tox-deps3-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements_test.txt" }}-{{ checksum "setup.py" }}-{{ checksum "Makefile" }}
+        key: tox-deps4-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements_test.txt" }}-{{ checksum "setup.py" }}-{{ checksum "Makefile" }}
     - run:
         name: install dependencies
-        command: pip install --user tox
+        command: pip install tox
     - run:
         name: run tox
-        command: ~/.local/bin/tox
+        command: tox
     - save_cache:
         paths:
           - .tox
           - ./eggs
-        key: tox-deps3-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements_test.txt" }}-{{ checksum "setup.py" }}-{{ checksum "Makefile" }}
+        key: tox-deps4-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements_test.txt" }}-{{ checksum "setup.py" }}-{{ checksum "Makefile" }}
 
 orbs:
   win: circleci/[email protected] # The Windows orb give you everything you need to start using the Windows executor.          

setup.py

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

staking_deposit/settings.py

@@ -1,7 +1,7 @@
 from typing import Dict, NamedTuple
 from eth_utils import decode_hex
 
-DEPOSIT_CLI_VERSION = '2.5.0'
+DEPOSIT_CLI_VERSION = '2.6.0'
 
 
 class BaseChainSetting(NamedTuple):
@@ -15,6 +15,7 @@ class BaseChainSetting(NamedTuple):
 PRATER = 'prater'
 SEPOLIA = 'sepolia'
 ZHEJIANG = 'zhejiang'
+HOLESKY = 'holesky'
 
 # Mainnet setting
 MainnetSetting = BaseChainSetting(
@@ -32,6 +33,10 @@ class BaseChainSetting(NamedTuple):
 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('00017000'),
+    GENESIS_VALIDATORS_ROOT=bytes.fromhex('9143aa7c615a7f7115e2b6aac319c03529df8242ae705fba9df39b79c59fa8b1'))
 
 
 ALL_CHAINS: Dict[str, BaseChainSetting] = {
@@ -40,6 +45,7 @@ class BaseChainSetting(NamedTuple):
     PRATER: GoerliSetting,  # Prater is the old name of the Prater/Goerli testnet
     SEPOLIA: SepoliaSetting,
     ZHEJIANG: ZhejiangSetting,
+    HOLESKY: HoleskySetting,
 }