(commit to fixup) add publish delay

Make sure fee-rate is updated by loopout.go before the value is used by
sweepbatcher.

Author: starius

client.go

@@ -62,8 +62,14 @@ var (
 	// probeTimeout is the maximum time until a probe is allowed to take.
 	probeTimeout = 3 * time.Minute
 
+	// repushDelay is the delay of (re)adding a sweep to sweepbatcher after
+	// a block is mined.
 	repushDelay = 1 * time.Second
 
+	// additionalDelay is the delay added on top of repushDelay inside the
+	// sweepbatcher to publish a sweep transaction.
+	additionalDelay = 1 * time.Second
+
 	// MinerFeeEstimationFailed is a magic number that is returned in a
 	// quote call as the miner fee if the fee estimation in lnd's wallet
 	// failed because of insufficient funds.
@@ -217,6 +223,17 @@ func NewClient(dbDir string, loopDB loopdb.SwapStore,
 		sweepbatcher.WithCustomFeeRate(
 			loopOutSweepFeerateProvider.GetMinFeeRate,
 		),
+
+		// Upon new block arrival, republishing is triggered in both
+		// loopout.go code (waitForHtlcSpendConfirmedV2/ <-timerChan)
+		// and in sweepbatcher code (batch.Run/case <-timerChan). The
+		// former updates the fee rate which is used by the later by
+		// calling AddSweep. Make sure they are ordered, add additional
+		// delay time to sweepbatcher's handling. The delay used in
+		// loopout.go is repushDelay.
+		sweepbatcher.WithPublishDelay(
+			repushDelay+additionalDelay,
+		),
 	)
 
 	executor = newExecutor(&executorConfig{