Merge branch 'main' of github.com:duneanalytics/spellbook into fix-pa…

…raswap-ethereum-trades
duneanalytics · Aug 23, 2024 · 53a09a3 · 53a09a3
2 parents 94a9226 + e321176
commit 53a09a3
Show file tree

Hide file tree

Showing 509 changed files with 19,781 additions and 13,721 deletions.
diff --git a/README.md b/README.md
@@ -199,7 +199,6 @@ models:
       error_after: { count: 24, period: hour }
     tables:
       - name: traces
-        loaded_at_field: block_time
 ```
 
 See links to more docs on dbt below.

diff --git a/...aily_spellbook/models/_sector/airdrops/ethereum/projects/x2y2_ethereum_airdrop_claims.sql b/...aily_spellbook/models/_sector/airdrops/ethereum/projects/x2y2_ethereum_airdrop_claims.sql
@@ -28,20 +28,19 @@ SELECT 'ethereum' AS blockchain
 , t.evt_block_number AS block_number
 , 'x2y2' AS project
 , 1 AS airdrop_number
-, t.to AS recipient
+, t.receiver AS recipient
 , t.contract_address
 , t.evt_tx_hash AS tx_hash
-, t.value AS amount_raw
-, CAST(t.value/POWER(10, 18) AS double) AS amount_original
-, CASE WHEN t.evt_block_time >= (SELECT minute FROM early_price) THEN CAST(pu.price*t.value/POWER(10, 18) AS double)
-    ELSE CAST((SELECT price FROM early_price)*t.value/POWER(10, 18) AS double)
+, t.amount AS amount_raw
+, CAST(t.amount/POWER(10, 18) AS double) AS amount_original
+, CASE WHEN t.evt_block_time >= (SELECT minute FROM early_price) THEN CAST(pu.price*t.amount/POWER(10, 18) AS double)
+    ELSE CAST((SELECT price FROM early_price)*t.amount/POWER(10, 18) AS double)
     END AS amount_usd
 , {{xtyt_token_address}} AS token_address
 , 'X2Y2' AS token_symbol
 , t.evt_index
-FROM {{ source('erc20_ethereum', 'evt_transfer') }} t
-LEFT JOIN {{ source('prices','usd_forward_fill') }} pu ON pu.blockchain = 'ethereum'
+FROM {{ source('x2y2_ethereum', 'X2Y2Drop_evt_Airdrop') }} t
+LEFT JOIN {{ source('prices', 'usd_forward_fill') }} pu ON pu.blockchain = 'ethereum'
     AND pu.contract_address= {{xtyt_token_address}}
     AND pu.minute=date_trunc('minute', t.evt_block_time)
 WHERE t.evt_block_time BETWEEN timestamp '2022-02-15' AND timestamp '2022-03-31'
-    AND t.contract_address = {{xtyt_token_address}}
diff --git a/dbt_subprojects/daily_spellbook/models/addresses_events/addresses_events_first_funded_by.sql b/dbt_subprojects/daily_spellbook/models/addresses_events/addresses_events_first_funded_by.sql
@@ -2,7 +2,7 @@
 (
     alias = 'first_funded_by',
     schema = 'addresses_events',
-    post_hook='{{ expose_spells(\'["arbitrum", "avalanche_c", "bnb", "ethereum", "fantom", "gnosis", "optimism", "polygon", "celo", "zksync", "zora", "base", "scroll"]\',
+    post_hook='{{ expose_spells(\'["arbitrum", "avalanche_c", "bnb", "ethereum", "fantom", "gnosis", "optimism", "polygon", "celo", "zksync", "zora", "base", "scroll", "mantle", "blast"]\',
                                     "sector",
                                     "addresses_events",
                                     \'["hildobby", "Henrystats"]\') }}'
@@ -25,6 +25,8 @@ ref('addresses_events_arbitrum_first_funded_by')
 , ref('addresses_events_scroll_first_funded_by')
 , ref('addresses_events_zkevm_first_funded_by')
 , ref('addresses_events_linea_first_funded_by')
+, ref('addresses_events_mantle_first_funded_by')
+, ref('addresses_events_blast_first_funded_by')
 ] %}
 
 SELECT *

diff --git a/dbt_subprojects/daily_spellbook/models/evms/evms_erc1155_transfersbatch.sql b/dbt_subprojects/daily_spellbook/models/evms/evms_erc1155_transfersbatch.sql
@@ -16,7 +16,7 @@
      , ('avalanche_c', source('erc1155_avalanche_c', 'evt_transferbatch'))
      , ('gnosis', source('erc1155_gnosis', 'evt_transferbatch'))
      , ('fantom', source('erc1155_fantom', 'evt_transferbatch'))
-     , ('optimism', source('erc1155_optimism', 'evt_transferbatch'))
+     , ('optimism', source('erc1155_optimism', 'evt_TransferBatch'))
      , ('arbitrum', source('erc1155_arbitrum', 'evt_transferbatch'))
      , ('celo', source('erc1155_celo', 'evt_transferbatch'))
      , ('base', source('erc1155_base', 'evt_transferbatch'))

diff --git a/dbt_subprojects/daily_spellbook/models/evms/evms_erc1155_transferssingle.sql b/dbt_subprojects/daily_spellbook/models/evms/evms_erc1155_transferssingle.sql
@@ -16,7 +16,7 @@
      , ('avalanche_c', source('erc1155_avalanche_c', 'evt_transfersingle'))
      , ('gnosis', source('erc1155_gnosis', 'evt_transfersingle'))
      , ('fantom', source('erc1155_fantom', 'evt_transfersingle'))
-     , ('optimism', source('erc1155_optimism', 'evt_transfersingle'))
+     , ('optimism', source('erc1155_optimism', 'evt_TransferSingle'))
      , ('arbitrum', source('erc1155_arbitrum', 'evt_transfersingle'))
      , ('celo', source('erc1155_celo', 'evt_transfersingle'))
      , ('base', source('erc1155_base', 'evt_transfersingle'))

diff --git a/dbt_subprojects/daily_spellbook/models/evms/evms_erc721_transfers.sql b/dbt_subprojects/daily_spellbook/models/evms/evms_erc721_transfers.sql
@@ -16,7 +16,7 @@
      , ('avalanche_c', source('erc721_avalanche_c', 'evt_transfer'))
      , ('gnosis', source('erc721_gnosis', 'evt_transfer'))
      , ('fantom', source('erc721_fantom', 'evt_transfer'))
-     , ('optimism', source('erc721_optimism', 'evt_transfer'))
+     , ('optimism', source('erc721_optimism', 'evt_Transfer'))
      , ('arbitrum', source('erc721_arbitrum', 'evt_transfer'))
      , ('celo', source('erc721_celo', 'evt_transfer'))
      , ('base', source('erc721_base', 'evt_transfer'))

diff --git a/dbt_subprojects/daily_spellbook/models/galxe/optimism/galxe_optimism_nft_mints.sql b/dbt_subprojects/daily_spellbook/models/galxe/optimism/galxe_optimism_nft_mints.sql
@@ -31,7 +31,7 @@ SELECT
 
 FROM
     {{source('optimism','transactions')}} t
-INNER JOIN {{source('erc721_optimism','evt_transfer')}} tfer 
+INNER JOIN {{source('erc721_optimism','evt_Transfer')}} tfer 
     ON t.hash = tfer.evt_tx_hash
     AND t.block_number = tfer.evt_block_number
     AND tfer."from" = 0x0000000000000000000000000000000000000000 --mint

diff --git a/dbt_subprojects/dex/models/_projects/balancer/trades/ethereum/balancer_ethereum_trades.sql b/dbt_subprojects/dex/models/_projects/balancer/trades/ethereum/balancer_ethereum_trades.sql
@@ -7,7 +7,8 @@
 
 {% set balancer_models = [
     ref('balancer_v1_ethereum_trades'),
-    ref('balancer_v2_ethereum_trades')
+    ref('balancer_v2_ethereum_trades'),
+    ref('balancer_cowswap_amm_ethereum_trades')
 ] %}
 
 SELECT *

diff --git a/dbt_subprojects/dex/models/_projects/balancer/trades/gnosis/balancer_gnosis_trades.sql b/dbt_subprojects/dex/models/_projects/balancer/trades/gnosis/balancer_gnosis_trades.sql
@@ -6,7 +6,8 @@
 
 
 {% set balancer_models = [
-    ref('balancer_v2_gnosis_trades')
+    ref('balancer_v2_gnosis_trades'),
+    ref('balancer_cowswap_amm_gnosis_trades')
 ] %}
 
 SELECT *

diff --git a/...projects/balancer_cowswap_amm/_schema.yml → ...projects/balancer_cowswap_amm/_schema.yml b/...projects/balancer_cowswap_amm/_schema.yml → ...projects/balancer_cowswap_amm/_schema.yml
@@ -87,31 +87,6 @@ models:
       - name: pool_symbol
       - name: swap_fee
 
-  - name: balancer_cowswap_amm_balances
-    meta:
-      blockchain: ethereum, gnosis
-      project: balancer_cowswap_amm
-      contributors: viniabussafi
-    config:
-      tags: ['ethereum', 'gnosis', 'balancer', 'balances']
-    description: >
-      ERC20 token rolling sum balances on Balancer, an automated portfolio manager and trading platform.
-    columns:
-      - &day
-        name: day
-        description: "UTC event block time truncated to the day mark"
-        tests:
-          - not_null
-      - &pool_address
-        name: pool_address
-        description: "Balancer CoWSwap AMM pool contract address"
-      - &token_address
-        name: token_address
-        description: "Token contract address"
-      - &token_balance_raw
-        name: token_balance_raw
-        description: "Balance of a token"
-
   - name: labels_balancer_cowswap_amm_pools
     meta:
       blockchain: ethereum, gnosis
@@ -149,36 +124,4 @@ models:
         description: "Name of the label model sourced from"
       - &label_type
         name: label_type
-        description: "Type of label (see labels overall readme)"
-
-  - name: balancer_cowswap_amm_liquidity
-    meta:
-      blockchain: ethereum, gnosis
-      project: balancer_cowswap_amm
-      contributors: viniabussafi
-    config:
-      tags: ['ethereum', 'gnosis', 'balancer', 'pools', 'liquidity']
-    description: >
-      Balancer CoWSwap AMM pools liquidity by token in Ethereum.
-    columns:
-      - *day
-      - name: pool_id
-      - *pool_address
-      - name: pool_symbol
-      - *version
-      - *blockchain
-      - name: pool_type
-      - *token_address
-      - &token_symbol
-        name: token_symbol
-        description: "Token symbol"
-      - *token_balance_raw
-      - &token_balance
-        name: token_balance
-        description: "Balance of the token in the pool"
-      - &protocol_liquidity_usd
-        name: protocol_liquidity_usd
-        description: "Protocol liquidity in USD"
-      - &protocol_liquidity_eth
-        name: protocol_liquidity_eth
-        description: "Protocol liquidity in ETH"
+        description: "Type of label (see labels overall readme)"
diff --git a/...wswap_amm/balancer_cowswap_amm_trades.sql → ...wswap_amm/balancer_cowswap_amm_trades.sql b/...wswap_amm/balancer_cowswap_amm_trades.sql → ...wswap_amm/balancer_cowswap_amm_trades.sql
@@ -35,6 +35,7 @@ FROM (
        , taker
        , maker
        , project_contract_address
+       , pool_id
        , tx_hash
        , tx_from
        , tx_to

diff --git a/...balancer_cowswap_amm/ethereum/_schema.yml → ...balancer_cowswap_amm/ethereum/_schema.yml b/...balancer_cowswap_amm/ethereum/_schema.yml → ...balancer_cowswap_amm/ethereum/_schema.yml
@@ -92,37 +92,6 @@ models:
       - name: pool_symbol
       - name: swap_fee
 
-  - name: balancer_cowswap_amm_ethereum_balances
-    meta:
-      blockchain: ethereum
-      project: balancer_cowswap_amm
-      contributors: viniabussafi
-    config:
-      tags: ['ethereum', 'balancer', 'balances']
-    description: >
-      ERC20 token rolling sum balances on Balancer, an automated portfolio manager and trading platform.
-    tests:
-      - dbt_utils.unique_combination_of_columns:
-          combination_of_columns:
-            - day
-            - pool_address
-            - token_address
-    columns:
-      - &day
-        name: day
-        description: "UTC event block time truncated to the day mark"
-        tests:
-          - not_null
-      - &pool_address
-        name: pool_address
-        description: "Balancer CoWSwap AMM pool contract address"
-      - &token_address
-        name: token_address
-        description: "Token contract address"
-      - &token_balance_raw
-        name: token_balance_raw
-        description: "Balance of a token"
-
   - name: labels_balancer_cowswap_amm_pools_ethereum
     meta:
       blockchain: ethereum
@@ -165,42 +134,4 @@ models:
         description: "Name of the label model sourced from"
       - &label_type
         name: label_type
-        description: "Type of label (see labels overall readme)"
-
-  - name: balancer_cowswap_amm_ethereum_liquidity
-    meta:
-      blockchain: ethereum
-      project: balancer_cowswap_amm
-      contributors: viniabussafi
-    config:
-      tags: ['ethereum', 'balancer', 'pools', 'liquidity']
-    description: >
-      Balancer CoWSwap AMM pools liquidity by token in Ethereum.
-    tests:
-      - dbt_utils.unique_combination_of_columns:
-          combination_of_columns:
-            - day
-            - pool_id
-            - token_address
-    columns:
-      - *day
-      - name: pool_id
-      - *pool_address
-      - name: pool_symbol
-      - *version
-      - *blockchain
-      - name: pool_type
-      - *token_address
-      - &token_symbol
-        name: token_symbol
-        description: "Token symbol"
-      - *token_balance_raw
-      - &token_balance
-        name: token_balance
-        description: "Balance of the token in the pool"
-      - &protocol_liquidity_usd
-        name: protocol_liquidity_usd
-        description: "Protocol liquidity in USD"
-      - &protocol_liquidity_eth
-        name: protocol_liquidity_eth
-        description: "Protocol liquidity in ETH"
+        description: "Type of label (see labels overall readme)"
diff --git a/.../balancer_cowswap_amm_ethereum_trades.sql → .../balancer_cowswap_amm_ethereum_trades.sql b/.../balancer_cowswap_amm_ethereum_trades.sql → .../balancer_cowswap_amm_ethereum_trades.sql
@@ -14,7 +14,7 @@
 
     SELECT 
     '{{blockchain}}' AS blockchain
-    , 'balancer_cowswap_amm' AS project
+    , 'balancer' AS project
     , '1' AS version
     , CAST(date_trunc('month', trade.evt_block_time) AS DATE) AS block_month
     , CAST(date_trunc('day', trade.evt_block_time) AS DATE) AS block_date
@@ -34,6 +34,7 @@
     ,trade.sellToken AS token_sold_address
     ,CAST(NULL AS VARBINARY) AS taker
     ,CAST(NULL AS VARBINARY) AS maker
+    , pool.bPool AS pool_id 
     , pool.bPool AS project_contract_address
     , trade.evt_tx_hash AS tx_hash
     , settlement.solver AS tx_from

diff --git a/...s_balancer_cowswap_amm_pools_ethereum.sql → ...s_balancer_cowswap_amm_pools_ethereum.sql b/...s_balancer_cowswap_amm_pools_ethereum.sql → ...s_balancer_cowswap_amm_pools_ethereum.sql
diff --git a/...s/balancer_cowswap_amm/gnosis/_schema.yml → ...s/balancer_cowswap_amm/gnosis/_schema.yml b/...s/balancer_cowswap_amm/gnosis/_schema.yml → ...s/balancer_cowswap_amm/gnosis/_schema.yml
@@ -92,37 +92,6 @@ models:
       - name: pool_symbol
       - name: swap_fee
 
-  - name: balancer_cowswap_amm_gnosis_balances
-    meta:
-      blockchain: gnosis
-      project: balancer_cowswap_amm
-      contributors: viniabussafi
-    config:
-      tags: ['gnosis', 'balancer', 'balances']
-    description: >
-      ERC20 token rolling sum balances on Balancer, an automated portfolio manager and trading platform.
-    tests:
-      - dbt_utils.unique_combination_of_columns:
-          combination_of_columns:
-            - day
-            - pool_address
-            - token_address
-    columns:
-      - &day
-        name: day
-        description: "UTC event block time truncated to the day mark"
-        tests:
-          - not_null
-      - &pool_address
-        name: pool_address
-        description: "Balancer CoWSwap AMM pool contract address"
-      - &token_address
-        name: token_address
-        description: "Token contract address"
-      - &token_balance_raw
-        name: token_balance_raw
-        description: "Balance of a token"
-
   - name: labels_balancer_cowswap_amm_pools_gnosis
     meta:
       blockchain: gnosis
@@ -165,42 +134,4 @@ models:
         description: "Name of the label model sourced from"
       - &label_type
         name: label_type
-        description: "Type of label (see labels overall readme)"
-
-  - name: balancer_cowswap_amm_gnosis_liquidity
-    meta:
-      blockchain: gnosis
-      project: balancer_cowswap_amm
-      contributors: viniabussafi
-    config:
-      tags: ['gnosis', 'balancer', 'pools', 'liquidity']
-    description: >
-      Balancer CoWSwap AMM pools liquidity by token in gnosis.
-    tests:
-      - dbt_utils.unique_combination_of_columns:
-          combination_of_columns:
-            - day
-            - pool_id
-            - token_address
-    columns:
-      - *day
-      - name: pool_id
-      - *pool_address
-      - name: pool_symbol
-      - *version
-      - *blockchain
-      - name: pool_type
-      - *token_address
-      - &token_symbol
-        name: token_symbol
-        description: "Token symbol"
-      - *token_balance_raw
-      - &token_balance
-        name: token_balance
-        description: "Balance of the token in the pool"
-      - &protocol_liquidity_usd
-        name: protocol_liquidity_usd
-        description: "Protocol liquidity in USD"
-      - &protocol_liquidity_eth
-        name: protocol_liquidity_eth
-        description: "Protocol liquidity in ETH"
+        description: "Type of label (see labels overall readme)"
diff --git a/...is/balancer_cowswap_amm_gnosis_trades.sql → ...is/balancer_cowswap_amm_gnosis_trades.sql b/...is/balancer_cowswap_amm_gnosis_trades.sql → ...is/balancer_cowswap_amm_gnosis_trades.sql
@@ -14,7 +14,7 @@
 
     SELECT 
     '{{blockchain}}' AS blockchain
-    , 'balancer_cowswap_amm' AS project
+    , 'balancer' AS project
     , '1' AS version
     , CAST(date_trunc('month', trade.evt_block_time) AS DATE) AS block_month
     , CAST(date_trunc('day', trade.evt_block_time) AS DATE) AS block_date
@@ -35,6 +35,7 @@
     ,CAST(NULL AS VARBINARY) AS taker
     ,CAST(NULL AS VARBINARY) AS maker
     , pool.bPool AS project_contract_address
+    , pool.bPool AS pool_id   
     , trade.evt_tx_hash AS tx_hash
     , settlement.solver AS tx_from
     , trade.contract_address AS tx_to

diff --git a/...els_balancer_cowswap_amm_pools_gnosis.sql → ...els_balancer_cowswap_amm_pools_gnosis.sql b/...els_balancer_cowswap_amm_pools_gnosis.sql → ...els_balancer_cowswap_amm_pools_gnosis.sql
diff --git a/...amm/labels_balancer_cowswap_amm_pools.sql → ...amm/labels_balancer_cowswap_amm_pools.sql b/...amm/labels_balancer_cowswap_amm_pools.sql → ...amm/labels_balancer_cowswap_amm_pools.sql
@@ -1,6 +1,6 @@
 {{config(
     schema = 'labels',
-    alias = 'balancer_cowswap_amm_pool',
+    alias = 'balancer_cowswap_amm_pools',
     materialized = 'view'
     )
 }}