loopdb: add asset params to store

Author: sputn1ck

loopdb/interface.go

@@ -30,6 +30,11 @@ type SwapStore interface {
 	UpdateLoopOut(ctx context.Context, hash lntypes.Hash, time time.Time,
 		state SwapStateData) error
 
+	// UpdateLoopOutAssetInfo updates the asset information for a loop out
+	// swap.
+	UpdateLoopOutAssetInfo(ctx context.Context, hash lntypes.Hash,
+		asset *LoopOutAssetSwap) error
+
 	// FetchLoopInSwaps returns all swaps currently in the store.
 	FetchLoopInSwaps(ctx context.Context) ([]*LoopIn, error)
 

loopdb/sql_store.go

@@ -39,9 +39,20 @@ func (db *BaseDB) FetchLoopOutSwaps(ctx context.Context) ([]*LoopOut,
 				return err
 			}
 
+			var assetInfo *sqlc.LoopoutSwapsAsset
+			if swap.IsAssetSwap {
+				assetI, err := tx.GetLoopOutSwapAssetInfo(
+					ctx, swap.SwapHash,
+				)
+				if err != nil {
+					return err
+				}
+				assetInfo = &assetI
+			}
+
 			loopOut, err := ConvertLoopOutRow(
 				db.network, sqlc.GetLoopOutSwapRow(swap),
-				updates,
+				updates, assetInfo,
 			)
 			if err != nil {
 				return err
@@ -71,13 +82,22 @@ func (db *BaseDB) FetchLoopOutSwap(ctx context.Context,
 			return err
 		}
 
+		var assetInfo *sqlc.LoopoutSwapsAsset
+		if swap.IsAssetSwap {
+			assetI, err := tx.GetLoopOutSwapAssetInfo(ctx, hash[:])
+			if err != nil {
+				return err
+			}
+			assetInfo = &assetI
+		}
+
 		updates, err := tx.GetSwapUpdates(ctx, swap.SwapHash)
 		if err != nil {
 			return err
 		}
 
 		loopOut, err = ConvertLoopOutRow(
-			db.network, swap, updates,
+			db.network, swap, updates, assetInfo,
 		)
 		if err != nil {
 			return err
@@ -126,10 +146,43 @@ func (db *BaseDB) CreateLoopOut(ctx context.Context, hash lntypes.Hash,
 			return err
 		}
 
+		// If the loop is an asset loop out, we'll also insert the
+		// asset details.
+		if swap.AssetSwapInfo != nil {
+			assetInfo := swap.AssetSwapInfo
+			err = tx.InsertLoopOutAsset(
+				ctx, sqlc.InsertLoopOutAssetParams{
+					SwapHash:    hash[:],
+					AssetID:     assetInfo.AssetId,
+					SwapRfqID:   assetInfo.SwapRfqId,
+					PrepayRfqID: assetInfo.PrepayRfqId,
+				},
+			)
+			if err != nil {
+				return err
+			}
+		}
+
 		return nil
 	})
 }
 
+func (db *BaseDB) UpdateLoopOutAssetInfo(ctx context.Context, hash lntypes.Hash,
+	asset *LoopOutAssetSwap) error {
+
+	log.Debugf("Updating asset info for swap %v %v", hash, asset)
+	writeOpts := NewSqlWriteOpts()
+	return db.ExecTx(ctx, writeOpts, func(tx *sqlc.Queries) error {
+		return tx.UpdateLoopOutAssetOffchainPayments(
+			ctx, sqlc.UpdateLoopOutAssetOffchainPaymentsParams{
+				SwapHash:           hash[:],
+				AssetAmtPaidSwap:   int64(asset.SwapPaidAmt),
+				AssetAmtPaidPrepay: int64(asset.PrepayPaidAmt),
+			},
+		)
+	})
+}
+
 // BatchCreateLoopOut adds multiple initiated swaps to the store.
 func (db *BaseDB) BatchCreateLoopOut(ctx context.Context,
 	swaps map[lntypes.Hash]*LoopOutContract) error {
@@ -499,6 +552,7 @@ func loopOutToInsertArgs(hash lntypes.Hash,
 		MaxPrepayRoutingFee: int64(loopOut.MaxPrepayRoutingFee),
 		PublicationDeadline: loopOut.SwapPublicationDeadline.UTC(),
 		PaymentTimeout:      int32(loopOut.PaymentTimeout.Seconds()),
+		IsAssetSwap:         loopOut.AssetSwapInfo != nil,
 	}
 }
 
@@ -543,7 +597,8 @@ func swapToHtlcKeysInsertArgs(hash lntypes.Hash,
 // ConvertLoopOutRow converts a database row containing a loop out swap to a
 // LoopOut struct.
 func ConvertLoopOutRow(network *chaincfg.Params, row sqlc.GetLoopOutSwapRow,
-	updates []sqlc.SwapUpdate) (*LoopOut, error) {
+	updates []sqlc.SwapUpdate, assetInfo *sqlc.LoopoutSwapsAsset) (*LoopOut,
+	error) {
 
 	htlcKeys, err := fetchHtlcKeys(
 		row.SenderScriptPubkey, row.ReceiverScriptPubkey,
@@ -601,6 +656,16 @@ func ConvertLoopOutRow(network *chaincfg.Params, row sqlc.GetLoopOutSwapRow,
 		},
 	}
 
+	if assetInfo != nil {
+		loopOut.Contract.AssetSwapInfo = &LoopOutAssetSwap{
+			AssetId:       assetInfo.AssetID,
+			SwapRfqId:     assetInfo.SwapRfqID,
+			PrepayRfqId:   assetInfo.PrepayRfqID,
+			SwapPaidAmt:   btcutil.Amount(assetInfo.AssetAmtPaidSwap),   // nolint: lll
+			PrepayPaidAmt: btcutil.Amount(assetInfo.AssetAmtPaidPrepay), // nolint: lll
+		}
+	}
+
 	if row.OutgoingChanSet != "" {
 		chanSet, err := ConvertOutgoingChanSet(row.OutgoingChanSet)
 		if err != nil {

loopdb/sql_test.go

@@ -22,6 +22,15 @@ const (
 	testLabel = "test label"
 )
 
+var (
+	testAssetId = []byte{
+		1, 1, 1, 1, 2, 2, 2, 2,
+		3, 3, 3, 3, 4, 4, 4, 4,
+		1, 1, 1, 1, 2, 2, 2, 2,
+		3, 3, 3, 3, 4, 4, 4, 4,
+	}
+)
+
 // TestSqliteLoopOutStore tests all the basic functionality of the current
 // sqlite swap store.
 func TestSqliteLoopOutStore(t *testing.T) {
@@ -80,6 +89,17 @@ func TestSqliteLoopOutStore(t *testing.T) {
 	t.Run("labelled swap", func(t *testing.T) {
 		testSqliteLoopOutStore(t, &labelledSwap)
 	})
+
+	assetSwap := unrestrictedSwap
+	assetSwap.AssetSwapInfo = &LoopOutAssetSwap{
+		AssetId:     testAssetId,
+		PrepayRfqId: testAssetId,
+		SwapRfqId:   testAssetId,
+	}
+
+	t.Run("asset swap", func(t *testing.T) {
+		testSqliteLoopOutStore(t, &assetSwap)
+	})
 }
 
 // testSqliteLoopOutStore tests the basic functionality of the current sqlite

loopdb/sqlc/migrations/000012_loop_out_asset_params.down.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS loopout_swaps_assets;

loopdb/sqlc/migrations/000012_loop_out_asset_params.up.sql

@@ -0,0 +1,24 @@
+ALTER TABLE loopout_swaps ADD COLUMN is_asset_swap BOOLEAN NOT NULL DEFAULT FALSE;
+
+CREATE TABLE IF NOT EXISTS loopout_swaps_assets (
+        -- swap_hash points to the parent loop out swap hash.
+        swap_hash BLOB PRIMARY KEY REFERENCES loopout_swaps(swap_hash),
+
+        -- asset_id is the asset that is used to pay the swap invoice.
+        asset_id BYTEA NOT NULL,
+
+        -- swap_rfq_id is the RFQ id that will be used to pay the swap invoice.
+        swap_rfq_id BYTEA NOT NULL,
+
+        -- prepay_rfq_id is the RFQ id that will be used to pay the prepay
+        -- invoice.
+        prepay_rfq_id BYTEA NOT NULL,
+
+        -- asset_amt_paid_swap is the actual asset amt that has been paid for
+        -- the swap invoice.
+        asset_amt_paid_swap BIGINT NOT NULL DEFAULT 0,
+
+        -- asset_amt_paid_prepay is the actual asset amt that has been paid for
+        -- the prepay invoice.
+        asset_amt_paid_prepay BIGINT NOT NULL DEFAULT 0
+)

loopdb/sqlc/models.go

@@ -26,6 +26,14 @@ JOIN
 WHERE
     swaps.swap_hash = $1;
 
+-- name: GetLoopOutSwapAssetInfo :one
+SELECT
+    *
+FROM
+    loopout_swaps_assets
+WHERE
+    swap_hash = $1;
+
 -- name: GetLoopInSwaps :many
 SELECT
     swaps.*,
@@ -106,11 +114,29 @@ INSERT INTO loopout_swaps (
     max_prepay_routing_fee,
     publication_deadline,
     single_sweep,
-    payment_timeout
+    payment_timeout,
+    is_asset_swap
 ) VALUES (
-    $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12
+    $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13
 );
 
+-- name: InsertLoopOutAsset :exec
+INSERT INTO loopout_swaps_assets (
+    swap_hash,
+    asset_id,
+    swap_rfq_id,
+    prepay_rfq_id
+) VALUES (
+    $1, $2, $3, $4
+);
+
+-- name: UpdateLoopOutAssetOffchainPayments :exec
+UPDATE loopout_swaps_assets
+SET
+    asset_amt_paid_swap = $2,
+    asset_amt_paid_prepay = $3
+WHERE swap_hash = $1;
+
 -- name: InsertLoopIn :exec
 INSERT INTO loopin_swaps (
     swap_hash,