From 26c390eb7c554314679250d52f028be7ef57237e Mon Sep 17 00:00:00 2001 From: Carl Beekhuizen Date: Mon, 15 May 2023 16:03:27 -0600 Subject: [PATCH 1/3] Fix CircleCI tox env --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 797c0720..4804859e 100644 --- a/.circleci/config.yml +++ b/.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/windows@2.2.0 # The Windows orb give you everything you need to start using the Windows executor. From 0dda9829bbf8eecfa0639e457488808c732e73f4 Mon Sep 17 00:00:00 2001 From: Hsiao-Wei Wang Date: Tue, 22 Aug 2023 10:08:59 -0600 Subject: [PATCH 2/3] Add Holesky testnet --- staking_deposit/settings.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/staking_deposit/settings.py b/staking_deposit/settings.py index 9cd24d95..80ff5c68 100644 --- a/staking_deposit/settings.py +++ b/staking_deposit/settings.py @@ -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, } From 4ea123dd93b99c5116e36525a4e0f520b33a87e1 Mon Sep 17 00:00:00 2001 From: Carl Beekhuizen Date: Fri, 25 Aug 2023 12:35:50 -0600 Subject: [PATCH 3/3] Bump version number to 2.6.0 for release --- setup.py | 2 +- staking_deposit/settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 3f34b5be..a2e8827a 100644 --- a/setup.py +++ b/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", diff --git a/staking_deposit/settings.py b/staking_deposit/settings.py index 80ff5c68..85296efe 100644 --- a/staking_deposit/settings.py +++ b/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):