From ee626ef6f14dee1c97cf81fe4be3f9f19dfa2790 Mon Sep 17 00:00:00 2001 From: San Yong <22216004+SanYongxie@users.noreply.github.com> Date: Thu, 13 Feb 2025 05:12:03 +0800 Subject: [PATCH] topic updates (#305) * topic updates * remove tx_status * updated to topic_0 * changes for standardization --------- Co-authored-by: drethereum --- macros/dbt/incremental_predicates.sql | 22 +++++ .../gold/core/core__ez_decoded_event_logs.sql | 10 ++- .../silver_bridge__across_fundsdeposited.sql | 2 +- ...silver_bridge__across_v3fundsdeposited.sql | 88 +++++++++++-------- .../silver_bridge__allbridge_tokens_sent.sql | 4 +- ...r_bridge__axelar_contractcallwithtoken.sql | 6 +- .../silver_bridge__celer_cbridge_send.sql | 2 +- ...lver_bridge__dln_debridge_createdorder.sql | 2 +- .../eywa/silver_bridge__eywa_requestsent.sql | 2 +- .../hop/silver_bridge__hop_transfersent.sql | 2 +- .../meson/silver_bridge__meson_transfers.sql | 2 +- ...er_bridge__multichain_v7_loganyswapout.sql | 2 +- .../stargate/silver_bridge__stargate_swap.sql | 2 +- ...er_bridge__symbiosis_synthesizerequest.sql | 2 +- .../silver_bridge__synapse_token_bridge.sql | 2 +- ...ver_bridge__synapse_tokenbridgeandswap.sql | 2 +- .../balancer/silver_dex__balancer_pools.sql | 2 +- .../balancer/silver_dex__balancer_swaps.sql | 2 +- .../dex/camelot/silver_dex__camelot_pools.sql | 2 +- .../camelot/silver_dex__camelot_v2_swaps.sql | 2 +- .../camelot/silver_dex__camelot_v3_swaps.sql | 2 +- .../dex/curve/silver_dex__curve_pools.sql | 2 +- .../dex/curve/silver_dex__curve_swaps.sql | 2 +- .../dex/dodo/silver_dex__dodo_v1_pools.sql | 2 +- .../dex/dodo/silver_dex__dodo_v1_swaps.sql | 4 +- .../dex/dodo/silver_dex__dodo_v2_pools.sql | 2 +- .../dex/dodo/silver_dex__dodo_v2_swaps.sql | 2 +- .../fraxswap/silver_dex__fraxswap_pools.sql | 2 +- .../fraxswap/silver_dex__fraxswap_swaps.sql | 2 +- .../defi/dex/gmx/silver_dex__gmx_swaps.sql | 2 +- .../hashflow/silver_dex__hashflow_swaps.sql | 4 +- .../silver_dex__hashflow_v3_pools.sql | 2 +- .../silver_dex__hashflow_v3_swaps.sql | 2 +- ...silver_dex__kyberswap_v1_dynamic_pools.sql | 2 +- ...silver_dex__kyberswap_v1_dynamic_swaps.sql | 2 +- .../silver_dex__kyberswap_v1_static_pools.sql | 2 +- .../silver_dex__kyberswap_v1_static_swaps.sql | 2 +- ...silver_dex__kyberswap_v2_elastic_pools.sql | 2 +- ...silver_dex__kyberswap_v2_elastic_swaps.sql | 2 +- .../ramses/silver_dex__ramses_v2_pools.sql | 2 +- .../dex/sparta/silver_dex__sparta_pools.sql | 2 +- .../dex/sparta/silver_dex__sparta_swaps.sql | 2 +- .../dex/sushi/silver_dex__sushi_pools.sql | 2 +- .../dex/sushi/silver_dex__sushi_swaps.sql | 2 +- .../silver_dex__trader_joe_v1_pools.sql | 2 +- .../silver_dex__trader_joe_v1_swaps.sql | 2 +- .../silver_dex__trader_joe_v2_1_swaps.sql | 2 +- .../silver_dex__trader_joe_v2_pools.sql | 2 +- .../silver_dex__trader_joe_v2_swaps.sql | 2 +- .../dex/uniswap/silver_dex__univ2_pools.sql | 2 +- .../dex/uniswap/silver_dex__univ2_swaps.sql | 2 +- .../dex/uniswap/silver_dex__univ3_pools.sql | 2 +- .../dex/woofi/silver_dex__woofi_swaps.sql | 4 +- .../zyberswap/silver_dex__zyberswap_pools.sql | 2 +- .../silver_dex__zyberswap_v2_swaps.sql | 2 +- .../silver_dex__zyberswap_v3_swaps.sql | 2 +- .../lending/aave/silver__aave_borrows.sql | 2 +- .../lending/aave/silver__aave_deposits.sql | 2 +- .../lending/aave/silver__aave_flashloans.sql | 2 +- .../aave/silver__aave_liquidations.sql | 2 +- .../lending/aave/silver__aave_repayments.sql | 2 +- .../lending/aave/silver__aave_withdraws.sql | 2 +- .../dforce/silver__dforce_asset_details.sql | 2 +- .../dforce/silver__dforce_withdraws.sql | 2 +- .../silver__lodestar_asset_details.sql | 2 +- .../lodestar/silver__lodestar_withdraws.sql | 2 +- .../radiant/silver__radiant_borrows.sql | 2 +- .../radiant/silver__radiant_deposits.sql | 2 +- .../radiant/silver__radiant_flashloans.sql | 2 +- .../radiant/silver__radiant_liquidations.sql | 2 +- .../radiant/silver__radiant_repayments.sql | 2 +- .../radiant/silver__radiant_withdraws.sql | 2 +- .../nft/sales/silver__element_sales.sql | 2 +- .../silver_olas__create_service_multisigs.sql | 2 +- .../silver_olas__service_registrations.sql | 2 +- .../vertex/silver__vertex_dim_products.sql | 2 +- .../vertex/silver__vertex_edge_trades.sql | 2 +- .../vertex/silver__vertex_liquidations.sql | 2 +- .../protocols/vertex/silver__vertex_perps.sql | 2 +- .../protocols/vertex/silver__vertex_spot.sql | 2 +- .../vertex/silver__vertex_staking.sql | 2 +- 81 files changed, 167 insertions(+), 121 deletions(-) create mode 100644 macros/dbt/incremental_predicates.sql diff --git a/macros/dbt/incremental_predicates.sql b/macros/dbt/incremental_predicates.sql new file mode 100644 index 0000000..ba1bb2e --- /dev/null +++ b/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 %} diff --git a/models/gold/core/core__ez_decoded_event_logs.sql b/models/gold/core/core__ez_decoded_event_logs.sql index 4bbad5a..d5b365a 100644 --- a/models/gold/core/core__ez_decoded_event_logs.sql +++ b/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') }} diff --git a/models/silver/defi/bridge/across/silver_bridge__across_fundsdeposited.sql b/models/silver/defi/bridge/across/silver_bridge__across_fundsdeposited.sql index 7f5b24d..99c6b99 100644 --- a/models/silver/defi/bridge/across/silver_bridge__across_fundsdeposited.sql +++ b/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 diff --git a/models/silver/defi/bridge/across/silver_bridge__across_v3fundsdeposited.sql b/models/silver/defi/bridge/across/silver_bridge__across_v3fundsdeposited.sql index 96ea3dd..f1a6eab 100644 --- a/models/silver/defi/bridge/across/silver_bridge__across_v3fundsdeposited.sql +++ b/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, diff --git a/models/silver/defi/bridge/allbridge/silver_bridge__allbridge_tokens_sent.sql b/models/silver/defi/bridge/allbridge/silver_bridge__allbridge_tokens_sent.sql index 71e5ace..ed64b13 100644 --- a/models/silver/defi/bridge/allbridge/silver_bridge__allbridge_tokens_sent.sql +++ b/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 diff --git a/models/silver/defi/bridge/axelar/silver_bridge__axelar_contractcallwithtoken.sql b/models/silver/defi/bridge/axelar/silver_bridge__axelar_contractcallwithtoken.sql index 430140a..416fef5 100644 --- a/models/silver/defi/bridge/axelar/silver_bridge__axelar_contractcallwithtoken.sql +++ b/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 ( diff --git a/models/silver/defi/bridge/celer/silver_bridge__celer_cbridge_send.sql b/models/silver/defi/bridge/celer/silver_bridge__celer_cbridge_send.sql index 57ccafb..fbc65d8 100644 --- a/models/silver/defi/bridge/celer/silver_bridge__celer_cbridge_send.sql +++ b/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 diff --git a/models/silver/defi/bridge/dln/silver_bridge__dln_debridge_createdorder.sql b/models/silver/defi/bridge/dln/silver_bridge__dln_debridge_createdorder.sql index 1094460..c9935c6 100644 --- a/models/silver/defi/bridge/dln/silver_bridge__dln_debridge_createdorder.sql +++ b/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 diff --git a/models/silver/defi/bridge/eywa/silver_bridge__eywa_requestsent.sql b/models/silver/defi/bridge/eywa/silver_bridge__eywa_requestsent.sql index 9ec6cc4..e9cc8e8 100644 --- a/models/silver/defi/bridge/eywa/silver_bridge__eywa_requestsent.sql +++ b/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 ( diff --git a/models/silver/defi/bridge/hop/silver_bridge__hop_transfersent.sql b/models/silver/defi/bridge/hop/silver_bridge__hop_transfersent.sql index 2f00599..8d54208 100644 --- a/models/silver/defi/bridge/hop/silver_bridge__hop_transfersent.sql +++ b/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 ( diff --git a/models/silver/defi/bridge/meson/silver_bridge__meson_transfers.sql b/models/silver/defi/bridge/meson/silver_bridge__meson_transfers.sql index 6d99e72..7c429a9 100644 --- a/models/silver/defi/bridge/meson/silver_bridge__meson_transfers.sql +++ b/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 ( diff --git a/models/silver/defi/bridge/multichain/silver_bridge__multichain_v7_loganyswapout.sql b/models/silver/defi/bridge/multichain/silver_bridge__multichain_v7_loganyswapout.sql index e9e3f08..f57e6ed 100644 --- a/models/silver/defi/bridge/multichain/silver_bridge__multichain_v7_loganyswapout.sql +++ b/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 diff --git a/models/silver/defi/bridge/stargate/silver_bridge__stargate_swap.sql b/models/silver/defi/bridge/stargate/silver_bridge__stargate_swap.sql index 33ff3c5..cc2321a 100644 --- a/models/silver/defi/bridge/stargate/silver_bridge__stargate_swap.sql +++ b/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 diff --git a/models/silver/defi/bridge/symbiosis/silver_bridge__symbiosis_synthesizerequest.sql b/models/silver/defi/bridge/symbiosis/silver_bridge__symbiosis_synthesizerequest.sql index 6659187..044af90 100644 --- a/models/silver/defi/bridge/symbiosis/silver_bridge__symbiosis_synthesizerequest.sql +++ b/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 diff --git a/models/silver/defi/bridge/synapse/silver_bridge__synapse_token_bridge.sql b/models/silver/defi/bridge/synapse/silver_bridge__synapse_token_bridge.sql index 20d4149..6e77e52 100644 --- a/models/silver/defi/bridge/synapse/silver_bridge__synapse_token_bridge.sql +++ b/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 diff --git a/models/silver/defi/bridge/synapse/silver_bridge__synapse_tokenbridgeandswap.sql b/models/silver/defi/bridge/synapse/silver_bridge__synapse_tokenbridgeandswap.sql index fc79c49..46dca3c 100644 --- a/models/silver/defi/bridge/synapse/silver_bridge__synapse_tokenbridgeandswap.sql +++ b/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 diff --git a/models/silver/defi/dex/balancer/silver_dex__balancer_pools.sql b/models/silver/defi/dex/balancer/silver_dex__balancer_pools.sql index 725cfb8..b72a304 100644 --- a/models/silver/defi/dex/balancer/silver_dex__balancer_pools.sql +++ b/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 ( diff --git a/models/silver/defi/dex/balancer/silver_dex__balancer_swaps.sql b/models/silver/defi/dex/balancer/silver_dex__balancer_swaps.sql index f5b5858..c6d9460 100644 --- a/models/silver/defi/dex/balancer/silver_dex__balancer_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/camelot/silver_dex__camelot_pools.sql b/models/silver/defi/dex/camelot/silver_dex__camelot_pools.sql index 002f1c4..af3ba19 100644 --- a/models/silver/defi/dex/camelot/silver_dex__camelot_pools.sql +++ b/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 diff --git a/models/silver/defi/dex/camelot/silver_dex__camelot_v2_swaps.sql b/models/silver/defi/dex/camelot/silver_dex__camelot_v2_swaps.sql index 341333f..4ae54d2 100644 --- a/models/silver/defi/dex/camelot/silver_dex__camelot_v2_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/camelot/silver_dex__camelot_v3_swaps.sql b/models/silver/defi/dex/camelot/silver_dex__camelot_v3_swaps.sql index cfa0206..a94b4c9 100644 --- a/models/silver/defi/dex/camelot/silver_dex__camelot_v3_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/curve/silver_dex__curve_pools.sql b/models/silver/defi/dex/curve/silver_dex__curve_pools.sql index c6aade8..52616ba 100644 --- a/models/silver/defi/dex/curve/silver_dex__curve_pools.sql +++ b/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 diff --git a/models/silver/defi/dex/curve/silver_dex__curve_swaps.sql b/models/silver/defi/dex/curve/silver_dex__curve_swaps.sql index c05be27..d61bf6e 100644 --- a/models/silver/defi/dex/curve/silver_dex__curve_swaps.sql +++ b/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 ( diff --git a/models/silver/defi/dex/dodo/silver_dex__dodo_v1_pools.sql b/models/silver/defi/dex/dodo/silver_dex__dodo_v1_pools.sql index ee2f81a..1388772 100644 --- a/models/silver/defi/dex/dodo/silver_dex__dodo_v1_pools.sql +++ b/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 diff --git a/models/silver/defi/dex/dodo/silver_dex__dodo_v1_swaps.sql b/models/silver/defi/dex/dodo/silver_dex__dodo_v1_swaps.sql index 792afd3..ebdcd8f 100644 --- a/models/silver/defi/dex/dodo/silver_dex__dodo_v1_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/dodo/silver_dex__dodo_v2_pools.sql b/models/silver/defi/dex/dodo/silver_dex__dodo_v2_pools.sql index ee9beaf..2df3e6e 100644 --- a/models/silver/defi/dex/dodo/silver_dex__dodo_v2_pools.sql +++ b/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 diff --git a/models/silver/defi/dex/dodo/silver_dex__dodo_v2_swaps.sql b/models/silver/defi/dex/dodo/silver_dex__dodo_v2_swaps.sql index 445f609..2d69089 100644 --- a/models/silver/defi/dex/dodo/silver_dex__dodo_v2_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/fraxswap/silver_dex__fraxswap_pools.sql b/models/silver/defi/dex/fraxswap/silver_dex__fraxswap_pools.sql index 6b45ea7..6aaabcc 100644 --- a/models/silver/defi/dex/fraxswap/silver_dex__fraxswap_pools.sql +++ b/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 diff --git a/models/silver/defi/dex/fraxswap/silver_dex__fraxswap_swaps.sql b/models/silver/defi/dex/fraxswap/silver_dex__fraxswap_swaps.sql index fcde2a3..c2cbf0e 100644 --- a/models/silver/defi/dex/fraxswap/silver_dex__fraxswap_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/gmx/silver_dex__gmx_swaps.sql b/models/silver/defi/dex/gmx/silver_dex__gmx_swaps.sql index 657aabe..90c745e 100644 --- a/models/silver/defi/dex/gmx/silver_dex__gmx_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/hashflow/silver_dex__hashflow_swaps.sql b/models/silver/defi/dex/hashflow/silver_dex__hashflow_swaps.sql index 50ca060..d032e91 100644 --- a/models/silver/defi/dex/hashflow/silver_dex__hashflow_swaps.sql +++ b/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 ( diff --git a/models/silver/defi/dex/hashflow/silver_dex__hashflow_v3_pools.sql b/models/silver/defi/dex/hashflow/silver_dex__hashflow_v3_pools.sql index 963fae0..5e48446 100644 --- a/models/silver/defi/dex/hashflow/silver_dex__hashflow_v3_pools.sql +++ b/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 diff --git a/models/silver/defi/dex/hashflow/silver_dex__hashflow_v3_swaps.sql b/models/silver/defi/dex/hashflow/silver_dex__hashflow_v3_swaps.sql index 7d95fd6..e3c2be3 100644 --- a/models/silver/defi/dex/hashflow/silver_dex__hashflow_v3_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v1_dynamic_pools.sql b/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v1_dynamic_pools.sql index d5e9d98..c03d19e 100644 --- a/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v1_dynamic_pools.sql +++ b/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 diff --git a/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v1_dynamic_swaps.sql b/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v1_dynamic_swaps.sql index d7071dc..ea47272 100644 --- a/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v1_dynamic_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v1_static_pools.sql b/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v1_static_pools.sql index 0d21f7b..b623d2d 100644 --- a/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v1_static_pools.sql +++ b/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 diff --git a/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v1_static_swaps.sql b/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v1_static_swaps.sql index 7c5186e..535e450 100644 --- a/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v1_static_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v2_elastic_pools.sql b/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v2_elastic_pools.sql index b92a03d..421930b 100644 --- a/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v2_elastic_pools.sql +++ b/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 diff --git a/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v2_elastic_swaps.sql b/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v2_elastic_swaps.sql index 98d8f7b..cc5c677 100644 --- a/models/silver/defi/dex/kyberswap/silver_dex__kyberswap_v2_elastic_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/ramses/silver_dex__ramses_v2_pools.sql b/models/silver/defi/dex/ramses/silver_dex__ramses_v2_pools.sql index 38f58b8..9aa9901 100644 --- a/models/silver/defi/dex/ramses/silver_dex__ramses_v2_pools.sql +++ b/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 ( diff --git a/models/silver/defi/dex/sparta/silver_dex__sparta_pools.sql b/models/silver/defi/dex/sparta/silver_dex__sparta_pools.sql index 9c305bf..f6139f7 100644 --- a/models/silver/defi/dex/sparta/silver_dex__sparta_pools.sql +++ b/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 diff --git a/models/silver/defi/dex/sparta/silver_dex__sparta_swaps.sql b/models/silver/defi/dex/sparta/silver_dex__sparta_swaps.sql index ea22621..56a179f 100644 --- a/models/silver/defi/dex/sparta/silver_dex__sparta_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/sushi/silver_dex__sushi_pools.sql b/models/silver/defi/dex/sushi/silver_dex__sushi_pools.sql index bd84f25..88953d5 100644 --- a/models/silver/defi/dex/sushi/silver_dex__sushi_pools.sql +++ b/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 diff --git a/models/silver/defi/dex/sushi/silver_dex__sushi_swaps.sql b/models/silver/defi/dex/sushi/silver_dex__sushi_swaps.sql index 649e3a7..cfe911d 100644 --- a/models/silver/defi/dex/sushi/silver_dex__sushi_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v1_pools.sql b/models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v1_pools.sql index 71addf6..647fc78 100644 --- a/models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v1_pools.sql +++ b/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 diff --git a/models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v1_swaps.sql b/models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v1_swaps.sql index 430c78c..d6c129d 100644 --- a/models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v1_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v2_1_swaps.sql b/models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v2_1_swaps.sql index 37b7699..31215d3 100644 --- a/models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v2_1_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v2_pools.sql b/models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v2_pools.sql index ea91eaa..8b50e25 100644 --- a/models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v2_pools.sql +++ b/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 diff --git a/models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v2_swaps.sql b/models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v2_swaps.sql index 0912adc..65eb93f 100644 --- a/models/silver/defi/dex/trader_joe/silver_dex__trader_joe_v2_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/uniswap/silver_dex__univ2_pools.sql b/models/silver/defi/dex/uniswap/silver_dex__univ2_pools.sql index 63ae1bc..4f0282b 100644 --- a/models/silver/defi/dex/uniswap/silver_dex__univ2_pools.sql +++ b/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 diff --git a/models/silver/defi/dex/uniswap/silver_dex__univ2_swaps.sql b/models/silver/defi/dex/uniswap/silver_dex__univ2_swaps.sql index 26fa472..a8d7ed1 100644 --- a/models/silver/defi/dex/uniswap/silver_dex__univ2_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/uniswap/silver_dex__univ3_pools.sql b/models/silver/defi/dex/uniswap/silver_dex__univ3_pools.sql index 5129817..1c2b8e0 100644 --- a/models/silver/defi/dex/uniswap/silver_dex__univ3_pools.sql +++ b/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 ( diff --git a/models/silver/defi/dex/woofi/silver_dex__woofi_swaps.sql b/models/silver/defi/dex/woofi/silver_dex__woofi_swaps.sql index de19620..cb5ae11 100644 --- a/models/silver/defi/dex/woofi/silver_dex__woofi_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/zyberswap/silver_dex__zyberswap_pools.sql b/models/silver/defi/dex/zyberswap/silver_dex__zyberswap_pools.sql index d4552c1..14e8e65 100644 --- a/models/silver/defi/dex/zyberswap/silver_dex__zyberswap_pools.sql +++ b/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 diff --git a/models/silver/defi/dex/zyberswap/silver_dex__zyberswap_v2_swaps.sql b/models/silver/defi/dex/zyberswap/silver_dex__zyberswap_v2_swaps.sql index 09db66f..cfc237f 100644 --- a/models/silver/defi/dex/zyberswap/silver_dex__zyberswap_v2_swaps.sql +++ b/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 diff --git a/models/silver/defi/dex/zyberswap/silver_dex__zyberswap_v3_swaps.sql b/models/silver/defi/dex/zyberswap/silver_dex__zyberswap_v3_swaps.sql index bca6c21..5d74393 100644 --- a/models/silver/defi/dex/zyberswap/silver_dex__zyberswap_v3_swaps.sql +++ b/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 diff --git a/models/silver/defi/lending/aave/silver__aave_borrows.sql b/models/silver/defi/lending/aave/silver__aave_borrows.sql index 70c1906..6b67c74 100644 --- a/models/silver/defi/lending/aave/silver__aave_borrows.sql +++ b/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 diff --git a/models/silver/defi/lending/aave/silver__aave_deposits.sql b/models/silver/defi/lending/aave/silver__aave_deposits.sql index 026e8b2..b3b6940 100644 --- a/models/silver/defi/lending/aave/silver__aave_deposits.sql +++ b/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 diff --git a/models/silver/defi/lending/aave/silver__aave_flashloans.sql b/models/silver/defi/lending/aave/silver__aave_flashloans.sql index a6fc2a3..58a7dcc 100644 --- a/models/silver/defi/lending/aave/silver__aave_flashloans.sql +++ b/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 diff --git a/models/silver/defi/lending/aave/silver__aave_liquidations.sql b/models/silver/defi/lending/aave/silver__aave_liquidations.sql index 7aa796f..ce6c4bc 100644 --- a/models/silver/defi/lending/aave/silver__aave_liquidations.sql +++ b/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 diff --git a/models/silver/defi/lending/aave/silver__aave_repayments.sql b/models/silver/defi/lending/aave/silver__aave_repayments.sql index 3b0e32f..663a221 100644 --- a/models/silver/defi/lending/aave/silver__aave_repayments.sql +++ b/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 diff --git a/models/silver/defi/lending/aave/silver__aave_withdraws.sql b/models/silver/defi/lending/aave/silver__aave_withdraws.sql index 6314c59..39df2aa 100644 --- a/models/silver/defi/lending/aave/silver__aave_withdraws.sql +++ b/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 diff --git a/models/silver/defi/lending/dforce/silver__dforce_asset_details.sql b/models/silver/defi/lending/dforce/silver__dforce_asset_details.sql index 2f46c27..4035a5b 100644 --- a/models/silver/defi/lending/dforce/silver__dforce_asset_details.sql +++ b/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 ( diff --git a/models/silver/defi/lending/dforce/silver__dforce_withdraws.sql b/models/silver/defi/lending/dforce/silver__dforce_withdraws.sql index d3e0c37..e58e329 100644 --- a/models/silver/defi/lending/dforce/silver__dforce_withdraws.sql +++ b/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 ( diff --git a/models/silver/defi/lending/lodestar/silver__lodestar_asset_details.sql b/models/silver/defi/lending/lodestar/silver__lodestar_asset_details.sql index e0411ec..8935487 100644 --- a/models/silver/defi/lending/lodestar/silver__lodestar_asset_details.sql +++ b/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 ( diff --git a/models/silver/defi/lending/lodestar/silver__lodestar_withdraws.sql b/models/silver/defi/lending/lodestar/silver__lodestar_withdraws.sql index 6ffb505..2d70a91 100644 --- a/models/silver/defi/lending/lodestar/silver__lodestar_withdraws.sql +++ b/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 ( diff --git a/models/silver/defi/lending/radiant/silver__radiant_borrows.sql b/models/silver/defi/lending/radiant/silver__radiant_borrows.sql index 89db7b1..6051529 100644 --- a/models/silver/defi/lending/radiant/silver__radiant_borrows.sql +++ b/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 ( diff --git a/models/silver/defi/lending/radiant/silver__radiant_deposits.sql b/models/silver/defi/lending/radiant/silver__radiant_deposits.sql index 71a8369..54afece 100644 --- a/models/silver/defi/lending/radiant/silver__radiant_deposits.sql +++ b/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'), diff --git a/models/silver/defi/lending/radiant/silver__radiant_flashloans.sql b/models/silver/defi/lending/radiant/silver__radiant_flashloans.sql index f5c3db4..79d1db0 100644 --- a/models/silver/defi/lending/radiant/silver__radiant_flashloans.sql +++ b/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'), diff --git a/models/silver/defi/lending/radiant/silver__radiant_liquidations.sql b/models/silver/defi/lending/radiant/silver__radiant_liquidations.sql index 0a57cfa..d93ed42 100644 --- a/models/silver/defi/lending/radiant/silver__radiant_liquidations.sql +++ b/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'), diff --git a/models/silver/defi/lending/radiant/silver__radiant_repayments.sql b/models/silver/defi/lending/radiant/silver__radiant_repayments.sql index f66183e..fee46c6 100644 --- a/models/silver/defi/lending/radiant/silver__radiant_repayments.sql +++ b/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'), diff --git a/models/silver/defi/lending/radiant/silver__radiant_withdraws.sql b/models/silver/defi/lending/radiant/silver__radiant_withdraws.sql index 7c63d64..2bb672c 100644 --- a/models/silver/defi/lending/radiant/silver__radiant_withdraws.sql +++ b/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'), diff --git a/models/silver/nft/sales/silver__element_sales.sql b/models/silver/nft/sales/silver__element_sales.sql index 36d7747..6f7bb0b 100644 --- a/models/silver/nft/sales/silver__element_sales.sql +++ b/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 ( diff --git a/models/silver/protocols/olas/silver_olas__create_service_multisigs.sql b/models/silver/protocols/olas/silver_olas__create_service_multisigs.sql index d4a99c4..dd01c7a 100644 --- a/models/silver/protocols/olas/silver_olas__create_service_multisigs.sql +++ b/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 %} diff --git a/models/silver/protocols/olas/silver_olas__service_registrations.sql b/models/silver/protocols/olas/silver_olas__service_registrations.sql index 0a73d1b..7b158d7 100644 --- a/models/silver/protocols/olas/silver_olas__service_registrations.sql +++ b/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 ( diff --git a/models/silver/protocols/vertex/silver__vertex_dim_products.sql b/models/silver/protocols/vertex/silver__vertex_dim_products.sql index 7462129..1463ed8 100644 --- a/models/silver/protocols/vertex/silver__vertex_dim_products.sql +++ b/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 ( diff --git a/models/silver/protocols/vertex/silver__vertex_edge_trades.sql b/models/silver/protocols/vertex/silver__vertex_edge_trades.sql index dfc1c3a..6c8b277 100644 --- a/models/silver/protocols/vertex/silver__vertex_edge_trades.sql +++ b/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 ( diff --git a/models/silver/protocols/vertex/silver__vertex_liquidations.sql b/models/silver/protocols/vertex/silver__vertex_liquidations.sql index 89a88ca..7b6a5e0 100644 --- a/models/silver/protocols/vertex/silver__vertex_liquidations.sql +++ b/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 ( diff --git a/models/silver/protocols/vertex/silver__vertex_perps.sql b/models/silver/protocols/vertex/silver__vertex_perps.sql index e14ca8a..7fec74d 100644 --- a/models/silver/protocols/vertex/silver__vertex_perps.sql +++ b/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 ( diff --git a/models/silver/protocols/vertex/silver__vertex_spot.sql b/models/silver/protocols/vertex/silver__vertex_spot.sql index 89a3422..2b19bce 100644 --- a/models/silver/protocols/vertex/silver__vertex_spot.sql +++ b/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 ( diff --git a/models/silver/protocols/vertex/silver__vertex_staking.sql b/models/silver/protocols/vertex/silver__vertex_staking.sql index 9e88109..9c40893 100644 --- a/models/silver/protocols/vertex/silver__vertex_staking.sql +++ b/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 (