change to one blockchain directory

duneanalytics · Jan 22, 2025 · 06c2281 · 06c2281
1 parent f034eb4
commit 06c2281
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 56 deletions.
diff --git a/dbt_subprojects/dex/macros/models/_decoding/evm_event_decoding_base.sql b/dbt_subprojects/dex/macros/models/_decoding/evm_event_decoding_base.sql
@@ -15,6 +15,7 @@ FROM TABLE (
         SELECT  block_number,
                 block_time,
                 block_date,
+                date_trunc('month', block_date) as block_month,
                 block_hash,
                 contract_address, 
                 topic0,

diff --git a/dbt_subprojects/dex/macros/models/_decoding/uniswap_exposed_blockchains_list.sql b/dbt_subprojects/dex/macros/models/_decoding/uniswap_exposed_blockchains_list.sql
@@ -0,0 +1,9 @@
+{% macro uniswap_exposed_blockchains_list() %}
+   {{ return([
+        "gnosis"
+        , "optimism"
+        , "zkevm"
+        , "zksync"
+        , "zora"
+    ]) }}
+{% endmacro %} 
diff --git a/dbt_subprojects/dex/macros/models/_decoding/uniswap_v3/uniswap_v3_trades.sql b/dbt_subprojects/dex/macros/models/_decoding/uniswap_v3/uniswap_v3_trades.sql
@@ -22,6 +22,7 @@ WITH evt_swap AS (
         , amount1
         , contract_address
         , tx_hash
+        , tx_index
         , evt_index
         , tx_from
         , tx_to

diff --git a/...utomated_trades/multichain/projects/uniswap/uniswap_v2_multichain_decoded_factory_evt.sql b/...utomated_trades/multichain/projects/uniswap/uniswap_v2_multichain_decoded_factory_evt.sql
@@ -11,19 +11,7 @@
 }}
 
 {%
-    set blockchains = [
-        "ethereum"
-        , "arbitrum"
-        , "base"
-        , "bnb"
-        , "fantom"
-        , "gnosis"
-        , "optimism"
-        , "polygon"
-        , "zkevm"
-        , "zksync"
-        , "zora"
-    ]
+    set blockchains = uniswap_exposed_blockchains_list()
 %}
 
 with uniswap_pool_created_logs as (

diff --git a/...omated_trades/multichain/projects/uniswap/uniswap_v2_multichain_decoded_pool_evt_swap.sql b/...omated_trades/multichain/projects/uniswap/uniswap_v2_multichain_decoded_pool_evt_swap.sql
@@ -11,19 +11,7 @@
 }}
 
 {%
-    set blockchains = [
-        "ethereum"
-        , "arbitrum"
-        , "base"
-        , "bnb"
-        , "fantom"
-        , "gnosis"
-        , "optimism"
-        , "polygon"
-        , "zkevm"
-        , "zksync"
-        , "zora"
-    ]
+    set blockchains = uniswap_exposed_blockchains_list()
 %}
 
 with uniswap_pool_swap_logs as (

diff --git a/...utomated_trades/multichain/projects/uniswap/uniswap_v3_multichain_decoded_factory_evt.sql b/...utomated_trades/multichain/projects/uniswap/uniswap_v3_multichain_decoded_factory_evt.sql
@@ -11,22 +11,10 @@
 }}
 
 {%
-    set blockchains = [
-        "ethereum"
-        , "arbitrum"
-        , "base"
-        , "bnb"
-        , "fantom"
-        , "gnosis"
-        , "optimism"
-        , "polygon"
-        , "zkevm"
-        , "zksync"
-        , "zora"
-    ]
+    set blockchains = uniswap_exposed_blockchains_list()
 %}
 
-with factory_events as (
+with uniswap_pool_created_logs as (
     {% for blockchain in blockchains %}      
         select 
             '{{blockchain}}' as blockchain,
@@ -42,5 +30,5 @@ with factory_events as (
     {% endfor %}
 )
 
-select * from factory_events
+select * from uniswap_pool_created_logs
 
diff --git a/...omated_trades/multichain/projects/uniswap/uniswap_v3_multichain_decoded_pool_evt_swap.sql b/...omated_trades/multichain/projects/uniswap/uniswap_v3_multichain_decoded_pool_evt_swap.sql
@@ -11,22 +11,10 @@
 }}
 
 {%
-    set blockchains = [
-        "ethereum"
-        , "arbitrum"
-        , "base"
-        , "bnb"
-        , "fantom"
-        , "gnosis"
-        , "optimism"
-        , "polygon"
-        , "zkevm"
-        , "zksync"
-        , "zora"
-    ]
+    set blockchains = uniswap_exposed_blockchains_list()
 %}
 
-with pool_events as (
+with uniswap_pool_swap_logs as (
     {% for blockchain in blockchains %}      
         select 
             '{{blockchain}}' as blockchain,
@@ -42,4 +30,4 @@ with pool_events as (
     {% endfor %}
 )
 
-select * from pool_events
+select * from uniswap_pool_swap_logs