staticaddr: retain historic withdrawal info

Author: hieblmi

cmd/loop/staticaddr.go

@@ -30,6 +30,7 @@ var staticAddressCommands = cli.Command{
 		newStaticAddressCommand,
 		listUnspentCommand,
 		listDepositsCommand,
+		listWithdrawalsCommand,
 		listStaticAddressSwapsCommand,
 		withdrawalCommand,
 		summaryCommand,
@@ -312,6 +313,38 @@ func listDeposits(ctx *cli.Context) error {
 	return nil
 }
 
+var listWithdrawalsCommand = cli.Command{
+	Name:  "listwithdrawals",
+	Usage: "Display a summary of past withdrawals.",
+	Description: `
+	`,
+	Action: listWithdrawals,
+}
+
+func listWithdrawals(ctx *cli.Context) error {
+	ctxb := context.Background()
+	if ctx.NArg() > 0 {
+		return cli.ShowCommandHelp(ctx, "withdrawals")
+	}
+
+	client, cleanup, err := getClient(ctx)
+	if err != nil {
+		return err
+	}
+	defer cleanup()
+
+	resp, err := client.ListStaticAddressWithdrawals(
+		ctxb, &looprpc.ListStaticAddressWithdrawalRequest{},
+	)
+	if err != nil {
+		return err
+	}
+
+	printRespJSON(resp)
+
+	return nil
+}
+
 var listStaticAddressSwapsCommand = cli.Command{
 	Name:  "listswaps",
 	Usage: "Shows a list of finalized static address swaps.",

loopd/daemon.go

@@ -604,6 +604,10 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 	depositManager = deposit.NewManager(depoCfg)
 
 	// Static address deposit withdrawal manager setup.
+	withdrawalStore := withdraw.NewSqlStore(
+		loopdb.NewTypedStore[withdraw.Querier](baseDb),
+		depositStore,
+	)
 	withdrawalCfg := &withdraw.ManagerConfig{
 		StaticAddressServerClient: staticAddressClient,
 		AddressManager:            staticAddressManager,
@@ -612,6 +616,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 		ChainParams:               d.lnd.ChainParams,
 		ChainNotifier:             d.lnd.ChainNotifier,
 		Signer:                    d.lnd.Signer,
+		Store:                     withdrawalStore,
 	}
 	withdrawalManager = withdraw.NewManager(withdrawalCfg, blockHeight)
 

loopd/swapclient_server.go

@@ -1673,6 +1673,53 @@ func (s *swapClientServer) ListStaticAddressDeposits(ctx context.Context,
 	}, nil
 }
 
+// ListStaticAddressWithdrawals returns a list of all finalized withdrawal
+// transactions.
+func (s *swapClientServer) ListStaticAddressWithdrawals(ctx context.Context,
+	_ *looprpc.ListStaticAddressWithdrawalRequest) (
+	*looprpc.ListStaticAddressWithdrawalResponse, error) {
+
+	withdrawals, err := s.withdrawalManager.GetAllWithdrawals(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(withdrawals) == 0 {
+		return &looprpc.ListStaticAddressWithdrawalResponse{}, nil
+	}
+
+	clientWithdrawals := make(
+		[]*looprpc.StaticAddressWithdrawal, 0, len(withdrawals),
+	)
+	for _, w := range withdrawals {
+		deposits := make([]*looprpc.Deposit, 0, len(w.Deposits))
+		for _, d := range w.Deposits {
+			deposits = append(deposits, &looprpc.Deposit{
+				Id:                 d.ID[:],
+				Outpoint:           d.OutPoint.String(),
+				Value:              int64(d.Value),
+				ConfirmationHeight: d.ConfirmationHeight,
+				State: toClientDepositState(
+					d.GetState(),
+				),
+			})
+		}
+		withdrawal := &looprpc.StaticAddressWithdrawal{
+			TxId:                       w.TxID.String(),
+			Deposits:                   deposits,
+			TotalDepositAmountSatoshis: int64(w.TotalDepositAmount),
+			WithdrawnAmountSatoshis:    int64(w.WithdrawnAmount),
+			ChangeAmountSatoshis:       int64(w.ChangeAmount),
+			ConfirmationHeight:         uint32(w.ConfirmationHeight),
+		}
+		clientWithdrawals = append(clientWithdrawals, withdrawal)
+	}
+
+	return &looprpc.ListStaticAddressWithdrawalResponse{
+		Withdrawals: clientWithdrawals,
+	}, nil
+}
+
 // ListStaticAddressSwaps returns a list of all swaps that are currently pending
 // or previously succeeded.
 func (s *swapClientServer) ListStaticAddressSwaps(ctx context.Context,

loopdb/sqlc/querier.go

@@ -1,89 +1,36 @@
 -- name: CreateWithdrawal :exec
-WITH inserted_withdrawal AS (
-    INSERT INTO withdrawals (
-        withdrawal_id,
-        withdrawal_tx_id,
-        total_deposit_amount,
-        withdrawn_amount,
-        change_amount,
-        initiation_time,
-        confirmation_height
-    ) VALUES (
-        $1, $2, $3, $4, $5, $6, $7
-    )
-    RETURNING withdrawal_id
-)
-INSERT INTO withdrawal_deposits (withdrawal_id, deposit_id)
-SELECT iw.withdrawal_id, did
-FROM inserted_withdrawal iw,
-     unnest($8::BLOB[]) AS did;
+INSERT INTO withdrawals (
+    withdrawal_id,
+    withdrawal_tx_id,
+    total_deposit_amount,
+    withdrawn_amount,
+    change_amount,
+    initiation_time,
+    confirmation_height
+) VALUES (
+     $1, $2, $3, $4, $5, $6, $7
+ );
 
--- name: GetWithdrawalWithDepositsJSON :one
-SELECT
-    w.withdrawal_id,
-    w.withdrawal_tx_id,
-    w.total_deposit_amount,
-    w.withdrawn_amount,
-    w.change_amount,
-    w.initiation_time,
-    w.confirmation_height AS withdrawal_confirmation_height,
+-- name: CreateWithdrawalDeposit :exec
+INSERT INTO withdrawal_deposits (
+    withdrawal_id,
+    deposit_id
+) VALUES (
+     $1, $2
+);
 
-    json_agg(
-            json_build_object(
-                    'deposit_id', d.deposit_id,
-                    'tx_hash', d.tx_hash,
-                    'out_index', d.out_index,
-                    'amount', d.amount,
-                    'confirmation_height', d.confirmation_height,
-                    'timeout_sweep_pk_script', d.timeout_sweep_pk_script,
-                    'expiry_sweep_txid', d.expiry_sweep_txid,
-                    'finalized_withdrawal_tx', d.finalized_withdrawal_tx
-            )
-    ) AS deposits
+-- name: GetWithdrawalDeposits :many
+SELECT
+    deposit_id
 FROM
-    withdrawals w
-        JOIN
-    withdrawal_deposits wd ON w.withdrawal_id = wd.withdrawal_id
-        JOIN
-    deposits d ON wd.deposit_id = d.deposit_id
+    withdrawal_deposits
 WHERE
-        w.withdrawal_tx_id = $1
-GROUP BY
-    w.id, w.withdrawal_id, w.withdrawal_tx_id, w.total_deposit_amount,
-    w.withdrawn_amount, w.change_amount, w.initiation_time, w.confirmation_height;
+    withdrawal_id = $1;
 
--- name: GetAllWithdrawalsWithDepositsJSON :many
+-- name: GetAllWithdrawals :many
 SELECT
-    w.withdrawal_id,
-    w.withdrawal_tx_id,
-    w.total_deposit_amount,
-    w.withdrawn_amount,
-    w.change_amount,
-    w.initiation_time,
-    w.confirmation_height AS withdrawal_confirmation_height,
-
-    json_agg(
-            json_build_object(
-                    'deposit_id', d.deposit_id,
-                    'tx_hash', d.tx_hash,
-                    'out_index', d.out_index,
-                    'amount', d.amount,
-                    'confirmation_height', d.confirmation_height,
-                    'timeout_sweep_pk_script', d.timeout_sweep_pk_script,
-                    'expiry_sweep_txid', d.expiry_sweep_txid,
-                    'finalized_withdrawal_tx', d.finalized_withdrawal_tx
-            )
-                ORDER BY d.id
-    ) AS deposits
+    *
 FROM
-    withdrawals w
-        JOIN
-    withdrawal_deposits wd ON w.withdrawal_id = wd.withdrawal_id
-        JOIN
-    deposits d ON wd.deposit_id = d.deposit_id
-GROUP BY
-    w.id, w.withdrawal_id, w.withdrawal_tx_id, w.total_deposit_amount,
-    w.withdrawn_amount, w.change_amount, w.initiation_time, w.confirmation_height
+    withdrawals
 ORDER BY
-    w.initiation_time DESC;
-
+    initiation_time DESC;