DuneSQL Migration: balancer_trades

models/balancer/arbitrum/balancer_arbitrum_schema.yml

@@ -162,7 +162,7 @@ models:
             - tx_hash
             - evt_index
             - trace_address
-      - check_dex_seed_legacy:
+      - check_dex_seed:
           blockchain: arbitrum
           project: balancer
           version: 2
@@ -212,6 +212,10 @@ models:
       - &maker
         name: maker
         description: "Address of trader who sold a token"
+      - *pool_id
+      - &swap_fee
+        name: swap_fee
+        description: 'Swap fee'
       - &project_contract_address
         name: project_contract_address
         description: "Pool address"
@@ -337,7 +341,7 @@ models:
             - tx_hash
             - evt_index
             - trace_address
-      - check_dex_seed_legacy:
+      - check_dex_seed:
           blockchain: arbitrum
           project: balancer
           version: 2
@@ -346,6 +350,7 @@ models:
       - name: project
       - name: version
       - name: block_date
+      - name: block_month
       - name: block_time
       - name: token_bought_symbol
       - name: token_sold_symbol
@@ -359,9 +364,9 @@ models:
       - name: token_sold_address
       - name: taker
       - name: maker
-      - name: project_contract_address
       - name: pool_id
       - name: swap_fee
+      - name: project_contract_address
       - name: tx_hash
       - name: tx_from
       - name: tx_to

models/balancer/arbitrum/balancer_arbitrum_trades.sql

@@ -1,4 +1,5 @@
 {{ config(
+    tags = ['dunesql'],
     alias = alias('trades'),
     post_hook='{{ expose_spells(\'["arbitrum"]\',
                                 "project",
@@ -32,6 +33,8 @@ FROM (
         token_sold_address,
         taker,
         maker,
+        pool_id,
+        swap_fee,
         project_contract_address,
         tx_hash,
         tx_from,

models/balancer/arbitrum/balancer_arbitrum_trades_legacy.sql

@@ -34,6 +34,8 @@ FROM (
         token_sold_address,
         taker,
         maker,
+        pool_id,
+        swap_fee,
         project_contract_address,
         tx_hash,
         tx_from,

models/balancer/arbitrum/balancer_v2_arbitrum_bpt_prices.sql

@@ -20,11 +20,11 @@ WITH
         WHERE tokenIn = bytearray_substring(poolId, 1, 20) OR tokenOut = bytearray_substring(poolId, 1, 20)
         {% if is_incremental() %}
         AND v.evt_block_time >= date_trunc('day', now() - interval '7' day)
-        {% endif %} 
-    ), 
-    
+        {% endif %}
+    ),
+
     all_trades_info AS (
-        SELECT 
+        SELECT
             a.evt_tx_hash AS tx_hash,
             a.evt_block_time AS block_time,
             a.evt_block_number AS block_number,
@@ -41,23 +41,25 @@ WITH
             COALESCE(p2.symbol, t2.symbol) AS token_out_sym,
             COALESCE(p2.decimals, t2.decimals) AS token_out_decimals
         FROM bpt_trades a
-        LEFT JOIN {{ source ('prices', 'usd') }} p1 ON p1.contract_address = a.tokenIn AND p1.blockchain = 'arbitrum' 
+        LEFT JOIN {{ source ('prices', 'usd') }} p1 ON p1.contract_address = a.tokenIn AND p1.blockchain = 'arbitrum'
             AND  p1.minute = date_trunc('minute', a.evt_block_time)
             {% if is_incremental() %}
             AND p1.minute >= date_trunc('day', now() - interval '7' day)
-            {% endif %} 
+            {% endif %}
+
         LEFT JOIN {{ source ('prices', 'usd') }} p2 ON p2.contract_address = a.tokenOut AND p2.blockchain = 'arbitrum'
             AND  p2.minute = date_trunc('minute', a.evt_block_time)
             {% if is_incremental() %}
             AND p2.minute >= date_trunc('day', now() - interval '7' day)
-            {% endif %} 
+            {% endif %}
+
         LEFT JOIN {{ ref ('tokens_erc20') }} t1 ON t1.contract_address = a.tokenIn AND t1.blockchain = 'arbitrum'
         LEFT JOIN {{ ref ('tokens_erc20') }} t2 ON t2.contract_address = a.tokenOut AND t2.blockchain = 'arbitrum'
         ORDER BY a.evt_block_number DESC, a.evt_index DESC
-    ), 
-    
+    ),
+
     all_trades_calc_2 AS (
-        SELECT *, 
+        SELECT *,
             amount_in / POWER(10, COALESCE(token_in_decimals, 18)) AS amount_in_norm,
             amount_out / POWER(10, COALESCE(token_out_decimals, 18)) AS amount_out_norm,
             (amount_in / POWER(10, COALESCE(token_in_decimals, 18))) / (amount_out / POWER(10, COALESCE(token_out_decimals, 18))) AS in_out_norm_rate,
@@ -74,27 +76,27 @@ WITH
                 ELSE COALESCE(
                         token_out_p,
                         (amount_in / POWER(10, COALESCE(token_in_decimals, 18))) / (amount_out / POWER(10, COALESCE(token_out_decimals, 18))) * token_in_p
-                    ) 
+                    )
             END AS token_out_price
         FROM all_trades_info
-    ), 
-    
+    ),
+
     unique_tx_token_price AS (
-        SELECT 
-            distinct 
-                tx_hash, 
-                token, 
-                AVG(token_price) OVER(PARTITION BY tx_hash, token) AS avg_price 
+        SELECT
+            distinct
+                tx_hash,
+                token,
+                AVG(token_price) OVER(PARTITION BY tx_hash, token) AS avg_price
         FROM (
             SELECT tx_hash, token_in AS token, token_in_price AS token_price
             FROM all_trades_calc_2
             UNION ALL
             SELECT tx_hash, token_out AS token, token_out_price AS token_price
             FROM all_trades_calc_2
-        ) 
+        )
         ORDER BY 1,2
     ),
-    
+
     backfill_pricing_1 AS (
         SELECT
             c2.block_time,
@@ -109,8 +111,8 @@ WITH
         FROM all_trades_calc_2 c2
         LEFT JOIN unique_tx_token_price u1 ON u1.tx_hash = c2.tx_hash AND u1.token = c2.token_in
         LEFT JOIN unique_tx_token_price u2 ON u2.tx_hash = c2.tx_hash AND u2.token = c2.token_out
-    ), 
-    
+    ),
+
     backfill_pricing_2 AS (
         SELECT
             block_time,
@@ -132,10 +134,10 @@ WITH
             contract_address,
             approx_percentile(price, 0.5) FILTER (WHERE is_finite(price)) AS median_price
         FROM (
-            SELECT block_time, contract_address, token_in_price AS price 
+            SELECT block_time, contract_address, token_in_price AS price
             FROM backfill_pricing_2 b2 WHERE b2.contract_address = b2.token_in
             UNION
-            SELECT block_time, contract_address, token_out_price AS price 
+            SELECT block_time, contract_address, token_out_price AS price
             FROM backfill_pricing_2 b2 WHERE b2.contract_address = b2.token_out
         )
         GROUP BY 1, 2, 3
@@ -146,11 +148,11 @@ SELECT
     blockchain,
     hour,
     contract_address,
-    CASE 
+    CASE
         WHEN median_price IS NOT NULL THEN median_price
-        WHEN LEAD(median_price) OVER(PARTITION BY contract_address ORDER BY hour DESC) IS NOT NULL 
+        WHEN LEAD(median_price) OVER(PARTITION BY contract_address ORDER BY hour DESC) IS NOT NULL
         THEN LEAD(median_price) OVER(PARTITION BY contract_address ORDER BY hour DESC)
-        WHEN LAG(median_price) OVER(PARTITION BY contract_address ORDER BY hour DESC) IS NOT NULL 
+        WHEN LAG(median_price) OVER(PARTITION BY contract_address ORDER BY hour DESC) IS NOT NULL
         THEN LAG(median_price) OVER(PARTITION BY contract_address ORDER BY hour DESC)
         ELSE approx_percentile(median_price, 0.5) OVER(
                 PARTITION BY contract_address ORDER BY hour

models/balancer/arbitrum/balancer_v2_arbitrum_pools_fees.sql

@@ -22,9 +22,6 @@ WITH registered_pools AS (
         DISTINCT poolAddress AS pool_address
     FROM
         {{ source ('balancer_v2_arbitrum', 'Vault_evt_PoolRegistered') }}
-    {% if is_incremental() %}
-    WHERE evt_block_time >= DATE_TRUNC('day', NOW() - interval '7' day)
-    {% endif %}
 )
 SELECT
     'arbitrum' AS blockchain,