Skip to content
Snippets Groups Projects
Commit 4a85f376 authored by Holger's avatar Holger
Browse files

Fix issue #162 - one-time use private key can be entered instead of unlocking the wallet

* prepare next beem release and increase version number
* switch default chain to STEEMAPPBASE
parent 562ea7e4
No related branches found
No related tags found
No related merge requests found
......@@ -46,7 +46,7 @@ class Asset(BlockchainObject):
self.chain_params = self.steem.get_network()
if self.chain_params is None:
from beemgraphenebase.chains import known_chains
self.chain_params = known_chains["STEEM"]
self.chain_params = known_chains["STEEMAPPBASE"]
self["asset"] = ""
found_asset = False
for asset in self.chain_params["chain_assets"]:
......
......@@ -109,8 +109,16 @@ def unlock_wallet(stm, password=None):
if bool(password):
stm.wallet.unlock(password)
else:
password = click.prompt("Password to unlock wallet", confirmation_prompt=False, hide_input=True)
stm.wallet.unlock(password)
password = click.prompt("Password to unlock wallet or posting/active wif", confirmation_prompt=False, hide_input=True)
try:
stm.wallet.unlock(password)
except:
try:
stm.wallet.setKeys([password])
print("Wif accepted!")
return True
except:
raise exceptions.WrongMasterPasswordException("entered password is not a valid password/wif")
if stm.wallet.locked():
if password_storage == "keyring" or password_storage == "environment":
......
......@@ -418,7 +418,7 @@ class Steem(object):
try:
return self.rpc.get_network()
except:
return known_chains["STEEM"]
return known_chains["STEEMAPPBASE"]
def get_median_price(self, use_stored_data=True):
""" Returns the current median history price as Price
......@@ -536,6 +536,9 @@ class Steem(object):
STEEM per MVEST ratio for the given time stamp. If unset the
current ratio is returned (default). (can also be a datetime object)
"""
if self.offline and time_stamp is None:
time_stamp =datetime.utcnow()
if time_stamp is not None:
if isinstance(time_stamp, (datetime, date)):
time_stamp = formatToTimeStamp(time_stamp)
......@@ -803,14 +806,14 @@ class Steem(object):
@property
def chain_params(self):
if self.offline or self.rpc is None:
return known_chains["STEEM"]
return known_chains["STEEMAPPBASE"]
else:
return self.get_network()
@property
def hardfork(self):
if self.offline or self.rpc is None:
versions = known_chains['STEEM']['min_version']
versions = known_chains['STEEMAPPBASE']['min_version']
else:
hf_prop = self.get_hardfork_properties()
if "current_hardfork_version" in hf_prop:
......
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
version = '0.20.19'
version = '0.20.20'
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
version = '0.20.19'
version = '0.20.20'
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
version = '0.20.19'
version = '0.20.20'
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
version = '0.20.19'
version = '0.20.20'
......@@ -16,7 +16,7 @@ except LookupError:
ascii = codecs.lookup('ascii')
codecs.register(lambda name, enc=ascii: {True: enc}.get(name == 'mbcs'))
VERSION = '0.20.19'
VERSION = '0.20.20'
tests_require = ['mock >= 2.0.0', 'pytest', 'pytest-mock', 'parameterized']
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment