Fix query for getting txs for address (#2272)

Signed-off-by: deniallugo <[email protected]>
drifterag · Jul 29, 2022 · 54be63f · 54be63f
1 parent f3740c5
commit 54be63f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/core/lib/storage/src/chain/operations_ext/mod.rs b/core/lib/storage/src/chain/operations_ext/mod.rs
@@ -1188,7 +1188,7 @@ impl<'a, 'c> OperationsExtSchema<'a, 'c> {
         };
 
         let token_query = if token.is_some() {
-            "AND a.token = $2"
+            "AND token = $2"
         } else {
             ""
         };
@@ -1208,7 +1208,9 @@ impl<'a, 'c> OperationsExtSchema<'a, 'c> {
                 b.block_index,
                 Null::bigint as batch_id
             FROM executed_priority_operations as b
-            WHERE EXISTS ( SELECT 1 FROM tx_filters as a WHERE a.tx_hash = b.tx_hash AND a.address = $1 {} )
+            JOIN 
+                (SELECT DISTINCT tx_hash FROM tx_filters WHERE address = $1 {})
+                    as a ON a.tx_hash = b.tx_hash
              {} 
         "#,
             token_query, query_direction
@@ -1244,7 +1246,7 @@ impl<'a, 'c> OperationsExtSchema<'a, 'c> {
         };
 
         let token_query = if token.is_some() {
-            "AND a.token = $2"
+            "AND token = $2"
         } else {
             ""
         };
@@ -1264,7 +1266,9 @@ impl<'a, 'c> OperationsExtSchema<'a, 'c> {
                     txs.block_index,
                     txs.batch_id
                 FROM executed_transactions as txs
-                WHERE EXISTS ( SELECT 1 FROM tx_filters as a WHERE a.tx_hash = txs.tx_hash AND a.address = $1 {} )
+                JOIN 
+                    (SELECT DISTINCT tx_hash FROM tx_filters WHERE address = $1 {})
+                        as a ON a.tx_hash = txs.tx_hash
                  {} 
             "#,
             token_query, query_direction