From 06c228190a5ee0d414d3de3bb7a10001baa3e2af Mon Sep 17 00:00:00 2001 From: Boxer Date: Wed, 22 Jan 2025 20:13:31 +0100 Subject: [PATCH] change to one blockchain directory --- .../_decoding/evm_event_decoding_base.sql | 1 + .../uniswap_exposed_blockchains_list.sql | 9 +++++++++ .../_decoding/uniswap_v3/uniswap_v3_trades.sql | 1 + ...iswap_v2_multichain_decoded_factory_evt.sql | 14 +------------- ...wap_v2_multichain_decoded_pool_evt_swap.sql | 14 +------------- ...iswap_v3_multichain_decoded_factory_evt.sql | 18 +++--------------- ...wap_v3_multichain_decoded_pool_evt_swap.sql | 18 +++--------------- 7 files changed, 19 insertions(+), 56 deletions(-) create mode 100644 dbt_subprojects/dex/macros/models/_decoding/uniswap_exposed_blockchains_list.sql 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 index 1e16e9382f7..aa9598fa294 100644 --- 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 new file mode 100644 index 00000000000..eb1165418d2 --- /dev/null +++ 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 %} \ No newline at end of file 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 index c0a39b04b27..7da3023a0c9 100644 --- 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/dbt_subprojects/dex/models/automated_trades/multichain/projects/uniswap/uniswap_v2_multichain_decoded_factory_evt.sql b/dbt_subprojects/dex/models/automated_trades/multichain/projects/uniswap/uniswap_v2_multichain_decoded_factory_evt.sql index 411112f8901..70d9e416062 100644 --- a/dbt_subprojects/dex/models/automated_trades/multichain/projects/uniswap/uniswap_v2_multichain_decoded_factory_evt.sql +++ b/dbt_subprojects/dex/models/automated_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/dbt_subprojects/dex/models/automated_trades/multichain/projects/uniswap/uniswap_v2_multichain_decoded_pool_evt_swap.sql b/dbt_subprojects/dex/models/automated_trades/multichain/projects/uniswap/uniswap_v2_multichain_decoded_pool_evt_swap.sql index b5425aecaaf..30b81f80992 100644 --- a/dbt_subprojects/dex/models/automated_trades/multichain/projects/uniswap/uniswap_v2_multichain_decoded_pool_evt_swap.sql +++ b/dbt_subprojects/dex/models/automated_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/dbt_subprojects/dex/models/automated_trades/multichain/projects/uniswap/uniswap_v3_multichain_decoded_factory_evt.sql b/dbt_subprojects/dex/models/automated_trades/multichain/projects/uniswap/uniswap_v3_multichain_decoded_factory_evt.sql index 31fdf6290d4..f0a5ee2430a 100644 --- a/dbt_subprojects/dex/models/automated_trades/multichain/projects/uniswap/uniswap_v3_multichain_decoded_factory_evt.sql +++ b/dbt_subprojects/dex/models/automated_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/dbt_subprojects/dex/models/automated_trades/multichain/projects/uniswap/uniswap_v3_multichain_decoded_pool_evt_swap.sql b/dbt_subprojects/dex/models/automated_trades/multichain/projects/uniswap/uniswap_v3_multichain_decoded_pool_evt_swap.sql index 3cbe7d3090d..63e283cfaec 100644 --- a/dbt_subprojects/dex/models/automated_trades/multichain/projects/uniswap/uniswap_v3_multichain_decoded_pool_evt_swap.sql +++ b/dbt_subprojects/dex/models/automated_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