Skip to content

Commit

Permalink
Will specifically mentioned keystore files with pbkdf2 option
Browse files Browse the repository at this point in the history
  • Loading branch information
valefar-on-discord committed May 9, 2024
1 parent 59cdf2f commit c75123b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ You can use `new-mnemonic --help` to see all arguments. Note that if there are m
| `--folder` | String. Pointing to `./validator_keys` by default | The folder path for the keystore(s) and deposit(s) |
| `--chain` | String. `mainnet` by default | The chain setting for the signing domain. |
| `--execution_address` (or `--eth1_withdrawal_address`) | String. Eth1 address in hexadecimal encoded form | If this field is set and valid, the given Eth1 address will be used to create the withdrawal credentials. Otherwise, it will generate withdrawal credentials with the mnemonic-derived withdrawal public key in [ERC-2334 format](https://eips.ethereum.org/EIPS/eip-2334#eth2-specific-parameters). |
| `--pbkdf2` | Flag | Will use pbkdf2 key derivation instead of scrypt as defined in EIP-2335. This can be a good alternative if you intend to work with a large number of keys. |
| `--pbkdf2` | Flag | Will use pbkdf2 key derivation instead of scrypt for generated keystore files as defined in EIP-2335. This can be a good alternative if you intend to work with a large number of keys. |

###### `existing-mnemonic` Arguments

Expand All @@ -165,7 +165,7 @@ You can use `existing-mnemonic --help` to see all arguments. Note that if there
| `--folder` | String. Pointing to `./validator_keys` by default | The folder path for the keystore(s) and deposit(s) |
| `--chain` | String. `mainnet` by default | The chain setting for the signing domain. |
| `--execution_address` (or `--eth1_withdrawal_address`) | String. Eth1 address in hexadecimal encoded form | If this field is set and valid, the given Eth1 address will be used to create the withdrawal credentials. Otherwise, it will generate withdrawal credentials with the mnemonic-derived withdrawal public key in [ERC-2334 format](https://eips.ethereum.org/EIPS/eip-2334#eth2-specific-parameters). |
| `--pbkdf2` | Flag | Will use pbkdf2 key derivation instead of scrypt as defined in EIP-2335. This can be a good alternative if you intend to work with a large number of keys. |
| `--pbkdf2` | Flag | Will use pbkdf2 key derivation instead of scrypt for generated keystore files as defined in EIP-2335. This can be a good alternative if you intend to work with a large number of keys. |

###### Successful message

Expand Down
2 changes: 1 addition & 1 deletion staking_deposit/cli/generate_keys.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def generate_keys_arguments_decorator(function: Callable[..., Any]) -> Callable[
default=False,
is_flag=True,
param_decls='--pbkdf2',
help='Uses the pbkdf2 encryption method instead of scrypt.',
help=lambda: load_text(['arg_pbkdf2', 'help'], func='generate_keys_arguments_decorator'),
),
]
for decorator in reversed(decorators):
Expand Down
3 changes: 3 additions & 0 deletions staking_deposit/intl/en/cli/generate_keys.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
"prompt": "Please enter the optional 20-byte execution address for the new withdrawal credentials. Note that you CANNOT change it once you have set it on chain.",
"confirm": "Repeat your execution address for confirmation.",
"mismatch": "Error: the two entered values do not match. Please type again."
},
"arg_pbkdf2": {
"help": "Uses the pbkdf2 hashing function instead of scrypt for generated keystore files. "
}
},
"generate_keys": {
Expand Down

0 comments on commit c75123b

Please sign in to comment.