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

@@ -126,10 +126,40 @@ 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
 	})
 }
 
+// UpdateLoopOutAssetInfo updates the offchain send amounts of the prepay and
+// swap payment for an asset loop out swap.
+func (db *BaseDB) UpdateLoopOutAssetInfo(ctx context.Context, hash lntypes.Hash,
+	asset *LoopOutAssetSwap) error {
+
+	return db.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 {
@@ -543,7 +573,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) (*LoopOut,
+	error) {
 
 	htlcKeys, err := fetchHtlcKeys(
 		row.SenderScriptPubkey, row.ReceiverScriptPubkey,
@@ -601,6 +632,20 @@ func ConvertLoopOutRow(network *chaincfg.Params, row sqlc.GetLoopOutSwapRow,
 		},
 	}
 
+	if row.AssetID != nil {
+		loopOut.Contract.AssetSwapInfo = &LoopOutAssetSwap{
+			AssetId:     row.AssetID,
+			SwapRfqId:   row.SwapRfqID,
+			PrepayRfqId: row.PrepayRfqID,
+			SwapPaidAmt: uint64(
+				unmarshalSqlInt64(row.AssetAmtPaidSwap),
+			),
+			PrepayPaidAmt: uint64(
+				unmarshalSqlInt64(row.AssetAmtPaidPrepay),
+			),
+		}
+	}
+
 	if row.OutgoingChanSet != "" {
 		chanSet, err := ConvertOutgoingChanSet(row.OutgoingChanSet)
 		if err != nil {
@@ -803,3 +848,11 @@ func blobTo33ByteSlice(blob []byte) ([33]byte, error) {
 
 	return key, nil
 }
+
+func unmarshalSqlInt64(data sql.NullInt64) int64 {
+	if !data.Valid {
+		return 0
+	}
+
+	return data.Int64
+}

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,22 @@
+CREATE TABLE IF NOT EXISTS loopout_swaps_asset_info (
+        -- 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

@@ -2,27 +2,33 @@
 SELECT
     swaps.*,
     loopout_swaps.*,
-    htlc_keys.*
+    htlc_keys.*,
+    loopout_swaps_asset_info.*
 FROM
     swaps
 JOIN
     loopout_swaps ON swaps.swap_hash = loopout_swaps.swap_hash
 JOIN
     htlc_keys ON swaps.swap_hash = htlc_keys.swap_hash
+LEFT JOIN
+    loopout_swaps_asset_info ON swaps.swap_hash = loopout_swaps_asset_info.swap_hash
 ORDER BY
     swaps.id;
 
 -- name: GetLoopOutSwap :one
 SELECT
     swaps.*,
     loopout_swaps.*,
-    htlc_keys.*
+    htlc_keys.*,
+    loopout_swaps_asset_info.*
 FROM
     swaps
 JOIN
     loopout_swaps ON swaps.swap_hash = loopout_swaps.swap_hash
 JOIN
     htlc_keys ON swaps.swap_hash = htlc_keys.swap_hash
+LEFT JOIN
+    loopout_swaps_asset_info ON swaps.swap_hash = loopout_swaps_asset_info.swap_hash
 WHERE
     swaps.swap_hash = $1;
 
@@ -111,6 +117,23 @@ INSERT INTO loopout_swaps (
     $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12
 );
 
+-- name: InsertLoopOutAsset :exec
+INSERT INTO loopout_swaps_asset_info (
+    swap_hash,
+    asset_id,
+    swap_rfq_id,
+    prepay_rfq_id
+) VALUES (
+    $1, $2, $3, $4
+);
+
+-- name: UpdateLoopOutAssetOffchainPayments :exec
+UPDATE loopout_swaps_asset_info
+SET
+    asset_amt_paid_swap = $2,
+    asset_amt_paid_prepay = $3
+WHERE swap_hash = $1;
+
 -- name: InsertLoopIn :exec
 INSERT INTO loopin_swaps (
     swap_hash,