multi: integrate the new htlc v2 scripts to loop in/out

This commit bumps the current protocol version and integrates htlc v2
with loop in/out for new swaps, while keeping htlc v1 for any pending
swaps with previous protocol versions.

Author: bhandras

client.go

@@ -175,9 +175,10 @@ func (s *Client) FetchSwaps() ([]*SwapInfo, error) {
 
 	for _, swp := range loopOutSwaps {
 		htlc, err := swap.NewHtlc(
-			swap.HtlcV1, swp.Contract.CltvExpiry,
-			swp.Contract.SenderKey, swp.Contract.ReceiverKey,
-			swp.Hash, swap.HtlcP2WSH, s.lndServices.ChainParams,
+			GetHtlcScriptVersion(swp.Contract.ProtocolVersion),
+			swp.Contract.CltvExpiry, swp.Contract.SenderKey,
+			swp.Contract.ReceiverKey, swp.Hash, swap.HtlcP2WSH,
+			s.lndServices.ChainParams,
 		)
 		if err != nil {
 			return nil, err
@@ -195,18 +196,20 @@ func (s *Client) FetchSwaps() ([]*SwapInfo, error) {
 
 	for _, swp := range loopInSwaps {
 		htlcNP2WSH, err := swap.NewHtlc(
-			swap.HtlcV1, swp.Contract.CltvExpiry,
-			swp.Contract.SenderKey, swp.Contract.ReceiverKey,
-			swp.Hash, swap.HtlcNP2WSH, s.lndServices.ChainParams,
+			GetHtlcScriptVersion(swp.Contract.ProtocolVersion),
+			swp.Contract.CltvExpiry, swp.Contract.SenderKey,
+			swp.Contract.ReceiverKey, swp.Hash, swap.HtlcNP2WSH,
+			s.lndServices.ChainParams,
 		)
 		if err != nil {
 			return nil, err
 		}
 
 		htlcP2WSH, err := swap.NewHtlc(
-			swap.HtlcV1, swp.Contract.CltvExpiry,
-			swp.Contract.SenderKey, swp.Contract.ReceiverKey,
-			swp.Hash, swap.HtlcP2WSH, s.lndServices.ChainParams,
+			GetHtlcScriptVersion(swp.Contract.ProtocolVersion),
+			swp.Contract.CltvExpiry, swp.Contract.SenderKey,
+			swp.Contract.ReceiverKey, swp.Hash, swap.HtlcP2WSH,
+			s.lndServices.ChainParams,
 		)
 		if err != nil {
 			return nil, err

loopd/view.go

@@ -50,7 +50,7 @@ func viewOut(swapClient *loop.Client, chainParams *chaincfg.Params) error {
 
 	for _, s := range swaps {
 		htlc, err := swap.NewHtlc(
-			swap.HtlcV1,
+			loop.GetHtlcScriptVersion(s.Contract.ProtocolVersion),
 			s.Contract.CltvExpiry,
 			s.Contract.SenderKey,
 			s.Contract.ReceiverKey,
@@ -102,7 +102,7 @@ func viewIn(swapClient *loop.Client, chainParams *chaincfg.Params) error {
 
 	for _, s := range swaps {
 		htlc, err := swap.NewHtlc(
-			swap.HtlcV1,
+			loop.GetHtlcScriptVersion(s.Contract.ProtocolVersion),
 			s.Contract.CltvExpiry,
 			s.Contract.SenderKey,
 			s.Contract.ReceiverKey,

loopdb/protocol_version.go

@@ -31,13 +31,17 @@ const (
 	// propose a cltv expiry height for loop out.
 	ProtocolVersionUserExpiryLoopOut ProtocolVersion = 4
 
+	// ProtocolVersionHtlcV2 indicates that the client will use the new
+	// HTLC v2 scrips for swaps.
+	ProtocolVersionHtlcV2 ProtocolVersion = 5
+
 	// ProtocolVersionUnrecorded is set for swaps were created before we
 	// started saving protocol version with swaps.
 	ProtocolVersionUnrecorded ProtocolVersion = math.MaxUint32
 
 	// CurrentRpcProtocolVersion defines the version of the RPC protocol
 	// that is currently supported by the loop client.
-	CurrentRPCProtocolVersion = looprpc.ProtocolVersion_USER_EXPIRY_LOOP_OUT
+	CurrentRPCProtocolVersion = looprpc.ProtocolVersion_HTLC_V2
 
 	// CurrentInteranlProtocolVersionInternal defines the RPC current
 	// protocol in the internal representation.
@@ -70,6 +74,9 @@ func (p ProtocolVersion) String() string {
 	case ProtocolVersionUserExpiryLoopOut:
 		return "User Expiry Loop Out"
 
+	case ProtocolVersionHtlcV2:
+		return "HTLC V2"
+
 	default:
 		return "Unknown"
 	}

loopdb/protocol_version_test.go

@@ -19,6 +19,7 @@ func TestProtocolVersionSanity(t *testing.T) {
 		ProtocolVersionSegwitLoopIn,
 		ProtocolVersionPreimagePush,
 		ProtocolVersionUserExpiryLoopOut,
+		ProtocolVersionHtlcV2,
 	}
 
 	rpcVersions := [...]looprpc.ProtocolVersion{
@@ -27,6 +28,7 @@ func TestProtocolVersionSanity(t *testing.T) {
 		looprpc.ProtocolVersion_NATIVE_SEGWIT_LOOP_IN,
 		looprpc.ProtocolVersion_PREIMAGE_PUSH_LOOP_OUT,
 		looprpc.ProtocolVersion_USER_EXPIRY_LOOP_OUT,
+		looprpc.ProtocolVersion_HTLC_V2,
 	}
 
 	require.Equal(t, len(versions), len(rpcVersions))

loopin.go

@@ -172,11 +172,13 @@ func newLoopInSwap(globalCtx context.Context, cfg *swapConfig,
 			MaxMinerFee:      request.MaxMinerFee,
 			MaxSwapFee:       request.MaxSwapFee,
 			Label:            request.Label,
+			ProtocolVersion:  loopdb.CurrentInternalProtocolVersion,
 		},
 	}
 
 	swapKit := newSwapKit(
-		swapHash, swap.TypeIn, cfg, &contract.SwapContract,
+		swapHash, swap.TypeIn,
+		cfg, &contract.SwapContract,
 	)
 
 	swapKit.lastUpdateTime = initiationTime
@@ -217,7 +219,8 @@ func resumeLoopInSwap(reqContext context.Context, cfg *swapConfig,
 	log.Infof("Resuming loop in swap %v", hash)
 
 	swapKit := newSwapKit(
-		hash, swap.TypeIn, cfg, &pend.Contract.SwapContract,
+		hash, swap.TypeIn, cfg,
+		&pend.Contract.SwapContract,
 	)
 
 	swap := &loopInSwap{

loopout.go

@@ -171,12 +171,14 @@ func newLoopOutSwap(globalCtx context.Context, cfg *swapConfig,
 			MaxMinerFee:      request.MaxMinerFee,
 			MaxSwapFee:       request.MaxSwapFee,
 			Label:            request.Label,
+			ProtocolVersion:  loopdb.CurrentInternalProtocolVersion,
 		},
 		OutgoingChanSet: chanSet,
 	}
 
 	swapKit := newSwapKit(
-		swapHash, swap.TypeOut, cfg, &contract.SwapContract,
+		swapHash, swap.TypeOut,
+		cfg, &contract.SwapContract,
 	)
 
 	swapKit.lastUpdateTime = initiationTime
@@ -223,7 +225,8 @@ func resumeLoopOutSwap(reqContext context.Context, cfg *swapConfig,
 	log.Infof("Resuming loop out swap %v", hash)
 
 	swapKit := newSwapKit(
-		hash, swap.TypeOut, cfg, &pend.Contract.SwapContract,
+		hash, swap.TypeOut, cfg,
+		&pend.Contract.SwapContract,
 	)
 
 	// Create the htlc.