Browse Source

Update package version numbers to 0.3.1

Update joinmarket-qt version numbers
Remove erroneous line from release notes 0.3.1
Update default config for electrum-server
master
AdamISZ 8 years ago
parent
commit
06283b3df7
No known key found for this signature in database
GPG Key ID: B3AE09F1E9A3197A
  1. 4
      docs/release-notes/release-notes-0.3.1.md
  2. 2
      jmbase/setup.py
  3. 2
      jmbitcoin/setup.py
  4. 3
      jmclient/jmclient/configure.py
  5. 4
      jmclient/setup.py
  6. 4
      jmdaemon/setup.py
  7. 4
      scripts/joinmarket-qt.py

4
docs/release-notes/release-notes-0.3.1.md

@ -12,7 +12,7 @@ Please report bugs using the issue tracker at github:
Upgrading
=========
To upgrade: run the `install.sh` script as mentioned in the README.
To upgrade: run the `install.sh` script as mentioned in the README. When prompted to overwrite the directory `jmvenv`, accept.
Notable changes
@ -38,8 +38,6 @@ Trying to use this feature for long running yield generators is not supported. P
This release adds support for two-factor mnemonic phrases. The user can optionally provide a passphrase or "mnemonic extension", both this extension and the 12-word mnemonic are required to recover the wallet. The feature is backward-compatible with existing BIP39 joinmarket wallet files and mnemonic phrases, and is disabled by default. See the [bitcoin wiki page](https://en.bitcoin.it/wiki/Mnemonic_phrase#Two-Factor_Mnemonic_Phrases) for more explanation on two-factor mnemonic phrases.
It's now possible to have a wallet password be an empty string, and JoinMarket won't prompt for a password if so.
### Significantly improved installation script
`10f20ed` `8027853` `9e65d2e` `28507bd` `15433df` `ad7309e` `69d274f` `4f4f0e5`

2
jmbase/setup.py

@ -2,7 +2,7 @@ from setuptools import setup
setup(name='joinmarketbase',
version='0.3.0',
version='0.3.1',
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.3.0',
version='0.3.1',
description='Joinmarket client library for Bitcoin coinjoins',
url='http://github.com/AdamISZ/joinmarket-clientserver/jmbitcoin',
author='Adam Gibson',

3
jmclient/jmclient/configure.py

@ -108,8 +108,7 @@ daemon_host = localhost
use_ssl = false
[BLOCKCHAIN]
#options: bitcoin-rpc, regtest, bc.i, electrum-server
#OPTIONS bc.i, electrum-server ARE EXPERIMENTAL AND MAY NOT WORK
#options: bitcoin-rpc, regtest, electrum-server
# for instructions on bitcoin-rpc read
# https://github.com/chris-belcher/joinmarket/wiki/Running-JoinMarket-with-Bitcoin-Core-full-node
blockchain_source = bitcoin-rpc

4
jmclient/setup.py

@ -2,12 +2,12 @@ from setuptools import setup
setup(name='joinmarketclient',
version='0.3.0',
version='0.3.1',
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.3.0', 'mnemonic', 'qt4reactor'],
install_requires=['joinmarketbase==0.3.1', 'mnemonic', 'qt4reactor'],
zip_safe=False)

4
jmdaemon/setup.py

@ -2,12 +2,12 @@ from setuptools import setup
setup(name='joinmarketdaemon',
version='0.3.0',
version='0.3.1',
description='Joinmarket client library for Bitcoin coinjoins',
url='http://github.com/AdamISZ/joinmarket-clientserver/jmdaemon',
author='Adam Gibson',
author_email='ekaggata@gmail.com',
license='GPL',
packages=['jmdaemon'],
install_requires=['txsocksx', 'pyopenssl', 'libnacl', 'joinmarketbase==0.3.0'],
install_requires=['txsocksx', 'pyopenssl', 'libnacl', 'joinmarketbase==0.3.1'],
zip_safe=False)

4
scripts/joinmarket-qt.py

@ -48,9 +48,9 @@ pyqt4reactor.install()
donation_address = "1AZgQZWYRteh6UyF87hwuvyWj73NvWKpL"
#Underlying joinmarket code version (as per setup.py etc.)
JM_CORE_VERSION = '0.3.0'
JM_CORE_VERSION = '0.3.1'
#Version of this Qt script specifically
JM_GUI_VERSION = '6'
JM_GUI_VERSION = '7'
from jmclient import (load_program_config, get_network, SegwitWallet,
get_p2sh_vbyte, get_p2pk_vbyte, jm_single, validate_address,

Loading…
Cancel
Save