diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4da27b6089ca23182eb932bba5a2ba1585a51551..e97c69c7d92d5bae4f389cd3cfbd9565c203843a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,9 @@ Changelog ========= +0.22.5 +------ +* Add workaround to allow transfers of HIVE/HBD in HIVE (operation need to use STEEM/SBD internally) + 0.22.4 ------ * fix AttributeError: 'PointJacobi' object has no attribute '_Point__x' diff --git a/beem/amount.py b/beem/amount.py index b596041adee95ed54b7e9bac784452df2518a578..7161043d59a355dc66988e6ae4a424a927ee7f74 100644 --- a/beem/amount.py +++ b/beem/amount.py @@ -211,9 +211,16 @@ class Amount(dict): def __str__(self): amount = quantize(self["amount"], self["asset"]["precision"]) + symbol = self["symbol"] + if self.steem.is_hive: + # Workaround to allow transfers in HIVE + if symbol == "HBD": + symbol = "SBD" + elif symbol == "HIVE": + symbol = "STEEM" return "{:.{prec}f} {}".format( amount, - self["symbol"], + symbol, prec=self["asset"]["precision"] ) diff --git a/beem/cli.py b/beem/cli.py index 281d8b136ddbc1f66577201774b6d704edc6db37..fac21de4e6aea14da917cc3af51c4aed81b8e275 100644 --- a/beem/cli.py +++ b/beem/cli.py @@ -86,8 +86,8 @@ def prompt_callback(ctx, param, value): def asset_callback(ctx, param, value): - if value not in ["STEEM", "SBD"]: - print("Please STEEM or SBD as asset!") + if value not in ["STEEM", "SBD", "HIVE", "HBD"]: + print("Please STEEM/HIVE or SBD/HBD as asset!") ctx.abort() else: return value @@ -829,7 +829,7 @@ def downvote(post, account, weight): @click.argument('memo', nargs=1, required=False) @click.option('--account', '-a', help='Transfer from this account') def transfer(to, amount, asset, memo, account): - """Transfer SBD/STEEM""" + """Transfer SBD/HD STEEM/HIVE""" stm = shared_steem_instance() if stm.rpc is not None: stm.rpc.rpcconnect() diff --git a/beem/version.py b/beem/version.py index a133bcab736647b788f5894cf95d316e536b7144..f978e84135ce4c9fe7965a86bd1cdb1bf837dfc0 100644 --- a/beem/version.py +++ b/beem/version.py @@ -1,2 +1,2 @@ """THIS FILE IS GENERATED FROM beem SETUP.PY.""" -version = '0.22.3' +version = '0.22.5' diff --git a/beemapi/version.py b/beemapi/version.py index a133bcab736647b788f5894cf95d316e536b7144..f978e84135ce4c9fe7965a86bd1cdb1bf837dfc0 100644 --- a/beemapi/version.py +++ b/beemapi/version.py @@ -1,2 +1,2 @@ """THIS FILE IS GENERATED FROM beem SETUP.PY.""" -version = '0.22.3' +version = '0.22.5' diff --git a/beembase/version.py b/beembase/version.py index a133bcab736647b788f5894cf95d316e536b7144..f978e84135ce4c9fe7965a86bd1cdb1bf837dfc0 100644 --- a/beembase/version.py +++ b/beembase/version.py @@ -1,2 +1,2 @@ """THIS FILE IS GENERATED FROM beem SETUP.PY.""" -version = '0.22.3' +version = '0.22.5' diff --git a/beemgraphenebase/version.py b/beemgraphenebase/version.py index a133bcab736647b788f5894cf95d316e536b7144..f978e84135ce4c9fe7965a86bd1cdb1bf837dfc0 100644 --- a/beemgraphenebase/version.py +++ b/beemgraphenebase/version.py @@ -1,2 +1,2 @@ """THIS FILE IS GENERATED FROM beem SETUP.PY.""" -version = '0.22.3' +version = '0.22.5' diff --git a/setup.py b/setup.py index 25d34db5054c74640480d549ecf6cd911ad1ce69..f13ea5acf275a7dffba3aae0ed1cfd1f1b10c7b1 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.22.4' +VERSION = '0.22.5' tests_require = ['mock >= 2.0.0', 'pytest', 'pytest-mock', 'parameterized']