Merge pull request #198 from bhandras/segwit_fix

loopin: fix htlc address in LoopIn SwapResponse
4 years ago · d01c33cbb6
parent f36d5a79f7 936bb851f2
commit d01c33cbb6
1 changed files with 7 additions and 6 deletions
--- a/loopd/swapclient_server.go
+++ b/loopd/swapclient_server.go
@ -434,16 +434,17 @@ func (s *swapClientServer) LoopIn(ctx context.Context,
 		return nil, err
 	}

-	np2wshAddress := swapInfo.HtlcAddressNP2WSH.String()
 	response := &looprpc.SwapResponse{
-		Id:                swapInfo.SwapHash.String(),
-		IdBytes:           swapInfo.SwapHash[:],
-		HtlcAddress:       np2wshAddress,
-		HtlcAddressNp2Wsh: np2wshAddress,
+		Id:               swapInfo.SwapHash.String(),
+		IdBytes:          swapInfo.SwapHash[:],
+		HtlcAddressP2Wsh: swapInfo.HtlcAddressP2WSH.String(),
 	}

 	if req.ExternalHtlc {
-		response.HtlcAddressP2Wsh = swapInfo.HtlcAddressP2WSH.String()
+		response.HtlcAddressNp2Wsh = swapInfo.HtlcAddressNP2WSH.String()
+		response.HtlcAddress = response.HtlcAddressNp2Wsh
+	} else {
+		response.HtlcAddress = response.HtlcAddressP2Wsh
 	}

 	return response, nil