Do not use formatted string in query for binary hashes

blocktx/store/sql/get_transaction_blocks.go

@@ -1,8 +1,10 @@
 package sql
 
 import (
+	"database/sql"
 	"encoding/hex"
 	"fmt"
+	"github.com/lib/pq"
 	"strings"
 
 	"github.com/bitcoin-sv/arc/blocktx/blocktx_api"
@@ -13,33 +15,24 @@ import (
 
 const (
 	queryGetBlockHashHeightForTxHashesPostgres = `
-SELECT
-b.hash, b.height, t.hash
-FROM blocks b
-INNER JOIN block_transactions_map m ON m.blockid = b.id
-INNER JOIN transactions t ON m.txid = t.id
-WHERE t.hash in (%s)
-AND b.orphanedyn = FALSE`
+			SELECT
+			b.hash, b.height, t.hash
+			FROM blocks b
+			INNER JOIN block_transactions_map m ON m.blockid = b.id
+			INNER JOIN transactions t ON m.txid = t.id
+			WHERE t.hash = ANY($1)
+			AND b.orphanedyn = FALSE`
 
 	queryGetBlockHashHeightForTxHashesSQLite = `
-SELECT
-b.hash, b.height, t.hash
-FROM blocks b
-INNER JOIN block_transactions_map m ON m.blockid = b.id
-INNER JOIN transactions t ON m.txid = t.id
-WHERE HEX(t.hash) in ('%s')
-AND b.orphanedyn = FALSE`
+			SELECT
+			b.hash, b.height, t.hash
+			FROM blocks b
+			INNER JOIN block_transactions_map m ON m.blockid = b.id
+			INNER JOIN transactions t ON m.txid = t.id
+			WHERE HEX(t.hash) in ('%s')
+			AND b.orphanedyn = FALSE`
 )
 
-func getQueryPostgres(transactions *blocktx_api.Transactions) string {
-	var result []string
-	for _, v := range transactions.Transactions {
-		result = append(result, fmt.Sprintf("decode('%x', 'hex')", (v.Hash)))
-	}
-
-	return fmt.Sprintf(queryGetBlockHashHeightForTxHashesPostgres, strings.Join(result, ","))
-}
-
 func getQuerySQLite(transactions *blocktx_api.Transactions) string {
 	var result []string
 	for _, v := range transactions.Transactions {
@@ -58,24 +51,32 @@ func (s *SQL) GetTransactionBlocks(ctx context.Context, transactions *blocktx_ap
 	defer cancel()
 
 	results := &blocktx_api.TransactionBlocks{}
-	var query string
+	var rows *sql.Rows
+	var err error
 
 	switch s.engine {
 	case sqliteEngine:
-		query = getQuerySQLite(transactions)
+		fallthrough
 	case sqliteMemoryEngine:
-		query = getQuerySQLite(transactions)
+		rows, err = s.db.QueryContext(ctx, getQuerySQLite(transactions))
+		if err != nil {
+			return nil, err
+		}
 	case postgresEngine:
-		query = getQueryPostgres(transactions)
+		var hashSlice [][]byte
+		for _, tx := range transactions.Transactions {
+			hashSlice = append(hashSlice, tx.Hash)
+		}
+
+		rows, err = s.db.QueryContext(ctx, queryGetBlockHashHeightForTxHashesPostgres, pq.Array(hashSlice))
+		if err != nil {
+			return nil, err
+		}
+
 	default:
 		return nil, fmt.Errorf("engine not supported: %s", s.engine)
 	}
 
-	rows, err := s.db.QueryContext(ctx, query)
-	if err != nil {
-		return nil, err
-	}
-
 	defer rows.Close()
 
 	for rows.Next() {