staticaddr: withdrawal changes to be squashed

Author: hieblmi

loopd/swapclient_server.go

@@ -1429,10 +1429,7 @@ func (s *swapClientServer) WithdrawDeposits(ctx context.Context,
 		}
 	}
 
-	err = s.withdrawalManager.WithdrawDeposits(ctx, outpoints)
-	if err != nil {
-		return nil, err
-	}
+	s.withdrawalManager.DeliverWithdrawalRequest(ctx, outpoints)
 
 	return &looprpc.WithdrawDepositsResponse{}, err
 }

loopdb/sqlc/migrations/000010_static_address_deposits.up.sql

@@ -26,9 +26,10 @@ CREATE TABLE IF NOT EXISTS deposits (
     -- expiry_sweep_txid is the transaction id of the expiry sweep.
     expiry_sweep_txid BLOB,
 
-    -- withdrawal_sweep_address is the address that will be used to sweep the
-    -- deposit cooperatively with the server before it has expired.
-    withdrawal_sweep_address TEXT
+    -- finalized_withdrawal_tx is the coop signed tx that will be used to sweep
+    -- the deposit back to the clients wallet. It will be republished on block
+    -- arrival and after daemon restarts.
+    finalized_withdrawal_tx TEXT
 );
 
 -- deposit_updates contains all the updates to a deposit.

loopdb/sqlc/models.go

@@ -7,7 +7,7 @@ INSERT INTO deposits (
     confirmation_height,
     timeout_sweep_pk_script,
     expiry_sweep_txid,
-    withdrawal_sweep_address
+    finalized_withdrawal_tx
 ) VALUES (
              $1,
              $2,
@@ -26,7 +26,7 @@ SET
     out_index = $3,
     confirmation_height = $4,
     expiry_sweep_txid = $5,
-    withdrawal_sweep_address = $6
+    finalized_withdrawal_tx = $6
 WHERE
     deposits.deposit_id = $1;
 

loopdb/sqlc/queries/static_address_deposits.sql

@@ -52,9 +52,9 @@ type Deposit struct {
 	// ExpirySweepTxid is the transaction id of the expiry sweep.
 	ExpirySweepTxid chainhash.Hash
 
-	// WithdrawalSweepAddress is the address that is used to
-	// cooperatively sweep the deposit to before it is expired.
-	WithdrawalSweepAddress string
+	// FinalizedWithdrawalTx is the coop signed withdrawal transaction. It
+	// is republished on new block arrivals and on client restarts.
+	FinalizedWithdrawalTx *wire.MsgTx
 
 	sync.Mutex
 }

loopdb/sqlc/static_address_deposits.sql.go

@@ -1,8 +1,10 @@
 package deposit
 
 import (
+	"bytes"
 	"context"
 	"database/sql"
+	"encoding/hex"
 
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
@@ -39,10 +41,6 @@ func (s *SqlStore) CreateDeposit(ctx context.Context, deposit *Deposit) error {
 		Amount:               int64(deposit.Value),
 		ConfirmationHeight:   deposit.ConfirmationHeight,
 		TimeoutSweepPkScript: deposit.TimeOutSweepPkScript,
-		WithdrawalSweepAddress: sql.NullString{
-			String: deposit.WithdrawalSweepAddress,
-			Valid:  deposit.WithdrawalSweepAddress != "",
-		},
 	}
 
 	updateArgs := sqlc.InsertDepositUpdateParams{
@@ -81,18 +79,34 @@ func (s *SqlStore) UpdateDeposit(ctx context.Context, deposit *Deposit) error {
 		}
 	)
 
+	var finalizedWithdrawalTx string
+	if deposit.FinalizedWithdrawalTx != nil {
+		var buffer bytes.Buffer
+		err := deposit.FinalizedWithdrawalTx.Serialize(
+			&buffer,
+		)
+		if err != nil {
+			return err
+		}
+
+		finalizedWithdrawalTx = hex.EncodeToString(buffer.Bytes())
+	}
+
 	updateArgs := sqlc.UpdateDepositParams{
 		DepositID:          deposit.ID[:],
 		TxHash:             txHash,
 		OutIndex:           outIndex.Int32,
 		ConfirmationHeight: confirmationHeight.Int64,
-		ExpirySweepTxid:    deposit.ExpirySweepTxid[:],
-		WithdrawalSweepAddress: sql.NullString{
-			String: deposit.WithdrawalSweepAddress,
-			Valid:  deposit.WithdrawalSweepAddress != "",
+		FinalizedWithdrawalTx: sql.NullString{
+			String: finalizedWithdrawalTx,
+			Valid:  finalizedWithdrawalTx != "",
 		},
 	}
 
+	if deposit.ExpirySweepTxid != (chainhash.Hash{}) {
+		updateArgs.ExpirySweepTxid = deposit.ExpirySweepTxid[:]
+	}
+
 	return s.baseDB.ExecTx(ctx, &loopdb.SqliteTxOptions{},
 		func(q *sqlc.Queries) error {
 			err := q.UpdateDeposit(ctx, updateArgs)
@@ -200,17 +214,31 @@ func (s *SqlStore) toDeposit(row sqlc.Deposit,
 		expirySweepTxid = *hash
 	}
 
+	var finalizedWithdrawalTx *wire.MsgTx
+	if row.FinalizedWithdrawalTx.Valid {
+		finalizedWithdrawalTx = &wire.MsgTx{}
+		tx, err := hex.DecodeString(row.FinalizedWithdrawalTx.String)
+		if err != nil {
+			return nil, err
+		}
+
+		err = finalizedWithdrawalTx.Deserialize(bytes.NewReader(tx))
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	return &Deposit{
 		ID:    id,
 		state: fsm.StateType(lastUpdate.UpdateState),
 		OutPoint: wire.OutPoint{
 			Hash:  *txHash,
 			Index: uint32(row.OutIndex),
 		},
-		Value:                  btcutil.Amount(row.Amount),
-		ConfirmationHeight:     row.ConfirmationHeight,
-		TimeOutSweepPkScript:   row.TimeoutSweepPkScript,
-		ExpirySweepTxid:        expirySweepTxid,
-		WithdrawalSweepAddress: row.WithdrawalSweepAddress.String,
+		Value:                 btcutil.Amount(row.Amount),
+		ConfirmationHeight:    row.ConfirmationHeight,
+		TimeOutSweepPkScript:  row.TimeoutSweepPkScript,
+		ExpirySweepTxid:       expirySweepTxid,
+		FinalizedWithdrawalTx: finalizedWithdrawalTx,
 	}, nil
 }

staticaddr/deposit/deposit.go

@@ -37,8 +37,8 @@ type DepositManager interface {
 	AllOutpointsActiveDeposits(outpoints []wire.OutPoint,
 		stateFilter fsm.StateType) ([]*deposit.Deposit, bool)
 
-	TransitionDeposits(deposits []*deposit.Deposit, event fsm.EventType,
-		expectedFinalState fsm.StateType) error
+	TransitionDeposits(ctx context.Context, deposits []*deposit.Deposit,
+		event fsm.EventType, expectedFinalState fsm.StateType) error
 
-	UpdateDeposit(d *deposit.Deposit) error
+	UpdateDeposit(ctx context.Context, d *deposit.Deposit) error
 }