merge 0.2.0 into develop

.gitignore

@@ -6,3 +6,6 @@ blockchain.cache
 env
 htmlcov/
 joinmarket.cfg
+cmttools/commitments.json
+blacklist
+

.travis.yml

@@ -1,3 +1,5 @@
+sudo: required
+dist: trusty
 language: python
 python:
  - "2.7_with_system_site_packages"
@@ -27,11 +29,13 @@ script:
  - cd ..
 #set up joinmarket.cfg
  - cp test/regtest_joinmarket.cfg joinmarket.cfg
+#install miniircd
+ - git clone git://github.com/Joinmarket-Org/miniircd.git
 #setup bitcoin config file
  - mkdir /home/travis/.bitcoin
  - cp test/bitcoin.conf /home/travis/.bitcoin/.
  - chmod 600 /home/travis/.bitcoin/bitcoin.conf
- - PYTHONPATH=.:$PYTHONPATH py.test --cov-report html --btcconf=/home/travis/.bitcoin/bitcoin.conf --btcpwd=123456abcdef --ignore test/test_tumbler.py
+ - PYTHONPATH=.:$PYTHONPATH py.test --cov=joinmarket/ --cov=test/ --cov=bitcoin/ --cov-report html --nirc=2 --btcconf=/home/travis/.bitcoin/bitcoin.conf --btcuser=bitcoinrpc --btcpwd=123456abcdef --ignore test/test_tumbler.py
  - cd logs
  - for x in `ls`; do tail -50 $x; done
  - cd ..

README.md

@@ -14,6 +14,9 @@ Widespread use of JoinMarket could improve bitcoin's fungibility as a commodity.
 
 ##Installation
 
+#####A NOTE ON UPDATING
+The installation is slightly changed, with the secp256k1 python binding no longer being optional, and libnacl now being installed via pip, not locally. The short version is: do follow the below process, for example the secp256k1 binding must be the latest version else you'll get errors. Of course if you already have libsodium you don't need to re-install it.
+
 #####REQUIRED INSTALLATION DEPENDENCIES
 
 + You will need python 2.7
@@ -33,22 +36,39 @@ Widespread use of JoinMarket could improve bitcoin's fungibility as a commodity.
     make check
     sudo make install
     ```
-+ (optional, recommended): Install the libsecp256k1 Python library:
+
++ Install Python dependencies:
+    You need `pip` (e.g. `sudo apt-get python-pip`, recent Python usually ships with pip).
+
+    (Setuptools version must be >= 3.3).
+
+    (Recommended but not needed) : use `virtualenv` to keep dependencies isolated.
+
+    If on Linux/OSX:
+
+    The Python binding to libsecp256k1 will most likely have some dependencies; read the [Wiki article](https://github.com/JoinMarket-Org/joinmarket/wiki/Installing-the-libsecp256k1-binding).
+
+    Try running the below without following those instructions, most likely it will fail and you will then have to follow them.
+
+    ```
+    pip install -r requirements.txt
+    ```
+
+    If on Windows:
 
     ```
-    pip install secp256k1
+    pip install -r requirements-windows.txt
     ```
 
- Note that this requires `pip`. This library will make use of libsecp256k1 if you already have it installed on your system. Most likely you won't, and it will try to build libsecp256k1 automatically for you. This requires some development packages; please read the installation details [here](https://github.com/ludbb/secp256k1-py#installation), provided for Debian/Ubuntu and OS X. Please also note that if you can't complete this step, Joinmarket will still run correctly, with two disadvantages: wallet loading is much slower without libsecp256k1, and the ECC crypto code is far less robust and well tested.
 + Matplotlib for displaying the graphs in orderbook-watcher (optional)
 
 ###DEBIAN / UBUNTU QUICK INSTALL FOR USERS:
 
 1. `sudo apt-get update -y && sudo apt-get upgrade -y && sudo apt-get install python libsodium-dev -y`
-2. `pip install secp256k1` (optional but recommended)
+2. `pip install -r requirements.txt`
 2. `sudo apt-get install python-matplotlib -y` (optional)
-3. Download JoinMarket 0.1.4 source from [here](https://github.com/joinmarket-org/joinmarket/releases/tag/v0.1.4)
-4. Extract or unzip and `cd joinmarket-0.1.4`
+3. Download JoinMarket 0.2.0 source from [here](https://github.com/joinmarket-org/joinmarket/releases/tag/v0.2.0)
+4. Extract or unzip and `cd joinmarket-0.2.0`
 4. Generating your first wallet will populate the configuration file: `joinmarket.cfg`.
    Check if the default settings suit your needs.
 

bitcoin/__init__.py

@@ -1,14 +1,8 @@
 from bitcoin.py2specials import *
 from bitcoin.py3specials import *
-secp_present = False
-try:
-    import secp256k1
-    secp_present = True
-    from bitcoin.secp256k1_main import *
-    from bitcoin.secp256k1_transaction import *
-    from bitcoin.secp256k1_deterministic import *    
-except ImportError as e:
-    from bitcoin.main import *
-    from bitcoin.deterministic import *
-    from bitcoin.transaction import *
+import secp256k1
+from bitcoin.secp256k1_main import *
+from bitcoin.secp256k1_transaction import *
+from bitcoin.secp256k1_deterministic import *
 from bitcoin.bci import *
+from bitcoin.podle import *