sweeper: set sequence to be able to sweep htlc v2 utxo

Author: bhandras

loopin.go

@@ -759,9 +759,10 @@ func (s *loopInSwap) publishTimeoutTx(ctx context.Context,
 		return s.htlc.GenTimeoutWitness(sig), nil
 	}
 
+	sequence := uint32(0)
 	timeoutTx, err := s.sweeper.CreateSweepTx(
-		ctx, s.height, s.htlc, *htlcOutpoint, s.SenderKey, witnessFunc,
-		htlcValue, fee, s.timeoutAddr,
+		ctx, s.height, sequence, s.htlc, *htlcOutpoint, s.SenderKey,
+		witnessFunc, htlcValue, fee, s.timeoutAddr,
 	)
 	if err != nil {
 		return err

loopout.go

@@ -937,8 +937,8 @@ func (s *loopOutSwap) sweep(ctx context.Context,
 
 	// Create sweep tx.
 	sweepTx, err := s.sweeper.CreateSweepTx(
-		ctx, s.height, s.htlc, htlcOutpoint, s.ReceiverKey, witnessFunc,
-		htlcValue, fee, s.DestAddr,
+		ctx, s.height, s.htlc.SuccessSequence(), s.htlc, htlcOutpoint,
+		s.ReceiverKey, witnessFunc, htlcValue, fee, s.DestAddr,
 	)
 	if err != nil {
 		return err

sweep/sweeper.go

@@ -21,7 +21,7 @@ type Sweeper struct {
 
 // CreateSweepTx creates an htlc sweep tx.
 func (s *Sweeper) CreateSweepTx(
-	globalCtx context.Context, height int32,
+	globalCtx context.Context, height int32, sequence uint32,
 	htlc *swap.Htlc, htlcOutpoint wire.OutPoint,
 	keyBytes [33]byte,
 	witnessFunc func(sig []byte) (wire.TxWitness, error),
@@ -37,6 +37,7 @@ func (s *Sweeper) CreateSweepTx(
 	sweepTx.AddTxIn(&wire.TxIn{
 		PreviousOutPoint: htlcOutpoint,
 		SignatureScript:  htlc.SigScript,
+		Sequence:         sequence,
 	})
 
 	// Add output for the destination address.