Merge Develop in Master

.gitignore

@@ -1,25 +1,10 @@
 env
 docs/_build/*
 
-test/counterpartyd.unittest.db
-test/db.new.dump
-test/log.new
-test/output.new.json
 profile.txt
 
 # precompiled python
 *.pyc
 
-# mac
-.DS_Store
-
-# happened during https://github.com/CounterpartyXCP/counterpartyd/pull/34
-._.DS_Store
-
 # files generated by py.test
-test/book.mainnet.new
-test/book.testnet.new
-test/counterpartyd.unittest.db-shm
-test/counterpartyd.unittest.db-wal
-test/db.dump.new
-test/output.json.new
+test/fixtures/scenarios/*.new.*

.travis.yml

@@ -0,0 +1,15 @@
+language: python
+python:
+- 3.4.0
+before_install:
+- sudo apt-get update -qq
+- sudo apt-get install -y unzip wget
+install:
+- wget https://github.com/rogerbinns/apsw/releases/download/3.8.5-r1/apsw-3.8.5-r1.zip
+- unzip apsw-3.8.5-r1.zip
+- cd apsw-3.8.5-r1 && python setup.py fetch --version=3.8.5 --all build --enable-all-extensions install
+- cd .. && pip install -r pip-requirements.txt --use-mirrors
+script: py.test --skiptestbook=all
+notifications:
+  slack:
+    secure: cl0G5fWZNnIK5VQ6BPZ4RtwVO2/nfvX/zjhljfF6cQ20OKyvyiJHq+e67fl2pkCKDlqlEqSWaQJ6G52YzUpDQmf+o7qpH6YnkFxSqYp5h4YF1hJw4sCHJ7bVSLrjogWxU8QaNvH7YpL4YkGe+WOau2FgoIZOcMt6hhKrvWclfuc=

CHANGELOG.md

@@ -1,4 +1,14 @@
 ## Client Versions ##
+* v9.45.0 (2014-10-23)
+	* add dividend fee of 0.0002 XCP per recipient (protocol change: 330000)
+* v9.44.0 (2014-09-22)
+	* server action requires `server` positional argument
+	* lockfile
+	* made `--force` server‐side only, moved after `server` argument
+	* multiple sources, destinations (testnet protocol change: 303000)
+	* multi‐signature support (testnet protocol change: 303000)
+* v9.43.0 (2014-09-14)
+	* generate movements hash for each block (start at block: 322000)
 * v9.42.0 (2014-09-04)
 	* disable dividends to XCP holders (protocol change: 320000)
 	* allow dividends only from issuers (protocol change: 320000)

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/CounterpartyXCP/counterpartyd.svg?branch=develop)](https://travis-ci.org/CounterpartyXCP/counterpartyd)
+
 # Description
 Counterparty is a protocol for the creation and use of decentralised financial
 instruments such as asset exchanges, contracts for difference and dividend
@@ -10,13 +12,13 @@ The Counterparty protocol specification may be found at
 
 # Dependencies
 * [Python 3](http://python.org)
-* Python 3 packages: apsw, requests, appdirs, prettytable, python-dateutil, json-rpc, tornado, flask, Flask-HTTPAuth, pycoin, pyzmq(v2.2+), pycrypto (see [this link](https://github.com/CounterpartyXCP/counterpartyd/blob/master/pip-requirements.txt) for exact working versions)
+* Python 3 packages: apsw, requests, appdirs, prettytable, python-dateutil, json-rpc, tornado, flask, Flask-HTTPAuth, pycoin, pyzmq(v2.2+), pycrypto, lockfile, python-bitcoinlib (see [this link](https://github.com/CounterpartyXCP/counterpartyd/blob/master/pip-requirements.txt) for exact working versions)
 * Bitcoind
 
 # Installation
 
 **NOTE: This section covers manual installation of counterpartyd. If you want more of
-an automated approach to counterpartyd installation for Windows and Linux, see [this link](http://counterpartyd-build.readthedocs.org/en/latest/).**
+an automated approach to counterpartyd installation for Windows and Linux, see [this link](http://counterparty.io/docs/build-system/).**
 
 In order for counterpartyd to function, it must be able to communicate with a
 running instance of Bitcoind or Bitcoin-Qt, which handles many Bitcoin‐specific
@@ -57,8 +59,9 @@ however.
 
 Sometimes the underlying package requirements may change for `counterpartyd`. If you build and installed it from scratch,
 you can manually update these requirements by executing something like:
-
-    ```pip install --upgrade -r pip-requirements.txt```
+```
+    pip install --upgrade -r pip-requirements.txt 
+```
 
 # Test suite
 
@@ -81,7 +84,7 @@ For a summary of the command‐line arguments and options, see
 # Versioning
 * Major version changes require a full rebuild of the database.
 * Minor version changes require a database reparse.
-* All protocol changes are retroactive on testnet.
+* Most protocol changes are retroactive on testnet.
 
 ## Input and Output
 * Quantities of divisible assets are written to eight decimal places.