Merge pull request #21 from HorizenOfficial/development

Update to zend 3.0.2

Author: yurikoinaba

Dockerfile

@@ -20,9 +20,9 @@ MAINTAINER cronic@horizen.io
 
 SHELL ["/bin/bash", "-c"]
 
-# Latest release zen 3.0.1
+# Latest release zen 3.0.2
 # TODO: Update ZEN_COMMITTISH to newest tag
-ARG ZEN_COMMITTISH=v3.0.1 
+ARG ZEN_COMMITTISH=v3.0.2
 ARG IS_RELEASE=false
 # cronic <cronic@zensystem.io> http://pool.sks-keyservers.net:11371/pks/lookup?search=0x219F55740BBF7A1CE368BA45FB7053CE4991B669&op=vindex
 # Luigi Varriale <luigi@zensystem.io> http://pool.sks-keyservers.net:11371/pks/lookup?search=0x7C20EDC1CABFC9D1005EADBF3C80D9DD9F971AB6&op=vindex

README.md

@@ -59,6 +59,18 @@ docker run -d --rm --ulimit "nofile=100000:100000" -v "$(pwd)/zen-data:/data" -e
 ```
 _If you cloned the repository, you can run `make run-mainnet-online`._
 
+#### Adding options to the zend conf file
+The zend configuration file can be extended by setting the docker command to /app/rosetta-zen
+and using the optional -extend-zen-conf="" switch. The value of -extend-zen-conf="" will be
+appended to /app/zen-${NETWORK}.conf, newlines can be set as "\n".
+```text
+docker run -d --rm --ulimit "nofile=100000:100000" -v "$(pwd)/zen-data:/data" -e "MODE=ONLINE" -e "NETWORK=MAINNET" -e "PORT=8080" -p 8080:8080 -p 9033:9033 rosetta-zen:latest /app/rosetta-zen -extend-zen-conf="reindexfast=1\ndebug=rpc\ndebug=net"
+# this command line would append the following to /app/zen-mainnet.conf
+reindexfast=1
+debug=rpc
+debug=net
+```
+
 #### Mainnet:Offline
 ```text
 docker run -d --rm -e "MODE=OFFLINE" -e "NETWORK=MAINNET" -e "PORT=8081" -p 8081:8081 rosetta-zen:latest

assets/zen-mainnet.conf_default

@@ -0,0 +1,30 @@
+##
+## zen.conf configuration file. Lines beginning with # are comments.
+##
+
+# DO NOT USE THIS CONFIGURATION FILE IF YOU PLAN TO EXPOSE
+# ZEND'S RPC PORT PUBLICALLY (THESE INSECURE CREDENTIALS
+# COULD LEAD TO AN ATTACK). ROSETTA-ZEN USES THE RPC PORT
+# FOR INDEXING AND TRANSACTION BROADCAST BUT NEVER PROVIDES THE
+# CALLER ACCESS TO ZEND'S RPC PORT.
+
+datadir=/data/.zen
+bind=0.0.0.0
+rpcbind=0.0.0.0
+bantime=15
+rpcallowip=0.0.0.0/0
+rpcallowip=::/0
+rpcthreads=16
+rpcworkqueue=1000
+disablewallet=1
+txindex=1
+port=9033
+rpcport=8231
+rpcuser=rosetta
+rpcpassword=rosetta
+showmetrics=0
+printtoconsole=1
+maturityheightindex=1
+
+# manual pruning is not supported in zend
+#prune=1

assets/zen-regtest.conf_default

@@ -0,0 +1,32 @@
+##
+## zen.conf configuration file. Lines beginning with # are comments.
+##
+
+# DO NOT USE THIS CONFIGURATION FILE IF YOU PLAN TO EXPOSE
+# ZEND'S RPC PORT PUBLICALLY (THESE INSECURE CREDENTIALS
+# COULD LEAD TO AN ATTACK). ROSETTA-ZEN USES THE RPC PORT
+# FOR INDEXING AND TRANSACTION BROADCAST BUT NEVER PROVIDES THE
+# CALLER ACCESS TO ZEND'S RPC PORT.
+
+datadir=/data/.zen
+bind=0.0.0.0
+rpcbind=0.0.0.0
+bantime=15
+rpcallowip=0.0.0.0/0
+rpcallowip=::/0
+rpcthreads=16
+rpcworkqueue=1000
+#disablewallet=1
+txindex=1
+port=19033
+rpcport=18231
+rpcuser=rosetta
+rpcpassword=rosetta
+showmetrics=0
+printtoconsole=1
+regtest=1
+maturityheightindex=1
+
+# manual pruning is not supported in zend
+#prune=1
+

assets/zen-testnet.conf_default

@@ -0,0 +1,31 @@
+##
+## zen.conf configuration file. Lines beginning with # are comments.
+##
+
+# DO NOT USE THIS CONFIGURATION FILE IF YOU PLAN TO EXPOSE
+# ZEND'S RPC PORT PUBLICALLY (THESE INSECURE CREDENTIALS
+# COULD LEAD TO AN ATTACK). ROSETTA-ZEN USES THE RPC PORT
+# FOR INDEXING AND TRANSACTION BROADCAST BUT NEVER PROVIDES THE
+# CALLER ACCESS TO ZEND'S RPC PORT.
+
+datadir=/data/.zen
+bind=0.0.0.0
+rpcbind=0.0.0.0
+bantime=15
+rpcallowip=0.0.0.0/0
+rpcallowip=::/0
+rpcthreads=16
+rpcworkqueue=1000
+disablewallet=1
+txindex=1
+port=19033
+rpcport=18231
+rpcuser=rosetta
+rpcpassword=rosetta
+showmetrics=0
+printtoconsole=1
+testnet=1
+maturityheightindex=1
+
+# manual pruning is not supported in zend
+#prune=1

entrypoint.sh

@@ -11,4 +11,21 @@ if [ "${MODE:-x}" = "ONLINE" ]; then
   /app/fetch-params.sh
 fi
 
+args_kept=""
+# parse args
+for arg in "$@"; do
+  case "$arg" in
+    -e=*|-extend-zen-conf=*)
+      cat "/app/zen-${NETWORK,,}.conf_default" > "/app/zen-${NETWORK,,}.conf"
+      echo -e "${arg#*=}" >> "/app/zen-${NETWORK,,}.conf"
+      shift
+      ;;
+    *)
+      args_kept+="${arg} "
+      shift
+      ;;
+  esac
+done
+
+set -- $args_kept
 exec "$@"

services/network_service_test.go

@@ -30,7 +30,7 @@ var (
 	defaultNetworkOptions = &types.NetworkOptionsResponse{
 		Version: &types.Version{
 			RosettaVersion:    types.RosettaAPIVersion,
-			NodeVersion:       "3.0.1",
+			NodeVersion:       "3.0.2",
 			MiddlewareVersion: &middlewareVersion,
 		},
 		Allow: &types.Allow{

services/types.go

@@ -24,7 +24,7 @@ import (
 const (
 	// NodeVersion is the version of
 	// zend core we are using.
-	NodeVersion = "3.0.1"
+	NodeVersion = "3.0.2"
 
 	// HistoricalBalanceLookup indicates
 	// that historical balance lookup is supported.