diff --git a/CHANGELOG.rst b/CHANGELOG.rst index de363f7cd9ec3e0ba5995c9808de80e9f3734a81..d460350d9aff246bfe86382d1ac7398a950392ab 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,14 @@ Changelog ========= +0.20.8 +------ +* fix hardfork property in steem +* Fix resource_market_bytes calculation +* Adding additional parameter to recharge time calculations by flugschwein (PR #103) +* fix Comment reward calculations by crokkon (PR #105) +* Fix typo in witness update feed +* Fix appveyor CI + 0.20.7 ------ * Fix issue #97 `get_discussions()` does not finish if discussions are empty by espoem diff --git a/beem/account.py b/beem/account.py index a130fe5a8581e92e0db9f1109e0f74f251c70652..ae92617d78b685a11bb1147a8d4ee557b03d4ed4 100644 --- a/beem/account.py +++ b/beem/account.py @@ -1041,7 +1041,11 @@ class Account(BlockchainObject): """ account = self["name"] global_properties = self.steem.get_dynamic_global_properties() - reserve_ratio = self.steem.get_reserve_ratio() + try: + reserve_ratio = self.steem.get_reserve_ratio() + except: + return {"used": 0, + "allocated": 0} if "received_vesting_shares" in self: received_vesting_shares = self["received_vesting_shares"].amount else: diff --git a/beem/steem.py b/beem/steem.py index 7c19870728a96a065b148344516e7ceba40825cf..545a95f42b3b4e5d77f5114894b16c4761f52a52 100644 --- a/beem/steem.py +++ b/beem/steem.py @@ -193,7 +193,7 @@ class Steem(object): self.data = {'last_refresh': None, 'last_node': None, 'dynamic_global_properties': None, 'feed_history': None, 'get_feed_history': None, 'hardfork_properties': None, - 'network': None, 'witness_schedule': None, 'reserve_ratio': None, + 'network': None, 'witness_schedule': None, 'config': None, 'reward_funds': None} self.data_refresh_time_seconds = data_refresh_time_seconds # self.refresh_data() @@ -281,10 +281,6 @@ class Steem(object): self.data['witness_schedule'] = self.get_witness_schedule(False) self.data['config'] = self.get_config(False) self.data['reward_funds'] = self.get_reward_funds(False) - try: - self.data['reserve_ratio'] = self.get_reserve_ratio(False) - except: - self.data['reserve_ratio'] = None def get_dynamic_global_properties(self, use_stored_data=True): """ This call returns the *dynamic global properties* @@ -301,17 +297,9 @@ class Steem(object): self.rpc.set_next_node_on_empty_reply(True) return self.rpc.get_dynamic_global_properties(api="database") - def get_reserve_ratio(self, use_stored_data=True): + def get_reserve_ratio(self): """ This call returns the *reserve ratio* - - :param bool use_stored_data: if True, stored data will be returned. If stored data are - empty or old, refresh_data() is used. - """ - if use_stored_data: - self.refresh_data() - return self.data['reserve_ratio'] - if self.rpc is None: return None self.rpc.set_next_node_on_empty_reply(True) diff --git a/beem/version.py b/beem/version.py index 525fda0cb5f26702079326003692746ce5457e65..95450f794d95e941bc708eba3738c883d1991a09 100644 --- a/beem/version.py +++ b/beem/version.py @@ -1,2 +1,2 @@ """THIS FILE IS GENERATED FROM beem SETUP.PY.""" -version = '0.20.8' +version = '0.20.9' diff --git a/beemapi/version.py b/beemapi/version.py index 525fda0cb5f26702079326003692746ce5457e65..95450f794d95e941bc708eba3738c883d1991a09 100644 --- a/beemapi/version.py +++ b/beemapi/version.py @@ -1,2 +1,2 @@ """THIS FILE IS GENERATED FROM beem SETUP.PY.""" -version = '0.20.8' +version = '0.20.9' diff --git a/beembase/version.py b/beembase/version.py index 525fda0cb5f26702079326003692746ce5457e65..95450f794d95e941bc708eba3738c883d1991a09 100644 --- a/beembase/version.py +++ b/beembase/version.py @@ -1,2 +1,2 @@ """THIS FILE IS GENERATED FROM beem SETUP.PY.""" -version = '0.20.8' +version = '0.20.9' diff --git a/beemgraphenebase/version.py b/beemgraphenebase/version.py index 525fda0cb5f26702079326003692746ce5457e65..95450f794d95e941bc708eba3738c883d1991a09 100644 --- a/beemgraphenebase/version.py +++ b/beemgraphenebase/version.py @@ -1,2 +1,2 @@ """THIS FILE IS GENERATED FROM beem SETUP.PY.""" -version = '0.20.8' +version = '0.20.9' diff --git a/setup.py b/setup.py index 9e593c3b2ff402e84068a18396003b1592e49d8c..837fb2ce71581a284e79f1c7531a329e08f7ed10 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.8' +VERSION = '0.20.9' tests_require = ['mock >= 2.0.0', 'pytest', 'pytest-mock', 'parameterized'] diff --git a/tests/beem/test_steem.py b/tests/beem/test_steem.py index f0053772a09288eb2e47812800b9452316a14c03..df18e428184bc89158ab76428d634bbe9ca32c84 100644 --- a/tests/beem/test_steem.py +++ b/tests/beem/test_steem.py @@ -422,8 +422,6 @@ class Testcases(unittest.TestCase): data_refresh_time_seconds=900, keys={"active": wif, "owner": wif, "memo": wif}) bts.refresh_data() - self.assertTrue(bts.get_reserve_ratio(use_stored_data=False) is None) - self.assertTrue(bts.get_reserve_ratio(use_stored_data=True) is None) self.assertTrue(bts.get_feed_history(use_stored_data=False) is None) self.assertTrue(bts.get_feed_history(use_stored_data=True) is None) self.assertTrue(bts.get_reward_funds(use_stored_data=False) is None) @@ -458,7 +456,6 @@ class Testcases(unittest.TestCase): data_refresh_time_seconds=900, keys={"active": wif, "owner": wif, "memo": wif}, num_retries=10) - self.assertTrue(bts.get_reserve_ratio(use_stored_data=False) is not None) self.assertTrue(bts.get_feed_history(use_stored_data=False) is not None) self.assertTrue(bts.get_reward_funds(use_stored_data=False) is not None) self.assertTrue(bts.get_current_median_history(use_stored_data=False) is not None)