From 0a775e75a5357cc75ef63af99899e58c84053222 Mon Sep 17 00:00:00 2001 From: kexkey Date: Wed, 14 Oct 2020 11:20:57 -0400 Subject: [PATCH 1/4] Added Bitcoin Core configs for Specter --- cyphernodeconf_docker/templates/bitcoin/bitcoin-client.conf | 3 +++ cyphernodeconf_docker/templates/bitcoin/bitcoin.conf | 1 + 2 files changed, 4 insertions(+) diff --git a/cyphernodeconf_docker/templates/bitcoin/bitcoin-client.conf b/cyphernodeconf_docker/templates/bitcoin/bitcoin-client.conf index e9402e8..32924ad 100644 --- a/cyphernodeconf_docker/templates/bitcoin/bitcoin-client.conf +++ b/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 %> diff --git a/cyphernodeconf_docker/templates/bitcoin/bitcoin.conf b/cyphernodeconf_docker/templates/bitcoin/bitcoin.conf index 1c47cc6..6ad29d3 100644 --- a/cyphernodeconf_docker/templates/bitcoin/bitcoin.conf +++ b/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 From eb5c6a0cd46c3506b739249dcca8a61d4f690e45 Mon Sep 17 00:00:00 2001 From: kexkey Date: Wed, 14 Oct 2020 11:55:24 -0400 Subject: [PATCH 2/4] Right version --- dist/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/setup.sh b/dist/setup.sh index 5a5358b..52ff04e 100755 --- a/dist/setup.sh +++ b/dist/setup.sh @@ -823,7 +823,7 @@ NOTIFIER_VERSION="v0.5.0-dev" PROXYCRON_VERSION="v0.5.0-dev" OTSCLIENT_VERSION="v0.5.0-dev" PYCOIN_VERSION="v0.5.0-dev" -CYPHERAPPS_VERSION="dev" +CYPHERAPPS_VERSION="features/specter" BITCOIN_VERSION="v0.20.1" LIGHTNING_VERSION="v0.9.1" TRAEFIK_VERSION="v1.7.9-alpine" From 26db143b2231bdcbfef5c0366796fe40b7320d2a Mon Sep 17 00:00:00 2001 From: kexkey Date: Mon, 16 Nov 2020 17:40:17 -0500 Subject: [PATCH 3/4] Specter is now optional, enabled by default --- cyphernodeconf_docker/features.json | 5 ++++- cyphernodeconf_docker/lib/app.js | 4 ++++ cyphernodeconf_docker/schema/config-v0.2.5.json | 8 +++++--- .../templates/installer/config.sh | 1 + dist/setup.sh | 14 ++++++++++++++ 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/cyphernodeconf_docker/features.json b/cyphernodeconf_docker/features.json index 3c96c57..9045fde 100644 --- a/cyphernodeconf_docker/features.json +++ b/cyphernodeconf_docker/features.json @@ -14,6 +14,9 @@ { "name": "Batcher Cypherapp", "value": "batcher" + }, + { + "name": "Specter Cypherapp", + "value": "specter" } - ] diff --git a/cyphernodeconf_docker/lib/app.js b/cyphernodeconf_docker/lib/app.js index df889d9..ee75850 100644 --- a/cyphernodeconf_docker/lib/app.js +++ b/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'], diff --git a/cyphernodeconf_docker/schema/config-v0.2.5.json b/cyphernodeconf_docker/schema/config-v0.2.5.json index 30e3da2..4810ac5 100644 --- a/cyphernodeconf_docker/schema/config-v0.2.5.json +++ b/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" ] } }, diff --git a/cyphernodeconf_docker/templates/installer/config.sh b/cyphernodeconf_docker/templates/installer/config.sh index e8af0b1..65950c5 100644 --- a/cyphernodeconf_docker/templates/installer/config.sh +++ b/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 %> diff --git a/dist/setup.sh b/dist/setup.sh index 52ff04e..0eeebe9 100755 --- a/dist/setup.sh +++ b/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() { From 85345b1e2c029369d5a28f04bc8f418cef645fcf Mon Sep 17 00:00:00 2001 From: kexkey Date: Wed, 18 Nov 2020 16:51:47 -0500 Subject: [PATCH 4/4] Right Cypherapps branch for specter dev --- dist/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/setup.sh b/dist/setup.sh index 0eeebe9..91396b4 100755 --- a/dist/setup.sh +++ b/dist/setup.sh @@ -837,7 +837,7 @@ NOTIFIER_VERSION="v0.5.0-dev" PROXYCRON_VERSION="v0.5.0-dev" OTSCLIENT_VERSION="v0.5.0-dev" PYCOIN_VERSION="v0.5.0-dev" -CYPHERAPPS_VERSION="features/specter" +CYPHERAPPS_VERSION="dev" BITCOIN_VERSION="v0.20.1" LIGHTNING_VERSION="v0.9.1" TRAEFIK_VERSION="v1.7.9-alpine"