diff --git a/beem/asset.py b/beem/asset.py index 1a025f14d0ddf981e3f7ca613239d2e0110090d7..f6ad84af76b6e2c4659f4049b97d859817dee56e 100644 --- a/beem/asset.py +++ b/beem/asset.py @@ -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"]: diff --git a/beem/cli.py b/beem/cli.py index 8b7804511847783ce02bc69e1720bcb46893f476..10360164bac9de09d2f8f2cbdc5fab0fb888f4e2 100644 --- a/beem/cli.py +++ b/beem/cli.py @@ -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": diff --git a/beem/steem.py b/beem/steem.py index 92e81e1c2e3fe6fc6f2513d6dfa4b604744f96aa..436d003840c531a28c720dfe0a86340cddbc2414 100644 --- a/beem/steem.py +++ b/beem/steem.py @@ -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: diff --git a/beem/version.py b/beem/version.py index f9cf1ab874175fecf2d3d854983a031a3127988d..2438e231cc2916012884b67ffe81206bab59c822 100644 --- a/beem/version.py +++ b/beem/version.py @@ -1,2 +1,2 @@ """THIS FILE IS GENERATED FROM beem SETUP.PY.""" -version = '0.20.19' +version = '0.20.20' diff --git a/beemapi/version.py b/beemapi/version.py index f9cf1ab874175fecf2d3d854983a031a3127988d..2438e231cc2916012884b67ffe81206bab59c822 100644 --- a/beemapi/version.py +++ b/beemapi/version.py @@ -1,2 +1,2 @@ """THIS FILE IS GENERATED FROM beem SETUP.PY.""" -version = '0.20.19' +version = '0.20.20' diff --git a/beembase/version.py b/beembase/version.py index f9cf1ab874175fecf2d3d854983a031a3127988d..2438e231cc2916012884b67ffe81206bab59c822 100644 --- a/beembase/version.py +++ b/beembase/version.py @@ -1,2 +1,2 @@ """THIS FILE IS GENERATED FROM beem SETUP.PY.""" -version = '0.20.19' +version = '0.20.20' diff --git a/beemgraphenebase/version.py b/beemgraphenebase/version.py index f9cf1ab874175fecf2d3d854983a031a3127988d..2438e231cc2916012884b67ffe81206bab59c822 100644 --- a/beemgraphenebase/version.py +++ b/beemgraphenebase/version.py @@ -1,2 +1,2 @@ """THIS FILE IS GENERATED FROM beem SETUP.PY.""" -version = '0.20.19' +version = '0.20.20' diff --git a/setup.py b/setup.py index ac09702fc7d198438564981f6147dd361ac1b03b..ed43a4b8f769bf25f430255e62f7cec5406f0565 100755 --- a/setup.py +++ b/setup.py @@ -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']