Fix returning redeem txs with matching txid in sqlite db

Author: altafan

server/internal/infrastructure/db/sqlite/round_repo.go

@@ -373,14 +373,17 @@ func (r *roundRepository) GetVtxoTreeWithTxid(ctx context.Context, txid string)
 }
 
 func (r *roundRepository) GetTxsWithTxids(ctx context.Context, txids []string) ([]string, error) {
-	rows, err := r.querier.GetTxsByTxid(ctx, txids)
+	rows, err := r.querier.GetTxsByTxid(ctx, queries.GetTxsByTxidParams{
+		Ids1: txids,
+		Ids2: txids,
+	})
 	if err != nil {
 		return nil, err
 	}
 
 	resp := make([]string, 0, len(rows))
 	for _, row := range rows {
-		resp = append(resp, row.Tx.Tx)
+		resp = append(resp, row.Data)
 	}
 
 	return resp, nil

server/internal/infrastructure/db/sqlite/sqlc/queries/query.sql.go

@@ -40,8 +40,17 @@ ON CONFLICT(id) DO UPDATE SET
     swept = EXCLUDED.swept;
 
 -- name: GetTxsByTxid :many
-SELECT sqlc.embed(tx) FROM tx
-WHERE txid in (sqlc.slice('ids'));
+SELECT
+    tx.txid,
+    tx.tx AS data
+FROM tx
+WHERE tx.txid IN (sqlc.slice('ids1'))
+UNION
+SELECT
+    vtxo.txid,
+    vtxo.redeem_tx AS data
+FROM vtxo
+WHERE vtxo.txid IN (sqlc.slice('ids2')) AND vtxo.redeem_tx IS NOT '';
 
 -- name: UpsertTxRequest :exec
 INSERT INTO tx_request (id, round_id) VALUES (?, ?)