Merge pull request #257 from SatoshiPortal/dev

v0.8.1

Author: Kexkey

.gitignore

@@ -2,4 +2,4 @@
 .vscode
 dist/**
 !dist/setup.sh
-!dist/sr.sh
+!dist/sr.sh

api_auth_docker/tests/test-gatekeeper.sh

@@ -17,7 +17,7 @@
 # action_installation_info=stats
 # action_getmempoolinfo=stats
 # action_getblockhash=stats
-# 
+#
 # # Watcher can do what the stats can do, plus:
 # action_watch=watcher
 # action_unwatch=watcher
@@ -47,7 +47,7 @@
 # action_ln_listpays=watcher
 # action_ln_paystatus=watcher
 # action_bitcoin_estimatesmartfee=watcher
-# 
+#
 # # Spender can do what the watcher can do, plus:
 # action_get_txns_spending=spender
 # action_getbalance=spender
@@ -78,10 +78,10 @@
 # action_listbatchers=spender
 # action_getbatcher=spender
 # action_getbatchdetails=spender
-# 
+#
 # # Admin can do what the spender can do, plus:
-# 
-# 
+#
+#
 # # Should be called from inside the Docker network only:
 # action_conf=internal
 # action_newblock=internal
@@ -558,7 +558,7 @@ exec_in_test_container_leave_lf apk add --update curl coreutils openssl
 
 # Copy keys to test container
 trace 1 "\n\n[test_gatekeeper] ${BCyan}Copying keys and certs to test container...${Color_Off}\n"
-gatekeeperid=$(docker ps -q -f "name=cyphernode_gatekeeper")
+gatekeeperid=$(docker ps -q -f "name=cyphernode.gatekeeper")
 testid=$(docker ps -q -f "name=tests-gatekeeper")
 docker cp ${gatekeeperid}:/etc/nginx/conf.d/keys.properties - | docker cp - ${testid}:/
 docker cp ${gatekeeperid}:/etc/ssl/certs/cert.pem - | docker cp - ${testid}:/

build.sh

@@ -2,15 +2,15 @@
 
 TRACING=1
 
-# CYPHERNODE VERSION "v0.8.0"
-CONF_VERSION="v0.8.0-local"
-GATEKEEPER_VERSION="v0.8.0-local"
-TOR_VERSION="v0.8.0-local"
-PROXY_VERSION="v0.8.0-local"
-NOTIFIER_VERSION="v0.8.0-local"
-PROXYCRON_VERSION="v0.8.0-local"
-OTSCLIENT_VERSION="v0.8.0-local"
-PYCOIN_VERSION="v0.8.0-local"
+# CYPHERNODE VERSION "v0.8.1"
+CONF_VERSION="v0.8.1-local"
+GATEKEEPER_VERSION="v0.8.1-local"
+TOR_VERSION="v0.8.1-local"
+PROXY_VERSION="v0.8.1-local"
+NOTIFIER_VERSION="v0.8.1-local"
+PROXYCRON_VERSION="v0.8.1-local"
+OTSCLIENT_VERSION="v0.8.1-local"
+PYCOIN_VERSION="v0.8.1-local"
 
 trace()
 {

cyphernodeconf_docker/package-lock.json

@@ -16,7 +16,7 @@
   ],
   "dependencies": {
     "@rauschma/stringio": "^1.4.0",
-    "ajv": "^6.10.0",
+    "ajv": "^6.12.3",
     "chalk": "^2.4.2",
     "coinstring": "^2.3.0",
     "colorsys": "^1.0.22",

cyphernodeconf_docker/package.json

@@ -0,0 +1,15 @@
+const chalk = require('chalk');
+
+const name = 'proxycron';
+
+module.exports = {
+  name: function() {
+    return name;
+  },
+  prompts: function( utils ) {
+    return [];
+  },
+  templates: function( props ) {
+    return [ 'proxycron.env' ];
+  }
+};

cyphernodeconf_docker/prompters/800_proxycron.js

@@ -245,9 +245,8 @@ services:
 
   proxycron:
     image: cyphernode/proxycron:<%= proxycron_version %>
-    environment:
-      - "TX_CONF_URL=proxy:8888/executecallbacks"
-      - "OTS_URL=proxy:8888/ots_backoffice"
+    env_file:
+      - .env/proxycron.env
     networks:
       - cyphernodenet
     depends_on: