moving faucet compose to use new infra sub domain containing the infr…

…astructure. Some small bug fixes (#180)
libsv · Aug 3, 2022 · 2c934c9 · 2c934c9
1 parent 0ae0e3c
commit 2c934c9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/config/viper.go b/config/viper.go
@@ -76,7 +76,7 @@ func (v *ViperConfig) WithHeadersClient() ConfigurationLoader {
 func (v *ViperConfig) WithWallet() ConfigurationLoader {
 	v.Wallet = &Wallet{
 		Network:             NetworkType(viper.GetString(EnvNetwork)),
-		SPVRequired:         viper.GetBool(EnvWalletSpvRequired),
+		SPVRequired:         false, // disabled for now until new proof method is available viper.GetBool(EnvWalletSpvRequired),
 		PaymentExpiryHours:  viper.GetInt64(EnvPaymentExpiry),
 		PayoutLimitEnabled:  viper.GetBool(EnvWalletPayoutLimitEnabled),
 		PayoutLimitSatoshis: viper.GetUint64(EnvWalletPayoutLimitSats),

diff --git a/docker-compose.faucet.yml b/docker-compose.faucet.yml
@@ -3,25 +3,25 @@ version: "3.7"
 services:
   payd:
     container_name: payd
-    image: libsv/payd:0.1.11
+    image: libsv/payd:0.1.13
     environment:
       DB_DSN: "file:paydb/wallet.db?_foreign_keys=true&pooling=true"
-      LOG_LEVEL: "debug"
-      DPP_HOST: "wss://faucet.bitcoinsv.io/dpp/ws"
-      MAPI_CALLBACK_HOST: "http://faucet.bitcoinsv.io/dpp"
+      LOG_LEVEL: "info"
+      DPP_HOST: "wss://infra.bitcoinsv.io/dpp/ws"
+      MAPI_CALLBACK_HOST: "http://infra.bitcoinsv.io/dpp"
       MAPI_MINERURL: "https://mapi.taal.com"
       MAPI_TOKEN: "Bearer testnet_27986b25bffa600482251a19e984f04d"
       MAPI_MINERNAME: "taal"
-      PEERCHANNELS_HOST: "faucet.bitcoinsv.io"
+      PEERCHANNELS_HOST: "infra.bitcoinsv.io"
       PEERCHANNELS_PATH: "peerchannels"
       PEERCHANNELS_TLS: 'true'
-      WALLET_SPVREQUIRED: 'true'
+      WALLET_SPVREQUIRED: 'false'
     volumes:
       - ./run/regtest/payd:/paydb
 
   payd-merchant:
     container_name: payd-merchant
-    image: libsv/payd:0.1.11
+    image: libsv/payd:0.1.13
     volumes:
       - ./run/regtest/payd-merchant:/paydb
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   payd:
     container_name: payd
-    image: libsv/payd:0.1.11
+    image: libsv/payd:0.1.13
     environment:
       DB_DSN: "file:paydb/wallet.db?_foreign_keys=true&pooling=true"
       LOG_LEVEL: "info"
@@ -24,7 +24,7 @@ services:
 
   payd-merchant:
     container_name: payd-merchant
-    image: libsv/payd:0.1.11
+    image: libsv/payd:0.1.13
     environment:
       DB_DSN: "file:paydb/merchant-wallet.db?_foreign_keys=true&pooling=true"
       SERVER_HOST: payd-merchant:28443

diff --git a/service/peerchannels_notify.go b/service/peerchannels_notify.go
@@ -121,7 +121,6 @@ func (p *peerChannelsNotifySvc) listen(ctx context.Context, sub *payd.PeerChanne
 			in <- true
 		}
 	}()
-
 	for {
 		select {
 		case <-ctx.Done():

diff --git a/service/proofs.go b/service/proofs.go
@@ -83,5 +83,5 @@ func (p *proofs) HandlePeerChannelsMessage(ctx context.Context, msgs spvchannels
 		}
 		p.l.Debugf("handling peer channel message - stored")
 	}
-	return false, nil
+	return true, nil
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     			in <- true
     		}
     	}()
     	for {
     		select {
     		case <-ctx.Done():
@@ Expand Down @@