(to squash) sweepbatcher: add mode with presigned transactions

Author: starius

sweepbatcher/presigned.go

@@ -340,7 +340,11 @@ func presign(ctx context.Context, presigner presigner, destAddr btcutil.Address,
 	)
 
 	// Calculate the locktime value to use for high feerate transactions.
-	highFeeRateLockTime := uint32(timeout - timeoutThreshold)
+	// If timeout <= timeoutThreshold, don't set LockTime (keep value 0).
+	var highFeeRateLockTime uint32
+	if timeout > timeoutThreshold {
+		highFeeRateLockTime = uint32(timeout - timeoutThreshold)
+	}
 
 	// Calculate which feerate to consider high. At least 100 sat/vbyte and
 	// at least 10x of current nextBlockFeeRate.
@@ -487,7 +491,8 @@ func (b *batch) publishPresigned(ctx context.Context) (btcutil.Amount, error,
 	numSweeps := len(tx.TxIn)
 	b.Infof("attempting to publish custom signed tx=%v, desiredFeerate=%v,"+
 		" signedFeeRate=%v, weight=%v, fee=%v, sweeps=%d, destAddr=%s",
-		txHash, feeRate, signedFeeRate, weight, fee, numSweeps, address)
+		txHash, feeRate, signedFeeRate, realWeight, fee, numSweeps,
+		address)
 	b.debugLogTx("serialized batch", tx)
 
 	// Publish the transaction.

sweepbatcher/presigned_test.go

@@ -714,7 +714,37 @@ func TestPresign(t *testing.T) {
 		},
 
 		{
-			name:           "two coop sweeps",
+			name:           "one sweep",
+			presigner:      &mockPresigner{},
+			primarySweepID: op1,
+			sweeps: []sweep{
+				{
+					outpoint: op1,
+					value:    1_000_000,
+					timeout:  1000,
+				},
+			},
+			destAddr:         destAddr,
+			nextBlockFeeRate: chainfee.FeePerKwFloor,
+			wantOutputs: []btcutil.Amount{
+				999900, 999880, 999856, 999827, 999793, 999752,
+				999702, 999643, 999572, 999486, 999384, 999260,
+				999113, 998935, 998723, 998467, 998161, 997793,
+				997352, 996823, 996187, 995425, 994510, 993413,
+				992096, 990515, 988618, 986342, 983610, 980332,
+				976399, 971679, 966015, 959218, 951062, 941274,
+				929530, 915435, 898523, 878227, 853873, 824648,
+			},
+			wantLockTimes: []uint32{
+				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 950, 950, 950,
+				950, 950, 950, 950, 950, 950, 950, 950, 950,
+				950, 950, 950, 950,
+			},
+		},
+
+		{
+			name:           "two sweeps",
 			presigner:      &mockPresigner{},
 			primarySweepID: op1,
 			sweeps: []sweep{
@@ -751,7 +781,7 @@ func TestPresign(t *testing.T) {
 		},
 
 		{
-			name:           "two coop sweeps, another primary",
+			name:           "two sweeps, another primary",
 			presigner:      &mockPresigner{},
 			primarySweepID: op2,
 			sweeps: []sweep{
@@ -787,6 +817,42 @@ func TestPresign(t *testing.T) {
 			},
 		},
 
+		{
+			name:           "timeout < 50",
+			presigner:      &mockPresigner{},
+			primarySweepID: op1,
+			sweeps: []sweep{
+				{
+					outpoint: op1,
+					value:    1_000_000,
+					timeout:  40,
+				},
+				{
+					outpoint: op2,
+					value:    2_000_000,
+					timeout:  40,
+				},
+			},
+			destAddr:         destAddr,
+			nextBlockFeeRate: 50 * chainfee.FeePerKwFloor,
+			wantOutputs: []btcutil.Amount{
+				2999841, 2999810, 2999773, 2999728, 2999673,
+				2999608, 2999530, 2999436, 2999323, 2999188,
+				2999026, 2998831, 2998598, 2998317, 2997981,
+				2997577, 2997093, 2996512, 2995814, 2994977,
+				2993973, 2992768, 2991322, 2989587, 2987505,
+				2985006, 2982007, 2978409, 2974091, 2968910,
+				2962691, 2955230, 2946276, 2935532, 2922639,
+				2907167, 2888600, 2866320, 2839584, 2807501,
+				2769001, 2722802,
+			},
+			wantLockTimes: []uint32{
+				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+				0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			},
+		},
+
 		{
 			name:           "high current feerate => locktime later",
 			presigner:      &mockPresigner{},

sweepbatcher/sweep_batch.go

@@ -662,18 +662,6 @@ func (b *batch) addSweeps(ctx context.Context, sweeps []*sweep) (bool, error) {
 					" this input: %v",
 					sweeps[0].swapHash[:6], err)
 
-				return false, nil
-			}
-		}
-	} else {
-		// Ensure that all the sweeps in the batch don't use presigned.
-		for _, s := range b.sweeps {
-			if s.presigned {
-				b.Warnf("failed to add a non-presigned sweep "+
-					"%x to the batch, because the batch "+
-					"has presigned sweep %x",
-					sweeps[0].swapHash[:6], s.swapHash[:6])
-
 				return false, nil
 			}
 		}

sweepbatcher/sweep_batcher.go

@@ -718,7 +718,7 @@ func (b *Batcher) PresignSweepsGroup(ctx context.Context, inputs []Input,
 // and adds them to the batcher for handling. This will either place the sweep
 // in an existing batch or create a new one. The method can be called multiple
 // times, but the sweeps (including the order of them) must be the same. If
-// notifier is provided, the batcher sends back sweeping results though it.
+// notifier is provided, the batcher sends back sweeping results through it.
 func (b *Batcher) AddSweep(ctx context.Context, sweepReq *SweepRequest) error {
 	// If the batcher is shutting down, quit now.
 	select {

sweepbatcher/sweep_batcher_presigned_test.go

@@ -243,7 +243,7 @@ func (h *mockPresignedHelper) FetchSweep(_ context.Context,
 }
 
 // testPresigned_forgotten_presign checks that adding sweeps causes the batcher
-// to fail of the sweeps were not presigned with PresignSweepsGroup. In addition
+// to fail if the sweeps were not presigned with PresignSweepsGroup. In addition
 // to that it checks that PresignSweepsGroup fails if the outpoint is offline.
 func testPresigned_forgotten_presign(t *testing.T,
 	batcherStore testBatcherStore) {