From 65478ad539a8e841db0dfa89bf9e91bcf5fa5653 Mon Sep 17 00:00:00 2001 From: Adam Gibson Date: Sun, 23 Jul 2017 19:11:40 +0300 Subject: [PATCH] Bump version 0.3.0, fix yieldgenerator bugs, disable *-qt script until updated --- jmbase/setup.py | 2 +- jmbitcoin/setup.py | 2 +- jmclient/jmclient/blockchaininterface.py | 2 +- jmclient/jmclient/yieldgenerator.py | 4 ++-- jmclient/setup.py | 4 ++-- jmdaemon/setup.py | 2 +- scripts/joinmarket-qt.py | 2 ++ 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/jmbase/setup.py b/jmbase/setup.py index 0e754b0..14df969 100644 --- a/jmbase/setup.py +++ b/jmbase/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup(name='joinmarketbase', - version='0.2.2', + version='0.3.0', description='Joinmarket client library for Bitcoin coinjoins', url='http://github.com/AdamISZ/joinmarket-clientserver/jmbase', author='Adam Gibson', diff --git a/jmbitcoin/setup.py b/jmbitcoin/setup.py index b492274..7320896 100644 --- a/jmbitcoin/setup.py +++ b/jmbitcoin/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup(name='joinmarketbitcoin', - version='0.2.2', + version='0.3.0', description='Joinmarket client library for Bitcoin coinjoins', url='http://github.com/AdamISZ/joinmarket-clientserver/jmbitcoin', author='Adam Gibson', diff --git a/jmclient/jmclient/blockchaininterface.py b/jmclient/jmclient/blockchaininterface.py index cdadd81..3d9fa1e 100644 --- a/jmclient/jmclient/blockchaininterface.py +++ b/jmclient/jmclient/blockchaininterface.py @@ -1287,7 +1287,7 @@ class BitcoinCoreInterface(BlockchainInterface): return result def estimate_fee_per_kb(self, N): - estimate = Decimal(1e8) * Decimal(self.rpc('estimatefee', [N])) + estimate = int(Decimal(1e8) * Decimal(self.rpc('estimatefee', [N]))) if estimate < 0: #This occurs when Core has insufficient data to estimate. #TODO anything better than a hardcoded default? diff --git a/jmclient/jmclient/yieldgenerator.py b/jmclient/jmclient/yieldgenerator.py index 43554ea..8429f06 100644 --- a/jmclient/jmclient/yieldgenerator.py +++ b/jmclient/jmclient/yieldgenerator.py @@ -6,10 +6,10 @@ import os import time import abc from optparse import OptionParser - +from jmbase import get_password from jmclient import (Maker, jm_single, get_network, load_program_config, get_log, SegwitWallet, sync_wallet, JMClientProtocolFactory, - start_reactor, calc_cj_fee) + start_reactor, calc_cj_fee, WalletError) jlog = get_log() diff --git a/jmclient/setup.py b/jmclient/setup.py index eafe6c1..1ba1dc0 100644 --- a/jmclient/setup.py +++ b/jmclient/setup.py @@ -2,12 +2,12 @@ from setuptools import setup setup(name='joinmarketclient', - version='0.2.2', + version='0.3.0', description='Joinmarket client library for Bitcoin coinjoins', url='http://github.com/AdamISZ/joinmarket-clientserver/jmclient', author='Adam Gibson', author_email='ekaggata@gmail.com', license='GPL', packages=['jmclient'], - install_requires=['joinmarketbase==0.2.2', 'mnemonic'], + install_requires=['joinmarketbase==0.3.0', 'mnemonic'], zip_safe=False) diff --git a/jmdaemon/setup.py b/jmdaemon/setup.py index ffde4db..b152d23 100644 --- a/jmdaemon/setup.py +++ b/jmdaemon/setup.py @@ -9,5 +9,5 @@ setup(name='joinmarketdaemon', author_email='ekaggata@gmail.com', license='GPL', packages=['jmdaemon'], - install_requires=['txsocksx', 'pyopenssl', 'libnacl', 'joinmarketbase==0.2.2'], + install_requires=['txsocksx', 'pyopenssl', 'libnacl', 'joinmarketbase==0.3.0'], zip_safe=False) diff --git a/scripts/joinmarket-qt.py b/scripts/joinmarket-qt.py index 398c5b2..fb5f837 100644 --- a/scripts/joinmarket-qt.py +++ b/scripts/joinmarket-qt.py @@ -1605,6 +1605,8 @@ def get_wallet_printout(wallet): ################################ config_load_error = False +print('Temporarily disabled in version 0.3.0 waiting for update, please use scripts.') +sys.exit(0) app = QApplication(sys.argv) try: load_program_config()