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 d3a6dc0f..2b47ade4 100644 --- a/models/silver/defi/bridge/across/silver_bridge__across_fundsdeposited.sql +++ b/models/silver/defi/bridge/across/silver_bridge__across_fundsdeposited.sql @@ -61,6 +61,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), bridge_to AS ( @@ -104,6 +105,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 a6cdeb0b..85d0b4d6 100644 --- a/models/silver/defi/bridge/across/silver_bridge__across_v3fundsdeposited.sql +++ b/models/silver/defi/bridge/across/silver_bridge__across_v3fundsdeposited.sql @@ -69,6 +69,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 b6335be6..39d04bb0 100644 --- a/models/silver/defi/bridge/axelar/silver_bridge__axelar_contractcallwithtoken.sql +++ b/models/silver/defi/bridge/axelar/silver_bridge__axelar_contractcallwithtoken.sql @@ -54,6 +54,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), native_gas_paid AS ( @@ -102,6 +103,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), transfers AS ( @@ -129,6 +131,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 5e44b961..2d6a35a9 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 @@ -55,6 +55,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 c1f6be99..f00bff01 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 @@ -79,6 +79,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 124dfba8..269d6da6 100644 --- a/models/silver/defi/bridge/eywa/silver_bridge__eywa_requestsent.sql +++ b/models/silver/defi/bridge/eywa/silver_bridge__eywa_requestsent.sql @@ -49,6 +49,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 acfb4094..30dff171 100644 --- a/models/silver/defi/bridge/hop/silver_bridge__hop_transfersent.sql +++ b/models/silver/defi/bridge/hop/silver_bridge__hop_transfersent.sql @@ -60,6 +60,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 a1f185ed..bf99c7ee 100644 --- a/models/silver/defi/bridge/meson/silver_bridge__meson_transfers.sql +++ b/models/silver/defi/bridge/meson/silver_bridge__meson_transfers.sql @@ -35,6 +35,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 eba479ba..369affbb 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 @@ -49,6 +49,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 2c199dee..38560ef5 100644 --- a/models/silver/defi/bridge/stargate/silver_bridge__stargate_swap.sql +++ b/models/silver/defi/bridge/stargate/silver_bridge__stargate_swap.sql @@ -75,6 +75,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 6eb00b4d..36288156 100644 --- a/models/silver/defi/bridge/symbiosis/silver_bridge__symbiosis_synthesizerequest.sql +++ b/models/silver/defi/bridge/symbiosis/silver_bridge__symbiosis_synthesizerequest.sql @@ -50,6 +50,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 a54abee2..265983ac 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 @@ -52,6 +52,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 971d593d..8c8ca2c4 100644 --- a/models/silver/defi/bridge/synapse/silver_bridge__synapse_tokenbridgeandswap.sql +++ b/models/silver/defi/bridge/synapse/silver_bridge__synapse_tokenbridgeandswap.sql @@ -59,6 +59,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ) SELECT diff --git a/models/silver/defi/dex/beethovenx/silver_dex__beethovenx_pools.sql b/models/silver/defi/dex/beethovenx/silver_dex__beethovenx_pools.sql index eec0401f..cd836703 100644 --- a/models/silver/defi/dex/beethovenx/silver_dex__beethovenx_pools.sql +++ b/models/silver/defi/dex/beethovenx/silver_dex__beethovenx_pools.sql @@ -40,6 +40,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), tokens_registered AS ( diff --git a/models/silver/defi/dex/beethovenx/silver_dex__beethovenx_swaps.sql b/models/silver/defi/dex/beethovenx/silver_dex__beethovenx_swaps.sql index 2b89eab9..38131b46 100644 --- a/models/silver/defi/dex/beethovenx/silver_dex__beethovenx_swaps.sql +++ b/models/silver/defi/dex/beethovenx/silver_dex__beethovenx_swaps.sql @@ -62,6 +62,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ) 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 1b844370..4dce1cc2 100644 --- a/models/silver/defi/dex/curve/silver_dex__curve_pools.sql +++ b/models/silver/defi/dex/curve/silver_dex__curve_pools.sql @@ -42,6 +42,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 676755a6..733029fc 100644 --- a/models/silver/defi/dex/curve/silver_dex__curve_swaps.sql +++ b/models/silver/defi/dex/curve/silver_dex__curve_swaps.sql @@ -79,6 +79,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), @@ -127,6 +128,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), from_transfers AS ( 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 2ccfdad0..d86a761c 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 @@ -34,6 +34,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), pool_evt AS ( @@ -76,6 +77,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), FINAL AS ( 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 0ea498f3..55fe6eef 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 @@ -98,6 +98,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ) SELECT diff --git a/models/silver/defi/dex/frax/silver_dex__fraxswap_pools.sql b/models/silver/defi/dex/frax/silver_dex__fraxswap_pools.sql index 73d71f6e..8912ff90 100644 --- a/models/silver/defi/dex/frax/silver_dex__fraxswap_pools.sql +++ b/models/silver/defi/dex/frax/silver_dex__fraxswap_pools.sql @@ -36,6 +36,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ) SELECT diff --git a/models/silver/defi/dex/frax/silver_dex__fraxswap_swaps.sql b/models/silver/defi/dex/frax/silver_dex__fraxswap_swaps.sql index 9a35e06c..bf5017cc 100644 --- a/models/silver/defi/dex/frax/silver_dex__fraxswap_swaps.sql +++ b/models/silver/defi/dex/frax/silver_dex__fraxswap_swaps.sql @@ -69,6 +69,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ) SELECT diff --git a/models/silver/defi/dex/hashflow/silver_dex__hashflow_pools.sql b/models/silver/defi/dex/hashflow/silver_dex__hashflow_pools.sql index 03f4af1d..34ce21b8 100644 --- a/models/silver/defi/dex/hashflow/silver_dex__hashflow_pools.sql +++ b/models/silver/defi/dex/hashflow/silver_dex__hashflow_pools.sql @@ -33,6 +33,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} qualify(ROW_NUMBER() over(PARTITION BY to_address 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 3dc59f62..b8bbe045 100644 --- a/models/silver/defi/dex/hashflow/silver_dex__hashflow_swaps.sql +++ b/models/silver/defi/dex/hashflow/silver_dex__hashflow_swaps.sql @@ -77,6 +77,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), swaps_base AS ( @@ -142,6 +143,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 75134b08..c21aab53 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 @@ -30,6 +30,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 a4e14f5c..1449c18d 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 @@ -61,6 +61,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ) 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 55a046d7..8acdb262 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 @@ -48,6 +48,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 dcbf4fd1..75271de7 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 @@ -74,6 +74,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 7e4add34..f11dad59 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 @@ -39,6 +39,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 a131ee17..2f0d9429 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 @@ -87,6 +87,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 c3fce622..53bf5ed1 100644 --- a/models/silver/defi/dex/sushi/silver_dex__sushi_pools.sql +++ b/models/silver/defi/dex/sushi/silver_dex__sushi_pools.sql @@ -36,6 +36,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 0c4b6349..a8b6f3e9 100644 --- a/models/silver/defi/dex/sushi/silver_dex__sushi_swaps.sql +++ b/models/silver/defi/dex/sushi/silver_dex__sushi_swaps.sql @@ -59,6 +59,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ) SELECT diff --git a/models/silver/defi/dex/synthetix/silver_dex__synthetix_swaps.sql b/models/silver/defi/dex/synthetix/silver_dex__synthetix_swaps.sql index b00cf1f3..fd8142fd 100644 --- a/models/silver/defi/dex/synthetix/silver_dex__synthetix_swaps.sql +++ b/models/silver/defi/dex/synthetix/silver_dex__synthetix_swaps.sql @@ -62,6 +62,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 333c2ce2..598e1c6c 100644 --- a/models/silver/defi/dex/uniswap/silver_dex__univ2_pools.sql +++ b/models/silver/defi/dex/uniswap/silver_dex__univ2_pools.sql @@ -36,6 +36,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 907a766c..c2cc44ce 100644 --- a/models/silver/defi/dex/uniswap/silver_dex__univ2_swaps.sql +++ b/models/silver/defi/dex/uniswap/silver_dex__univ2_swaps.sql @@ -67,6 +67,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 1d8d1405..2e2a244e 100644 --- a/models/silver/defi/dex/uniswap/silver_dex__univ3_pools.sql +++ b/models/silver/defi/dex/uniswap/silver_dex__univ3_pools.sql @@ -37,12 +37,11 @@ WITH created_pools AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), initial_info AS ( @@ -66,12 +65,11 @@ initial_info AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), diff --git a/models/silver/defi/dex/uniswap/silver_dex__univ3_swaps.sql b/models/silver/defi/dex/uniswap/silver_dex__univ3_swaps.sql index 3f3651db..dbf710b5 100644 --- a/models/silver/defi/dex/uniswap/silver_dex__univ3_swaps.sql +++ b/models/silver/defi/dex/uniswap/silver_dex__univ3_swaps.sql @@ -45,12 +45,11 @@ WITH base_swaps AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), pool_data AS ( diff --git a/models/silver/defi/dex/velodrome/silver_dex__velodrome_v1_pools.sql b/models/silver/defi/dex/velodrome/silver_dex__velodrome_v1_pools.sql index eabec707..68c3102c 100644 --- a/models/silver/defi/dex/velodrome/silver_dex__velodrome_v1_pools.sql +++ b/models/silver/defi/dex/velodrome/silver_dex__velodrome_v1_pools.sql @@ -43,6 +43,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} qualify(ROW_NUMBER() over (PARTITION BY pool_address diff --git a/models/silver/defi/dex/velodrome/silver_dex__velodrome_v1_swaps.sql b/models/silver/defi/dex/velodrome/silver_dex__velodrome_v1_swaps.sql index 0e2429fb..8f439b33 100644 --- a/models/silver/defi/dex/velodrome/silver_dex__velodrome_v1_swaps.sql +++ b/models/silver/defi/dex/velodrome/silver_dex__velodrome_v1_swaps.sql @@ -72,6 +72,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ) SELECT diff --git a/models/silver/defi/dex/velodrome/silver_dex__velodrome_v2_pools.sql b/models/silver/defi/dex/velodrome/silver_dex__velodrome_v2_pools.sql index 5b80083a..432c4381 100644 --- a/models/silver/defi/dex/velodrome/silver_dex__velodrome_v2_pools.sql +++ b/models/silver/defi/dex/velodrome/silver_dex__velodrome_v2_pools.sql @@ -36,12 +36,11 @@ WHERE {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} qualify(ROW_NUMBER() over (PARTITION BY pool_address diff --git a/models/silver/defi/dex/velodrome/silver_dex__velodrome_v2_swaps.sql b/models/silver/defi/dex/velodrome/silver_dex__velodrome_v2_swaps.sql index 3d886aeb..596890db 100644 --- a/models/silver/defi/dex/velodrome/silver_dex__velodrome_v2_swaps.sql +++ b/models/silver/defi/dex/velodrome/silver_dex__velodrome_v2_swaps.sql @@ -70,6 +70,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ) SELECT 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 7e69d824..a2dda26d 100644 --- a/models/silver/defi/dex/woofi/silver_dex__woofi_swaps.sql +++ b/models/silver/defi/dex/woofi/silver_dex__woofi_swaps.sql @@ -72,6 +72,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), swaps_base AS ( @@ -140,6 +141,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 b6d0ad0a..d5f941f2 100644 --- a/models/silver/defi/lending/aave/silver__aave_borrows.sql +++ b/models/silver/defi/lending/aave/silver__aave_borrows.sql @@ -53,12 +53,11 @@ borrow AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} AND contract_address = LOWER('0x794a61358D6845594F94dc1DB02A252b5b4814aD') AND tx_status = 'SUCCESS' --excludes failed txs diff --git a/models/silver/defi/lending/aave/silver__aave_deposits.sql b/models/silver/defi/lending/aave/silver__aave_deposits.sql index 3dc73539..fff12f02 100644 --- a/models/silver/defi/lending/aave/silver__aave_deposits.sql +++ b/models/silver/defi/lending/aave/silver__aave_deposits.sql @@ -46,12 +46,11 @@ WITH deposits AS( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} AND contract_address = LOWER('0x794a61358D6845594F94dc1DB02A252b5b4814aD') AND tx_status = 'SUCCESS' --excludes failed txs diff --git a/models/silver/defi/lending/aave/silver__aave_flashloans.sql b/models/silver/defi/lending/aave/silver__aave_flashloans.sql index a5a74458..d8595bf8 100644 --- a/models/silver/defi/lending/aave/silver__aave_flashloans.sql +++ b/models/silver/defi/lending/aave/silver__aave_flashloans.sql @@ -48,12 +48,11 @@ WITH flashloan AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} AND contract_address = LOWER('0x794a61358D6845594F94dc1DB02A252b5b4814aD') AND tx_status = 'SUCCESS' --excludes failed txs diff --git a/models/silver/defi/lending/aave/silver__aave_liquidations.sql b/models/silver/defi/lending/aave/silver__aave_liquidations.sql index e68be4dc..26b10b9d 100644 --- a/models/silver/defi/lending/aave/silver__aave_liquidations.sql +++ b/models/silver/defi/lending/aave/silver__aave_liquidations.sql @@ -46,12 +46,11 @@ WITH liquidation AS( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} AND contract_address = LOWER('0x794a61358D6845594F94dc1DB02A252b5b4814aD') AND tx_status = 'SUCCESS' --excludes failed txs diff --git a/models/silver/defi/lending/aave/silver__aave_repayments.sql b/models/silver/defi/lending/aave/silver__aave_repayments.sql index 5dff8383..601ff940 100644 --- a/models/silver/defi/lending/aave/silver__aave_repayments.sql +++ b/models/silver/defi/lending/aave/silver__aave_repayments.sql @@ -43,12 +43,11 @@ WITH repay AS( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} AND contract_address = LOWER('0x794a61358D6845594F94dc1DB02A252b5b4814aD') AND tx_status = 'SUCCESS' --excludes failed txs diff --git a/models/silver/defi/lending/aave/silver__aave_withdraws.sql b/models/silver/defi/lending/aave/silver__aave_withdraws.sql index e3cac082..49c977a3 100644 --- a/models/silver/defi/lending/aave/silver__aave_withdraws.sql +++ b/models/silver/defi/lending/aave/silver__aave_withdraws.sql @@ -42,12 +42,11 @@ WITH withdraw AS( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} AND contract_address = LOWER('0x794a61358D6845594F94dc1DB02A252b5b4814aD') AND tx_status = 'SUCCESS' --excludes failed txs diff --git a/models/silver/defi/lending/exactly/silver__exactly_asset_details.sql b/models/silver/defi/lending/exactly/silver__exactly_asset_details.sql index e4a92ab8..ac10cd51 100644 --- a/models/silver/defi/lending/exactly/silver__exactly_asset_details.sql +++ b/models/silver/defi/lending/exactly/silver__exactly_asset_details.sql @@ -25,12 +25,11 @@ WITH log_pull AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), traces_pull AS ( diff --git a/models/silver/defi/lending/exactly/silver__exactly_borrows.sql b/models/silver/defi/lending/exactly/silver__exactly_borrows.sql index 972ce998..b4bd095a 100644 --- a/models/silver/defi/lending/exactly/silver__exactly_borrows.sql +++ b/models/silver/defi/lending/exactly/silver__exactly_borrows.sql @@ -55,13 +55,12 @@ sonne_borrows AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( - SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' - FROM - {{ this }} + SELECT + MAX(_inserted_timestamp) - INTERVAL '12 hours' + FROM + {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), sonne_combine AS ( diff --git a/models/silver/defi/lending/exactly/silver__exactly_deposits.sql b/models/silver/defi/lending/exactly/silver__exactly_deposits.sql index f276f1b4..c20220dd 100644 --- a/models/silver/defi/lending/exactly/silver__exactly_deposits.sql +++ b/models/silver/defi/lending/exactly/silver__exactly_deposits.sql @@ -56,13 +56,12 @@ exactly_deposits AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( - SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' - FROM - {{ this }} + SELECT + MAX(_inserted_timestamp) - INTERVAL '12 hours' + FROM + {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), exactly_combine AS ( diff --git a/models/silver/defi/lending/exactly/silver__exactly_liquidations.sql b/models/silver/defi/lending/exactly/silver__exactly_liquidations.sql index ba0ce974..eaa27a91 100644 --- a/models/silver/defi/lending/exactly/silver__exactly_liquidations.sql +++ b/models/silver/defi/lending/exactly/silver__exactly_liquidations.sql @@ -59,13 +59,12 @@ exactly_liquidations AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( - SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' - FROM - {{ this }} + SELECT + MAX(_inserted_timestamp) - INTERVAL '12 hours' + FROM + {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), liquidation_union AS ( diff --git a/models/silver/defi/lending/exactly/silver__exactly_repayments.sql b/models/silver/defi/lending/exactly/silver__exactly_repayments.sql index a9408a2a..dc79352e 100644 --- a/models/silver/defi/lending/exactly/silver__exactly_repayments.sql +++ b/models/silver/defi/lending/exactly/silver__exactly_repayments.sql @@ -54,13 +54,12 @@ exactly_repayments AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( - SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' - FROM - {{ this }} + SELECT + MAX(_inserted_timestamp) - INTERVAL '12 hours' + FROM + {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), exactly_combine AS ( diff --git a/models/silver/defi/lending/exactly/silver__exactly_withdraws.sql b/models/silver/defi/lending/exactly/silver__exactly_withdraws.sql index 86a821b6..a1426d09 100644 --- a/models/silver/defi/lending/exactly/silver__exactly_withdraws.sql +++ b/models/silver/defi/lending/exactly/silver__exactly_withdraws.sql @@ -55,12 +55,11 @@ exactly_redemptions AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), exactly_combine AS ( diff --git a/models/silver/defi/lending/granary/silver__granary_borrows.sql b/models/silver/defi/lending/granary/silver__granary_borrows.sql index f74b0e45..22f12328 100644 --- a/models/silver/defi/lending/granary/silver__granary_borrows.sql +++ b/models/silver/defi/lending/granary/silver__granary_borrows.sql @@ -53,12 +53,11 @@ borrow AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} AND contract_address = LOWER('0x8FD4aF47E4E63d1D2D45582c3286b4BD9Bb95DfE') AND tx_status = 'SUCCESS' --excludes failed txs diff --git a/models/silver/defi/lending/granary/silver__granary_deposits.sql b/models/silver/defi/lending/granary/silver__granary_deposits.sql index 809c29d4..1f64f165 100644 --- a/models/silver/defi/lending/granary/silver__granary_deposits.sql +++ b/models/silver/defi/lending/granary/silver__granary_deposits.sql @@ -46,12 +46,11 @@ WITH deposits AS( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} AND contract_address = LOWER('0x8FD4aF47E4E63d1D2D45582c3286b4BD9Bb95DfE') AND tx_status = 'SUCCESS' --excludes failed txs diff --git a/models/silver/defi/lending/granary/silver__granary_flashloans.sql b/models/silver/defi/lending/granary/silver__granary_flashloans.sql index 482e9f34..d29e56c9 100644 --- a/models/silver/defi/lending/granary/silver__granary_flashloans.sql +++ b/models/silver/defi/lending/granary/silver__granary_flashloans.sql @@ -48,12 +48,11 @@ WITH flashloan AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} AND contract_address = LOWER('0x8FD4aF47E4E63d1D2D45582c3286b4BD9Bb95DfE') AND tx_status = 'SUCCESS' --excludes failed txs diff --git a/models/silver/defi/lending/granary/silver__granary_liquidations.sql b/models/silver/defi/lending/granary/silver__granary_liquidations.sql index 460e44cc..371e2144 100644 --- a/models/silver/defi/lending/granary/silver__granary_liquidations.sql +++ b/models/silver/defi/lending/granary/silver__granary_liquidations.sql @@ -46,12 +46,11 @@ WITH liquidation AS( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} AND contract_address = LOWER('0x8FD4aF47E4E63d1D2D45582c3286b4BD9Bb95DfE') AND tx_status = 'SUCCESS' --excludes failed txs diff --git a/models/silver/defi/lending/granary/silver__granary_repayments.sql b/models/silver/defi/lending/granary/silver__granary_repayments.sql index bd666488..17abeb60 100644 --- a/models/silver/defi/lending/granary/silver__granary_repayments.sql +++ b/models/silver/defi/lending/granary/silver__granary_repayments.sql @@ -43,12 +43,11 @@ WITH repay AS( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} AND contract_address = LOWER('0x8FD4aF47E4E63d1D2D45582c3286b4BD9Bb95DfE') AND tx_status = 'SUCCESS' --excludes failed txs diff --git a/models/silver/defi/lending/granary/silver__granary_withdraws.sql b/models/silver/defi/lending/granary/silver__granary_withdraws.sql index 9599909c..f293a0fb 100644 --- a/models/silver/defi/lending/granary/silver__granary_withdraws.sql +++ b/models/silver/defi/lending/granary/silver__granary_withdraws.sql @@ -42,12 +42,11 @@ WITH withdraw AS( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} AND contract_address = LOWER('0x8FD4aF47E4E63d1D2D45582c3286b4BD9Bb95DfE') AND tx_status = 'SUCCESS' --excludes failed txs diff --git a/models/silver/defi/lending/sonne/silver__sonne_asset_details.sql b/models/silver/defi/lending/sonne/silver__sonne_asset_details.sql index 9be32e7b..bbb994e0 100644 --- a/models/silver/defi/lending/sonne/silver__sonne_asset_details.sql +++ b/models/silver/defi/lending/sonne/silver__sonne_asset_details.sql @@ -24,12 +24,11 @@ WITH log_pull AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), traces_pull AS ( diff --git a/models/silver/defi/lending/sonne/silver__sonne_borrows.sql b/models/silver/defi/lending/sonne/silver__sonne_borrows.sql index e9997998..ecf86f11 100644 --- a/models/silver/defi/lending/sonne/silver__sonne_borrows.sql +++ b/models/silver/defi/lending/sonne/silver__sonne_borrows.sql @@ -59,13 +59,12 @@ sonne_borrows AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( - SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' - FROM - {{ this }} + SELECT + MAX(_inserted_timestamp) - INTERVAL '12 hours' + FROM + {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), sonne_combine AS ( diff --git a/models/silver/defi/lending/sonne/silver__sonne_deposits.sql b/models/silver/defi/lending/sonne/silver__sonne_deposits.sql index a36d1401..b285c8de 100644 --- a/models/silver/defi/lending/sonne/silver__sonne_deposits.sql +++ b/models/silver/defi/lending/sonne/silver__sonne_deposits.sql @@ -56,13 +56,12 @@ sonne_deposits AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( - SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' - FROM - {{ this }} + SELECT + MAX(_inserted_timestamp) - INTERVAL '12 hours' + FROM + {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), sonne_combine AS ( diff --git a/models/silver/defi/lending/sonne/silver__sonne_liquidations.sql b/models/silver/defi/lending/sonne/silver__sonne_liquidations.sql index 842985b7..0caa841a 100644 --- a/models/silver/defi/lending/sonne/silver__sonne_liquidations.sql +++ b/models/silver/defi/lending/sonne/silver__sonne_liquidations.sql @@ -58,13 +58,12 @@ sonne_liquidations AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( - SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' - FROM - {{ this }} + SELECT + MAX(_inserted_timestamp) - INTERVAL '12 hours' + FROM + {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), liquidation_union AS ( diff --git a/models/silver/defi/lending/sonne/silver__sonne_repayments.sql b/models/silver/defi/lending/sonne/silver__sonne_repayments.sql index a9dc7897..869b3888 100644 --- a/models/silver/defi/lending/sonne/silver__sonne_repayments.sql +++ b/models/silver/defi/lending/sonne/silver__sonne_repayments.sql @@ -54,13 +54,12 @@ sonne_repayments AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( - SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' - FROM - {{ this }} + SELECT + MAX(_inserted_timestamp) - INTERVAL '12 hours' + FROM + {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), sonne_combine AS ( diff --git a/models/silver/defi/lending/sonne/silver__sonne_withdraws.sql b/models/silver/defi/lending/sonne/silver__sonne_withdraws.sql index c846c6a0..37c2ef44 100644 --- a/models/silver/defi/lending/sonne/silver__sonne_withdraws.sql +++ b/models/silver/defi/lending/sonne/silver__sonne_withdraws.sql @@ -57,12 +57,11 @@ sonne_redemptions AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), sonne_combine AS ( diff --git a/models/silver/defi/lending/tarot/silver__tarot_borrows.sql b/models/silver/defi/lending/tarot/silver__tarot_borrows.sql index 20efa165..375885bd 100644 --- a/models/silver/defi/lending/tarot/silver__tarot_borrows.sql +++ b/models/silver/defi/lending/tarot/silver__tarot_borrows.sql @@ -65,12 +65,11 @@ log_pull AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ) SELECT diff --git a/models/silver/defi/lending/tarot/silver__tarot_deposits.sql b/models/silver/defi/lending/tarot/silver__tarot_deposits.sql index 3276c98f..4d1525f3 100644 --- a/models/silver/defi/lending/tarot/silver__tarot_deposits.sql +++ b/models/silver/defi/lending/tarot/silver__tarot_deposits.sql @@ -62,12 +62,11 @@ log_pull AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ) SELECT diff --git a/models/silver/defi/lending/tarot/silver__tarot_liquidations.sql b/models/silver/defi/lending/tarot/silver__tarot_liquidations.sql index a61234ac..51dbb849 100644 --- a/models/silver/defi/lending/tarot/silver__tarot_liquidations.sql +++ b/models/silver/defi/lending/tarot/silver__tarot_liquidations.sql @@ -69,12 +69,11 @@ log_pull as ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ) select diff --git a/models/silver/defi/lending/tarot/silver__tarot_liquidity_pools.sql b/models/silver/defi/lending/tarot/silver__tarot_liquidity_pools.sql index b5f18371..d123d1d3 100644 --- a/models/silver/defi/lending/tarot/silver__tarot_liquidity_pools.sql +++ b/models/silver/defi/lending/tarot/silver__tarot_liquidity_pools.sql @@ -34,12 +34,11 @@ WITH factory_pull AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), lp_token_pull AS ( diff --git a/models/silver/defi/lending/tarot/silver__tarot_repayments.sql b/models/silver/defi/lending/tarot/silver__tarot_repayments.sql index 4905a73a..b50deb2e 100644 --- a/models/silver/defi/lending/tarot/silver__tarot_repayments.sql +++ b/models/silver/defi/lending/tarot/silver__tarot_repayments.sql @@ -66,12 +66,11 @@ log_pull AS ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ) SELECT diff --git a/models/silver/defi/lending/tarot/silver__tarot_withdraws.sql b/models/silver/defi/lending/tarot/silver__tarot_withdraws.sql index 8f31438f..64f58407 100644 --- a/models/silver/defi/lending/tarot/silver__tarot_withdraws.sql +++ b/models/silver/defi/lending/tarot/silver__tarot_withdraws.sql @@ -55,12 +55,11 @@ log_pull as ( {% if is_incremental() %} AND _inserted_timestamp >= ( SELECT - MAX( - _inserted_timestamp - ) - INTERVAL '12 hours' + MAX(_inserted_timestamp) - INTERVAL '12 hours' FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ) select diff --git a/models/silver/nft/sales/silver__element_sales.sql b/models/silver/nft/sales/silver__element_sales.sql index 2b5a4bd0..e69ec8cd 100644 --- a/models/silver/nft/sales/silver__element_sales.sql +++ b/models/silver/nft/sales/silver__element_sales.sql @@ -96,6 +96,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), raw_fees AS ( @@ -218,6 +219,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ) SELECT diff --git a/models/silver/nft/sales/silver__seaport_1_5_sales.sql b/models/silver/nft/sales/silver__seaport_1_5_sales.sql index f5661e22..07e67f1f 100644 --- a/models/silver/nft/sales/silver__seaport_1_5_sales.sql +++ b/models/silver/nft/sales/silver__seaport_1_5_sales.sql @@ -41,6 +41,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), raw_logs AS ( @@ -83,6 +84,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), raw_logs_event_index_fill AS ( @@ -1869,6 +1871,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), nft_transfer_operator AS ( @@ -1910,6 +1913,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), final_seaport AS ( diff --git a/models/silver/nft/sales/silver__seaport_1_6_sales.sql b/models/silver/nft/sales/silver__seaport_1_6_sales.sql index 31eaacaa..b3838f3c 100644 --- a/models/silver/nft/sales/silver__seaport_1_6_sales.sql +++ b/models/silver/nft/sales/silver__seaport_1_6_sales.sql @@ -40,6 +40,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), raw_logs AS ( @@ -81,6 +82,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), raw_logs_event_index_fill AS ( @@ -1867,6 +1869,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), nft_transfer_operator AS ( @@ -1908,6 +1911,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), final_seaport 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 5df29875..c62c5880 100644 --- a/models/silver/protocols/olas/silver_olas__create_service_multisigs.sql +++ b/models/silver/protocols/olas/silver_olas__create_service_multisigs.sql @@ -50,4 +50,5 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_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 f554a1fc..bfdbf476 100644 --- a/models/silver/protocols/olas/silver_olas__service_registrations.sql +++ b/models/silver/protocols/olas/silver_olas__service_registrations.sql @@ -47,6 +47,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), transfers AS ( diff --git a/models/silver/protocols/velodrome/silver__velodrome_pools.sql b/models/silver/protocols/velodrome/silver__velodrome_pools.sql index 7021a64f..4c89d7e5 100644 --- a/models/silver/protocols/velodrome/silver__velodrome_pools.sql +++ b/models/silver/protocols/velodrome/silver__velodrome_pools.sql @@ -37,6 +37,7 @@ AND _inserted_timestamp >= ( FROM {{ this }} ) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), function_sigs AS (