add token metadata & time/block filters

Author: DenisCarriere

src/sql/transfers/tvm.sql

@@ -10,6 +10,12 @@ arrayFilter(x -> x != '', {contract:Array(String)}) AS contracts,
 (length(to_addresses) > 0) AS has_to,
 (length(contracts) > 0) AS has_contract,
 has_contract AND (NOT has_from) AND (NOT has_to) AS has_only_contract,
+toRelativeMinuteNum(toDateTime({start_time:UInt64})) AS start_minute,
+toRelativeMinuteNum(toDateTime({end_time:UInt64})) AS end_minute,
+{start_time:UInt64} = 1420070400 AS no_start_time,
+{end_time:UInt64} = 2524608000 AS no_end_time,
+{start_block:UInt64} = 0 AS no_start_block,
+{end_block:UInt64} = 9999999999 AS no_end_block,
 
 tx_hash_timestamps AS (
     SELECT (minute, timestamp)
@@ -35,8 +41,8 @@ contract_minutes AS (
     SELECT minute
     FROM trc20_transfer
     WHERE has_only_contract
-        AND ({start_time:UInt64} = 1420070400 OR timestamp >= toRelativeMinuteNum(toDateTime({start_time:UInt64})))
-        AND ({end_time:UInt64} = 2524608000 OR timestamp <= toRelativeMinuteNum(toDateTime({end_time:UInt64})))
+        AND (no_start_time OR minute >= start_minute)
+        AND (no_end_time OR minute <= end_minute)
         AND log_address IN {contract:Array(String)}
     GROUP BY minute
     ORDER BY minute DESC
@@ -46,11 +52,9 @@ transfers AS (
     SELECT *
     FROM trc20_transfer
     WHERE
-        /* filter by timestamp and block_num early to reduce data scanned */
-            ({start_time:UInt64} = 1420070400 OR timestamp >= toDateTime({start_time:UInt64}))
-        AND ({end_time:UInt64} = 2524608000 OR timestamp <= toDateTime({end_time:UInt64}))
-        AND ({start_block:UInt64} = 0 OR block_num >= {start_block:UInt64})
-        AND ({end_block:UInt64} = 9999999999 OR block_num <= {end_block:UInt64})
+        /* direct minutes */
+            (no_start_time OR minute >= start_minute)
+        AND (no_end_time OR minute <= end_minute)
 
         /* transaction ID filter */
         AND ( NOT has_tx_hash OR (minute, timestamp) IN tx_hash_timestamps AND tx_hash IN {transaction_id:Array(String)} )
@@ -65,6 +69,12 @@ transfers AS (
         AND ( NOT has_to OR `to` IN {to_address:Array(String)} )
         AND ( NOT has_contract OR log_address IN {contract:Array(String)} )
 
+        /* timestamp and block_num filters */
+        AND (no_start_block OR block_num >= {start_block:UInt64})
+        AND (no_end_block OR block_num <= {end_block:UInt64})
+        AND (no_start_time OR timestamp >= toDateTime({start_time:UInt64}))
+        AND (no_end_time OR timestamp <= toDateTime({end_time:UInt64}))
+
     ORDER BY minute DESC, timestamp DESC, block_num DESC, tx_index DESC, log_index DESC
     LIMIT   {limit:UInt64}
     OFFSET  {offset:UInt64}
@@ -102,7 +112,14 @@ SELECT
     `to`,
     toString(t.amount) AS amount,
 
+    /* token metadata */
+    t.amount / pow(10, decimals) AS value,
+    name,
+    symbol,
+    decimals,
+
     /* network */
     {network:String} AS network
 FROM transfers AS t
+LEFT JOIN metadata m ON t.log_address = m.contract
 ORDER BY minute DESC, timestamp DESC, block_num DESC, tx_index DESC, log_index DESC;

src/sql/transfers_native/tvm.sql

@@ -8,6 +8,14 @@ arrayFilter(x -> x != '', {to_address:Array(String)}) AS to_addresses,
 (length(from_addresses) > 0) AS has_from,
 (length(to_addresses) > 0) AS has_to,
 
+toRelativeMinuteNum(toDateTime({start_time:UInt64})) AS start_minute,
+toRelativeMinuteNum(toDateTime({end_time:UInt64})) AS end_minute,
+{start_time:UInt64} = 1420070400 AS no_start_time,
+{end_time:UInt64} = 2524608000 AS no_end_time,
+{start_block:UInt64} = 0 AS no_start_block,
+{end_block:UInt64} = 9999999999 AS no_end_block,
+
+
 tx_hash_timestamps AS (
     SELECT (minute, timestamp)
     FROM native_transfer
@@ -52,11 +60,9 @@ SELECT
     {network:String} AS network
 FROM native_transfer AS t
 WHERE
-    /* filter by timestamp and block_num early to reduce data scanned */
-        ({start_time:UInt64} = 1420070400 OR timestamp >= toDateTime({start_time:UInt64}))
-    AND ({end_time:UInt64} = 2524608000 OR timestamp <= toDateTime({end_time:UInt64}))
-    AND ({start_block:UInt64} = 0 OR block_num >= {start_block:UInt64})
-    AND ({end_block:UInt64} = 9999999999 OR block_num <= {end_block:UInt64})
+    /* direct minutes */
+        (no_start_time OR minute >= start_minute)
+    AND (no_end_time OR minute <= end_minute)
 
     /* transaction ID filter */
     AND ( NOT has_tx_hash OR (minute, timestamp) IN tx_hash_timestamps AND tx_hash IN {transaction_id:Array(String)} )
@@ -68,6 +74,13 @@ WHERE
     /* direct filters */
     AND (NOT has_from OR `from` IN {from_address:Array(String)})
     AND (NOT has_to OR `to` IN {to_address:Array(String)})
+
+    /* timestamp and block_num filters */
+    AND (no_start_block OR block_num >= {start_block:UInt64})
+    AND (no_end_block OR block_num <= {end_block:UInt64})
+    AND (no_start_time OR timestamp >= toDateTime({start_time:UInt64}))
+    AND (no_end_time OR timestamp <= toDateTime({end_time:UInt64}))
+
 ORDER BY minute DESC, timestamp DESC, block_num DESC, tx_index DESC
 LIMIT   {limit:UInt64}
 OFFSET  {offset:UInt64}