TODO break up to fixups

Author: bhandras

assets/deposit/deposit.go

@@ -1,12 +1,15 @@
 package deposit
 
 import (
+	"context"
 	"encoding/hex"
 	"fmt"
 	"time"
 
+	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcwallet/wtxmgr"
+	"github.com/lightninglabs/loop/assets"
 	"github.com/lightninglabs/taproot-assets/proof"
 )
 
@@ -130,9 +133,11 @@ type DepositInfo struct {
 	// only set if the deposit has been confirmed.
 	Expiry uint32
 
-	// SweepAddr is the address we'll use to sweep the deposit back after
-	// timeout or if cooperatively withdrawing.
-	SweepAddr string
+	// SweepScriptKey is the script key of the swept asset.
+	SweepScriptKey *btcec.PublicKey
+
+	// SweepInternalKey is the internal key of output of the swept asset.
+	SweepInternalKey *btcec.PublicKey
 }
 
 // Copy creates a copy of the DepositInfo struct.
@@ -146,7 +151,6 @@ func (d *DepositInfo) Copy() *DepositInfo {
 		State:              d.State,
 		ConfirmationHeight: d.ConfirmationHeight,
 		Expiry:             d.Expiry,
-		SweepAddr:          d.SweepAddr,
 	}
 
 	if d.Outpoint != nil {
@@ -156,6 +160,16 @@ func (d *DepositInfo) Copy() *DepositInfo {
 		}
 	}
 
+	if d.SweepScriptKey != nil {
+		pubKey := *d.SweepScriptKey
+		info.SweepScriptKey = &pubKey
+	}
+
+	if d.SweepInternalKey != nil {
+		pubKey := *d.SweepInternalKey
+		info.SweepInternalKey = &pubKey
+	}
+
 	return info
 }
 
@@ -175,10 +189,22 @@ type Deposit struct {
 	AnchorRootHash []byte
 }
 
-// label returns a string label that we can use for marking a transfer funding
-// the deposit. This is useful if we need to filter deposits.
-func (d *Deposit) label() string {
-	return fmt.Sprintf("deposit %v", d.ID)
+// fundingLabel returns a string label that we can use for marking a transfer
+// funding the deposit. This is useful if we need to filter deposits.
+func (d *Deposit) fundingLabel() string {
+	return fmt.Sprintf("deposit funding %v", d.ID)
+}
+
+// timeoutSweepLabel is a string label that we can use for marking a timeout
+// sweep transfer. This is useful if we need to filter deposits.
+func (d *Deposit) timeoutSweepLabel() string {
+	return fmt.Sprintf("deposit timeout sweep %v", d.ID)
+}
+
+// withdrawLabel is a string label that we can use for marking a withdrawal
+// sweep transfer. This is useful if we need to filter deposits.
+func (d *Deposit) withdrawLabel() string {
+	return fmt.Sprintf("deposit withdraw sweep %v", d.ID)
 }
 
 // lockID converts a deposit ID to a lock ID. The lock ID is used to lock inputs
@@ -200,3 +226,23 @@ func (d *Deposit) lockID() (wtxmgr.LockID, error) {
 
 	return lockID, nil
 }
+
+// GenerateSweepKeys generates the sweep script key and internal key for the
+// deposit sweep.
+func (d *Deposit) GenerateSweepKeys(ctx context.Context,
+	client *assets.TapdClient) error {
+
+	if d.SweepScriptKey != nil {
+		return nil
+	}
+
+	scriptKey, internalKeyDesc, err := client.DeriveNewKeys(ctx)
+	if err != nil {
+		return err
+	}
+
+	d.SweepScriptKey = scriptKey.PubKey
+	d.SweepInternalKey = internalKeyDesc.PubKey
+
+	return nil
+}