From e992a38fc36a22c14809283a57404f020ff22a25 Mon Sep 17 00:00:00 2001 From: jeff-dude <102681548+jeff-dude@users.noreply.github.com> Date: Wed, 31 Jul 2024 10:00:13 -0400 Subject: [PATCH] DUX-422: evms info downstream ref to sources (#6464) * add evms schema / tables to sources, cleanup old * switch to sources --- macros/models/_sector/fungible/fungible_transfers.sql | 2 +- macros/models/_sector/social/enrich_social_trades.sql | 2 +- .../_subprojects_outputs/daily_spellbook/_sources.yml | 10 +++++++++- sources/_subprojects_outputs/evms/_sources.yml | 10 ---------- 4 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 sources/_subprojects_outputs/evms/_sources.yml diff --git a/macros/models/_sector/fungible/fungible_transfers.sql b/macros/models/_sector/fungible/fungible_transfers.sql index ce474794dd9..751dda86635 100644 --- a/macros/models/_sector/fungible/fungible_transfers.sql +++ b/macros/models/_sector/fungible/fungible_transfers.sql @@ -60,7 +60,7 @@ INNER JOIN {{ transactions }} et ON et.block_number=t.block_number AND et.hash=t.tx_hash LEFT JOIN {{ source('prices','usd_forward_fill') }} pu ON pu.blockchain = '{{blockchain}}' AND (pu.contract_address=t.contract_address - OR t.contract_address IS NULL AND pu.contract_address=(SELECT wrapped_native_token_address FROM {{ ref('evms_info') }} WHERE blockchain='{{blockchain}}') + OR t.contract_address IS NULL AND pu.contract_address=(SELECT wrapped_native_token_address FROM {{ source('evms','info') }} WHERE blockchain='{{blockchain}}') ) AND pu.minute = date_trunc('minute', t.block_time) diff --git a/macros/models/_sector/social/enrich_social_trades.sql b/macros/models/_sector/social/enrich_social_trades.sql index d0fbba8ea33..52835a26978 100644 --- a/macros/models/_sector/social/enrich_social_trades.sql +++ b/macros/models/_sector/social/enrich_social_trades.sql @@ -24,7 +24,7 @@ SELECT , t.evt_index , t.contract_address FROM {{ base_trades }} t -INNER JOIN {{ref('evms_info')}} info +INNER JOIN {{ source('evms','info') }} info ON info.blockchain = t.blockchain LEFT JOIN {{source('tokens', 'erc20')}} tok ON tok.blockchain = t.blockchain diff --git a/sources/_subprojects_outputs/daily_spellbook/_sources.yml b/sources/_subprojects_outputs/daily_spellbook/_sources.yml index efb81d12706..8f206eeff71 100644 --- a/sources/_subprojects_outputs/daily_spellbook/_sources.yml +++ b/sources/_subprojects_outputs/daily_spellbook/_sources.yml @@ -20,4 +20,12 @@ sources: - name: labels tables: - name: jelly_swap_pools_sei - - name: addresses \ No newline at end of file + - name: addresses + + - name: evms + description: "Cross-chain EVM raw data" + tables: + - name: info + description: "Blockchain metadata for all EVM compatible chains" + - name: evm_smart_account_method_ids + - name: base_evm_smart_account_method_ids \ No newline at end of file diff --git a/sources/_subprojects_outputs/evms/_sources.yml b/sources/_subprojects_outputs/evms/_sources.yml deleted file mode 100644 index f1b3beda4fb..00000000000 --- a/sources/_subprojects_outputs/evms/_sources.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: 2 - -sources: - - name: evms - description: "Cross-chain EVM raw data" - tables: - - name: info - description: "Blockchain metadata for all EVM compatible chains" - - name: evm_smart_account_method_ids - - name: base_evm_smart_account_method_ids \ No newline at end of file