cmd/loop: handle external loop in flag

Author: guggero

cmd/loop/loopin.go

@@ -56,27 +56,29 @@ func loopIn(ctx *cli.Context) error {
 	}
 	defer cleanup()
 
+	external := ctx.Bool("external")
 	quote, err := client.GetLoopInQuote(
 		context.Background(),
 		&looprpc.QuoteRequest{
-			Amt: int64(amt),
+			Amt:          int64(amt),
+			ExternalHtlc: external,
 		},
 	)
 	if err != nil {
 		return err
 	}
 
 	limits := getInLimits(amt, quote)
-
-	if err := displayLimits(loop.TypeIn, amt, limits); err != nil {
+	err = displayLimits(loop.TypeIn, amt, limits, external)
+	if err != nil {
 		return err
 	}
 
 	resp, err := client.LoopIn(context.Background(), &looprpc.LoopInRequest{
 		Amt:          int64(amt),
 		MaxMinerFee:  int64(limits.maxMinerFee),
 		MaxSwapFee:   int64(limits.maxSwapFee),
-		ExternalHtlc: ctx.Bool("external"),
+		ExternalHtlc: external,
 	})
 	if err != nil {
 		return err

cmd/loop/loopout.go

@@ -94,7 +94,7 @@ func loopOut(ctx *cli.Context) error {
 
 	limits := getLimits(amt, quote)
 
-	if err := displayLimits(loop.TypeOut, amt, limits); err != nil {
+	if err := displayLimits(loop.TypeOut, amt, limits, false); err != nil {
 		return err
 	}
 

cmd/loop/main.go

@@ -116,14 +116,23 @@ func getLimits(amt btcutil.Amount, quote *looprpc.QuoteResponse) *limits {
 	}
 }
 
-func displayLimits(swapType loop.Type, amt btcutil.Amount, l *limits) error {
+func displayLimits(swapType loop.Type, amt btcutil.Amount, l *limits,
+	externalHtlc bool) error {
+
 	totalSuccessMax := l.maxMinerFee + l.maxSwapFee
 	if l.maxSwapRoutingFee != nil {
 		totalSuccessMax += *l.maxSwapRoutingFee
 	}
 	if l.maxPrepayRoutingFee != nil {
 		totalSuccessMax += *l.maxPrepayRoutingFee
 	}
+	
+	if swapType == loop.TypeIn && externalHtlc {
+		fmt.Printf("On-chain fee for external loop in is not " +
+			"included.\nSufficient fees will need to be paid " +
+			"when constructing the transaction in the external " +
+			"wallet.\n\n")
+	}
 
 	fmt.Printf("Max swap fees for %d Loop %v: %d\n",
 		btcutil.Amount(amt), swapType, totalSuccessMax,
@@ -139,7 +148,10 @@ func displayLimits(swapType loop.Type, amt btcutil.Amount, l *limits) error {
 		return nil
 	case "x":
 		fmt.Println()
-		fmt.Printf("Max on-chain fee:                 %d\n", l.maxMinerFee)
+		if swapType != loop.TypeIn || !externalHtlc {
+			fmt.Printf("Max on-chain fee:                 %d\n",
+				l.maxMinerFee)
+		}
 
 		if l.maxSwapRoutingFee != nil {
 			fmt.Printf("Max off-chain swap routing fee:   %d\n",