[swell] adding daily balances table of core swell assets

README.md

@@ -11,10 +11,10 @@ Welcome to [Spellbook](https://youtu.be/o7p0BNt7NHs). Cast a magical incantation
 - Are you building something new? **Please make sure to open a Draft PR**, so we minimize duplicated work, and other wizards can help you if you need
 - Don't know where to start? The docs below will guide you, but as a summary:
   - Want to make an incremental improvement to one of our spells? (add a new project, fix a bug you found), simply open a PR with your changes.
-    - Follow the guide for [Submitting a PR](), [Setting up your dev environment]() and [Using dbt to write spells]() if you find yourself lost.
-    - Not sure how to start? Follow the walkthrough [here](https://dune.com/docs/spellbook/).
+    - Follow the guide for [Submitting a PR](#submitting-a-pr), [Setting up your dev environment](#setting-up-your-local-dev-environment) and [Using dbt to write spells](#how-to-use-dbt-to-create-spells) if you find yourself lost.
+    - Not sure how to start? Follow the walkthrough [here](#introduction).
     - Make sure to open a draft PR if you will work on your spell for longer than a few days, to avoid duplicated work
-  - Do you want to get started building spells and you don't know what to build? Check [Issues]() to see what the community needs.
+  - Do you want to get started building spells and you don't know what to build? Check [Issues](https://github.com/duneanalytics/spellbook/issues) to see what the community needs.
   - Check the Discussions section to see what problems the community is trying to solve (i.e. non-incremental changes) or propose your own!
 - Have questions? Head over to #spellbook on our [discord](https://discord.com/channels/757637422384283659/999683200563564655) and the community will be happy to help out!
 - Like with most OSS projects, your contributions to Spellbook are your own IP, you can find more details in the [Contributor License Agreement](CLA.md)

dbt_subprojects/daily_spellbook/macros/project/oneinch/_meta/oneinch_project_swaps_exposed_blockchains_list.sql

@@ -8,6 +8,7 @@
         'bnb', 
         'gnosis', 
         'fantom', 
-        'base', 
+        'base',
+        'zksync',
     ]) }}
 {% endmacro %}

dbt_subprojects/daily_spellbook/macros/project/oneinch/project/cfg/oneinch_project_orders_cfg_methods_macro.sql

@@ -475,7 +475,7 @@
 {% set _taker_data = "4 + 32*4 + bytearray_to_bigint(substr(input, 4 + 32*13 + 24 + 1, 8))" %}
 {% set _recipients = "bytearray_to_bigint(substr(input, " ~ _taker_data ~ " + 32*1 + 24 + 1, 8))" %}
 {% set methods = methods + [{
-    "project":          "Uniswap",
+    "project":          "UniswapX",
     "selector":         "0x3f62192e",
     "tag":              "'UniswapXV1'",
     "name":             "execute",
@@ -501,7 +501,7 @@
 {% set _taker_data = "4 + 32*5 + bytearray_to_bigint(substr(input, 4 + 32*14 + 24 + 1, 8))" %}
 {% set _recipients = "bytearray_to_bigint(substr(input, " ~ _taker_data ~ " + 32*1 + 24 + 1, 8))" %}
 {% set methods = methods + [{
-    "project":          "Uniswap",
+    "project":          "UniswapX",
     "selector":         "0x0d335884",
     "tag":              "'UniswapXV1'",
     "name":             "executeWithCallback",
@@ -528,7 +528,7 @@
 {% set _taker_data = "bytearray_to_bigint(substr(input, " ~ _order_beginning ~ " + 32*12 + 24 + 1, 8))" %}
 {% set _recipients = "bytearray_to_bigint(substr(input, " ~ _order_beginning ~ " + " ~ _taker_data ~ " + 32*4 + 24 + 1, 8))" %}
 {% set methods = methods + [{
-    "project":          "Uniswap",
+    "project":          "UniswapX",
     "selector":         "0x0d7a16c3",
     "tag":              "'UniswapXV1'",
     "name":             "executeBatch",
@@ -557,7 +557,7 @@
 {% set _taker_data = "bytearray_to_bigint(substr(input, " ~ _order_beginning ~ " + 32*12 + 24 + 1, 8))" %}
 {% set _recipients = "bytearray_to_bigint(substr(input, " ~ _order_beginning ~ " + " ~ _taker_data ~ " + 32*4 + 24 + 1, 8))" %}
 {% set methods = methods + [{
-    "project":          "Uniswap",
+    "project":          "UniswapX",
     "selector":         "0x13fb72c7",
     "tag":              "'UniswapXV1'",
     "name":             "executeBatchWithCallback",
@@ -584,7 +584,7 @@
 {% set _taker_data = "4 + 32*1 + bytearray_to_bigint(substr(input, 4 + 32*10 + 24 + 1, 8))" %}
 {% set _recipients = "bytearray_to_bigint(substr(input, " ~ _taker_data ~ " + 32*4 + 24 + 1, 8))" %}
 {% set methods = methods + [{
-    "project":          "Uniswap",
+    "project":          "UniswapX",
     "selector":         "0x3f62192e",
     "tag":              "'UniswapXV2'",
     "name":             "execute",
@@ -610,7 +610,7 @@
 {% set _taker_data = "4 + 32*2 + bytearray_to_bigint(substr(input, 4 + 32*11 + 24 + 1, 8))" %}
 {% set _recipients = "bytearray_to_bigint(substr(input, " ~ _taker_data ~ " + 32*4 + 24 + 1, 8))" %}
 {% set methods = methods + [{
-    "project":          "Uniswap",
+    "project":          "UniswapX",
     "selector":         "0x0d335884",
     "tag":              "'UniswapXV2'",
     "name":             "executeWithCallback",
@@ -638,7 +638,7 @@
 {% set _taker_data = "bytearray_to_bigint(substr(input, " ~ _order_beginning ~ " + 32*9 + 24 + 1, 8))" %}
 {% set _recipients = "bytearray_to_bigint(substr(input, " ~ _order_beginning ~ " + " ~ _taker_data ~ " + 32*4 + 24 + 1, 8))" %}
 {% set methods = methods + [{
-    "project":          "Uniswap",
+    "project":          "UniswapX",
     "selector":         "0x13fb72c7",
     "tag":              "'UniswapXV2'",
     "name":             "executeBatchWithCallback",

dbt_subprojects/daily_spellbook/macros/project/oneinch/project/oneinch_project_swaps_macro.sql

@@ -27,7 +27,7 @@ meta as (
         block_number
         , tx_hash
         , call_trace_address
-        , project
+        , project as order_project
         , order_hash
         , maker
         , taker
@@ -51,7 +51,7 @@ meta as (
         block_number
         , tx_hash
         , call_trace_address
-        , '1inch' as project
+        , '1inch' as order_project
         , coalesce(order_hash, concat(tx_hash, to_big_endian_32(cast(counter as int)))) as order_hash
         , maker
         , receiver as taker
@@ -81,7 +81,7 @@ meta as (
         , tx_from
         , tx_to
         , call_trace_address
-        , project
+        , coalesce(order_project, project) as project
         , tag
         , flags
         , call_selector
@@ -116,7 +116,7 @@ meta as (
             and call_success
             and (flags['cross_chain'] or not flags['cross_chain_method']) -- without cross-chain methods calls in non cross-chain protocols
     )
-    left join orders using(block_number, tx_hash, call_trace_address, project)
+    left join orders using(block_number, tx_hash, call_trace_address)
     join meta on true
     where
         reduce(call_trace_addresses, true, (r, x) -> if(r and x <> call_trace_address and slice(call_trace_address, 1, cardinality(x)) = x, false, r), r -> r) -- only not nested calls of the project in tx
@@ -314,11 +314,36 @@ meta as (
     select
         *
         , map_from_entries(array[
-              ('classic: direct', flags['direct'] and order_hash is null and not auction and not cross_chain_swap or second_side)
-            , ('classic: external', not flags['direct'] and order_hash is null and not auction and not cross_chain_swap)
-            , ('intent: intra-chain auction', auction and not cross_chain_swap)
-            , ('intent: intra-chain user limit order', order_hash is not null and not auction and not cross_chain_swap and not contracts_only)
-            , ('intent: intra-chain contracts only', contracts_only)
+              ('intra-chain: classic: direct',
+                flags['direct']
+                and order_hash is null
+                and not auction
+                and not cross_chain_swap
+                and not contracts_only
+                or second_side
+            )
+            , ('intra-chain: classic: external',
+                not flags['direct']
+                and order_hash is null
+                and not auction
+                and not contracts_only
+                and not cross_chain_swap
+            )
+            , ('intra-chain: intents: auction',
+                auction
+                and not cross_chain_swap
+            )
+            , ('intra-chain: intents: user limit order',
+                order_hash is not null
+                and not auction
+                and not cross_chain_swap
+                and not contracts_only
+                and not second_side
+            )
+            , ('intra-chain: intents: contracts only',
+                contracts_only
+                and not second_side
+            )
             , ('cross-chain', cross_chain_swap)
         ]) as modes
     from (

dbt_subprojects/daily_spellbook/macros/sector/metrics/metrics_fees_evm.sql

@@ -0,0 +1,18 @@
+{% macro metrics_fees_evm(blockchain) %}
+
+select
+    blockchain
+    , block_date
+    , sum(tx_fee_usd) as gas_fees_usd
+from
+    {{ source('gas', 'fees') }}
+where blockchain = '{{blockchain}}'
+{% if is_incremental() %}
+and
+    {{ incremental_predicate('block_date') }}
+{% endif %}
+group by
+    blockchain
+    ,block_date
+
+{% endmacro %}

dbt_subprojects/daily_spellbook/macros/sector/metrics/metrics_transactions_evm.sql

@@ -0,0 +1,19 @@
+{% macro metrics_transactions_evm(blockchain) %}
+
+select
+        blockchain
+        , block_date
+        , approx_distinct(tx_hash) as tx_count --max 2% error, which is fine
+from
+    {{ source('tokens', 'transfers') }}
+where
+    blockchain = '{{ blockchain }}'
+    and amount_usd >=1
+    {% if is_incremental() %}
+    and {{ incremental_predicate('block_date') }}
+    {% endif %}
+group by
+    blockchain
+    , block_date
+
+{% endmacro %}

dbt_subprojects/daily_spellbook/models/_metrics/transfers/metrics_net_transfers_daily.sql → dbt_subprojects/daily_spellbook/macros/sector/metrics/metrics_transfers_evm.sql

@@ -1,13 +1,4 @@
-{{ config(
-        schema = 'metrics'
-        , alias = 'net_transfers_daily'
-        , materialized = 'incremental'
-        , file_format = 'delta'
-        , incremental_strategy = 'merge'
-        , unique_key = ['blockchain', 'block_date']
-        , incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_date')]
-        )
-}}
+{% macro metrics_transfers_evm(blockchain) %}
 
 with raw_transfers as (
     select
@@ -19,7 +10,7 @@ with raw_transfers as (
     from
         {{ source('tokens', 'transfers') }}
     where
-        1 = 1
+        blockchain = '{{blockchain}}'
         {% if is_incremental() %}
         and {{ incremental_predicate('block_date') }}
         {% endif %}
@@ -40,7 +31,7 @@ with raw_transfers as (
     from
         {{ source('tokens', 'transfers') }}
     where
-        1 = 1
+        blockchain = '{{blockchain}}'
         {% if is_incremental() %}
         and {{ incremental_predicate('block_date') }}
         {% endif %}
@@ -60,6 +51,7 @@ with raw_transfers as (
     inner join
         {{ source('labels', 'owner_details') }} as od
         on oa.owner_key = od.owner_key
+    where oa.blockchain = '{{blockchain}}'
 ), transfers_amount as (
     select
         t.blockchain
@@ -108,3 +100,5 @@ where
 group by
     blockchain
     , block_date
+
+{% endmacro %}

dbt_subprojects/daily_spellbook/models/_metrics/dune_index/_schema.yml

@@ -4,7 +4,7 @@ models:
   - name: metrics_dune_index_daily
     meta:
       sector: metrics
-      contributors: jeff-dude
+      contributors: jeff-dude, 0xRob
     config:
       tags: ['metrics', 'dune', 'index', 'daily']
     description: "Combine transactions, transfers and fees index values to get a daily dune index value"
@@ -13,10 +13,11 @@ models:
           combination_of_columns:
             - blockchain
             - block_date
+
   - name: metrics_dune_index_stats
     meta:
       sector: metrics
       contributors: jeff-dude
     config:
-      tags: ['metrics', 'dune', 'index', 'daily']
-    description: "View containing various time aggregations of the dune index"
+      tags: [ 'metrics', 'dune', 'index', 'daily' ]
+    description: "View containing various time aggregations of the dune index"

dbt_subprojects/daily_spellbook/models/_metrics/dune_index/metrics_dune_index_daily.sql

@@ -1,21 +1,71 @@
 {{ config(
         schema = 'metrics'
         , alias = 'dune_index_daily'
-        , materialized = 'view'
+        , materialized = 'incremental'
+        , file_format = 'delta'
+        , incremental_strategy = 'merge'
+        , unique_key = ['blockchain', 'block_date']
+        , incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_date')]
         )
 }}
 
+{% set baseline_date = '2018-01-01' %}
+{% set start_date = '2015-08-21' %}
+
+with
+fees as (
+    select
+        blockchain
+        , block_date
+        , gas_fees_usd
+        , (gas_fees_usd / (select sum(gas_fees_usd) from {{ ref('metrics_gas_fees_daily') }} where block_date = date '{{ baseline_date }}')) * 10 as fees_index
+    from
+        {{ ref('metrics_gas_fees_daily') }}
+    where
+        block_date >= date '{{ start_date }}'
+        {% if is_incremental() %}
+        and {{ incremental_predicate('block_date') }}
+        {% endif %}
+),
+transactions as (
+    select
+        blockchain
+        , block_date
+        , tx_count
+        , (tx_count / cast((select sum(tx_count) from {{ ref('metrics_transactions_daily') }} where block_date = date '{{ baseline_date }}') as double)) * 10 as tx_index
+    from
+        {{ ref('metrics_transactions_daily') }}
+    where
+        block_date >= date '{{ start_date }}'
+        {% if is_incremental() %}
+        and {{ incremental_predicate('block_date') }}
+        {% endif %}
+)
+,transfers as (
+    select
+        blockchain
+        , block_date
+        , net_transfer_amount_usd
+        , (net_transfer_amount_usd / cast((select sum(net_transfer_amount_usd) from {{ ref('metrics_transfers_daily') }} where block_date = date '{{ baseline_date }}') as double)) * 10 as transfers_index
+    from
+        {{ ref('metrics_transfers_daily') }}
+    where
+        block_date >= date '{{ start_date }}'
+        {% if is_incremental() %}
+        and {{ incremental_predicate('block_date') }}
+        {% endif %}
+)
+
 select
     blockchain
     , block_date
-    , coalesce(f.fees_index,0) as fees_index
-    , coalesce(tr.transfers_index,0) as transfers_index
-    , coalesce(tx.tx_index,0) as tx_index
-    , coalesce(f.fees_index,0)*0.45 + coalesce(tr.transfers_index,0)*0.45 + coalesce(tx.tx_index,0)*0.10 as dune_index
-from {{ ref('metrics_fees_index_daily') }} as f
-left join
-    {{ ref('metrics_transfers_index_daily') }} as tr
-    using (blockchain, block_date)
-left join
-    {{ ref('metrics_transactions_index_daily') }} as tx
-     using (blockchain, block_date)
+    , 0.45 * coalesce(fees_index,0) + 0.45 * coalesce(transfers_index,0) + 0.10 * coalesce(tx_index,0) as dune_index
+    , coalesce(fees_index,0) as fees_index
+    , coalesce(transfers_index,0) as transfers_index
+    , coalesce(tx_index,0) as tx_index
+    , gas_fees_usd
+    , tx_count
+    , net_transfer_amount_usd
+from fees
+left join transfers using (blockchain, block_date)
+left join transactions using (blockchain, block_date)

dbt_subprojects/daily_spellbook/models/_metrics/dune_index/metrics_dune_index_stats.sql

@@ -157,4 +157,4 @@ from
 inner join weekly_stats as w
     on d.blockchain = w.blockchain
 inner join monthly_stats as m
-    on d.blockchain = m.blockchain
+    on d.blockchain = m.blockchain

dbt_subprojects/daily_spellbook/models/_metrics/fees/_schema.yml

@@ -8,27 +8,11 @@ models:
     config:
       tags: ['metrics', 'fees', 'gas', 'daily']
     description: "Sum of total fees spent per day across all chains available in gas.fees and gas_solana.fees tables"
-    data_tests:
-      - dbt_utils.unique_combination_of_columns:
-          combination_of_columns:
-            - blockchain
-            - block_date
+
   - name: metrics_gas_fees_stats
     meta:
       sector: metrics
       contributors: jeff-dude
     config:
       tags: ['metrics', 'fees', 'gas']
-    description: "View of gas fees per blockchain aggregated to various levels. The goal is to output one row per chain with stats availble for use in counter visuals."
-  - name: metrics_fees_index_daily
-    meta:
-      sector: metrics
-      contributors: jeff-dude
-    config:
-      tags: ['metrics', 'fees', 'gas', 'index', 'daily']
-    description: "Each day, per chain, compare the adoption of activity based on total gas fees relative to the baseline expectation"
-    data_tests:
-      - dbt_utils.unique_combination_of_columns:
-          combination_of_columns:
-            - blockchain
-            - block_date
+    description: "View of gas fees per blockchain aggregated to various levels. The goal is to output one row per chain."