Merge pull request #260 from CounterpartyXCP/develop

1.1.3

ChangeLog.md

@@ -0,0 +1,39 @@
+## Versions ##
+* v1.1.3 (2016-01-18)
+  * COMPATIBLE WITH: `counterparty-lib` 9.53.0 and `counterblock` 1.3.1
+  * Updated `bitcoin` core to 0.11.2
+  * Update `mongodb` to 3.0.x
+* v1.1.2 (2015-11-01)
+  * COMPATIBLE WITH: `counterparty-lib` 9.52.0 and `counterblock` 1.2.0
+  * updated nginx version to newest
+* v1.1.1 (2015-02-19)
+  * numerous smaller bug fixes
+* v1.1.0 (2015-02-12)
+
+  This was a major update to the build system, to coincide with the structural changes made to `counterpartyd` (now `counterparty-lib` and `counterparty-cli`) and `counterblockd` (now `counterblock`):
+
+  * Revamped and refactored build system: Build system is for federated node only, given that `counterparty` and `counterblock` both have their own setuptools `setup.py` files now.
+  * Renamed repo from `counterparty_build` to `federatednode_build`
+  * Removed Windows and Ubuntu 12.04/13.10 support. 
+  * Service name changes: `counterpartyd service` changed to `counterparty`, `counterblockd` service changed to `counterblock`. `bitcoind` service changed to `bitcoin`
+  * Bitcoin-testnet data-dir location changed: moved from `~xcp/.bitcoin-testnet` to `~xcp/.bitcoin/testnet3`
+  * All configuration file locations changed:
+
+    * `counterparty`: From `~xcp/.config/counterpartyd/counterparty.conf` to `~xcp/.config/counterparty/server.conf`
+    * `counterparty-testnet`: From `~xcp/.config/counterpartyd-testnet/counterpartyd.conf` to `~xcp/.config/counterparty/server-testnet.conf`
+    * `counterblock`: From `~xcp/.config/counterblockd/counterblockd.conf` to `~xcp/.config/counterblock/server.conf`
+    * `counterblock-testnet`: From `~xcp/.config/counterblockd-testnet/counterblockd.conf` to `~xcp/.config/counterblock/server-testnet.conf`
+
+  * Log and data directories changed as well (please see `counterparty` and `counterblock` release notes for more information, as well as the federated node document’s troubleshooting section for the new paths with federated nodes).
+  * Updated the setup guide for federated nodes for new paths, service names, and more, located at: http://counterparty.io/docs/federated_node/
+
+  * Updating:
+
+    When updating to this new version, please BACKUP all data, and do a complete rebuild. Best way to kick this off is to do:
+```
+BRANCH=develop wget -q -O /tmp/fednode_run.py https://raw.github.com/CounterpartyXCP/federatednode_build/${BRANCH}/run.py sudo python3 /tmp/fednode_run.py
+```
+
+    When prompted, choose rebuild (‘r’), and then answer the other questions as appropriate. This rebuild should not delete your existing data, but does automatically build out everything for the new configuration files and paths.
+
+    NOTE: If you have any customized `counterblock` configuration files, you will need to manually migrate those changes over from the old path (`~xcp/.config/counterblockd/counterblockd.conf`) to the new path (`~xcp/.config/counterblock/counterblock.conf`) (please don’t overwrite the new file, but just paste in the modified changes).

run.py

@@ -218,7 +218,7 @@ def do_base_setup(run_as_user):
 
     #install some necessary base deps
     runcmd("apt-key update && apt-get update")
-    runcmd("apt-get -y install git-core software-properties-common python-software-properties build-essential ssl-cert ntp runit curl")
+    runcmd("apt-get -y install git-core software-properties-common python-software-properties build-essential ssl-cert ntp runit curl libjpeg8-dev libgmp-dev")
 
     #install node-js
     #node-gyp building has ...issues out of the box on Ubuntu... use Chris Lea's nodejs build instead, which is newer
@@ -263,9 +263,9 @@ def do_backend_rpc_setup():
     """Installs and configures bitcoind"""
 
     def install_from_source():
-        #Install bitcoind (btcbrak's 0.10.2 addrindex branch)
-        BITCOIND_VERSION="0.10-2"
-        BITCOIND_DEB_VERSION="0.10.2"
+        #Install bitcoind (btcbrak's 0.11.2 addrindex branch)
+        BITCOIND_VERSION="0.11-2"
+        BITCOIND_DEB_VERSION="0.11.2"
 
         #Install deps (see https://help.ubuntu.com/community/bitcoin)
         runcmd("apt-get -y install build-essential libtool autotools-dev autoconf pkg-config libssl-dev libboost-dev libboost-all-dev software-properties-common checkinstall")
@@ -285,10 +285,10 @@ def install_from_source():
         runcmd("ln -sf /usr/local/bin/bitcoind /usr/bin/bitcoind && ln -sf /usr/local/bin/bitcoin-cli /usr/bin/bitcoin-cli")
 
     def install_binaries():
-        BITCOIND_URL="https://github.com/btcdrak/bitcoin/releases/download/addrindex-0.10.2/bitcoin-addrindex-0.10.2-linux64.tar.gz"
-        BITCOIND_FILENAME="bitcoin-addrindex-0.10.2-linux64.tar.gz"
-        BITCOIND_DIRNAME="bitcoin-0.10.2"
-        BITCOIND_SHA256_HASH="69068c4e04ec42d26e2b53bf79a682aaa180d06047daa0b30903ad1638d73dc5"
+        BITCOIND_URL="https://github.com/btcdrak/bitcoin/releases/download/v0.11.2-addrindex/bitcoin-0.11.2-addrindex-linux64.tar.gz"
+        BITCOIND_FILENAME="bitcoin-0.11.2-addrindex-linux64.tar.gz"
+        BITCOIND_DIRNAME="bitcoin-0.11.2"
+        BITCOIND_SHA256_HASH="9682ec10b54bfe1368dbac2d9c19a010708c5ea8e6ff962455bb760975772c73"
 
         runcmd("apt-get -y remove bitcoin.addrindex bitcoin-addrindex-0.10", abort_on_failure=False) #remove old versions
 
@@ -354,11 +354,11 @@ def install_dependencies():
             #counterblockd currently uses Python 2.7 due to gevent-socketio's lack of support for Python 3
             runcmd("apt-get -y install python python-dev python-setuptools python-pip python-sphinx python-zmq libzmq3 libzmq3-dev libxml2-dev libxslt-dev zlib1g-dev libimage-exiftool-perl libevent-dev cython")
 
-            #install mongo-10gen (newer than what ubuntu has), pegged to a specific version
-            MONGO_VERSION = "2.6.6"
+            #install mongodb
+            MONGO_VERSION = "3.0.7"
             runcmd("apt-get -y remove mongodb mongodb-server") #remove ubuntu stock packages, if installed
             runcmd("apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10")
-            runcmd("/bin/bash -c \"echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list\"")
+            runcmd("/bin/bash -c \"echo 'deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.0 multiverse' | sudo tee /etc/apt/sources.list.d/mongodb.list\"")
             runcmd("apt-get update")
             runcmd("apt-get -y --force-yes install mongodb-org=%s mongodb-org-server=%s mongodb-org-shell=%s mongodb-org-mongos=%s mongodb-org-tools=%s" % (
                 MONGO_VERSION, MONGO_VERSION, MONGO_VERSION, MONGO_VERSION, MONGO_VERSION))
@@ -626,7 +626,7 @@ def do_nginx_setup(run_as_user, enable=True):
 
     #Build and install nginx (openresty) on Ubuntu
     #Most of these build commands from http://brian.akins.org/blog/2013/03/19/building-openresty-on-ubuntu/
-    OPENRESTY_VER = "1.7.10.1"
+    OPENRESTY_VER = "1.7.10.2"
 
     #uninstall nginx if already present
     runcmd("apt-get -y remove nginx")