Merge pull request #30 from Xeonus/fix-core-pools-page

chore: fix core pool page

Author: Xeonus

src/data/maxis/maxiStaticTypes.ts

@@ -1,18 +1,24 @@
 // Define the structure of a single record in your CSV data.
+// Note: The current_fees CSV (v2_earned_fees_*.csv) only has pool_id, chain, symbol, earned_fees
+// The incentives CSV (v2_incentives_*.csv) has all fields including fee breakdown
 export interface PoolFeeRecord {
     pool_id: string;
     chain: string;
     symbol: string;
     earned_fees: string;
-    fees_to_vebal: string;
-    fees_to_dao: string;
-    total_incentives: string;
-    aura_incentives: string;
-    bal_incentives: string;
-    redirected_incentives: string;
-    reroute_incentives: number;
+    // The following fields are only available in historical incentives CSVs
+    fees_to_vebal?: string;
+    fees_to_dao?: string;
+    fees_to_beets?: string;
+    total_incentives?: string;
+    aura_incentives?: string;
+    bal_incentives?: string;
+    redirected_incentives?: string;
+    reroute_incentives?: number;
+    bpt_price?: string;
     date_string?: string;
     last_join_exit?: string;
+    is_partner?: string;
 }
 
 export interface FeeAllocations {

src/data/maxis/useGetCollectedFeesSummary.ts

@@ -2,6 +2,9 @@ import {FeeAllocations} from "./maxiStaticTypes";
 import React, { useEffect, useState } from 'react';
 import historicalData from './static/historical_fee_allocations_monthly.json';
 
+// Cutoff timestamp: January 30, 2025 00:00:00 UTC
+const V2_CUTOFF_TIMESTAMP = 1738195200;
+
 export default function useGetCollectedFeesSummary () : { feeData: FeeAllocations[], loading: boolean, error: string } {
 
     const [feeData, setFeeData] = useState<FeeAllocations[]>([]);
@@ -11,14 +14,34 @@ export default function useGetCollectedFeesSummary () : { feeData: FeeAllocation
     useEffect(() => {
         const fetchData = async () => {
             try {
-                const response = await fetch('https://raw.githubusercontent.com/BalancerMaxis/protocol_fee_allocator/main/fee_allocator/summaries/recon.json');
-                if (!response.ok) {
-                    throw new Error('Network response was not ok');
+                // Fetch from both old and new endpoints in parallel
+                const [oldResponse, v2Response] = await Promise.all([
+                    fetch('https://raw.githubusercontent.com/BalancerMaxis/protocol_fee_allocator/main/fee_allocator/summaries/recon.json'),
+                    fetch('https://raw.githubusercontent.com/BalancerMaxis/protocol_fee_allocator_v2/refs/heads/collect-fees-cron/fee_allocator/summaries/v2_recon.json')
+                ]);
+
+                let oldData: FeeAllocations[] = [];
+                let v2Data: FeeAllocations[] = [];
+
+                if (oldResponse.ok) {
+                    oldData = await oldResponse.json();
+                    // Filter old data to only include entries up to and including the cutoff
+                    oldData = oldData.filter(entry => entry.periodEnd <= V2_CUTOFF_TIMESTAMP);
                 }
-                const fetchedData = await response.json();
 
-                // Combine the fetched data with historical data
-                const combinedData = [...historicalData, ...fetchedData];
+                if (v2Response.ok) {
+                    v2Data = await v2Response.json();
+                    // Filter v2 data to only include entries after the cutoff
+                    v2Data = v2Data.filter(entry => entry.periodEnd > V2_CUTOFF_TIMESTAMP);
+                } else {
+                    console.warn('Failed to fetch v2 recon data');
+                }
+
+                // Combine historical data, filtered old data, and v2 data
+                // Sort by periodEnd to ensure chronological order
+                const combinedData = [...historicalData, ...oldData, ...v2Data]
+                    .sort((a, b) => a.periodEnd - b.periodEnd);
+
                 setFeeData(combinedData);
             } catch (error) {
                 if (error instanceof Error) {

src/data/maxis/useGetCorePoolCurrentFees.ts

@@ -32,32 +32,34 @@ export default function useGetCorePoolCurrentFees(): PoolFeeRecord[] {
         const fetchData = async () => {
             try {
                 const feeEndpoint = generateFeeEndpoint();
-                console.log('Fetching from:', feeEndpoint); // Optional: for debugging
+                console.log('Fetching current fees from:', feeEndpoint);
 
                 const response = await fetch(feeEndpoint);
-                const reader = response.body?.getReader();
-                const result = await reader?.read(); // raw array
-                const decoder = new TextDecoder('utf-8');
-                const csv = decoder.decode(result?.value); // convert the raw array to string
-
-                // Modify the CSV string to insert 'poolId' as the first header.
-                const correctedCsv = csv.replace(/^,/, 'poolId,');
+                if (!response.ok) {
+                    if (response.status === 404) {
+                        console.warn('Current fees file not found:', feeEndpoint);
+                        setData([]);
+                        return;
+                    }
+                    throw new Error(`HTTP error! status: ${response.status}`);
+                }
 
-                // Now, parse the corrected CSV string.
-                const results = Papa.parse(correctedCsv, {
+                const csv = await response.text();
+                const results = Papa.parse(csv, {
                     header: true,
                     skipEmptyLines: true,
                 });
 
                 if (results.errors.length > 0) {
-                    // Handle the error or throw it.
-                    console.log("CSV PARSING", results);
-                    throw new Error('Error parsing CSV data');
+                    console.log("CSV PARSING errors:", results.errors);
                 }
 
-                setData(results.data as PoolFeeRecord[]);
+                const parsedData = results.data as PoolFeeRecord[];
+                console.log('Parsed current fees, count:', parsedData.length);
+                setData(parsedData);
             } catch (error) {
-                console.error("Error fetching data: ", error);
+                console.error("Error fetching current fees data:", error);
+                setData([]);
             }
         };
 

src/data/maxis/useGetCorePoolHistoricalFees.ts

@@ -35,18 +35,26 @@ export default function useGetCorePoolHistoricalFees(endDate: string): PoolFeeRe
                     feeEndpoint = `${basePath}${pathSegment}/allocations/incentives_${startDate}_${endDate}.csv`;
                 }
 
-                console.log('Fetching historical data from:', feeEndpoint); // Optional: for debugging
+                console.log('Fetching historical data from:', feeEndpoint);
 
                 const response = await fetch(feeEndpoint);
-                const reader = response.body?.getReader();
-                const result = await reader?.read(); // raw array
-                const decoder = new TextDecoder('utf-8');
-                let csv = decoder.decode(result?.value); // convert the raw array to string
+                if (!response.ok) {
+                    if (response.status === 404) {
+                        // File doesn't exist yet (current epoch not processed), return empty data
+                        console.warn(`Historical data not available yet for ${startDate} to ${endDate}`);
+                        setData([]);
+                        return;
+                    }
+                    throw new Error(`HTTP error! status: ${response.status}`);
+                }
+
+                // Use response.text() to get the entire response body
+                let csv = await response.text();
 
                 let correctedCsv: string;
                 if (useNewEndpoint) {
-                    // New endpoint: leave as is (should have pool_id), just handle missing header
-                    correctedCsv = csv.replace(/^,/, 'pool_id,');
+                    // New endpoint: v2 format already has proper headers (pool_id)
+                    correctedCsv = csv;
                 } else {
                     // Old endpoint: convert poolId to pool_id for consistency
                     correctedCsv = csv.replace(/^,/, 'poolId,'); // First handle missing header
@@ -60,7 +68,6 @@ export default function useGetCorePoolHistoricalFees(endDate: string): PoolFeeRe
                 });
 
                 if (results.errors.length > 0) {
-                    // Handle the error or throw it.
                     console.log("CSV PARSING ERROR:", results.errors);
                     throw new Error('Error parsing CSV data');
                 }

src/data/maxis/useGetTotalFeesCollected.ts

@@ -37,11 +37,16 @@ export default function useGetCollectedFees(endDate: string): NetworkFees | unde
                     feeEndpoint = `${basePath}${pathSegment}/fees_collected/fees_${startDate}_${endDate}.json`;
                 }
 
-                console.log('Fetching collected fees from:', feeEndpoint); // Optional: for debugging
+                console.log('Fetching collected fees from:', feeEndpoint);
 
                 const response = await fetch(feeEndpoint);
                 if (!response.ok) {
-                    // If the server response was not ok, throw an error
+                    if (response.status === 404) {
+                        // File doesn't exist yet (current epoch not processed), return undefined
+                        console.warn(`Collected fees data not available yet for ${startDate} to ${endDate}`);
+                        setData(undefined);
+                        return;
+                    }
                     throw new Error(`Error fetching data: ${response.statusText}`);
                 }
                 const fees: NetworkFees = await response.json();

src/pages/CorePools/index.tsx

@@ -45,9 +45,9 @@ function calculateDelta(historicalFees: NetworkFees, poolFeeRecords: PoolFeeReco
 
     // Sum up fees_to_vebal, fees_to_dao, and total_incentives from historicalData
     const totalHistoricalSum = poolFeeRecords.reduce((acc, record) => {
-        const feesToVebal = parseFloat(record.fees_to_vebal);
-        const feesToDao = parseFloat(record.fees_to_dao);
-        const totalIncentives = parseFloat(record.total_incentives);
+        const feesToVebal = parseFloat(record.fees_to_vebal || '0');
+        const feesToDao = parseFloat(record.fees_to_dao || '0');
+        const totalIncentives = parseFloat(record.total_incentives || '0');
         return acc + feesToVebal + feesToDao + totalIncentives;
     }, 0);
 
@@ -93,9 +93,9 @@ export default function CorePools() {
         totalSwept = totalSwept / 1000000
         // Sum up fees_to_vebal, fees_to_dao, and total_incentives from historicalData
         totalHistoricalSum = historicalData.reduce((acc, record) => {
-            const feesToVebal = parseFloat(record.fees_to_vebal);
-            const feesToDao = parseFloat(record.fees_to_dao);
-            const totalIncentives = parseFloat(record.total_incentives);
+            const feesToVebal = parseFloat(record.fees_to_vebal || '0');
+            const feesToDao = parseFloat(record.fees_to_dao || '0');
+            const totalIncentives = parseFloat(record.total_incentives || '0');
             return acc + feesToVebal + feesToDao + totalIncentives;
         }, 0);
 
@@ -577,7 +577,7 @@ export default function CorePools() {
 
                 {selectedPeriod === "Current Fee Epoch" ?
                     <Grid item xs={11}>
-                        {corePools && globalPools && globalPools.length > 10 ?
+                        {corePools && globalPools && globalPools.length > 0 ?
                             <CorePoolTable poolDatas={globalPools} corePools={corePools}/> :
                             <Grid
                                 container
@@ -591,7 +591,7 @@ export default function CorePools() {
 
                     </Grid> :
                     <Grid item xs={11}>
-                        {corePools && globalPools && globalPools.length > 10 ?
+                        {corePools && globalPools && globalPools.length > 0 ?
                             <CorePoolHistoricalTable poolDatas={globalPools} corePools={corePools}/> :
                             <Grid
                                 container