Merge pull request #143 from CounterpartyXCP/develop

1.4.0

.gitignore

@@ -4,6 +4,7 @@
 # Packages
 *.egg
 *.egg-info
+.eggs
 build
 eggs
 parts
@@ -44,3 +45,5 @@ schema.py
 #Docs 
 docs/_build
 
+#backup files
+*.bak

ChangeLog.md

@@ -1,4 +1,14 @@
 ## Changelog ##
+* v1.4.0 (2016-06-26)
+    * Ported to Python 3
+    * PEP8 styling applied across codebase
+    * Added Docker packaging support
+    * Removed counterwallet_iofeeds and socketio stuff
+    * Move armory-utxsvr into its own repo
+    * Fixes for timezone in generated/parsed datetimes
+    * Update "reparse" command logic to make it like counterparty-lib
+    * Pegged deps to specific versions
+    * Added ability to disable file logging for main log and tx log
 * v1.3.1 (2016-01-24)
     * Modify blockfeed logic to work with reorgs properly again with the undolog fix introduced in `counterparty-lib` 9.53.0.
     * Enhance blockfeed error recovery logic to make more robust and minimize/remove chance of blockfeed hangs.

Dockerfile

@@ -0,0 +1,22 @@
+FROM counterparty/base
+
+MAINTAINER Counterparty Developers <[email protected]>
+
+# Install extra counterblock deps
+RUN apt-get update && apt-get -y install libjpeg8-dev libgmp-dev libzmq3-dev libxml2-dev libxslt-dev zlib1g-dev libimage-exiftool-perl libevent-dev cython
+
+# Install
+COPY . /counterblock
+WORKDIR /counterblock
+RUN pip3 install -r requirements.txt
+RUN python3 setup.py develop
+
+COPY docker/server.conf /root/.config/counterblock/server.conf
+COPY docker/modules.conf /root/.config/counterblock/modules.conf
+COPY docker/counterwallet.conf /root/.config/counterblock/counterwallet.conf
+COPY docker/start.sh /usr/local/bin/start.sh
+RUN chmod a+x /usr/local/bin/start.sh
+
+EXPOSE 4100 4101 4102 14100 14101 14102
+
+ENTRYPOINT ["start.sh"]

README.md

@@ -1,19 +1,35 @@
 [![Slack Status](http://slack.counterparty.io/badge.svg)](http://slack.counterparty.io)
 
-counterblockd
+counterblock
 ==============
 
-Provides extended API functionality over `counterparty-server` (such as market information, asset history, etc).
-Works alongside `counterparty`.
+`counterblock` provides additional services to Counterwallet beyond those offered in the API provided by `counterparty-server`. It features a full-fledged JSON RPC-based API, which services Counterwallet as well as any 3rd party services which wish to use it. `counterblock` has an extensible architecture, and developers may write custom plugins for it, which are loaded dynamically and allow them to extend `counterblock` with new parsing functionality, write gateways to other currencies or services, and much more.
 
-Automatic Installation
-------------------------
+With its set of core-plugins, `counterblock` provides a more high-level data processing, and an API that layers on top of `counterparty-server`’s API. `counterblock` generates and allows querying of data such as market and price information, trade operations, asset history, and more. It is used extensively by Counterwallet itself, and is appropriate for use by applications that require additional API-based functionality beyond the scope of what `counterparty-server` itself provides.
 
-Please see the [Setting up a Federated Node](http://counterparty.io/docs/federated_node/) guide
-(under the *"Node Setup"* section) for a script that will set counterblockd up for you, automatically. When prompted
-for the node type, choose "counterblock basic".
+# Installation
 
-Manual Installation (Linux Only)
----------------------------------
+For a simple Docker-based install of the Counterparty software stack, see [this guide](http://counterparty.io/docs/federated_node/).
 
-`sudo pip install counterblock`
+# Manual installation
+
+(Linux only.) First, install `mongodb` and `redis`, and have an instance of `bitcoind` (`addrindex` branch) and [`counterparty-server`](https://github.com/CounterpartyXCP/counterparty-lib) running.
+
+Then, download and install `counterblock`:
+
+```
+$ git clone https://github.com/CounterpartyXCP/counterblock.git
+$ cd counterblock
+$ sudo pip3 install -r requirements.txt
+$ sudo python3 setup.py install
+```
+
+Then, launch the daemon via the following command, with the passwords set as appropriate:
+
+```
+$ counterblock --backend-password=rpc --counterparty-password=rpc server
+```
+
+Further command line options are available via:
+
+* `$ counterblock --help`

counterblock/__init__.py

@@ -1,9 +1,7 @@
-import os, sys
+import os
+import sys
+
 
 def server_main():
     from counterblock import server
     server.main()
-
-def armory_utxsvr_main():
-    from counterblock import armory_utxsvr
-    armory_utxsvr.main()