topic updates (#305)

* topic updates

* remove tx_status

* updated to topic_0

* changes for standardization

---------

Co-authored-by: drethereum <trevor.wenokur@gmail.com>

macros/dbt/incremental_predicates.sql

@@ -0,0 +1,22 @@
+{% macro standard_predicate(
+        input_column = 'block_number'
+    ) -%}
+    {%- set database_name = target.database -%}
+    {%- set schema_name = generate_schema_name(
+        node = model
+    ) -%}
+    {%- set table_name = generate_alias_name(
+        node = model
+    ) -%}
+    {%- set tmp_table_name = table_name ~ '__dbt_tmp' -%}
+    {%- set full_table_name = database_name ~ '.' ~ schema_name ~ '.' ~ table_name -%}
+    {%- set full_tmp_table_name = database_name ~ '.' ~ schema_name ~ '.' ~ tmp_table_name -%}
+    {{ full_table_name }}.{{ input_column }} >= (
+        SELECT
+            MIN(
+                {{ input_column }}
+            )
+        FROM
+            {{ full_tmp_table_name }}
+    )
+{%- endmacro %}

models/gold/core/core__ez_decoded_event_logs.sql

@@ -3,6 +3,7 @@
     unique_key = "ez_decoded_event_logs_id",
     incremental_strategy = 'delete+insert',
     cluster_by = "block_timestamp::date",
+    incremental_predicates = [standard_predicate()],
     post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(ez_decoded_event_logs_id, contract_name, contract_address)",
     tags = ['decoded_logs']
 ) }}
@@ -42,8 +43,13 @@ SELECT
             ['tx_hash', 'event_index']
         ) }}
     ) AS ez_decoded_event_logs_id,
-    GREATEST(COALESCE(l.inserted_timestamp, '2000-01-01'), COALESCE(C.inserted_timestamp, '2000-01-01')) AS inserted_timestamp,
-    GREATEST(COALESCE(l.modified_timestamp, '2000-01-01'), COALESCE(C.modified_timestamp, '2000-01-01')) AS modified_timestamp,
+{% if is_incremental() %}
+    SYSDATE() AS inserted_timestamp,
+    SYSDATE() AS modified_timestamp,
+{% else %}
+    GREATEST(block_timestamp, dateadd('day', -10, SYSDATE())) AS inserted_timestamp,
+    GREATEST(block_timestamp, dateadd('day', -10, SYSDATE())) AS modified_timestamp,
+{% endif %}
     tx_status --deprecate
 FROM
     {{ ref('silver__decoded_logs') }}

models/silver/defi/bridge/across/silver_bridge__across_fundsdeposited.sql

@@ -70,7 +70,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/bridge/across/silver_bridge__across_v3fundsdeposited.sql

@@ -18,45 +18,61 @@ WITH base_evt AS (
         contract_address,
         'across-v3' AS NAME,
         event_index,
-        topics [0] :: STRING AS topic_0,
-        event_name,
+        topic_0,
+        CASE
+            WHEN topic_0 = '0x32ed1a409ef04c7b0227189c3a103dc5ac10e775a15b785dcc510201f7c25ad3' THEN 'FundsDeposited'
+            WHEN topic_0 = '0xa123dc29aebf7d0c3322c8eeb5b999e859f39937950ed31056532713d0de396f' THEN 'V3FundsDeposited'
+        END AS event_name,
+        topics,
+        DATA,
+        regexp_substr_all(SUBSTR(DATA, 3, len(DATA)), '.{64}') AS segmented_data,
         TRY_TO_NUMBER(
-            decoded_log :"depositId" :: STRING
-        ) AS depositId,
-        decoded_log :"depositor" :: STRING AS depositor,
-        TRY_TO_NUMBER(
-            decoded_log :"destinationChainId" :: STRING
+            utils.udf_hex_to_int(
+                topics [1] :: STRING
+            )
         ) AS destinationChainId,
-        decoded_log :"message" :: STRING AS message,
+        TRY_TO_NUMBER(
+            utils.udf_hex_to_int(
+                topics [2] :: STRING
+            )
+        ) AS depositId,
+        CONCAT('0x', SUBSTR(topics [3] :: STRING, 27, 40)) AS depositor,
+        CONCAT('0x', SUBSTR(segmented_data [0] :: STRING, 25, 40)) AS inputToken,
+        CONCAT('0x', SUBSTR(segmented_data [1] :: STRING, 25, 40)) AS outputToken,
+        TRY_TO_NUMBER(
+            utils.udf_hex_to_int(
+                segmented_data [2] :: STRING
+            )
+        ) AS inputAmount,
+        TRY_TO_NUMBER(
+            utils.udf_hex_to_int(
+                segmented_data [3] :: STRING
+            )
+        ) AS outputAmount,
         TRY_TO_TIMESTAMP(
-            decoded_log :"quoteTimestamp" :: STRING
+            utils.udf_hex_to_int(
+                segmented_data [4] :: STRING
+            )
         ) AS quoteTimestamp,
-        decoded_log :"recipient" :: STRING AS recipient,
-        TRY_TO_NUMBER(
-            decoded_log :"relayerFeePct" :: STRING
-        ) AS relayerFeePct,
-        decoded_log :"exclusiveRelayer" :: STRING AS exclusiveRelayer,
-        TRY_TO_NUMBER(
-            decoded_log :"exclusivityDeadline" :: STRING
-        ) AS exclusivityDeadline,
-        TRY_TO_NUMBER(
-            decoded_log :"fillDeadline" :: STRING
+        TRY_TO_TIMESTAMP(
+            utils.udf_hex_to_int(
+                segmented_data [5] :: STRING
+            )
         ) AS fillDeadline,
         TRY_TO_NUMBER(
-            decoded_log :"inputAmount" :: STRING
-        ) AS inputAmount,
-        decoded_log :"inputToken" :: STRING AS inputToken,
+            utils.udf_hex_to_int(
+                segmented_data [6] :: STRING
+            )
+        ) AS exclusivityDeadline,
+        CONCAT('0x', SUBSTR(segmented_data [7] :: STRING, 25, 40)) AS recipient,
+        CONCAT('0x', SUBSTR(segmented_data [8] :: STRING, 25, 40)) AS exclusiveRelayer,
         TRY_TO_NUMBER(
-            decoded_log :"outputAmount" :: STRING
-        ) AS outputAmount,
-        decoded_log :"outputToken" :: STRING AS outputToken,
-        decoded_log,
+            utils.udf_hex_to_int(
+                segmented_data [9] :: STRING
+            )
+        ) AS relayerFeePct,
+        segmented_data [10] :: STRING AS message,
         event_removed,
-        IFF(
-            tx_succeeded,
-            'SUCCESS',
-            'FAIL'
-        ) AS tx_status,
         CONCAT(
             tx_hash :: STRING,
             '-',
@@ -64,9 +80,12 @@ WITH base_evt AS (
         ) AS _log_id,
         modified_timestamp AS _inserted_timestamp
     FROM
-        {{ ref('core__ez_decoded_event_logs') }}
+        {{ ref('core__fact_event_logs') }}
     WHERE
-        topics [0] :: STRING = '0xa123dc29aebf7d0c3322c8eeb5b999e859f39937950ed31056532713d0de396f'
+        topic_0 IN (
+            '0x32ed1a409ef04c7b0227189c3a103dc5ac10e775a15b785dcc510201f7c25ad3',
+            '0xa123dc29aebf7d0c3322c8eeb5b999e859f39937950ed31056532713d0de396f'
+        )
         AND contract_address = '0xe35e9842fceaca96570b734083f4a58e8f7c5f2a'
         AND tx_succeeded
 
@@ -78,7 +97,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT
@@ -92,7 +111,6 @@ SELECT
     topic_0,
     event_name,
     event_removed,
-    tx_status,
     contract_address AS bridge_address,
     NAME AS platform,
     depositor AS sender,

models/silver/defi/bridge/allbridge/silver_bridge__allbridge_tokens_sent.sql

@@ -48,7 +48,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 lp_evt AS (
@@ -99,7 +99,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/bridge/axelar/silver_bridge__axelar_contractcallwithtoken.sql

@@ -60,7 +60,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 native_gas_paid AS (
@@ -118,7 +118,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 transfers AS (
@@ -150,7 +150,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 FINAL AS (

models/silver/defi/bridge/celer/silver_bridge__celer_cbridge_send.sql

@@ -67,7 +67,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/bridge/dln/silver_bridge__dln_debridge_createdorder.sql

@@ -88,7 +88,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/bridge/eywa/silver_bridge__eywa_requestsent.sql

@@ -58,7 +58,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 requestsent AS (

models/silver/defi/bridge/hop/silver_bridge__hop_transfersent.sql

@@ -69,7 +69,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 hop_tokens AS (

models/silver/defi/bridge/meson/silver_bridge__meson_transfers.sql

@@ -40,7 +40,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 native_transfers AS (

models/silver/defi/bridge/multichain/silver_bridge__multichain_v7_loganyswapout.sql

@@ -58,7 +58,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/bridge/stargate/silver_bridge__stargate_swap.sql

@@ -84,7 +84,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/bridge/symbiosis/silver_bridge__symbiosis_synthesizerequest.sql

@@ -62,7 +62,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/bridge/synapse/silver_bridge__synapse_token_bridge.sql

@@ -61,7 +61,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/bridge/synapse/silver_bridge__synapse_tokenbridgeandswap.sql

@@ -68,7 +68,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/balancer/silver_dex__balancer_pools.sql

@@ -45,7 +45,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 tokens_registered AS (

models/silver/defi/dex/balancer/silver_dex__balancer_swaps.sql

@@ -68,7 +68,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/camelot/silver_dex__camelot_pools.sql

@@ -47,7 +47,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/camelot/silver_dex__camelot_v2_swaps.sql

@@ -72,7 +72,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/camelot/silver_dex__camelot_v3_swaps.sql

@@ -91,7 +91,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/curve/silver_dex__curve_pools.sql

@@ -53,7 +53,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 
 qualify(ROW_NUMBER() over(PARTITION BY to_address

models/silver/defi/dex/curve/silver_dex__curve_swaps.sql

@@ -92,7 +92,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 token_exchange AS (

models/silver/defi/dex/dodo/silver_dex__dodo_v1_pools.sql

@@ -38,7 +38,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/dodo/silver_dex__dodo_v1_swaps.sql

@@ -79,7 +79,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 buy_base_token AS (
@@ -139,7 +139,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/dodo/silver_dex__dodo_v2_pools.sql

@@ -56,7 +56,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/dodo/silver_dex__dodo_v2_swaps.sql

@@ -102,7 +102,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/fraxswap/silver_dex__fraxswap_pools.sql

@@ -45,7 +45,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/fraxswap/silver_dex__fraxswap_swaps.sql

@@ -73,7 +73,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/gmx/silver_dex__gmx_swaps.sql

@@ -83,7 +83,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/hashflow/silver_dex__hashflow_swaps.sql

@@ -81,7 +81,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 swaps_base AS (
@@ -152,7 +152,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 FINAL AS (

models/silver/defi/dex/hashflow/silver_dex__hashflow_v3_pools.sql

@@ -35,7 +35,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/hashflow/silver_dex__hashflow_v3_swaps.sql

@@ -65,7 +65,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v1_dynamic_pools.sql

@@ -48,7 +48,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v1_dynamic_swaps.sql

@@ -78,7 +78,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v1_static_pools.sql

@@ -53,7 +53,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v1_static_swaps.sql

@@ -78,7 +78,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v2_elastic_pools.sql

@@ -47,7 +47,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v2_elastic_swaps.sql

@@ -91,7 +91,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/ramses/silver_dex__ramses_v2_pools.sql

@@ -46,7 +46,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 initial_info AS (

models/silver/defi/dex/sparta/silver_dex__sparta_pools.sql

@@ -41,7 +41,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/sparta/silver_dex__sparta_swaps.sql

@@ -72,7 +72,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/sushi/silver_dex__sushi_pools.sql

@@ -41,7 +41,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/sushi/silver_dex__sushi_swaps.sql

@@ -72,7 +72,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v1_pools.sql

@@ -41,7 +41,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v1_swaps.sql

@@ -73,7 +73,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v2_1_swaps.sql

@@ -95,7 +95,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v2_pools.sql

@@ -59,7 +59,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v2_swaps.sql

@@ -92,7 +92,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/uniswap/silver_dex__univ2_pools.sql

@@ -41,7 +41,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/uniswap/silver_dex__univ2_swaps.sql

@@ -72,7 +72,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/uniswap/silver_dex__univ3_pools.sql

@@ -46,7 +46,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 initial_info AS (

models/silver/defi/dex/woofi/silver_dex__woofi_swaps.sql

@@ -81,7 +81,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 swaps_base AS (
@@ -164,7 +164,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/zyberswap/silver_dex__zyberswap_pools.sql

@@ -46,7 +46,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/zyberswap/silver_dex__zyberswap_v2_swaps.sql

@@ -72,7 +72,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/dex/zyberswap/silver_dex__zyberswap_v3_swaps.sql

@@ -91,7 +91,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 )
 SELECT

models/silver/defi/lending/aave/silver__aave_borrows.sql

@@ -62,7 +62,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 AND contract_address = LOWER('0x794a61358D6845594F94dc1DB02A252b5b4814aD')
 AND tx_succeeded

models/silver/defi/lending/aave/silver__aave_deposits.sql

@@ -55,7 +55,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 AND contract_address = LOWER('0x794a61358D6845594F94dc1DB02A252b5b4814aD')
 AND tx_succeeded

models/silver/defi/lending/aave/silver__aave_flashloans.sql

@@ -57,7 +57,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 AND contract_address = LOWER('0x794a61358D6845594F94dc1DB02A252b5b4814aD')
 AND tx_succeeded

models/silver/defi/lending/aave/silver__aave_liquidations.sql

@@ -55,7 +55,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 AND contract_address = LOWER('0x794a61358D6845594F94dc1DB02A252b5b4814aD')
 AND tx_succeeded

models/silver/defi/lending/aave/silver__aave_repayments.sql

@@ -52,7 +52,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 AND contract_address = LOWER('0x794a61358D6845594F94dc1DB02A252b5b4814aD')
 AND tx_succeeded

models/silver/defi/lending/aave/silver__aave_withdraws.sql

@@ -51,7 +51,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 AND contract_address = LOWER('0x794a61358D6845594F94dc1DB02A252b5b4814aD')
 AND tx_succeeded

models/silver/defi/lending/dforce/silver__dforce_asset_details.sql

@@ -37,7 +37,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 traces_pull AS (

models/silver/defi/lending/dforce/silver__dforce_withdraws.sql

@@ -66,7 +66,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 dforce_combine AS (

models/silver/defi/lending/lodestar/silver__lodestar_asset_details.sql

@@ -34,7 +34,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 traces_pull AS (

models/silver/defi/lending/lodestar/silver__lodestar_withdraws.sql

@@ -66,7 +66,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 lodestar_combine AS (

models/silver/defi/lending/radiant/silver__radiant_borrows.sql

@@ -63,7 +63,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 atoken_meta AS (

models/silver/defi/lending/radiant/silver__radiant_deposits.sql

@@ -51,7 +51,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 AND contract_address IN (
     LOWER('0x2032b9A8e9F7e76768CA9271003d3e43E1616B1F'),

models/silver/defi/lending/radiant/silver__radiant_flashloans.sql

@@ -53,7 +53,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 AND contract_address IN (
     LOWER('0x2032b9A8e9F7e76768CA9271003d3e43E1616B1F'),

models/silver/defi/lending/radiant/silver__radiant_liquidations.sql

@@ -51,7 +51,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 AND contract_address IN (
     LOWER('0x2032b9A8e9F7e76768CA9271003d3e43E1616B1F'),

models/silver/defi/lending/radiant/silver__radiant_repayments.sql

@@ -48,7 +48,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 AND contract_address IN (
     LOWER('0x2032b9A8e9F7e76768CA9271003d3e43E1616B1F'),

models/silver/defi/lending/radiant/silver__radiant_withdraws.sql

@@ -47,7 +47,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 AND contract_address IN (
     LOWER('0x2032b9A8e9F7e76768CA9271003d3e43E1616B1F'),

models/silver/nft/sales/silver__element_sales.sql

@@ -102,7 +102,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 raw_fees AS (

models/silver/protocols/olas/silver_olas__create_service_multisigs.sql

@@ -55,5 +55,5 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}

models/silver/protocols/olas/silver_olas__service_registrations.sql

@@ -52,7 +52,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 transfers AS (

models/silver/protocols/vertex/silver__vertex_dim_products.sql

@@ -32,7 +32,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 new_prod AS (

models/silver/protocols/vertex/silver__vertex_edge_trades.sql

@@ -23,7 +23,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 edge_trades AS (

models/silver/protocols/vertex/silver__vertex_liquidations.sql

@@ -36,7 +36,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 logs_pull_v1 AS (

models/silver/protocols/vertex/silver__vertex_perps.sql

@@ -49,7 +49,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 order_fill_decode AS (

models/silver/protocols/vertex/silver__vertex_spot.sql

@@ -49,7 +49,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 order_fill_decode AS (

models/silver/protocols/vertex/silver__vertex_staking.sql

@@ -49,7 +49,7 @@ AND _inserted_timestamp >= (
         {{ this }}
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
-AND block_timestamp >= SYSDATE() - INTERVAL '7 day'
+
 {% endif %}
 ),
 FINAL AS (