cmd: print both htlc addresses when monitoring a loop-in

cmd/loop/loopin.go

@@ -153,7 +153,10 @@ func loopIn(ctx *cli.Context) error {
 
 	fmt.Printf("Swap initiated\n")
 	fmt.Printf("ID:           %v\n", resp.Id)
-	fmt.Printf("HTLC address: %v\n", resp.HtlcAddress)
+	if external {
+		fmt.Printf("HTLC address (NP2WSH): %v\n", resp.HtlcAddressNp2Wsh)
+	}
+	fmt.Printf("HTLC address (P2WSH): %v\n", resp.HtlcAddressP2Wsh)
 	fmt.Println()
 	fmt.Printf("Run `loop monitor` to monitor progress.\n")
 

cmd/loop/main.go

@@ -225,11 +225,24 @@ func parseAmt(text string) (btcutil.Amount, error) {
 }
 
 func logSwap(swap *looprpc.SwapStatus) {
-	fmt.Printf("%v %v %v %v - %v",
-		time.Unix(0, swap.LastUpdateTime).Format(time.RFC3339),
-		swap.Type, swap.State, btcutil.Amount(swap.Amt),
-		swap.HtlcAddress,
-	)
+	if swap.Type == looprpc.SwapType_LOOP_OUT {
+		fmt.Printf("%v %v %v %v - %v",
+			time.Unix(0, swap.LastUpdateTime).Format(time.RFC3339),
+			swap.Type, swap.State, btcutil.Amount(swap.Amt),
+			swap.HtlcAddressP2Wsh,
+		)
+	} else {
+		fmt.Printf("%v %v %v %v -",
+			time.Unix(0, swap.LastUpdateTime).Format(time.RFC3339),
+			swap.Type, swap.State, btcutil.Amount(swap.Amt))
+		if swap.HtlcAddressP2Wsh != "" {
+			fmt.Printf(" P2WSH: %v", swap.HtlcAddressP2Wsh)
+		}
+
+		if swap.HtlcAddressNp2Wsh != "" {
+			fmt.Printf(" NP2WSH: %v", swap.HtlcAddressNp2Wsh)
+		}
+	}
 
 	if swap.State != looprpc.SwapState_INITIATED &&
 		swap.State != looprpc.SwapState_HTLC_PUBLISHED &&