labels: add labels package

Add labels package to handle labeling on-chain transactions.
* Opening label
* claim by CSV label
* claim by cooperative close label

labels/labels.go

@@ -0,0 +1,36 @@
+package labels
+
+import "fmt"
+
+const (
+	// peerswapLabelPattern is the pattern that peerswap uses to label on-chain transactions.
+	peerswapLabelPattern = "peerswap -- %s(swap id=%s)"
+	// opening is the label used for the opening transaction.
+	opening = "Opening"
+	// claimByInvoice is the label used for the claim by invoice transaction.
+	claimByInvoice = "ClaimByInvoice"
+	// claimByCoop is the label used for the claim by cooperative close transaction.
+	claimByCoop = "ClaimByCoop"
+	// ClaimByCsv is the label used for the claim by CSV transaction.
+	claimByCsv = "ClaimByCsv"
+)
+
+// Opening returns the label used for the opening transaction.
+func Opening(swapID string) string {
+	return fmt.Sprintf(peerswapLabelPattern, opening, swapID)
+}
+
+// ClaimByInvoice returns the label used for the claim by invoice transaction.
+func ClaimByInvoice(swapID string) string {
+	return fmt.Sprintf(peerswapLabelPattern, claimByInvoice, swapID)
+}
+
+// ClaimByCoop returns the label used for the claim by cooperative close transaction.
+func ClaimByCoop(swapID string) string {
+	return fmt.Sprintf(peerswapLabelPattern, claimByCoop, swapID)
+}
+
+// ClaimByCsv returns the label used for the claim by CSV transaction.
+func ClaimByCsv(swapID string) string {
+	return fmt.Sprintf(peerswapLabelPattern, claimByCsv, swapID)
+}

swap/actions.go

@@ -13,14 +13,14 @@ import (
 
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/elementsproject/peerswap/isdev"
+	"github.com/elementsproject/peerswap/labels"
 	"github.com/elementsproject/peerswap/lightning"
 	"github.com/elementsproject/peerswap/messages"
 )
 
 const (
-	BitcoinCsv    = 1008
-	LiquidCsv     = 60
-	peerswapLabel = "peerswap"
+	BitcoinCsv = 1008
+	LiquidCsv  = 60
 )
 
 type CheckRequestWrapperAction struct {
@@ -195,9 +195,10 @@ func (s *ClaimSwapTransactionWithPreimageAction) Execute(services *SwapServices,
 			return Event_OnRetry
 		}
 		swap.ClaimTxId = txId
-		err = wallet.LabelTransaction(txId, peerswapLabel)
+		err = wallet.LabelTransaction(txId, labels.ClaimByInvoice(swap.GetId().Short()))
 		if err != nil {
-			log.Infof("Error labeling trnasaction %v", err)
+			log.Infof("Error labeling transaction. txid: %s, label: %s, error: %v",
+				txId, labels.ClaimByInvoice(swap.GetId().Short()), err)
 		}
 	}
 
@@ -254,9 +255,10 @@ func (c *CreateAndBroadcastOpeningTransaction) Execute(services *SwapServices, s
 		// todo: idempotent states
 		return swap.HandleError(err)
 	}
-	err = wallet.LabelTransaction(txId, peerswapLabel)
+	err = wallet.LabelTransaction(txId, labels.Opening(swap.GetId().Short()))
 	if err != nil {
-		log.Infof("Error labeling trnasaction %v", err)
+		log.Infof("Error labeling transaction. txid: %s, label: %s, error: %v",
+			txId, labels.Opening(swap.GetId().Short()), err)
 	}
 	startingHeight, err := txWatcher.GetBlockHeight()
 	if err != nil {
@@ -446,9 +448,10 @@ func (c *ClaimSwapTransactionWithCsv) Execute(services *SwapServices, swap *Swap
 			return Event_OnRetry
 		}
 		swap.ClaimTxId = txId
-		err = wallet.LabelTransaction(txId, peerswapLabel)
+		err = wallet.LabelTransaction(txId, labels.ClaimByCsv(swap.GetId().Short()))
 		if err != nil {
-			log.Infof("Error labeling trnasaction %v", err)
+			log.Infof("Error labeling transaction. txid: %s, label: %s, error: %v",
+				txId, labels.ClaimByCsv(swap.GetId().Short()), err)
 		}
 	}
 
@@ -476,9 +479,10 @@ func (c *ClaimSwapTransactionCoop) Execute(services *SwapServices, swap *SwapDat
 			return swap.HandleError(err)
 		}
 		swap.ClaimTxId = txId
-		err = wallet.LabelTransaction(txId, peerswapLabel)
+		err = wallet.LabelTransaction(txId, labels.ClaimByCoop(swap.GetId().Short()))
 		if err != nil {
-			log.Infof("Error labeling trnasaction %v", err)
+			log.Infof("Error labeling transaction. txid: %s, label: %s, error: %v",
+				txId, labels.ClaimByCoop(swap.GetId().Short()), err)
 		}
 	}
 
@@ -717,7 +721,7 @@ type ValidateTxAndPayClaimInvoiceAction struct{}
 
 func (p *ValidateTxAndPayClaimInvoiceAction) Execute(services *SwapServices, swap *SwapData) EventType {
 	lc := services.lightning
-	onchain, _, validator, err := services.getOnChainServices(swap.GetChain())
+	onchain, wallet, validator, err := services.getOnChainServices(swap.GetChain())
 	if err != nil {
 		return swap.HandleError(err)
 	}
@@ -730,6 +734,15 @@ func (p *ValidateTxAndPayClaimInvoiceAction) Execute(services *SwapServices, swa
 	if !ok {
 		return swap.HandleError(errors.New("tx is not valid"))
 	}
+	txId, err := validator.TxIdFromHex(swap.OpeningTxHex)
+	if err != nil {
+		return swap.HandleError(err)
+	}
+	err = wallet.LabelTransaction(txId, labels.Opening(swap.GetId().Short()))
+	if err != nil {
+		log.Infof("Error labeling transaction. txid: %s, label: %s, error: %v",
+			txId, labels.Opening(swap.GetId().Short()), err)
+	}
 
 	var retryTime time.Duration = 120 * time.Second
 	var interval time.Duration = 10 * time.Second

swap/swap.go

@@ -455,6 +455,11 @@ func (s *SwapId) FromString(str string) error {
 	return nil
 }
 
+// Short returns a shortened version of the id suitable for use in observing.
+func (s *SwapId) Short() string {
+	return s.String()[:6]
+}
+
 func ParseSwapIdFromString(str string) (*SwapId, error) {
 	data, err := hex.DecodeString(str)
 	if err != nil {