diff --git a/docs/conf.py b/docs/conf.py index 0463f38ad4b24c5605a62cd3a164ccde636ed90f..9dbff49c802cb23b2d6e9de56aa3a95199ab019f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -68,7 +68,7 @@ author = 'pharesim@protonmail.com' # The short X.Y version. version = '0.9' # The full version, including alpha/beta/rc tags. -release = '0.9.16' +release = '0.9.18' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/hive/__init__.py b/hive/__init__.py index 6d72900a0fd0c8dd56c2e27bcad2d0daf1d1bb9b..f2e54d9814877c871befd3383481913171d579b5 100644 --- a/hive/__init__.py +++ b/hive/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- from .hive import Hive -__version__ = '0.9.16' +__version__ = '0.9.18' diff --git a/hive/commit.py b/hive/commit.py index f12579789a0a10f0a12d081fe89b373594b2084c..34241e9cfee4cf0ba2a16710e40443ed490123ed 100644 --- a/hive/commit.py +++ b/hive/commit.py @@ -916,11 +916,16 @@ class Commit(object): reward_hbd = a['reward_sbd_balance'] reward_vests = a['reward_vesting_balance'] + if reward_hive[-4:] == 'HIVE': + reward_hive = reward_hive[:-4]+'STEEM' + if reward_hbd[-3:] == 'HBD': + reward_hbd = reward_hbd[:-3]+'SBD' + op = operations.ClaimRewardBalance( **{ "account": account, - "reward_hive": reward_hive, - "reward_hbd": reward_hbd, + "reward_steem": reward_hive, + "reward_sbd": reward_hbd, "reward_vests": reward_vests, }) return self.finalizeOp(op, account, "posting") diff --git a/hivebase/http_client.py b/hivebase/http_client.py index 094d1048f493e99cb66612aa74f8e476baab3bf7..579c2bff5e8ebac663bcd8b2f208fdd5c9553b62 100644 --- a/hivebase/http_client.py +++ b/hivebase/http_client.py @@ -272,7 +272,11 @@ class HttpClient(object): else: error = 'unspecified error' else: - error = result['error']['data']['name'] + from pprint import pprint + if isinstance(result['error']['data'],list): + error = result['error']['data']['name'] + else: + error = result['error']['data'] if legacy: detail = ":".join(detail.split("\n")[0:2]) diff --git a/hivebase/operations.py b/hivebase/operations.py index e9cd3ed83f4b1ae48a0f1bbb862d23b20b163918..ed23d6aac8fa522133323bf43061be3a129d15f5 100644 --- a/hivebase/operations.py +++ b/hivebase/operations.py @@ -565,8 +565,8 @@ class ClaimRewardBalance(GrapheneObject): super(ClaimRewardBalance, self).__init__( OrderedDict([ ('account', String(kwargs["account"])), - ('reward_hive', Amount(kwargs["reward_hive"])), - ('reward_hbd', Amount(kwargs["reward_hbd"])), + ('reward_steem', Amount(kwargs["reward_steem"])), + ('reward_sbd', Amount(kwargs["reward_sbd"])), ('reward_vests', Amount(kwargs["reward_vests"])), ])) diff --git a/setup.py b/setup.py index 037d7ae4ace38f5d6e35319deaaac26301304197..655819b88db4041cb175716e46492e8162bdc080 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ from setuptools.command.test import test as TestCommand # Package meta-data. NAME = 'hivepy' -VERSION = '0.9.16' +VERSION = '0.9.18' DESCRIPTION = 'A python hive library.' URL = 'https://github.com/pharesim/hive-python' EMAIL = 'pharesim@protonmail.com'