From c6407eb3ea13bf88635030ffa8b860b7ef784998 Mon Sep 17 00:00:00 2001
From: Austin <93135983+austinFlipside@users.noreply.github.com>
Date: Thu, 12 Sep 2024 11:17:22 -0400
Subject: [PATCH] predicate (#211)

---
 macros/dbt/predicate.sql                    | 26 ---------------------
 models/silver/core/silver__fact_traces2.sql |  2 +-
 package-lock.yml                            |  4 ++--
 packages.yml                                |  2 +-
 4 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 macros/dbt/predicate.sql

diff --git a/macros/dbt/predicate.sql b/macros/dbt/predicate.sql
deleted file mode 100644
index 4532a8b..0000000
--- a/macros/dbt/predicate.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-{% 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
-    ) | trim -%}
-    {%- set full_tmp_table_name = (
-        database_name ~ '.' ~ schema_name ~ '.' ~ tmp_table_name
-    ) | trim -%}
-    {{ full_table_name }}.{{ input_column }} >= (
-        SELECT
-            MIN(
-                {{ input_column }}
-            )
-        FROM
-            {{ full_tmp_table_name }}
-    )
-{%- endmacro %}
diff --git a/models/silver/core/silver__fact_traces2.sql b/models/silver/core/silver__fact_traces2.sql
index 4e23a5b..d2365a9 100644
--- a/models/silver/core/silver__fact_traces2.sql
+++ b/models/silver/core/silver__fact_traces2.sql
@@ -2,10 +2,10 @@
     materialized = "incremental",
     incremental_strategy = 'delete+insert',
     unique_key = "block_number",
+    incremental_predicates = [fsc_evm.standard_predicate()],
     cluster_by = "block_timestamp::date",
     post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION",
     tags = ['core','non_realtime'],
-    incremental_predicates = [standard_predicate()],
     full_refresh = false
 ) }}
 {{ fsc_evm.gold_traces_v1(
diff --git a/package-lock.yml b/package-lock.yml
index 9029f6e..ac246cc 100644
--- a/package-lock.yml
+++ b/package-lock.yml
@@ -10,9 +10,9 @@ packages:
 - package: get-select/dbt_snowflake_query_tags
   version: 2.5.0
 - git: https://github.com/FlipsideCrypto/fsc-evm.git
-  revision: cd09f5c97aa2e09671ff5c3a60aab57b4b27e670
+  revision: 9326ce6c0b1a8fb7dbd9eb8c3f22a32628ff7883
 - package: calogica/dbt_date
   version: 0.7.2
 - git: https://github.com/FlipsideCrypto/livequery-models.git
   revision: b024188be4e9c6bc00ed77797ebdc92d351d620e
-sha1_hash: 2639021a873ca556b9399807a57d293a78f59dba
+sha1_hash: 33a323ebe67678ba663438f7b6a41ab7451ae3b6
diff --git a/packages.yml b/packages.yml
index 0158591..9dc81c7 100644
--- a/packages.yml
+++ b/packages.yml
@@ -10,4 +10,4 @@ packages:
   - package: get-select/dbt_snowflake_query_tags
     version: [">=2.0.0", "<3.0.0"]
   - git: https://github.com/FlipsideCrypto/fsc-evm.git
-    revision: v1.1.0
\ No newline at end of file
+    revision: v1.3.0
\ No newline at end of file