Update balancer_protocol_fee_macro and schemas to reflect new fee spl…

…it (duneanalytics#7466) Co-authored-by: jeff-dude <[email protected]>
viniabussafi · Jan 16, 2025 · c5b463e · c5b463e
1 parent 10c7850
commit c5b463e
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 40 deletions.
diff --git a/dbt_macros/shared/balancer/balancer_protocol_fee_macro.sql b/dbt_macros/shared/balancer/balancer_protocol_fee_macro.sql
@@ -146,7 +146,7 @@ WITH pool_labels AS (
             WHEN day < DATE '2022-07-03' THEN 0.25 -- veBAL release
             WHEN day >= DATE '2022-07-03' AND day < DATE '2023-01-23' THEN 0.25 -- BIP 19
             WHEN day >= DATE '2023-01-23' AND day < DATE '2023-07-24' THEN 0.35 -- BIP 161
-            WHEN day >= DATE '2023-07-24' THEN 0.175 -- BIP 371
+            WHEN day >= DATE '2023-07-24' THEN 0.175 -- BIP 371 and BIP 734
         END AS treasury_share
     FROM UNNEST(SEQUENCE(DATE '2022-03-01', CURRENT_DATE, INTERVAL '1' DAY)) AS date(day)
     )
@@ -155,19 +155,20 @@ WITH pool_labels AS (
     SELECT
         f.day,
         f.pool_id,
-        BYTEARRAY_SUBSTRING(f.pool_id,1,20) as pool_address,
+        BYTEARRAY_SUBSTRING(f.pool_id,1,20) AS pool_address,
         l.name AS pool_symbol,
-        '{{version}}' as version,
-        '{{blockchain}}' as blockchain,
+        '{{version}}' AS version,
+        '{{blockchain}}' AS blockchain,
         l.pool_type,
         'v2' AS fee_type,
         f.token_address,
         f.token_symbol,
-        SUM(f.token_amount_raw) as token_amount_raw,
-        SUM(f.token_amount) as token_amount,
-        SUM(f.protocol_fee_collected_usd) as protocol_fee_collected_usd, 
+        SUM(f.token_amount_raw) AS token_amount_raw,
+        SUM(f.token_amount) AS token_amount,
+        SUM(f.protocol_fee_collected_usd) AS protocol_fee_collected_usd, 
         r.treasury_share,
-        SUM(f.protocol_fee_collected_usd) * r.treasury_share as treasury_revenue_usd
+        SUM(f.protocol_fee_collected_usd) * r.treasury_share AS treasury_fee_usd,
+        SUM(f.protocol_fee_collected_usd) AS lp_fee_collected_usd
     FROM decorated_protocol_fee f
     INNER JOIN revenue_share r 
         ON r.day = f.day
@@ -342,12 +343,9 @@ WITH pool_labels AS (
         SELECT
         day,
         CASE 
-            WHEN day < DATE '2022-07-03' THEN 0.25 -- veBAL release
-            WHEN day >= DATE '2022-07-03' AND day < DATE '2023-01-23' THEN 0.25 -- BIP 19
-            WHEN day >= DATE '2023-01-23' AND day < DATE '2023-07-24' THEN 0.35 -- BIP 161
-            WHEN day >= DATE '2023-07-24' THEN 0.175 -- BIP 371
+            WHEN day >= DATE '2024-12-01' THEN 0.175 -- BIP 734
         END AS treasury_share
-    FROM UNNEST(SEQUENCE(DATE '2022-03-01', CURRENT_DATE, INTERVAL '1' DAY)) AS date(day)
+    FROM UNNEST(SEQUENCE(DATE '2024-12-01', CURRENT_DATE, INTERVAL '1' DAY)) AS date(day)
     )
 
 
@@ -366,7 +364,10 @@ WITH pool_labels AS (
         SUM(f.token_amount) as token_amount,
         SUM(f.protocol_fee_collected_usd) as protocol_fee_collected_usd, 
         r.treasury_share,
-        SUM(f.protocol_fee_collected_usd) * r.treasury_share as treasury_revenue_usd
+        SUM(f.protocol_fee_collected_usd) * r.treasury_share as treasury_feee_usd,
+        SUM(CASE WHEN f.fee_type = 'swap_fee' THEN f.protocol_fee_collected_usd
+        WHEN f.fee_type = 'yield_fee' THEN f.protocol_fee_collected_usd * 9 END) 
+            AS lp_fee_collected_usd
     FROM decorated_protocol_fee f
     INNER JOIN revenue_share r 
         ON r.day = f.day

diff --git a/dbt_subprojects/daily_spellbook/models/beethoven_x/fantom/beethoven_x_fantom_schema.yml b/dbt_subprojects/daily_spellbook/models/beethoven_x/fantom/beethoven_x_fantom_schema.yml
@@ -102,10 +102,13 @@ models:
         description: "Fee collected in the pool in USD"
       - &treasury_share
         name: treasury_share
-        description: "Share of total fee that is directed to Balancer DAO's treasury, as per BIPs 19, 161 and 371"
-      - &treasury_revenue_usd
+        description: "Share of total fee that is directed to Beethoven DAO's treasury, as per BIPs 19, 161 and 371"
+      - &treasury_fee_usd
         name: treasury_revenue_usd
-        description: "USD value of fee directed to Balancer DAO's treasury"
+        description: "USD value of fee directed to Beethoven X DAO's treasury"
+      - &lp_fee_collected_usd
+        name: lp_fee_collected_usd
+        description: "USD value of the fee returned to liquidity providers" 
 
   - name: beethoven_x_fantom_bpt_supply
     meta:
@@ -115,7 +118,7 @@ models:
     config:
       tags: ['fantom', 'bpt', 'supply']
     description: >
-      Balancer Pool Token (BPT) supply for Beethoven X pools built on Balancer.
+      Balancer Pool Token (BPT) supply for Beethoven X pools built on Beethoven X.
     data_tests:
       - dbt_utils.unique_combination_of_columns:
           combination_of_columns:

diff --git a/dbt_subprojects/daily_spellbook/models/beets/sonic/beets_schema.yml b/dbt_subprojects/daily_spellbook/models/beets/sonic/beets_schema.yml
@@ -103,9 +103,12 @@ models:
       - &treasury_share
         name: treasury_share
         description: "Share of total fee that is directed to Balancer DAO's treasury, as per BIPs 19, 161 and 371"
-      - &treasury_revenue_usd
+      - &treasury_fee_usd
         name: treasury_revenue_usd
-        description: "USD value of fee directed to Balancer DAO's treasury"
+        description: "USD value of fee directed to Beets DAO's treasury"
+      - &lp_fee_collected_usd
+        name: lp_fee_collected_usd
+        description: "USD value of the fee returned to liquidity providers" 
 
   - name: beets_bpt_supply
     meta:

diff --git a/dbt_subprojects/daily_spellbook/models/jelly_swap/sei/jelly_swap_sei_schema.yml b/dbt_subprojects/daily_spellbook/models/jelly_swap/sei/jelly_swap_sei_schema.yml
@@ -77,7 +77,7 @@ models:
     config:
       tags: ['sei', 'revenue', 'fees']
     description: >
-      Daily Protocol Fee collected and Revenue by pool on JellySwap, an automated portfolio manager and trading platform built on jelly_swap.
+      Daily Protocol Fee collected and Revenue by pool on JellySwap, an automated portfolio manager and trading platform, Friendly Fork of Balancer.
     data_tests:
       - dbt_utils.unique_combination_of_columns:
           combination_of_columns:
@@ -103,9 +103,12 @@ models:
       - &treasury_share
         name: treasury_share
         description: "Share of total fee that is directed to jelly_swap DAO's treasury, as per BIPs 19, 161 and 371"
-      - &treasury_revenue_usd
+      - &treasury_fee_usd
         name: treasury_revenue_usd
-        description: "USD value of fee directed to jelly_swap DAO's treasury"
+        description: "USD value of fee directed to Jelly Swap DAO's treasury"
+      - &lp_fee_collected_usd
+        name: lp_fee_collected_usd
+        description: "USD value of the fee returned to liquidity providers" 
 
   - name: jelly_swap_sei_bpt_supply
     meta:

diff --git a/dbt_subprojects/hourly_spellbook/models/_project/balancer/protocol_fee/_schema.yml b/dbt_subprojects/hourly_spellbook/models/_project/balancer/protocol_fee/_schema.yml
@@ -59,6 +59,9 @@ models:
       - &treasury_share
         name: treasury_share
         description: "Share of total fee that is directed to Balancer DAO's treasury, as per BIPs 19, 161 and 371"
-      - &treasury_revenue_usd
+      - &treasury_fee_usd
         name: treasury_revenue_usd
-        description: "USD value of fee directed to Balancer DAO's treasury"
+        description: "USD value of fee directed to Balancer DAO's treasury"
+      - &lp_fee_collected_usd
+        name: lp_fee_collected_usd
+        description: "USD value of the fee returned to liquidity providers" 
diff --git a/dbt_subprojects/hourly_spellbook/models/_project/balancer/protocol_fee/arbitrum/_schema.yml b/dbt_subprojects/hourly_spellbook/models/_project/balancer/protocol_fee/arbitrum/_schema.yml
@@ -56,6 +56,9 @@ models:
       - &treasury_share
         name: treasury_share
         description: "Share of total fee that is directed to Balancer DAO's treasury, as per BIPs 19, 161 and 371"
-      - &treasury_revenue_usd
-        name: treasury_revenue_usd
-        description: "USD value of fee directed to Balancer DAO's treasury"
+      - &treasury_fee_usd
+        name: treasury_fee_usd
+        description: "USD value of fee directed to Balancer DAO's treasury"
+      - &lp_fee_collected_usd
+        name: lp_fee_collected_usd
+        description: "USD value of the fee returned to liquidity providers"        
diff --git a/...ubprojects/hourly_spellbook/models/_project/balancer/protocol_fee/avalanche_c/_schema.yml b/...ubprojects/hourly_spellbook/models/_project/balancer/protocol_fee/avalanche_c/_schema.yml
@@ -58,4 +58,7 @@ models:
         description: "Share of total fee that is directed to Balancer DAO's treasury, as per BIPs 19, 161 and 371"
       - &treasury_revenue_usd
         name: treasury_revenue_usd
-        description: "USD value of fee directed to Balancer DAO's treasury"
+        description: "USD value of fee directed to Balancer DAO's treasury"
+      - &lp_fee_collected_usd
+        name: lp_fee_collected_usd
+        description: "USD value of the fee returned to liquidity providers"        
diff --git a/dbt_subprojects/hourly_spellbook/models/_project/balancer/protocol_fee/base/_schema.yml b/dbt_subprojects/hourly_spellbook/models/_project/balancer/protocol_fee/base/_schema.yml
@@ -58,4 +58,7 @@ models:
         description: "Share of total fee that is directed to Balancer DAO's treasury, as per BIPs 19, 161 and 371"
       - &treasury_revenue_usd
         name: treasury_revenue_usd
-        description: "USD value of fee directed to Balancer DAO's treasury"
+        description: "USD value of fee directed to Balancer DAO's treasury"
+      - &lp_fee_collected_usd
+        name: lp_fee_collected_usd
+        description: "USD value of the fee returned to liquidity providers" 
diff --git a/dbt_subprojects/hourly_spellbook/models/_project/balancer/protocol_fee/ethereum/_schema.yml b/dbt_subprojects/hourly_spellbook/models/_project/balancer/protocol_fee/ethereum/_schema.yml
@@ -59,9 +59,12 @@ models:
       - &treasury_share
         name: treasury_share
         description: "Share of total fee that is directed to Balancer DAO's treasury, as per BIPs 19, 161 and 371"
-      - &treasury_revenue_usd
+      - &treasury_fee_usd
         name: treasury_revenue_usd
         description: "USD value of fee directed to Balancer DAO's treasury"
+      - &lp_fee_collected_usd
+        name: lp_fee_collected_usd
+        description: "USD value of the fee returned to liquidity providers" 
 
   - name: balancer_v3_ethereum_protocol_fee
     meta:
@@ -94,4 +97,5 @@ models:
       - *token_amount
       - *protocol_fee_collected_usd
       - *treasury_share
-      - *treasury_revenue_usd            
+      - *treasury_fee_usd
+      - *lp_fee_collected_usd            
diff --git a/dbt_subprojects/hourly_spellbook/models/_project/balancer/protocol_fee/gnosis/_schema.yml b/dbt_subprojects/hourly_spellbook/models/_project/balancer/protocol_fee/gnosis/_schema.yml
@@ -59,9 +59,12 @@ models:
       - &treasury_share
         name: treasury_share
         description: "Share of total fee that is directed to Balancer DAO's treasury, as per BIPs 19, 161 and 371"
-      - &treasury_revenue_usd
+      - &treasury_fee_usd
         name: treasury_revenue_usd
         description: "USD value of fee directed to Balancer DAO's treasury"
+      - &lp_fee_collected_usd
+        name: lp_fee_collected_usd
+        description: "USD value of the fee returned to liquidity providers" 
 
   - name: balancer_v3_gnosis_protocol_fee
     meta:
@@ -94,4 +97,5 @@ models:
       - *token_amount
       - *protocol_fee_collected_usd
       - *treasury_share
-      - *treasury_revenue_usd    
+      - *treasury_fee_usd    
+      - *lp_fee_collected_usd
diff --git a/dbt_subprojects/hourly_spellbook/models/_project/balancer/protocol_fee/optimism/_schema.yml b/dbt_subprojects/hourly_spellbook/models/_project/balancer/protocol_fee/optimism/_schema.yml
@@ -56,6 +56,9 @@ models:
       - &treasury_share
         name: treasury_share
         description: "Share of total fee that is directed to Balancer DAO's treasury, as per BIPs 19, 161 and 371"
-      - &treasury_revenue_usd
+      - &treasury_fee_usd
         name: treasury_revenue_usd
-        description: "USD value of fee directed to Balancer DAO's treasury"
+        description: "USD value of fee directed to Balancer DAO's treasury"
+      - &lp_fee_collected_usd
+        name: lp_fee_collected_usd
+        description: "USD value of the fee returned to liquidity providers" 
diff --git a/dbt_subprojects/hourly_spellbook/models/_project/balancer/protocol_fee/polygon/_schema.yml b/dbt_subprojects/hourly_spellbook/models/_project/balancer/protocol_fee/polygon/_schema.yml
@@ -56,6 +56,9 @@ models:
       - &treasury_share
         name: treasury_share
         description: "Share of total fee that is directed to Balancer DAO's treasury, as per BIPs 19, 161 and 371"
-      - &treasury_revenue_usd
+      - &treasury_fee_usd
         name: treasury_revenue_usd
-        description: "USD value of fee directed to Balancer DAO's treasury"
+        description: "USD value of fee directed to Balancer DAO's treasury"
+      - &lp_fee_collected_usd
+        name: lp_fee_collected_usd
+        description: "USD value of the fee returned to liquidity providers" 
diff --git a/dbt_subprojects/hourly_spellbook/models/_project/balancer/protocol_fee/zkevm/_schema.yml b/dbt_subprojects/hourly_spellbook/models/_project/balancer/protocol_fee/zkevm/_schema.yml
@@ -56,6 +56,9 @@ models:
       - &treasury_share
         name: treasury_share
         description: "Share of total fee that is directed to Balancer DAO's treasury, as per BIPs 19, 161 and 371"
-      - &treasury_revenue_usd
+      - &treasury_fee_usd
         name: treasury_revenue_usd
-        description: "USD value of fee directed to Balancer DAO's treasury"
+        description: "USD value of fee directed to Balancer DAO's treasury"
+      - &lp_fee_collected_usd
+        name: lp_fee_collected_usd
+        description: "USD value of the fee returned to liquidity providers"