Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ensure geth --dev accounts are always unlocked

pull/1124/head
Kieran Prasch 2019-07-17 13:43:22 -07:00
parent 0b52cd2c74
commit b37a899c6b
No known key found for this signature in database
GPG Key ID: 199AB839D4125A62
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nucypher/blockchain/eth/actors.py
View File

@ -824,7 +824,7 @@ class StakeHolder(BaseConfiguration):
password=password, password=password,
account=checksum_address) account=checksum_address)
self.__transacting_powers[checksum_address] = transacting_power self.__transacting_powers[checksum_address] = transacting_power
transacting_power.activate() transacting_power.activate(password=password)
def to_configuration_file(self, *args, **kwargs) -> str: def to_configuration_file(self, *args, **kwargs) -> str:
filepath = super().to_configuration_file(modifier=self.funding_account, *args, **kwargs) filepath = super().to_configuration_file(modifier=self.funding_account, *args, **kwargs)

4
nucypher/blockchain/eth/clients.py
View File

@ -277,6 +277,10 @@ class GethClient(Web3Client):
return to_checksum_address(new_account) # cast and validate return to_checksum_address(new_account) # cast and validate
def unlock_account(self, address, password): def unlock_account(self, address, password):
if self.is_local:
# TODO: Is there a more formalized check here for geth --dev mode?
# Geth --dev accounts are unlocked by default.
return True
return self.w3.geth.personal.unlockAccount(address, password) return self.w3.geth.personal.unlockAccount(address, password)
def sign_transaction(self, transaction: dict) -> bytes: def sign_transaction(self, transaction: dict) -> bytes:

5
nucypher/cli/stake.py
View File

@ -170,7 +170,8 @@ def stake(click_config,
choice = click.prompt("Select staking account, or enter 'c' to derive a new one", default='c') choice = click.prompt("Select staking account, or enter 'c' to derive a new one", default='c')
if choice == 'c': if choice == 'c':
click.confirm("Create new ethereum account for staking?", abort=True) click.confirm("Create new ethereum account for staking?", abort=True)
password = click.prompt("Enter new account password", hide_input=True, confirmation_prompt=True) if not device:
password = click.prompt("Enter new account password", hide_input=True, confirmation_prompt=True)
staking_address = None # signals to create an account later staking_address = None # signals to create an account later
else: else:
try: try:
@ -178,7 +179,7 @@ def stake(click_config,
except KeyError: except KeyError:
raise click.BadParameter(f"'{choice}' is not a valid command.") raise click.BadParameter(f"'{choice}' is not a valid command.")
if not password: if not password and not device:
password = click.prompt(f"Enter password to unlock {staking_address}", password = click.prompt(f"Enter password to unlock {staking_address}",
hide_input=True, hide_input=True,
confirmation_prompt=False) confirmation_prompt=False)