Wasabi 2 initial implementation

api_auth_docker/api-sample.properties

@@ -1,5 +1,10 @@
 # The file api.properties generated by the installer should look like this.
 
+
+# Watcher can do stuff
+# Spender can do what the watcher can do plus more stuff
+# Admin can do what the spender can do plus even more stuff
+
 # Stats can:
 action_helloworld=stats
 action_getblockchaininfo=stats
@@ -16,26 +21,31 @@ action_unwatchxpubbylabel=watcher
 action_getactivewatchesbyxpub=watcher
 action_getactivewatchesbylabel=watcher
 action_getactivexpubwatches=watcher
+action_get_txns_by_watchlabel=watcher
+action_get_unused_addresses_by_watchlabel=watcher
 action_watchtxid=watcher
 action_unwatchtxid=watcher
 action_getactivewatches=watcher
-action_get_txns_by_watchlabel=watcher
-action_get_unused_addresses_by_watchlabel=watcher
 action_getbestblockhash=watcher
 action_getbestblockinfo=watcher
 action_getblockinfo=watcher
 action_gettransaction=watcher
+action_ots_verify=watcher
+action_ots_info=watcher
 action_ln_getinfo=watcher
 action_ln_create_invoice=watcher
 action_ln_getconnectionstring=watcher
 action_ln_decodebolt11=watcher
 action_ln_listpeers=watcher
 action_ln_getroute=watcher
 action_ln_listpays=watcher
+action_ln_paystatus=watcher
 action_bitcoin_estimatesmartfee=watcher
+action_bitcoin_gettxoutproof=watcher
+action_validateaddress=watcher
 
 # Spender can do what the watcher can do, plus:
-action_getxnslist=spender
+action_get_txns_spending=spender
 action_getbalance=spender
 action_getbalances=spender
 action_getbalancebyxpub=spender
@@ -47,13 +57,14 @@ action_addtobatch=spender
 action_batchspend=spender
 action_deriveindex=spender
 action_derivepubpath=spender
+action_deriveindex_bitcoind=spender
+action_derivepubpath_bitcoind=spender
 action_ln_pay=spender
 action_ln_newaddr=spender
 action_ots_stamp=spender
 action_ots_getfile=spender
 action_ln_getinvoice=spender
 action_ln_delinvoice=spender
-action_ln_decodebolt11=spender
 action_ln_connectfund=spender
 action_ln_listfunds=spender
 action_ln_withdraw=spender
@@ -63,17 +74,19 @@ action_removefrombatch=spender
 action_listbatchers=spender
 action_getbatcher=spender
 action_getbatchdetails=spender
+action_bitcoin_generatetoaddress=spender
 action_wasabi_getnewaddress=spender
 action_wasabi_getbalances=spender
 action_wasabi_spend=spender
 action_wasabi_gettransactions=spender
 action_wasabi_getunspentcoins=spender
+action_wasabi_payincoinjoin=spender
+action_wasabi_listpayincoinjoin=spender
+action_wasabi_cancelpayincoinjoin=spender
 action_config_props=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
 action_executecallbacks=internal
 action_ots_backoffice=internal

api_auth_docker/tests/test-gatekeeper.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-. ./colors.sh
+DIR="$( dirname -- "${BASH_SOURCE[0]}"; )"; 
+. $DIR/colors.sh
 
 # We just want to test the authentication/authorization, not the actual called function
 # You need jq installed for these tests to run correctly
@@ -47,6 +48,9 @@
 # action_ln_listpays=watcher
 # action_ln_paystatus=watcher
 # action_bitcoin_estimatesmartfee=watcher
+# action_bitcoin_gettxoutproof=watcher
+# action_validateaddress=watcher
+
 #
 # # Spender can do what the watcher can do, plus:
 # action_get_txns_spending=spender
@@ -78,6 +82,7 @@
 # action_listbatchers=spender
 # action_getbatcher=spender
 # action_getbatchdetails=spender
+# action_bitcoin_generatetoaddress=spender
 #
 # # Admin can do what the spender can do, plus:
 #
@@ -105,7 +110,7 @@ trace_following() {
 start_test_container() {
   trace 1 "[stop_test_container] ${BCyan}Starting test container...${Color_Off}\n"
 
-  docker run -d --rm -t --name tests-gatekeeper --network=cyphernodenet alpine
+  docker run -d --rm -t --name tests-gatekeeper --network=cyphernodenet alpine:3.15.4
 
   sleep 2
 }
@@ -380,28 +385,32 @@ test_watcher_functions() {
   test_authorization "ln_getinfo" "${token}" ${has_access} || return 200
 
   # action_ln_create_invoice=watcher
-  test_authorization "ln_create_invoice" "${token}" ${has_access} || return 210
+  test_authorization "ln_create_invoice" "${token}" ${has_access} || return 201
 
   # action_ln_getconnectionstring=watcher
-  test_authorization "ln_getconnectionstring" "${token}" ${has_access} || return 220
+  test_authorization "ln_getconnectionstring" "${token}" ${has_access} || return 202
 
   # action_ln_decodebolt11=watcher
-  test_authorization "ln_decodebolt11" "${token}" ${has_access} || return 230
+  test_authorization "ln_decodebolt11" "${token}" ${has_access} || return 203
 
   # action_ln_listpeers=watcher
-  test_authorization "ln_listpeers" "${token}" ${has_access} || return 240
+  test_authorization "ln_listpeers" "${token}" ${has_access} || return 204
 
   # action_ln_getroute=watcher
-  test_authorization "ln_getroute" "${token}" ${has_access} || return 250
+  test_authorization "ln_getroute" "${token}" ${has_access} || return 205
 
   # action_ln_listpays=watcher
-  test_authorization "ln_listpays" "${token}" ${has_access} || return 260
+  test_authorization "ln_listpays" "${token}" ${has_access} || return 206
 
   # action_ln_paystatus=watcher
-  test_authorization "ln_paystatus" "${token}" ${has_access} || return 270
+  test_authorization "ln_paystatus" "${token}" ${has_access} || return 207
 
   # action_bitcoin_estimatesmartfee=watcher
-  test_authorization "bitcoin_estimatesmartfee" "${token}" ${has_access} || return 280
+  test_authorization "bitcoin_estimatesmartfee" "${token}" ${has_access} || return 210
+
+  test_authorization "bitcoin_gettxoutproof" "${token}" ${has_access} || return 220
+
+  test_authorization "validateaddress" "${token}" ${has_access} || return 230
 
   trace 1 "\n\n[test_watcher_functions] ${On_IGreen}${BBlack} SUCCESS with user ${id}! ${Color_Off}\n"
 }
@@ -418,88 +427,90 @@ test_spender_functions() {
   test_authorization "get_txns_spending" "${token}" ${has_access} || return 10
 
   # action_getbalance=spender
-  test_authorization "getbalance" "${token}" ${has_access} || return 10
+  test_authorization "getbalance" "${token}" ${has_access} || return 15
 
   # action_getbalances=spender
-  test_authorization "getbalances" "${token}" ${has_access} || return 10
+  test_authorization "getbalances" "${token}" ${has_access} || return 20
 
   # action_getbalancebyxpub=spender
-  test_authorization "getbalancebyxpub" "${token}" ${has_access} || return 10
+  test_authorization "getbalancebyxpub" "${token}" ${has_access} || return 25
 
   # action_getbalancebyxpublabel=spender
-  test_authorization "getbalancebyxpublabel" "${token}" ${has_access} || return 10
+  test_authorization "getbalancebyxpublabel" "${token}" ${has_access} || return 30
 
   # action_getnewaddress=spender
-  test_authorization "getnewaddress" "${token}" ${has_access} || return 10
+  test_authorization "getnewaddress" "${token}" ${has_access} || return 35
 
   # action_spend=spender
-  test_authorization "spend" "${token}" ${has_access} || return 10
+  test_authorization "spend" "${token}" ${has_access} || return 40
 
   # action_bumpfee=spender
-  test_authorization "bumpfee" "${token}" ${has_access} || return 10
+  test_authorization "bumpfee" "${token}" ${has_access} || return 45
 
   # action_addtobatch=spender
-  test_authorization "addtobatch" "${token}" ${has_access} || return 10
+  test_authorization "addtobatch" "${token}" ${has_access} || return 50
 
   # action_batchspend=spender
-  test_authorization "batchspend" "${token}" ${has_access} || return 10
+  test_authorization "batchspend" "${token}" ${has_access} || return 55
 
   # action_deriveindex=spender
-  test_authorization "deriveindex" "${token}" ${has_access} || return 10
+  test_authorization "deriveindex" "${token}" ${has_access} || return 60
 
   # action_derivepubpath=spender
-  test_authorization "derivepubpath" "${token}" ${has_access} || return 10
+  test_authorization "derivepubpath" "${token}" ${has_access} || return 65
 
   # action_deriveindex_bitcoind=spender
-  test_authorization "deriveindex_bitcoind" "${token}" ${has_access} || return 10
+  test_authorization "deriveindex_bitcoind" "${token}" ${has_access} || return 70
 
   # action_derivepubpath_bitcoind=spender
-  test_authorization "derivepubpath_bitcoind" "${token}" ${has_access} || return 10
+  test_authorization "derivepubpath_bitcoind" "${token}" ${has_access} || return 75
 
   # action_ln_pay=spender
-  test_authorization "ln_pay" "${token}" ${has_access} || return 10
+  test_authorization "ln_pay" "${token}" ${has_access} || return 80
 
   # action_ln_newaddr=spender
-  test_authorization "ln_newaddr" "${token}" ${has_access} || return 10
+  test_authorization "ln_newaddr" "${token}" ${has_access} || return 85
 
   # action_ots_stamp=spender
-  test_authorization "ots_stamp" "${token}" ${has_access} || return 10
+  test_authorization "ots_stamp" "${token}" ${has_access} || return 90
 
   # action_ots_getfile=spender
-  test_authorization "ots_getfile" "${token}" ${has_access} || return 10
+  test_authorization "ots_getfile" "${token}" ${has_access} || return 95
 
   # action_ln_getinvoice=spender
-  test_authorization "ln_getinvoice" "${token}" ${has_access} || return 10
+  test_authorization "ln_getinvoice" "${token}" ${has_access} || return 100
 
   # action_ln_delinvoice=spender
-  test_authorization "ln_delinvoice" "${token}" ${has_access} || return 10
+  test_authorization "ln_delinvoice" "${token}" ${has_access} || return 105
 
   # action_ln_connectfund=spender
-  test_authorization "ln_connectfund" "${token}" ${has_access} || return 10
+  test_authorization "ln_connectfund" "${token}" ${has_access} || return 110
 
   # action_ln_listfunds=spender
-  test_authorization "ln_listfunds" "${token}" ${has_access} || return 10
+  test_authorization "ln_listfunds" "${token}" ${has_access} || return 120
 
   # action_ln_withdraw=spender
-  test_authorization "ln_withdraw" "${token}" ${has_access} || return 10
+  test_authorization "ln_withdraw" "${token}" ${has_access} || return 125
 
   # action_createbatcher=spender
-  test_authorization "createbatcher" "${token}" ${has_access} || return 10
+  test_authorization "createbatcher" "${token}" ${has_access} || return 130
 
   # action_updatebatcher=spender
-  test_authorization "updatebatcher" "${token}" ${has_access} || return 10
+  test_authorization "updatebatcher" "${token}" ${has_access} || return 135
 
   # action_removefrombatch=spender
-  test_authorization "removefrombatch" "${token}" ${has_access} || return 10
+  test_authorization "removefrombatch" "${token}" ${has_access} || return 140
 
   # action_listbatchers=spender
-  test_authorization "listbatchers" "${token}" ${has_access} || return 10
+  test_authorization "listbatchers" "${token}" ${has_access} || return 145
 
   # action_getbatcher=spender
-  test_authorization "getbatcher" "${token}" ${has_access} || return 10
+  test_authorization "getbatcher" "${token}" ${has_access} || return 150
 
   # action_getbatchdetails=spender
-  test_authorization "getbatchdetails" "${token}" ${has_access} || return 10
+  test_authorization "getbatchdetails" "${token}" ${has_access} || return 155
+
+  test_authorization "bitcoin_generatetoaddress" "${token}" ${has_access} || return 160
 
   trace 1 "\n\n[test_spender_functions] ${On_IGreen}${BBlack} SUCCESS with user ${id}! ${Color_Off}\n"
 }

build.sh

@@ -11,7 +11,7 @@ NOTIFIER_VERSION="v0.9.0-dev-local"
 PROXYCRON_VERSION="v0.9.0-dev-local"
 OTSCLIENT_VERSION="v0.9.0-dev-local"
 PYCOIN_VERSION="v0.9.0-dev-local"
-WASABI_VERSION="v0.3.1-local"
+WASABI_VERSION="v0.4.0-dev-local"
 
 trace()
 {

cron_docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.12.4
+FROM alpine:3.15.4
 
 RUN apk add --update --no-cache \
     curl

cyphernodeconf_docker/Dockerfile

@@ -1,17 +1,17 @@
-FROM golang:1.13.15-alpine3.12 as builder-torgen
+FROM golang:1.17-alpine3.16 as builder-torgen
 
 RUN apk add git build-base
 
-RUN mkdir -p /go/src/torgen
+RUN mkdir -p /go/src
 
-COPY torgen/torgen.go /go/src/torgen
+COPY torgen /go/src/torgen
 
-WORKDIR /go/src/torgen
+WORKDIR /go/src/torgen/src
 
 RUN go get
 
 RUN go build torgen.go
-RUN chmod +x /go/src/torgen/torgen
+RUN chmod +x /go/src/torgen/src/torgen
 
 FROM alpine:3.12.4 as builder-qrencode
 
@@ -35,7 +35,7 @@ FROM node:15.11.0-alpine3.12
 ENV EDITOR=/usr/bin/nano
 
 COPY . /app
-COPY --from=builder-torgen /go/src/torgen/torgen /app/torgen
+COPY --from=builder-torgen /go/src/torgen/src/torgen /app/torgen
 COPY --from=builder-qrencode /usr/local/bin/qrencode /usr/local/bin/
 COPY --from=builder-qrencode /usr/local/lib/libqrencode.so.4.1.0 /usr/local/lib/libqrencode.so.4
 

cyphernodeconf_docker/lib/app.js

@@ -292,6 +292,9 @@ module.exports = class App {
       if (this.isChecked('torifyables', 'tor_bitcoin')) {
         this.sessionData.tor_bitcoin_hostname = await torgen.generateTorFiles(this.destinationPath( path.join( destinationDirName, 'tor/bitcoin/hidden_service' ) ));
       }
+      if (this.isChecked('torifyables', 'tor_wasabibackend')) {
+        this.sessionData.tor_wasabibackend_hostname = await torgen.generateTorFiles(this.destinationPath( path.join( destinationDirName, 'tor/wasabibackend/hidden_service' ) ));
+      }
     }
 
     // creates keys if they don't exist or we say so.
@@ -449,7 +452,9 @@ module.exports = class App {
           uacomment: this.config.data.bitcoin_uacomment,
           torified: this.torifyables.find(data => data.value === 'tor_bitcoin').checked,
           clearnet: !this.isChecked('features', 'tor') || this.isChecked('clearnet', 'clearnet_bitcoin'),
-          tor_hostname: this.sessionData.tor_bitcoin_hostname
+          tor_hostname: this.sessionData.tor_bitcoin_hostname,
+          port: (this.config.data.net === 'regtest') ? 18444 : ((this.config.data.net === 'testnet') ? 18333 : 8333),
+          network: this.config.data.net
         }
       },
       {
@@ -569,7 +574,10 @@ module.exports = class App {
         docker: "cyphernode/wasabi:"+this.config.docker_versions['cyphernode/wasabi'],
         extra: {
           mixuntil: this.config.data.wasabi_mixuntil,
-          instance_count: this.config.data.wasabi_instance_count
+          instance_count: this.config.data.wasabi_instance_count,
+          torified: this.torifyables.find(data => data.value === 'tor_wasabibackend').checked,
+          clearnet: !this.isChecked('features', 'tor') || this.isChecked('clearnet', 'clearnet_wasabibackend'),
+          tor_hostname: this.sessionData.tor_wasabibackend_hostname
         }
       }
     }