Merge pull request #207 from SatoshiPortal/features/specter

Features/specter

cyphernodeconf_docker/features.json

@@ -14,6 +14,9 @@
   {
     "name": "Batcher Cypherapp",
     "value": "batcher"
+  },
+  {
+    "name": "Specter Cypherapp",
+    "value": "specter"
   }
-
 ]

cyphernodeconf_docker/lib/app.js

@@ -534,6 +534,10 @@ module.exports = class App {
         networks: ['cyphernodeappsnet'],
         docker: "cyphernode/batcher:" + this.config.docker_versions['cyphernode/batcher']
       },
+      specter: {
+        networks: ['cyphernodeappsnet'],
+        docker: "cyphernode/specter:" + this.config.docker_versions['cyphernode/specter']
+      },
       lightning: {
         networks: ['cyphernodenet'],
         docker: "cyphernode/clightning:"+this.config.docker_versions['cyphernode/clightning'],

cyphernodeconf_docker/schema/config-v0.2.5.json

@@ -178,7 +178,7 @@
       "$id": "#/properties/features",
       "type": "array",
       "title": "The optional features of this cyphernode",
-      "default": [],
+      "default": ["specter"],
       "items": {
         "$id": "#/properties/features/items",
         "type": "string",
@@ -186,7 +186,8 @@
           "tor",
           "lightning",
           "otsclient",
-          "batcher"
+          "batcher",
+          "specter"
         ],
         "title": "The feature",
         "default": "",
@@ -194,7 +195,8 @@
           "tor",
           "lightning",
           "otsclient",
-          "batcher"
+          "batcher",
+          "specter"
         ]
       }
     },

cyphernodeconf_docker/templates/bitcoin/bitcoin-client.conf

@@ -7,5 +7,8 @@ regtest=1
 <% } %>
 
 rpcconnect=<%= (bitcoin_mode === 'internal')?'bitcoin':bitcoin_node_ip %>
+main.rpcport=8332
+test.rpcport=18332
+regtest.rpcport=18443
 rpcuser=<%= bitcoin_rpcuser %>
 rpcpassword=<%= bitcoin_rpcpassword %>

cyphernodeconf_docker/templates/bitcoin/bitcoin.conf

@@ -16,6 +16,7 @@ zmqpubrawblock=tcp://0.0.0.0:18501
 zmqpubrawtx=tcp://0.0.0.0:18502
 
 listen=1
+blockfilterindex=1
 
 <% if ( features.indexOf('tor') !== -1 && torifyables && torifyables.indexOf('tor_bitcoin') !== -1 ) { %>
 #tor

cyphernodeconf_docker/templates/installer/config.sh

@@ -2,6 +2,7 @@ INSTALLER_MODE=<%= installer_mode %>
 BITCOIN_INTERNAL=<%= (bitcoin_mode==="internal"?'true':'false') %>
 FEATURE_LIGHTNING=<%= (features.indexOf('lightning') != -1)?'true':'false' %>
 FEATURE_BATCHER=<%= (features.indexOf('batcher') != -1)?'true':'false' %>
+FEATURE_SPECTER=<%= (features.indexOf('specter') != -1)?'true':'false' %>
 FEATURE_OTSCLIENT=<%= (features.indexOf('otsclient') != -1)?'true':'false' %>
 LIGHTNING_IMPLEMENTATION=<%= lightning_implementation %>
 PROXY_DATAPATH=<%= proxy_datapath %>

dist/setup.sh

@@ -795,6 +795,20 @@ install_apps() {
       next
     fi
   fi
+
+  if [[ $FEATURE_SPECTER == true ]]; then
+    if [ -d "$current_path/apps/specter" ]; then
+      step "   delete ignoreThisApp for enabled Specter"
+      sudo_if_required rm -f $current_path/apps/specter/ignoreThisApp
+      next
+    fi
+  else
+    if [ -d "$current_path/apps/specter" ]; then
+      step "   create ignoreThisApp for disabled Specter"
+      sudo_if_required touch $current_path/apps/specter/ignoreThisApp
+      next
+    fi
+  fi
 }
 
 install() {