From 922b2b3f49a27739c793f90297289f1e087288ee Mon Sep 17 00:00:00 2001 From: pharesim <pharesim@protonmail.com> Date: Fri, 20 Mar 2020 23:01:35 +0100 Subject: [PATCH] vests calculation --- docs/conf.py | 2 +- hive/__init__.py | 2 +- hive/cli.py | 2 +- hive/converter.py | 3 ++- hivebase/transactions.py | 1 + setup.py | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 5dcf67d..1abbf8f 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.13' +release = '0.9.15' # 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 33c7165..e3834e8 100644 --- a/hive/__init__.py +++ b/hive/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- from .hive import Hive -__version__ = '0.9.13' +__version__ = '0.9.15' diff --git a/hive/cli.py b/hive/cli.py index 0e30d59..951f116 100644 --- a/hive/cli.py +++ b/hive/cli.py @@ -798,7 +798,7 @@ def legacyentry(): info = blockchain.info() median_price = hive.get_current_median_history_price() hive_per_mvest = ( - Amount(info["total_vesting_fund_hive"]).amount / + Amount(info["total_vesting_fund_steem"]).amount / (Amount(info["total_vesting_shares"]).amount / 1e6)) price = (Amount(median_price["base"]).amount / Amount( median_price["quote"]).amount) diff --git a/hive/converter.py b/hive/converter.py index 8619be1..a204c4a 100644 --- a/hive/converter.py +++ b/hive/converter.py @@ -30,7 +30,8 @@ class Converter(object): """ Obtain HIVE/MVESTS ratio """ info = self.hived.get_dynamic_global_properties() - return (Amount(info["total_vesting_fund_hive"]).amount / + + return (Amount(info["total_vesting_fund_steem"]).amount / (Amount(info["total_vesting_shares"]).amount / 1e6)) def vests_to_hp(self, vests): diff --git a/hivebase/transactions.py b/hivebase/transactions.py index 49d7391..d54aa09 100644 --- a/hivebase/transactions.py +++ b/hivebase/transactions.py @@ -256,6 +256,7 @@ class SignedTransaction(GrapheneObject): """ if not chain: raise ValueError("Chain needs to be provided!") + self.deriveDigest(chain) # Get Unique private keys diff --git a/setup.py b/setup.py index ce5357b..0dad7b8 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.13' +VERSION = '0.9.15' DESCRIPTION = 'A python hive library.' URL = 'https://github.com/pharesim/hive-python' EMAIL = 'pharesim@protonmail.com' -- GitLab