From c0142e665bddbc695c22d7c8b7576a098daa6c16 Mon Sep 17 00:00:00 2001
From: Syed Asif <aftabsyedasif@gmail.com>
Date: Mon, 17 Nov 2025 19:59:25 +0400
Subject: [PATCH 1/3] Fix volume not working for flash, Depreacate Community.3

---
 dexs/flashtrade/index.ts | 11 ++++++++---
 fees/flashtrade.ts       | 18 +++++++++---------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/dexs/flashtrade/index.ts b/dexs/flashtrade/index.ts
index 2d60f36bfe..7245c5e73b 100644
--- a/dexs/flashtrade/index.ts
+++ b/dexs/flashtrade/index.ts
@@ -10,8 +10,8 @@ const pools = [
     "Governance.1",
     "Community.1",
     "Community.2",
-    "Community.3",
     "Trump.1",
+    "Ore.1",
 ]
 
 const fetch = async (_a: any, _b: any, options: FetchOptions) => {
@@ -20,8 +20,13 @@ const fetch = async (_a: any, _b: any, options: FetchOptions) => {
     let dailyVolume = 0;
     for (const pool of pools) {
         const url = `https://api.prod.flash.trade/pnl-info/cumulative-pnl-per-day?poolName=${pool}&startDate=2023-01-01%2000:00:00&endDate=${targetDate}%2023:59:59`;
-        const res = await fetchURL(url);
-        dailyVolume += (res[targetDate]?.totalVolume / 1e6) || 0;
+        try {
+            const res = await fetchURL(url);
+            dailyVolume += (res[targetDate]?.totalVolume / 1e6) || 0;
+        } catch {
+            // Treat failures as zero volume and continue with the remaining pools
+            continue;
+        }
     }
     return { dailyVolume }
 }
diff --git a/fees/flashtrade.ts b/fees/flashtrade.ts
index da0af67ba4..fb94ed3161 100644
--- a/fees/flashtrade.ts
+++ b/fees/flashtrade.ts
@@ -27,8 +27,8 @@ const pools = [
   "Governance.1",
   "Community.1",
   "Community.2",
-  "Community.3",
   "Trump.1",
+  "Ore.1",
 ]
 
 const fetch = async (_a: any, _b: any, options: FetchOptions): Promise<FetchResultFees> => {
@@ -37,18 +37,18 @@ const fetch = async (_a: any, _b: any, options: FetchOptions): Promise<FetchResu
 
   const poolFeesData: { [pool: string]: number } = {};
   let dailyFees = 0;
-  
+
   for (const pool of pools) {
     const url = `https://api.prod.flash.trade/pnl-info/cumulative-pnl-per-day?poolName=${pool}&startDate=2023-01-01%2000:00:00&endDate=${targetDate}%2023:59:59`;
     try {
       const res = await fetchURL(url);
       const poolFees = (res[targetDate]?.totalFees / 1e6) || 0;
       poolFeesData[pool] = poolFees;
-      dailyFees += poolFees; 
-    } catch(e: any) {
-      if (e.axiosError !== 'Pool not found') {
-        throw e;
-      }
+      dailyFees += poolFees;
+    } catch {
+      // Treat failures as zero fees and continue with the remaining pools
+      poolFeesData[pool] = 0;
+      continue;
     }
   }
 
@@ -80,8 +80,8 @@ const fetch = async (_a: any, _b: any, options: FetchOptions): Promise<FetchResu
       "Governance.1": 0.30,
       "Community.1": 0.00,
       "Community.2": 0.00,
-      "Community.3": 0.05,
       "Trump.1": 0.05,
+      "Ore.1": 0.10,
     };
 
     for (const pool of pools) {
@@ -111,7 +111,7 @@ const fetch = async (_a: any, _b: any, options: FetchOptions): Promise<FetchResu
 const methodology = {
   Fees: 'All fees generated by the pools.',
   Revenue: 'Sum of protocol revenue and holder revenue.',
-  ProtocolRevenue: 'Before 2025-06-19: Crypto.1/Virtual.1/Governance.1 pools at 30%, Community.3/Trump.1 pools at 5%, Community.1/Community.2 at 0%. After 2025-06-19: dynamic based on API.',
+  ProtocolRevenue: 'Before 2025-06-19: Crypto.1/Virtual.1/Governance.1 pools at 30%, Trump.1 pools at 5%, Community.1/Community.2 at 0%. After 2025-06-19: dynamic based on API.',
   HolderRevenue: 'Token holder revenue started from 2025-06-19, 0 before that date.',
   SupplySideRevenue: 'Fees paid to LP pools.',
 }

From 1fd4d64528bea3a35e3d090d5ce73288dfbda853 Mon Sep 17 00:00:00 2001
From: Eden <noat.eth@gmail.com>
Date: Tue, 18 Nov 2025 00:01:40 +0700
Subject: [PATCH 2/3] keep old pools

---
 dexs/flashtrade/index.ts | 3 +++
 fees/flashtrade.ts       | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/dexs/flashtrade/index.ts b/dexs/flashtrade/index.ts
index 7245c5e73b..433cef71ad 100644
--- a/dexs/flashtrade/index.ts
+++ b/dexs/flashtrade/index.ts
@@ -12,6 +12,9 @@ const pools = [
     "Community.2",
     "Trump.1",
     "Ore.1",
+    
+    // keep historical pools
+    "Community.3",
 ]
 
 const fetch = async (_a: any, _b: any, options: FetchOptions) => {
diff --git a/fees/flashtrade.ts b/fees/flashtrade.ts
index fb94ed3161..27ee7154d2 100644
--- a/fees/flashtrade.ts
+++ b/fees/flashtrade.ts
@@ -29,6 +29,9 @@ const pools = [
   "Community.2",
   "Trump.1",
   "Ore.1",
+  
+  // keep historical pools
+  "Community.3",
 ]
 
 const fetch = async (_a: any, _b: any, options: FetchOptions): Promise<FetchResultFees> => {
@@ -80,6 +83,7 @@ const fetch = async (_a: any, _b: any, options: FetchOptions): Promise<FetchResu
       "Governance.1": 0.30,
       "Community.1": 0.00,
       "Community.2": 0.00,
+      "Community.3": 0.05,
       "Trump.1": 0.05,
       "Ore.1": 0.10,
     };

From 0a25d7f894430c76809e7c55a6c6977b86ba188a Mon Sep 17 00:00:00 2001
From: Syed Asif <aftabsyedasif@gmail.com>
Date: Fri, 5 Dec 2025 11:42:49 +0530
Subject: [PATCH 3/3] Add support for Remora Pools

---
 dexs/flashtrade/index.ts | 1 +
 fees/flashtrade.ts       | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dexs/flashtrade/index.ts b/dexs/flashtrade/index.ts
index 433cef71ad..bc62effe79 100644
--- a/dexs/flashtrade/index.ts
+++ b/dexs/flashtrade/index.ts
@@ -12,6 +12,7 @@ const pools = [
     "Community.2",
     "Trump.1",
     "Ore.1",
+    "Remora.1",
     
     // keep historical pools
     "Community.3",
diff --git a/fees/flashtrade.ts b/fees/flashtrade.ts
index 27ee7154d2..dd36e9363e 100644
--- a/fees/flashtrade.ts
+++ b/fees/flashtrade.ts
@@ -29,7 +29,7 @@ const pools = [
   "Community.2",
   "Trump.1",
   "Ore.1",
-  
+  "Remora.1",
   // keep historical pools
   "Community.3",
 ]
@@ -86,6 +86,7 @@ const fetch = async (_a: any, _b: any, options: FetchOptions): Promise<FetchResu
       "Community.3": 0.05,
       "Trump.1": 0.05,
       "Ore.1": 0.10,
+      "Remora.1": 0.20,
     };
 
     for (const pool of pools) {