From 9a05fd8c71b65d11a32f9d32903e2e7e3510c0ca Mon Sep 17 00:00:00 2001
From: Mike Stepanovic <mike.stepanovic@flipsidecrypto.com>
Date: Wed, 7 May 2025 14:30:38 -0600
Subject: [PATCH] tweak model names and macro defs

---
 macros/functions/general/create_udfs.sql                    | 4 ++--
 .../streamline/complete/streamline__blocks_complete.sql     | 6 +++---
 .../complete/streamline__transactions_complete.sql          | 6 +++---
 .../streamline/complete/streamline__tx_counts_complete.sql  | 6 +++---
 .../streamline/realtime/streamline__tx_counts_realtime.sql  | 2 +-
 .../{streamline_blocks.sql => streamline__blocks.sql}       | 2 +-
 .../{streamline_chainhead.sql => streamline__chainhead.sql} | 0
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename models/main_package/core/streamline/{streamline_blocks.sql => streamline__blocks.sql} (87%)
 rename models/main_package/core/streamline/{streamline_chainhead.sql => streamline__chainhead.sql} (100%)

diff --git a/macros/functions/general/create_udfs.sql b/macros/functions/general/create_udfs.sql
index 5f0688b..b243608 100644
--- a/macros/functions/general/create_udfs.sql
+++ b/macros/functions/general/create_udfs.sql
@@ -1,9 +1,9 @@
 {% macro create_udfs() %}
-    {% if var("UPDATE_UDFS_AND_SPS") %}
+    {% if var("UPDATE_UDFS_AND_SPS", false) %}
         {% set sql %}
         CREATE schema if NOT EXISTS silver;
-        {{ create_udf_bulk_rest_api_v2() }}
         {% endset %}
         {% do run_query(sql) %}
+        {{- fsc_utils.create_udfs() -}}
     {% endif %}
 {% endmacro %}
\ No newline at end of file
diff --git a/models/main_package/core/streamline/complete/streamline__blocks_complete.sql b/models/main_package/core/streamline/complete/streamline__blocks_complete.sql
index 231f0aa..0ceed14 100644
--- a/models/main_package/core/streamline/complete/streamline__blocks_complete.sql
+++ b/models/main_package/core/streamline/complete/streamline__blocks_complete.sql
@@ -1,7 +1,7 @@
 {# Get variables #}
 {% set vars = return_vars() %}
 
--- depends_on: {{ ref('bronze__streamline_blocks') }}
+-- depends_on: {{ ref('bronze__blocks') }}
 {{ config (
     materialized = "incremental",
     incremental_strategy = 'merge',
@@ -23,7 +23,7 @@ SELECT
 FROM
 
 {% if is_incremental() %}
-{{ ref('bronze__streamline_blocks') }}
+{{ ref('bronze__blocks') }}
 WHERE
     inserted_timestamp >= (
         SELECT
@@ -32,7 +32,7 @@ WHERE
             {{ this }}
     )
 {% else %}
-    {{ ref('bronze__streamline_blocks_fr') }}
+    {{ ref('bronze__blocks_fr') }}
 {% endif %}
 
 qualify(ROW_NUMBER() over (PARTITION BY block_id
diff --git a/models/main_package/core/streamline/complete/streamline__transactions_complete.sql b/models/main_package/core/streamline/complete/streamline__transactions_complete.sql
index 044f9bd..451dd7f 100644
--- a/models/main_package/core/streamline/complete/streamline__transactions_complete.sql
+++ b/models/main_package/core/streamline/complete/streamline__transactions_complete.sql
@@ -1,7 +1,7 @@
 {# Get variables #}
 {% set vars = return_vars() %}
 
--- depends_on: {{ ref('bronze__streamline_transactions') }}
+-- depends_on: {{ ref('bronze__transactions') }}
 
 {{ config (
     materialized = "incremental",
@@ -32,9 +32,9 @@ SELECT
 FROM
 
 {% if is_incremental() %}
-{{ ref('bronze__streamline_transactions') }}
+{{ ref('bronze__transactions') }}
 {% else %}
-    {{ ref('bronze__streamline_transactions_fr') }}
+    {{ ref('bronze__transactions_fr') }}
 {% endif %}
 WHERE
     DATA <> '[]'
diff --git a/models/main_package/core/streamline/complete/streamline__tx_counts_complete.sql b/models/main_package/core/streamline/complete/streamline__tx_counts_complete.sql
index 405ea10..59c7e6d 100644
--- a/models/main_package/core/streamline/complete/streamline__tx_counts_complete.sql
+++ b/models/main_package/core/streamline/complete/streamline__tx_counts_complete.sql
@@ -1,7 +1,7 @@
 {# Get variables #}
 {% set vars = return_vars() %}
 
--- depends_on: {{ ref('bronze__streamline_tx_counts') }}
+-- depends_on: {{ ref('bronze__tx_counts') }}
 
 {{ config (
     materialized = "incremental",
@@ -25,7 +25,7 @@ SELECT
 FROM
 
 {% if is_incremental() %}
-{{ ref('bronze__streamline_tx_counts') }}
+{{ ref('bronze__tx_counts') }}
 WHERE
     inserted_timestamp >= (
         SELECT
@@ -35,7 +35,7 @@ WHERE
     )
     AND block_id NOT IN (21208991)
 {% else %}
-    {{ ref('bronze__streamline_tx_counts_fr') }}
+    {{ ref('bronze__tx_counts_fr') }}
 {% endif %}
 
 qualify(ROW_NUMBER() over (PARTITION BY block_id
diff --git a/models/main_package/core/streamline/realtime/streamline__tx_counts_realtime.sql b/models/main_package/core/streamline/realtime/streamline__tx_counts_realtime.sql
index f20a67a..70318c6 100644
--- a/models/main_package/core/streamline/realtime/streamline__tx_counts_realtime.sql
+++ b/models/main_package/core/streamline/realtime/streamline__tx_counts_realtime.sql
@@ -1,7 +1,7 @@
 {# Get variables #}
 {% set vars = return_vars() %}
 
--- depends_on: {{ ref('streamline__complete_tx_counts') }}
+-- depends_on: {{ ref('streamline__tx_counts_complete') }}
 
 {{ config (
     materialized = 'view',
diff --git a/models/main_package/core/streamline/streamline_blocks.sql b/models/main_package/core/streamline/streamline__blocks.sql
similarity index 87%
rename from models/main_package/core/streamline/streamline_blocks.sql
rename to models/main_package/core/streamline/streamline__blocks.sql
index 4b5013f..e12b675 100644
--- a/models/main_package/core/streamline/streamline_blocks.sql
+++ b/models/main_package/core/streamline/streamline__blocks.sql
@@ -18,5 +18,5 @@ WHERE
                 0
             )
         FROM
-            {{ ref('streamline_chainhead') }}
+            {{ ref('streamline__chainhead') }}
     )
diff --git a/models/main_package/core/streamline/streamline_chainhead.sql b/models/main_package/core/streamline/streamline__chainhead.sql
similarity index 100%
rename from models/main_package/core/streamline/streamline_chainhead.sql
rename to models/main_package/core/streamline/streamline__chainhead.sql