Merge branch 'duneanalytics:main' into main

5afe · Jul 26, 2024 · 6fc38c7 · 6fc38c7
2 parents 52ce339 + c307578
commit 6fc38c7
Show file tree

Hide file tree

Showing 845 changed files with 16,415 additions and 1,804 deletions.
diff --git a/analyses/.gitkeep b/analyses/.gitkeep
diff --git a/daily_spellbook/models/_projects/oneinch/_meta/oneinch_mapped_contracts.sql b/daily_spellbook/models/_projects/oneinch/_meta/oneinch_mapped_contracts.sql
@@ -3,14 +3,13 @@
         schema = 'oneinch',
         alias = 'mapped_contracts',
         materialized = 'table',
-        tags = ['prod_exclude'],
         unique_key = ['blockchain', 'address'],
     )
 }}
 
 
 
 {% for blockchain in oneinch_project_swaps_exposed_blockchains_list() %}
-    select * from ({{ oneinch_mapped_contracts_macro(blockchain) }})
+    select * from {{ ref('oneinch_' + blockchain + '_mapped_contracts') }}
     {% if not loop.last %} union all {% endif %}
 {% endfor %}
diff --git a/daily_spellbook/models/_projects/oneinch/_meta/oneinch_mapped_methods.sql b/daily_spellbook/models/_projects/oneinch/_meta/oneinch_mapped_methods.sql
@@ -3,14 +3,13 @@
         schema = 'oneinch',
         alias = 'mapped_methods',
         materialized = 'table',
-        tags = ['prod_exclude'],
         unique_key = ['blockchain', 'address', 'signature'],
     )
 }}
 
 
 
 {% for blockchain in oneinch_project_swaps_exposed_blockchains_list() %}
-    select * from ({{ oneinch_mapped_methods_macro(blockchain) }})
+    select * from {{ ref('oneinch_' + blockchain + '_mapped_methods') }}
     {% if not loop.last %} union all {% endif %}
 {% endfor %}
diff --git a/daily_spellbook/models/_sector/labels/_schema.yml b/daily_spellbook/models/_sector/labels/_schema.yml
@@ -10,6 +10,8 @@ models:
           combination_of_columns:
             - blockchain
             - address
+            - token_address
+            - token_symbol
 
   - name: labels_transfer_summary_daily
     config:
@@ -21,6 +23,8 @@ models:
             - blockchain
             - address
             - block_date
+            - token_address
+            - token_symbol
 
   - name: labels_counterparty_activity_daily
     config:
@@ -33,3 +37,5 @@ models:
             - address
             - block_date
             - counterparty
+            - token_address
+            - token_symbol
diff --git a/daily_spellbook/models/_sector/labels/labels_counterparty_activity_daily.sql b/daily_spellbook/models/_sector/labels/labels_counterparty_activity_daily.sql
@@ -5,7 +5,7 @@
         materialized = 'incremental',
         file_format = 'delta',
         incremental_strategy = 'merge',
-        unique_key = ['blockchain', 'address', 'block_date', 'counterparty'],
+        unique_key = ['blockchain', 'address', 'block_date', 'counterparty', 'token_address', 'token_symbol'],
         incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_date')],
         post_hook = '{{ expose_spells(\'["arbitrum", "avalanche_c", "base", "bnb", "celo", "ethereum", "fantom", "gnosis", "optimism", "polygon", "scroll", "zksync"]\',
                                     "sector",
@@ -20,6 +20,9 @@ select
     ,l.address
     ,t.block_date
     ,coalesce(cp.custody_owner, cp.account_owner) as counterparty
+    ,coalesce(t.contract_address,0x0000000000000000000000000000000000000000) as token_address
+    ,t.symbol as token_symbol
+    ,t.token_standard
     ,count(*) as transfers_in
     ,sum(amount_usd) as usd_in
 from {{source('labels','owner_addresses')}} l
@@ -33,7 +36,7 @@ inner join {{source('tokens', 'transfers')}} t
 inner join {{source('labels','owner_addresses')}} cp
  on t.blockchain = cp.blockchain
  and "from" = cp.address
-group by 1,2,3,4
+group by 1,2,3,4,5,6,7
 )
 
 ,stats_out as (
@@ -42,6 +45,9 @@ select
     ,l.address
     ,t.block_date
     ,coalesce(cp.custody_owner, cp.account_owner) as counterparty
+    ,coalesce(t.contract_address,0x0000000000000000000000000000000000000000) as token_address
+    ,t.symbol as token_symbol
+    ,t.token_standard
     ,count(*) as transfers_out
     ,sum(amount_usd)  as usd_out
 from {{source('labels','owner_addresses')}} l
@@ -55,7 +61,7 @@ inner join {{source('tokens', 'transfers')}} t
 inner join {{source('labels','owner_addresses')}} cp
  on t.blockchain = cp.blockchain
  and "to" = cp.address
-group by 1,2,3,4
+group by 1,2,3,4,5,6,7
 )
 
 select
@@ -65,6 +71,9 @@ select
     ,l.account_owner
     ,coalesce(stats_in.block_date,stats_out.block_date) as block_date
     ,coalesce(stats_in.counterparty,stats_out.counterparty) as counterparty
+    ,coalesce(stats_in.token_address,stats_out.token_address) as token_address
+    ,coalesce(stats_in.token_symbol,stats_out.token_symbol) as token_symbol
+    ,coalesce(stats_in.token_standard,stats_out.token_standard) as token_standard
     ,transfers_in
     ,transfers_out
     ,usd_in
@@ -77,6 +86,7 @@ left join stats_out
 on l.blockchain = stats_out.blockchain
     and l.address = stats_out.address
     and (stats_in.block_date is null or stats_in.block_date = stats_out.block_date)
-    and (stats_in.counterparty is null or stats_in.counterparty = stats_out.counterparty)
+    and (stats_in.block_date is null or stats_in.counterparty = stats_out.counterparty)
+    and (stats_in.block_date is null or stats_in.token_address = stats_out.token_address)
+    and (stats_in.block_date is null or stats_in.token_symbol = stats_out.token_symbol)
 where coalesce(stats_in.block_date,stats_out.block_date) is not null
-    and coalesce(stats_in.counterparty,stats_out.counterparty) is not null
diff --git a/daily_spellbook/models/_sector/labels/labels_transfer_summary.sql b/daily_spellbook/models/_sector/labels/labels_transfer_summary.sql
@@ -15,6 +15,9 @@ WITH stats_in as (
 select
     l.blockchain
     ,l.address
+    ,coalesce(t.contract_address,0x0000000000000000000000000000000000000000) as token_address
+    ,t.symbol as token_symbol
+    ,t.token_standard
     ,count(*) as transfers_in
     ,sum(amount_usd) as usd_in
     ,min_by(tx_hash, block_time) as first_tx_hash
@@ -26,13 +29,16 @@ inner join {{source('tokens', 'transfers')}} t
 on t.blockchain = l.blockchain
  and "to" = l.address
  and amount_usd < pow(10,12)
-group by 1,2
+group by 1,2,3,4,5
 )
 
 ,stats_out as (
 select
     l.blockchain
     ,l.address
+    ,coalesce(t.contract_address,0x0000000000000000000000000000000000000000) as token_address
+    ,t.symbol as token_symbol
+    ,t.token_standard
     ,count(*) as transfers_out
     ,sum(amount_usd)  as usd_out
     ,min_by(tx_hash, block_time) as first_tx_hash
@@ -44,14 +50,17 @@ inner join {{source('tokens', 'transfers')}} t
 on t.blockchain = l.blockchain
  and "from" = l.address
  and amount_usd < pow(10,12)
-group by 1,2
+group by 1,2,3,4,5
 )
 
 select
-    blockchain
-    ,address
+    l.blockchain
+    ,l.address
     ,l.custody_owner
     ,l.account_owner
+    ,coalesce(stats_in.token_address,stats_out.token_address) as token_address
+    ,coalesce(stats_in.token_symbol,stats_out.token_symbol) as token_symbol
+    ,coalesce(stats_in.token_standard,stats_out.token_standard) as token_standard
     ,transfers_in
     ,transfers_out
     ,usd_in
@@ -61,5 +70,14 @@ select
     ,case when stats_in.last_block_time > stats_out.last_block_time then stats_in.last_tx_hash
         else stats_out.last_tx_hash end as last_tx_hash
 from {{source('labels','owner_addresses')}} l
-left join stats_in using (blockchain, address)
-left join stats_out using (blockchain, address)
+left join stats_in
+on l.blockchain = stats_in.blockchain
+    and l.address = stats_in.address
+left join stats_out
+on l.blockchain = stats_out.blockchain
+    and l.address = stats_out.address
+    and (stats_in.address is null or stats_in.token_address = stats_out.token_address)
+    and (stats_in.address is null or stats_in.token_symbol = stats_out.token_symbol)
+where coalesce(stats_in.token_address,stats_out.token_address) is not null
+
+
diff --git a/daily_spellbook/models/_sector/labels/labels_transfer_summary_daily.sql b/daily_spellbook/models/_sector/labels/labels_transfer_summary_daily.sql
@@ -5,7 +5,7 @@
         materialized = 'incremental',
         file_format = 'delta',
         incremental_strategy = 'merge',
-        unique_key = ['blockchain', 'address', 'block_date'],
+        unique_key = ['blockchain', 'address', 'block_date', 'token_address', 'token_symbol'],
         incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_date')],
         post_hook = '{{ expose_spells(\'["arbitrum", "avalanche_c", "base", "bnb", "celo", "ethereum", "fantom", "gnosis", "optimism", "polygon", "scroll", "zksync"]\',
                                     "sector",
@@ -19,6 +19,9 @@ select
     l.blockchain
     ,l.address
     ,t.block_date
+    ,coalesce(t.contract_address,0x0000000000000000000000000000000000000000) as token_address
+    ,t.symbol as token_symbol
+    ,t.token_standard
     ,count(*) as transfers_in
     ,sum(amount_usd) as usd_in
 from {{source('labels','owner_addresses')}} l
@@ -29,14 +32,17 @@ on t.blockchain = l.blockchain
  {% if is_incremental() %}
  and {{ incremental_predicate('block_time') }}
  {% endif %}
-group by 1,2,3
+group by 1,2,3,4,5,6
 )
 
 ,stats_out as (
 select
     l.blockchain
     ,l.address
     ,t.block_date
+    ,coalesce(t.contract_address,0x0000000000000000000000000000000000000000) as token_address
+    ,t.symbol as token_symbol
+    ,t.token_standard
     ,count(*) as transfers_out
     ,sum(amount_usd)  as usd_out
 from {{source('labels','owner_addresses')}} l
@@ -47,7 +53,7 @@ on t.blockchain = l.blockchain
  {% if is_incremental() %}
  and {{ incremental_predicate('block_time') }}
  {% endif %}
-group by 1,2,3
+group by 1,2,3,4,5,6
 )
 
 select
@@ -56,6 +62,9 @@ select
     ,l.custody_owner
     ,l.account_owner
     ,coalesce(stats_in.block_date,stats_out.block_date) as block_date
+    ,coalesce(stats_in.token_address,stats_out.token_address) as token_address
+    ,coalesce(stats_in.token_symbol,stats_out.token_symbol) as token_symbol
+    ,coalesce(stats_in.token_standard,stats_out.token_standard) as token_standard
     ,transfers_in
     ,transfers_out
     ,usd_in
@@ -68,4 +77,6 @@ left join stats_out
 on l.blockchain = stats_out.blockchain
     and l.address = stats_out.address
     and (stats_in.block_date is null or stats_in.block_date = stats_out.block_date)
+    and (stats_in.block_date is null or stats_in.token_address = stats_out.token_address)
+    and (stats_in.block_date is null or stats_in.token_symbol = stats_out.token_symbol)
 where coalesce(stats_in.block_date,stats_out.block_date) is not null
diff --git a/...y_spellbook/models/chainlink/ethereum/chainlink_ethereum_price_feeds_oracle_addresses.sql b/...y_spellbook/models/chainlink/ethereum/chainlink_ethereum_price_feeds_oracle_addresses.sql
@@ -67,13 +67,15 @@
 {% set dpi_usd = 'DPI / USD' %}
 {% set dydx_usd = 'DYDX / USD' %}
 {% set doodles_floor_price = 'Doodles Floor Price' %}
+{% set efil_por = 'eFIL PoR' %}
 {% set enj_usd = 'ENJ / USD' %}
 {% set ens_usd = 'ENS / USD' %}
 {% set eos_usd = 'EOS / USD' %}
 {% set ern_usd = 'ERN / USD' %}
 {% set eth_btc = 'ETH / BTC' %}
 {% set eth_usd = 'ETH / USD' %}
 {% set eurt_usd = 'EURT / USD' %}
+{% set ezeth_eth = 'ezETH / ETH' %}
 {% set farm_eth = 'FARM / ETH' %}
 {% set fei_usd = 'FEI / USD' %}
 {% set fil_eth = 'FIL / ETH' %}
@@ -157,25 +159,29 @@
 {% set swell_eth_por = 'Swell ETH PoR' %}
 {% set synthetix_aggregator_debt_ratio = 'Synthetix Aggregator Debt Ratio' %}
 {% set synthetix_aggregator_issued_synths = 'Synthetix Aggregator Issued Synths' %}
+{% set tbtc_usd = 'tBTC / USD' %}
 {% set tusd_usd = 'TUSD / USD' %}
 {% set tusd_por = 'TUSD PoR' %}
 {% set tusd_reserves = 'TUSD Reserves' %}
 {% set total_marketcap_usd = 'Total Marketcap / USD' %}
 {% set uma_eth = 'UMA / ETH' %}
 {% set uni_usd = 'UNI / USD' %}
+{% set usdc_usd = 'USDC / USD' %}
+{% set usdc_eth = 'USDC / ETH' %}
 {% set usdd_usd = 'USDD / USD' %}
 {% set usdp_usd = 'USDP / USD' %}
+{% set usdt_eth = 'USDT / ETH' %}
 {% set ust_eth = 'UST / ETH' %}
 {% set ust_usd = 'UST / USD' %}
 {% set veefriends_floor_price = 'VeeFriends Floor Price' %}
+{% set weeth_eth = 'weETH / ETH' %}
 {% set wbtc_btc = 'WBTC / BTC' %}
 {% set wbtc_por = 'WBTC PoR' %}
 {% set wing_usd = 'WING / USD' %}
 {% set world_of_women_floor_price = 'World of Women Floor Price' %}
 {% set xcn_usd = 'XCN / USD' %}
 {% set yfi_usd = 'YFI / USD' %}
 {% set zrx_usd = 'ZRX / USD' %}
-{% set efil_por = 'eFIL PoR' %}
 
 SELECT
    'ethereum' as blockchain,
@@ -245,13 +251,15 @@ FROM (values
   ('{{dydx_usd}}', 8, 0x478909D4D798f3a1F11fFB25E4920C959B4aDe0b, 0x6A0cCCA35f6ca00146547B949233C63441B34d7a),
   ('{{dydx_usd}}', 8, 0x478909D4D798f3a1F11fFB25E4920C959B4aDe0b, 0xe28371cd7a0c1687d2D956a567946688B48e5629),
   ('{{doodles_floor_price}}', 18, 0x027828052840a43Cc2D0187BcfA6e3D6AcE60336, 0x440C8fc45C7f00E09c2F437b95FC123888a3d951),
+  ('{{efil_por}}', 18, 0x8917800a6BDd8fA8b7c94E25aE2219Db28050622, 0xD423C9A9AD8c21C97bdeE2E74F8098625aa4f329),
   ('{{enj_usd}}', 8, 0x23905C55dC11D609D5d11Dc604905779545De9a7, 0xCBbe4ff0d8add07CCe71afC0CcdF3492b8eaA76A),
   ('{{ens_usd}}', 8, 0x5C00128d4d1c2F4f652C267d7bcdD7aC99C16E16, 0x780f1bD91a5a22Ede36d4B2b2c0EcCB9b1726a28),
   ('{{eos_usd}}', 8, 0x10a43289895eAff840E8d45995BBa89f9115ECEe, 0xea7C55976844396f3bD4C89F66988b8b5Be5E96a),
   ('{{ern_usd}}', 8, 0x0a87e12689374A4EF49729582B474a1013cceBf8, 0xbDa0c715E5F153092A0d9d6dBBbDCc2beF892618),
   ('{{eth_btc}}', 8, 0xAc559F25B1619171CbC396a50854A3240b6A4e99, 0x0f00392FcB466c0E4E4310d81b941e07B4d5a079),
   ('{{eth_usd}}', 8, 0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419, 0xE62B71cf983019BFf55bC83B48601ce8419650CC),
   ('{{eurt_usd}}', 8, 0x01D391A48f4F7339aC64CA2c83a07C22F95F587a, 0x920E5DC12E7500c6571C63D4Bba19c62e99d6883),
+  ('{{ezeth_eth}}', 18, 0x636A000262F6aA9e1F094ABF0aD8f645C44f641C, 0x85Fbd46EDeD893392e52A02BC5ac0294FB06f88D),
   ('{{farm_eth}}', 18, 0x611E0d2709416E002A3f38085e4e1cf77c015921, 0x883Ba661FD9824778FF14a97F3A03eb324540201),
   ('{{fei_usd}}', 8, 0x31e0a88fecB6eC0a411DBe0e9E76391498296EE9, 0xc04126CF546146457C45009BCE5dA529eF960Fa1),
   ('{{fil_eth}}', 18, 0x0606Be69451B1C9861Ac6b3626b99093b713E801, 0x9965AD91B4877d29c246445011Ce370b3890C5C2),
@@ -341,25 +349,29 @@ FROM (values
   ('{{swell_eth_por}}', 18, 0x60cbE8D88EF519cF3C62414D76f50818D211fea1, 0x477716B8e95749bF31ce26cF4e4E4Af87b8Acf59),
   ('{{synthetix_aggregator_debt_ratio}}', 27, 0x0981af0C002345c9C5AD5efd26242D0cBe5aCA99, 0xc7BB32a4951600FBac701589C73e219b26Ca2DFC),
   ('{{synthetix_aggregator_issued_synths}}', 18, 0xbCF5792575bA3A875D8C406F4E7270f51a902539, 0x59CCf62B862f99B5aEd8857FBAdB7F895f6c59D5),
+  ('{{tbtc_usd}}', 8, 0x8350b7De6a6a2C1368E7D4Bd968190e13E354297, 0x0A7AaAa55cEe361EBE1d57F80345285dbAF96FCC),
   ('{{tusd_usd}}', 8, 0xec746eCF986E2927Abd291a2A1716c940100f8Ba, 0x98953e9C76573e06ec265Bdde1dbB89fa02d56d3),
   ('{{tusd_por}}', 18, 0x81243627cC533Ca6CF6F23c3f61add1D0f626674, 0x4d76Ae11EEF9cEf363300Abf66b599BDE4aBb33e),
   ('{{tusd_reserves}}', 18, 0xBE456fd14720C3aCCc30A2013Bffd782c9Cb75D5, 0xAC099D59755982757537F13c7c4Ae8c8d9F030B9),
   ('{{total_marketcap_usd}}', 8, 0xEC8761a0A73c34329CA5B1D3Dc7eD07F30e836e2, 0x9257D83A0DdA413cA24F66dD32A056Bc2eBAFd2e),
   ('{{uma_eth}}', 18, 0xf817B69EA583CAFF291E287CaE00Ea329d22765C, 0x68a371D12213a1EbDd5fa9a2EE5519E6B73F1E37),
   ('{{uni_usd}}', 8, 0x553303d460EE0afB37EdFf9bE42922D8FF63220e, 0x373BCe97bec13BfA8A5f07Cc578EC2D77f80c589),
+  ('{{usdc_eth}}', 18, 0x986b5E1e1755e3C2440e960477f25201B0a8bbD4, 0xe5BbBdb2Bb953371841318E1Edfbf727447CeF2E),
+  ('{{usdc_usd}}', 8, 0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6, 0x789190466E21a8b78b8027866CBBDc151542A26C),
   ('{{usdd_usd}}', 8, 0x0ed39A19D2a68b722408d84e4d970827f61E6c0A, 0x589a85FC02EB6bB86D1c84c1a75abbB012C661De),
   ('{{usdp_usd}}', 8, 0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3, 0xF3d70857B489Ecc6768D0982B773E1Cba9E1f00b),
+  ('{{usdt_eth}}', 18, 0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46, 0x7De0d6fce0C128395C488cb4Df667cdbfb35d7DE),
   ('{{ust_eth}}', 18, 0xa20623070413d42a5C01Db2c8111640DD7A5A03a, 0x4a81f77C8BBcA2CbA8110279cDbC9F1A8D3eAE6B),
   ('{{ust_usd}}', 8, 0x8b6d9085f310396C6E4f0012783E9f850eaa8a82, 0x01b87e7fF78022A70394d3C6Dd127D0c709e3beA),
   ('{{ust_usd}}', 8, 0x8b6d9085f310396C6E4f0012783E9f850eaa8a82, 0x5EDd5F803b831b47715aD3e11a90dD244F0cD0a9),
   ('{{veefriends_floor_price}}', 18, 0x35bf6767577091E7f04707c0290b3f889e968307, 0xe0552DC960366F67Da00CB3d9DF441F24B5C2AC1),
+  ('{{weeth_eth}}', 18, 0x5c9C449BbC9a6075A2c061dF312a35fd1E05fF22, 0x4dF36F726d8059d881294166dB52c1D13e976FE7),
   ('{{wbtc_btc}}', 8, 0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23, 0xD7623f1d24b35c392862fB67C9716564A117C9DE),
   ('{{wbtc_por}}', 8, 0xa81FE04086865e63E12dD3776978E49DEEa2ea4e, 0xB622b7D6d9131cF6A1230EBa91E5da58dbea6F59),
   ('{{wing_usd}}', 8, 0x134fE0a225Fb8e6683617C13cEB6B3319fB4fb82, 0xc29d104A418a08407f9f2CDb614c1CDCf82986e0),
   ('{{wing_usd}}', 8, 0x134fE0a225Fb8e6683617C13cEB6B3319fB4fb82, 0x2c9A8c2caEb80FEb24048587a10BFB6aeFF601c5),
   ('{{world_of_women_floor_price}}', 18, 0xDdf0B85C600DAF9e308AFed9F597ACA212354764, 0x45B68d24Df514BF13a838d88bE4363F8011719de),
   ('{{xcn_usd}}', 8, 0xeb988B77b94C186053282BfcD8B7ED55142D3cAB, 0xD6A3a9Bb4bd49DdB2374CA58Edf47a8bB63Af3d2),
   ('{{yfi_usd}}', 8, 0xA027702dbb89fbd58938e4324ac03B58d812b0E1, 0xcac109af977AC94929A5dD37ed8Af763BAD78151),
-  ('{{zrx_usd}}', 8, 0x2885d15b8Af22648b98B122b22FDF4D2a56c6023, 0x4Dde220fF2690A350b0Ea9404F35C8f3Ad012584),
-  ('{{efil_por}}', 18, 0x8917800a6BDd8fA8b7c94E25aE2219Db28050622, 0xD423C9A9AD8c21C97bdeE2E74F8098625aa4f329)
+  ('{{zrx_usd}}', 8, 0x2885d15b8Af22648b98B122b22FDF4D2a56c6023, 0x4Dde220fF2690A350b0Ea9404F35C8f3Ad012584)
 ) a (feed_name, decimals, proxy_address, aggregator_address)
diff --git a/daily_spellbook/package-lock.yml b/daily_spellbook/package-lock.yml
@@ -1,4 +1,4 @@
 packages:
 - package: dbt-labs/dbt_utils
   version: 1.1.1
-sha1_hash: d69e0f3c2585c08a713303dfd8086eb7ba5c4021
+sha1_hash: 23451c207c1d4dd71b5925f12a5cd66f2ebb2b3b