From 24f5b552b4d45414b9d61701958686f93c4cb2c3 Mon Sep 17 00:00:00 2001
From: gus-t460 <gabidi@gmail.com>
Date: Tue, 3 Dec 2019 15:40:23 -0500
Subject: [PATCH] Fix queries

---
 proxy_docker/app/script/getactivewatches.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/proxy_docker/app/script/getactivewatches.sh b/proxy_docker/app/script/getactivewatches.sh
index e19c784..7348732 100644
--- a/proxy_docker/app/script/getactivewatches.sh
+++ b/proxy_docker/app/script/getactivewatches.sh
@@ -6,7 +6,14 @@
 get_txns_by_watchlabel(){
   trace "Entering get_txns_by_watchlabel()..."
   local label_txns
-  $sql = "SELECT w32.label, w.address, wtxn.txn_id, wtxn.v_out, wtxn.amount FROM watching_by_pub32 as w32 INNER JOIN watching ON w32.id = w.watching_by_pub32_id INNER JOIN watching_tx as wtxn ON w.id = wtxn.watching_id WHERE w32.label={$1}" 
+  $sql=<<HERE
+	SELECT w32.label, w.address, tx.txid, tx.confirmations,tx.blockheight, wtxn.v_out, wtxn.amount 
+	FROM watching_by_pub32 as w32 
+	INNER JOIN watching ON w32.id = w.watching_by_pub32_id 
+	INNER JOIN watching_tx as wtxn ON w.id = wtxn.watching_id 
+	INNER JOIN tx as tx ON wtxn.tx_id = tx.id 
+	WHERE w32.label={$1} 
+HERE
   $label_txns = $(sql "$sql")
   returncode=$?
   trace_rc ${returncode}
@@ -15,7 +22,7 @@ get_txns_by_watchlabel(){
     [inputs
      | . / "\n"
      | (.[] | select(length > 0) | . / "|") as $input
-     | {"label": $input[0], "address": $input[1], "txn_id": "$input[2], "v_out": $input[3], "amount" : $input[4]}]}
+     | {"label": $input[0], "address": $input[1], "txid": "$input[2], "confirmations": $input[3], "blockheight" : $input[4], "v_out":$input[5], "amount": $input[6]}]}
   ' <$($label_txns)
   return $label_txns_json
 }