loopdb: add migraton and DB code to handle payment timeout

Author: bhandras

loopdb/loopout.go

@@ -61,6 +61,10 @@ type LoopOutContract struct {
 	// allow the server to delay the publication in exchange for possibly
 	// lower fees.
 	SwapPublicationDeadline time.Time
+
+	// PaymentTimeout is the timeout for any individual off-chain payment
+	// attempt.
+	PaymentTimeout time.Duration
 }
 
 // ChannelSet stores a set of channels.

loopdb/sql_store.go

@@ -443,6 +443,7 @@ func loopOutToInsertArgs(hash lntypes.Hash,
 		PrepayInvoice:       loopOut.PrepayInvoice,
 		MaxPrepayRoutingFee: int64(loopOut.MaxPrepayRoutingFee),
 		PublicationDeadline: loopOut.SwapPublicationDeadline.UTC(),
+		PaymentTimeout:      int32(loopOut.PaymentTimeout.Seconds()),
 	}
 }
 
@@ -536,6 +537,9 @@ func ConvertLoopOutRow(network *chaincfg.Params, row sqlc.GetLoopOutSwapRow,
 			PrepayInvoice:           row.PrepayInvoice,
 			MaxPrepayRoutingFee:     btcutil.Amount(row.MaxPrepayRoutingFee),
 			SwapPublicationDeadline: row.PublicationDeadline,
+			PaymentTimeout: time.Duration(
+				row.PaymentTimeout,
+			) * time.Second,
 		},
 		Loop: Loop{
 			Hash: swapHash,

loopdb/sql_test.go

@@ -60,6 +60,7 @@ func TestSqliteLoopOutStore(t *testing.T) {
 		SweepConfTarget:         2,
 		HtlcConfirmations:       2,
 		SwapPublicationDeadline: initiationTime,
+		PaymentTimeout:          time.Second * 11,
 	}
 
 	t.Run("no outgoing set", func(t *testing.T) {
@@ -120,6 +121,8 @@ func testSqliteLoopOutStore(t *testing.T, pendingSwap *LoopOutContract) {
 		if expectedState == StatePreimageRevealed {
 			require.NotNil(t, swap.State().HtlcTxHash)
 		}
+
+		require.Equal(t, time.Second*11, swap.Contract.PaymentTimeout)
 	}
 
 	// If we create a new swap, then it should show up as being initialized

loopdb/sqlc/batch.sql.go

@@ -0,0 +1,3 @@
+-- payment_timeout is the timeout in seconds for each individual off-chain
+-- payment.
+ALTER TABLE loopout_swaps DROP COLUMN payment_timeout;

loopdb/sqlc/migrations/000007_payment_timeout.down.sql

@@ -0,0 +1,3 @@
+-- payment_timeout is the timeout in seconds for each individual off-chain
+-- payment.
+ALTER TABLE loopout_swaps ADD payment_timeout INTEGER NOT NULL DEFAULT 0;

loopdb/sqlc/migrations/000007_payment_timeout.up.sql

@@ -105,9 +105,10 @@ INSERT INTO loopout_swaps (
     prepay_invoice,
     max_prepay_routing_fee,
     publication_deadline,
-    single_sweep
+    single_sweep,
+    payment_timeout
 ) VALUES (
-    $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11
+    $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12
 );
 
 -- name: InsertLoopIn :exec
@@ -131,4 +132,4 @@ INSERT INTO htlc_keys(
     client_key_index
 ) VALUES (
     $1, $2, $3, $4, $5, $6, $7
-);
+);