Merge branch 'main' into enhance_evms_event_tables

Author: hildobby

dbt_subprojects/hourly_spellbook/models/_sector/gas/fees/apechain/gas_apechain_fees.sql

@@ -11,4 +11,83 @@
     ,incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_time')]
     )
 }}
-{{ arbitrum_orbit_stack_gas_fees(blockchain) }}
+
+WITH base_model as (
+    SELECT
+        txns.block_time
+        ,txns.block_number
+        ,txns.hash AS tx_hash
+        ,txns."from" AS tx_from
+        ,txns.to AS tx_to
+        ,cast(gas_price as uint256) as gas_price
+        ,txns.gas_used as gas_used
+        ,cast(base_fee_per_gas as uint256) * cast(txns.gas_used as uint256) as tx_fee_raw
+        ,map(array['base_fee'], array[cast(base_fee_per_gas as uint256) * cast(txns.gas_used as uint256)]) as tx_fee_breakdown_raw
+        ,0x7f9fbf9bdd3f4105c478b996b648fe6e828a1e98 as tx_fee_currency
+        ,blocks.miner AS block_proposer
+        ,txns.max_fee_per_gas
+        ,txns.priority_fee_per_gas
+        ,txns.max_priority_fee_per_gas
+        ,blocks.base_fee_per_gas
+        ,txns.gas_limit
+        ,CASE  --safe divide-by-zero
+            WHEN txns.gas_limit = 0 THEN NULL
+            WHEN txns.gas_limit != 0 THEN cast(txns.gas_used as double) / cast(txns.gas_limit as double)
+        END AS gas_limit_usage
+        {% if blockchain == 'apechain' %}
+        ,l1_gas_used
+        {% endif %}
+    FROM {{ source(blockchain, 'transactions') }} txns
+    INNER JOIN {{ source(blockchain, 'blocks') }} blocks
+        ON txns.block_number = blocks.number
+        {% if is_incremental() %}
+        AND {{ incremental_predicate('blocks.time') }}
+        {% endif %}
+    {% if test_short_ci %}
+    WHERE {{ incremental_predicate('txns.block_time') }}
+    OR txns.hash in (select tx_hash from {{ref('evm_gas_fees')}})
+    {% elif is_incremental() %}
+    WHERE {{ incremental_predicate('txns.block_time') }}
+    {% endif %}
+)
+
+SELECT
+    '{{blockchain}}' as blockchain
+    ,CAST(date_trunc('month', block_time) AS DATE) AS block_month
+    ,CAST(date_trunc('day', block_time) AS DATE) AS block_date
+    ,block_time
+    ,block_number
+    ,tx_hash
+    ,tx_from
+    ,tx_to
+    ,gas_price
+    ,gas_used
+    ,p.symbol as currency_symbol
+    ,coalesce(tx_fee_raw, 0) as tx_fee_raw
+    ,coalesce(tx_fee_raw, 0) / pow(10,p.decimals) as tx_fee
+    ,coalesce(tx_fee_raw, 0) / pow(10,p.decimals) * p.price as tx_fee_usd
+    ,transform_values(tx_fee_breakdown_raw,
+            (k,v) -> coalesce(v, cast(0 as uint256))) as tx_fee_breakdown_raw
+    ,transform_values(tx_fee_breakdown_raw,
+            (k,v) -> coalesce(v, cast(0 as uint256)) / pow(10,p.decimals) ) as tx_fee_breakdown
+    ,transform_values(tx_fee_breakdown_raw,
+            (k,v) -> coalesce(v, cast(0 as uint256)) / pow(10,p.decimals) * p.price) as tx_fee_breakdown_usd
+    ,tx_fee_currency
+    ,block_proposer
+    ,max_fee_per_gas
+    ,priority_fee_per_gas
+    ,max_priority_fee_per_gas
+    ,base_fee_per_gas
+    ,gas_limit
+    ,gas_limit_usage
+    {% if blockchain == 'apechain' %}
+    ,l1_gas_used
+    {% endif %}
+FROM base_model
+LEFT JOIN {{ ref('prices_usd_with_native') }} p
+    ON p.blockchain = '{{blockchain}}'
+    AND p.contract_address = tx_fee_currency
+    AND p.minute = date_trunc('minute', block_time)
+    {% if is_incremental() %}
+    AND {{ incremental_predicate('p.minute') }}
+    {% endif %}

dbt_subprojects/hourly_spellbook/models/_sector/gas/fees/mantle/gas_mantle_fees.sql

@@ -35,7 +35,7 @@ WITH base_model as (
                          )
                 end
         ) as tx_fee_breakdown_raw
-        ,{{var('ETH_ERC20_ADDRESS')}} as tx_fee_currency
+        ,0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000 as tx_fee_currency
         ,blocks.miner AS block_proposer
         ,txns.max_fee_per_gas
         ,txns.priority_fee_per_gas

dbt_subprojects/hourly_spellbook/models/_sector/gas/fees/polygon/gas_polygon_fees.sql

@@ -34,7 +34,7 @@ WITH base_model as (
                             )
             end
         ) as tx_fee_breakdown_raw
-        ,{{var('ETH_ERC20_ADDRESS')}} as tx_fee_currency
+        ,0x0000000000000000000000000000000000001010 as tx_fee_currency
         ,blocks.miner AS block_proposer
         ,txns.max_fee_per_gas
         ,txns.priority_fee_per_gas

dbt_subprojects/hourly_spellbook/models/_sector/gas/fees/zksync/gas_zksync_fees.sql

@@ -28,7 +28,7 @@ WITH base_model as (
             map()
             ,map(array['base_fee'], array[(cast(gas_price as uint256) * cast(txns.gas_used as uint256))])
         ) as tx_fee_breakdown_raw
-        ,{{var('ETH_ERC20_ADDRESS')}} as tx_fee_currency
+        ,0x000000000000000000000000000000000000800a as tx_fee_currency
         ,blocks.miner AS block_proposer
         ,txns.max_fee_per_gas
         ,txns.priority_fee_per_gas

dbt_subprojects/hourly_spellbook/models/_sector/prices/prices_schema.yml

@@ -101,3 +101,38 @@ models:
         description: "daily minimum USD price of a token"
       - name: price_close
         description: "daily closing USD price of a token"
+
+  - name: prices_usd_native
+    description: "Native token prices in USD"
+    contributors: krishhh
+    columns:
+      - name: blockchain
+        description: "The blockchain name"
+        tests:
+          - not_null
+      - name: contract_address
+        description: "The token contract address"
+        tests:
+          - not_null
+      - name: symbol
+        description: "The token symbol"
+        tests:
+          - not_null
+      - name: decimals
+        description: "The token decimals"
+        tests:
+          - not_null
+      - name: minute
+        description: "The timestamp of the price"
+        tests:
+          - not_null
+      - name: price
+        description: "The price in USD"
+        tests:
+          - not_null
+    data_tests:
+      - dbt_utils.unique_combination_of_columns:
+          combination_of_columns:
+            - blockchain
+            - contract_address
+            - minute

dbt_subprojects/hourly_spellbook/models/_sector/prices/prices_usd_native.sql

@@ -6,26 +6,28 @@
 -- this is a TEMPORARY spell that should be incorporated in the general prices models.
 -- more discussion here: https://github.com/duneanalytics/spellbook/issues/6577
 
-WITH blockchains as
-(
-select
-    evm.blockchain
-    ,evm.native_token_symbol as symbol
-    ,{{var('ETH_ERC20_ADDRESS')}} as contract_address -- 0x00..00
-    ,18 as decimals
-from {{source('evms','info')}} evm
-inner join {{source('prices_native','tokens')}} p
-on native_token_symbol = p.symbol
+with native_prices as (
+    select
+        *
+    from
+        {{ source('prices', 'usd') }}
+    where
+        blockchain is null
+)
+
+, native_tokens as (
+    select
+        *
+    FROM {{ source('dune', 'blockchains') }}
 )
 
-SELECT
-  b.blockchain
-, b.contract_address
-, b.decimals
-, b.symbol
-, p.minute
-, p.price
-FROM {{ source('prices', 'usd') }} p
-INNER JOIN blockchains b
-ON b.symbol = p.symbol
-and p.blockchain is null
+select
+    t.name as blockchain
+    , t.token_address as contract_address
+    , t.token_decimals as decimals
+    , t.token_symbol as symbol
+    , p.minute
+    , p.price
+from native_tokens as t
+inner join native_prices as p
+    on t.token_symbol = p.symbol

dbt_subprojects/hourly_spellbook/models/_sector/prices/prices_usd_with_native.sql

@@ -22,4 +22,4 @@ select
     ,decimals
     ,symbol
     ,price
-from {{ref('prices_usd_native')}}
+from {{ref('prices_usd_native')}}

dbt_subprojects/tokens/models/prices/abstract/prices_abstract_tokens.sql

@@ -21,5 +21,4 @@ FROM
     ('weth-weth', 'WETH', 0x3439153EB7AF838Ad19d56E1571FBD09333C2809, 18)
     , ('usdc-usd-coin', 'USDC.e', 0x84a71ccd554cc1b02749b35d22f684cc8ec987e1, 6)
     , ('pengu-pudgy-penguins', 'PENGU', 0x9ebe3a824ca958e4b3da772d2065518f009cba62, 18)
-    , ('eth-ethereum', 'ETH', 0x000000000000000000000000000000000000800a, 18)
 ) as temp (token_id, symbol, contract_address, decimals) 

dbt_subprojects/tokens/models/prices/celo/prices_celo_tokens.sql

@@ -16,7 +16,6 @@ SELECT
 FROM
 (
     VALUES
-    ('celo-celo', 'celo', 'CELO', 0x471ece3750da237f93b8e339c536989b8978a438, 18), 
     ('cusd-celo-dollar', 'celo', 'cUSD', 0x765de816845861e75a25fca122bb6898b8b1282a, 18),
     ('ceur-celo-euro', 'celo', 'cEUR', 0xd8763cba276a3738e6de85b4b3bf5fded6d6ca73, 18), --requested add to coinPaprika 2023-08-10
     ('creal-celo-brazilian-real', 'celo', 'cREAL', 0xe8537a3d056DA446677B9E9d6c5dB704EaAb4787, 18),

dbt_subprojects/tokens/models/prices/mantle/prices_mantle_tokens.sql

@@ -16,7 +16,6 @@ SELECT
 FROM
 (
     VALUES
-    ('mnt-mantle', 'mantle', 'MNT', 0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000, 18),
     ('mnt-mantle', 'mantle', 'WMNT', 0x78c1b0c915c4faa5fffa6cabf0219da63d7f4cb8, 18),
     ('joe-trader-joe', 'mantle', 'JOE', 0x371c7ec6d8039ff7933a2aa28eb827ffe1f52f07, 18),
     ('usdc-usd-coin', 'mantle', 'USDC', 0x09bc4e0d864854c6afb6eb9a9cdf58ac190d0df9, 6),

dbt_subprojects/tokens/models/prices/polygon/prices_polygon_tokens.sql

@@ -22,7 +22,6 @@ FROM
     ('bal-balancer','polygon','BAL',0x9a71012b13ca4d3d0cdc72a177df3ef03b0e76a3,18),
     ('dpi-defi-pulse-index', 'polygon', 'DPI', 0x85955046df4668e1dd369d2de9f3aeb98dd2a369, 18),
     ('eurs-stasis-eurs','polygon','EURS',0xe111178a87a3bff0c8d18decba5798827539ae99,2),
-    ('matic-polygon', 'polygon', 'POL', 0x0000000000000000000000000000000000001010, 18),
     ('dai-dai', 'polygon', 'DAI', 0x8f3cf7ad23cd3cadbd9735aff958023239c6a063, 18),
     ('dquick-dragon-quick', 'polygon', 'dQUICK', 0x958d208Cdf087843e9AD98d23823d32E17d723A1, 18),
     ('usdc-usd-coin', 'polygon', 'USDC', 0x2791bca1f2de4661ed88a30c99a7a9449aa84174, 6),

dbt_subprojects/tokens/models/prices/zksync/prices_zksync_tokens.sql

@@ -17,7 +17,6 @@ FROM
     VALUES
 
     ('busd-binance-usd', 'zksync', 'BUSD', 0x2039bb4116b4efc145ec4f0e2ea75012d6c0f181, 18),
-    ('eth-ethereum', 'zksync', 'ETH', 0x000000000000000000000000000000000000800a, 18),
     ('izi-izumi-finance', 'zksync', 'iZi', 0x16a9494e257703797d747540f01683952547ee5b, 18),
     ('mav-maverick-token', 'zksync', 'MAV', 0x787c09494ec8bcb24dcaf8659e7d5d69979ee508, 18),
     ('mute-mute', 'zksync', 'MUTE', 0x0e97c7a0f8b2c9885c8ac9fc6136e829cbc21d42, 18),