clean up params, fix optional column logic

duneanalytics · Jan 24, 2025 · 75bc302 · 75bc302
1 parent 410e7ca
commit 75bc302
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 20 deletions.
diff --git a/dbt_subprojects/dex/macros/models/_project/uniswap_compatible_trades.sql b/dbt_subprojects/dex/macros/models/_project/uniswap_compatible_trades.sql
@@ -124,12 +124,13 @@ FROM
     blockchain = null
     , project = 'uniswap'
     , version = '4'
-    , Pair_evt_Swap = null
-    , Factory_evt_PoolCreated = null
+    , PoolManager_evt_Swap = null
+    , PoolManager_evt_Initialize = null
     , taker_column_name = 't.evt_tx_from'
     , maker_column_name = null
-    , optional_columns = ['f.fee', 't.hooks']
-    , pair_column_name = 'f.id'
+    , swap_optional_columns = ['fee']
+    , initialize_optional_columns = ['hooks']
+    , pair_column_name = 'id'
     )
 %}
 WITH dexs AS
@@ -146,18 +147,23 @@ WITH dexs AS
         , CASE WHEN t.amount0 < INT256 '0' THEN f.currency0 ELSE f.currency1 END AS token_sold_address
         , t.contract_address as project_contract_address
         , t.sender 
-        {%- if optional_columns %}
-        {%- for optional_column in optional_columns %}
-        , {{ optional_column }}
-        {%- endfor %}
-        {%- endif %}
         , t.evt_tx_hash AS tx_hash
         , t.evt_index
+        {%- if swap_optional_columns %}
+        {%- for optional_column in swap_optional_columns %}
+        , t.{{ optional_column }}
+        {%- endfor %}
+        {%- endif %}
+        {%- if initialize_optional_columns %}
+        {%- for optional_column in initialize_optional_columns %}
+        , f.{{ optional_column }}
+        {%- endfor %}
+        {%- endif %}
     FROM
-        {{ Pair_evt_Swap }} t
+        {{ PoolManager_evt_Swap }} t
     INNER JOIN
-        {{ Factory_evt_PoolCreated }} f
-        ON {{ pair_column_name }} = t.id
+        {{ PoolManager_evt_Initialize }} f
+        ON f.{{ pair_column_name }} = t.id
     {%- if is_incremental() %}
     WHERE
         {{ incremental_predicate('t.evt_block_time') }}
@@ -177,16 +183,21 @@ SELECT
     , dexs.token_bought_address
     , dexs.token_sold_address
     , dexs.sender as router
-    {%- if optional_columns %}  
-    {%- for optional_column in optional_columns %}  
-    , dexs.{{ optional_column }}  
-    {%- endfor %}  
-    {%- endif %}  
     , dexs.taker
     , dexs.maker
     , dexs.project_contract_address
     , dexs.tx_hash
     , dexs.evt_index
+    {%- if swap_optional_columns %}  
+    {%- for optional_column in swap_optional_columns %}  
+    , dexs.{{ optional_column }}  
+    {%- endfor %}  
+    {%- endif %}  
+    {%- if initialize_optional_columns %}
+    {%- for optional_column in initialize_optional_columns %}
+    , dexs.{{ optional_column }}
+    {%- endfor %}
+    {%- endif %}
 FROM
     dexs
 {% endmacro %}
diff --git a/dbt_subprojects/dex/models/trades/base/platforms/uniswap_v4_base_base_trades.sql b/dbt_subprojects/dex/models/trades/base/platforms/uniswap_v4_base_base_trades.sql
@@ -14,8 +14,7 @@
         blockchain = 'base'
         , project = 'uniswap'
         , version = '4'
-        , Pair_evt_Swap = source('uniswap_v4_base', 'PoolManager_evt_Swap') 
-        , Factory_evt_PoolCreated = source('uniswap_v4_base', 'PoolManager_evt_Initialize')
-        , optional_columns = ['f.fee', 'f.hooks']
+        , PoolManager_evt_Swap = source('uniswap_v4_base', 'PoolManager_evt_Swap') 
+        , PoolManager_evt_Initialize = source('uniswap_v4_base', 'PoolManager_evt_Initialize')
     )
 }}