Browse Source

Bump version 0.3.0, fix yieldgenerator bugs,

disable *-qt script until updated
master
Adam Gibson 9 years ago
parent
commit
65478ad539
No known key found for this signature in database
GPG Key ID: B3AE09F1E9A3197A
  1. 2
      jmbase/setup.py
  2. 2
      jmbitcoin/setup.py
  3. 2
      jmclient/jmclient/blockchaininterface.py
  4. 4
      jmclient/jmclient/yieldgenerator.py
  5. 4
      jmclient/setup.py
  6. 2
      jmdaemon/setup.py
  7. 2
      scripts/joinmarket-qt.py

2
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',

2
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',

2
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?

4
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()

4
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)

2
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)

2
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()

Loading…
Cancel
Save