Merge pull request #251 from ethereum/version_bump

Version bump -> V2.1.0
ethereum · Mar 29, 2022 · bb3ae3b · bb3ae3b
2 parents a55514b + 5e343d4
commit bb3ae3b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@
 
 ## Introduction
 
-`deposit-cli` is a tool for creating [EIP-2335 format](https://eips.ethereum.org/EIPS/eip-2335) BLS12-381 keystores and a corresponding `deposit_data*.json` file for [Ethereum 2.0 Launchpad](https://github.com/ethereum/staking-launchpad).
+`deposit-cli` is a tool for creating [EIP-2335 format](https://eips.ethereum.org/EIPS/eip-2335) BLS12-381 keystores and a corresponding `deposit_data*.json` file for [Ethereum Staking Launchpad](https://github.com/ethereum/staking-launchpad).
 
 - **Warning: Please generate your keystores on your own safe, completely offline device.**
 - **Warning: Please backup your mnemonic, keystores, and password securely.**
@@ -94,7 +94,7 @@ On Unix-based systems, keystores and the `deposit_data*.json` have `440`/`-r--r-
 
 ##### Step 1. Installation
 
-See [releases page](https://github.com/ethereum/eth2.0-deposit-cli/releases) to download and decompress the corresponding binary files.
+See [releases page](https://github.com/ethereum/staking-deposit-cli/releases) to download and decompress the corresponding binary files.
 
 ##### Step 2. Create keys and `deposit_data-*.json`
 
@@ -338,7 +338,7 @@ See [here](#successful-message)
 
 ##### Step 1. Installation
 
-See [releases page](https://github.com/ethereum/eth2.0-deposit-cli/releases) to download and decompress the corresponding binary files.
+See [releases page](https://github.com/ethereum/staking-deposit-cli/releases) to download and decompress the corresponding binary files.
 
 ##### Step 2. Create keys and `deposit_data-*.json`
 

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

diff --git a/staking_deposit/key_handling/key_derivation/mnemonic.py b/staking_deposit/key_handling/key_derivation/mnemonic.py
@@ -111,13 +111,13 @@ def reconstruct_mnemonic(mnemonic: str, words_path: str) -> Optional[str]:
     reconstructed_mnemonic = None
     for language in languages:
         try:
-            word_list = abbreviate_words(_get_word_list(language, words_path))
-            mnemonic_list = abbreviate_words(mnemonic.lower().split(' '))
-            if len(mnemonic_list) not in range(12, 25, 3):
+            abbrev_word_list = abbreviate_words(_get_word_list(language, words_path))
+            abbrev_mnemonic_list = abbreviate_words(mnemonic.lower().split(' '))
+            if len(abbrev_mnemonic_list) not in range(12, 25, 3):
                 return None
-            word_indices = [_word_to_index(word_list, word) for word in mnemonic_list]
+            word_indices = [_word_to_index(abbrev_word_list, word) for word in abbrev_mnemonic_list]
             mnemonic_int = _uint11_array_to_uint(word_indices)
-            checksum_length = len(mnemonic_list) // 3
+            checksum_length = len(abbrev_mnemonic_list) // 3
             checksum = mnemonic_int & 2**checksum_length - 1
             entropy = (mnemonic_int - checksum) >> checksum_length
             entropy_bits = entropy.to_bytes(checksum_length * 4, 'big')

diff --git a/staking_deposit/settings.py b/staking_deposit/settings.py
@@ -1,7 +1,7 @@
 from typing import Dict, NamedTuple
 
 
-DEPOSIT_CLI_VERSION = '2.0.0'
+DEPOSIT_CLI_VERSION = '2.1.0'
 
 
 class BaseChainSetting(NamedTuple):