refactor(btcrpc): simplify error handling in broadcast methods

Author: lmquang

internal/btcrpc/blockstream/blockstream.go

@@ -55,9 +55,15 @@ func (c *blockstream) BroadcastTx(txHex string) (string, error) {
 		bodyStr := string(body)
 
 		// Regex to extract minimum fee from error message
-		minFeeRegex := regexp.MustCompile(`min relay fee not met, (\d+) < (\d+)`)
+		minFeeRegex := regexp.MustCompile(`sendrawtransaction RPC error -26: min relay fee not met, (\d+) < (\d+)`)
 		matches := minFeeRegex.FindStringSubmatch(bodyStr)
 
+		c.logger.Error("[blockstream.BroadcastTx] broadcast error", map[string]string{
+			"error":     bodyStr,
+			"matches":   fmt.Sprintf("%v", matches),
+			"match_len": strconv.Itoa(len(matches)),
+		})
+
 		if len(matches) == 3 {
 			minFee, _ := strconv.ParseInt(matches[2], 10, 64)
 

internal/btcrpc/btcrpc.go

@@ -3,7 +3,6 @@ package btcrpc
 import (
 	"fmt"
 	"strconv"
-	"strings"
 
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg"
@@ -117,7 +116,7 @@ func (b *BtcRpc) broadcastWithFeeAdjustment(
 
 	// Check if the error is specifically about minimum relay fee
 	broadcastErr, ok := err.(*blockstream.BroadcastTxError)
-	if ok && strings.Contains(broadcastErr.Error(), "min relay fee not met") {
+	if ok {
 		b.logger.Info("[btcrpc.Send][FeeAdjustment]", map[string]string{
 			"message": "Attempting to adjust transaction fee",
 		})

internal/btcrpc/helper.go

@@ -198,7 +198,7 @@ func (b *BtcRpc) broadcast(tx *wire.MsgTx) (string, error) {
 
 	txID, err := b.blockstream.BroadcastTx(txHex)
 	if err != nil {
-		return "", fmt.Errorf("failed to broadcast transaction: %v", err)
+		return "", err
 	}
 
 	return txID, nil