cow-swap correct revenue and handle eth very high revenue alert (DefiLlama#3985)

Author: treeoflife2

fees/cow-protocol.ts

@@ -1,4 +1,4 @@
-import { Adapter, Chain, FetchOptions } from "../adapters/types";
+import { Adapter, FetchOptions } from "../adapters/types";
 import { CHAIN } from "../helpers/chains";
 import { getSqlFromFile, queryDuneSql } from "../helpers/dune";
 import { getTimestampAtStartOfDayUTC } from "../utils/date";
@@ -21,16 +21,26 @@ const fetch = async (_a: any, _ts: any, options: FetchOptions) => {
 
   if (data) {
     // All values are now in ETH from the new dune query
-    const protocolFee = data.protocol_fee || 0;
-    const partnerFee = data.partner_fee || 0;
+    const protocolFee = data.protocol_fee_revenue || 0;
+    const partnerFeePartner = data.partner_fee_partner_revenue || 0;
     const mevBlockerFee = data.mev_blocker_fee || 0;
-    
-    const totalFees = protocolFee + partnerFee + mevBlockerFee;
-    const protocolRevenue = protocolFee + mevBlockerFee; // Excluding partner fees
-    
+    // const limitFee = data.limit_revenue || 0;
+    // const marketFee = data.market_revenue || 0;
+    // const uiFee = data.ui_fee_revenue || 0;
+    const partnerFeeCow = data.partner_fee_cow_revenue || 0;
+
+    let totalFees = protocolFee + partnerFeeCow + partnerFeePartner + (mevBlockerFee * 2); // beaverbuild receive same amount for mevBlockerFee
+    let protocolRevenue = protocolFee + partnerFeeCow + mevBlockerFee; // Excluding partner fees
+
     // Sanity check for Gnosis chain
     if(options.chain === CHAIN.XDAI && totalFees > 5) {
-      throw new Error(`Total fees ${totalFees} ETH very high for gnosis. Protocol: ${protocolFee}, Partner: ${partnerFee}, MEV: ${mevBlockerFee}`);
+      throw new Error(`Total fees ${totalFees} ETH very high for gnosis. Protocol: ${protocolFee}, Partner(Partner): ${partnerFeePartner}, Partner(COW): ${partnerFeeCow}, MEV: ${mevBlockerFee}`);
+    }
+
+    if(options.chain === CHAIN.ETHEREUM && totalFees > 1000) {
+      totalFees = 0;
+      protocolRevenue = 0;
+      // throw new Error(`Total fees ${totalFees} ETH very high for ethereum. Protocol: ${protocolFee}, Partner: ${partnerFee}, MEV: ${mevBlockerFee}`);
     }
 
     dailyFees.addCGToken('ethereum', totalFees);
@@ -50,8 +60,8 @@ const fetch = async (_a: any, _ts: any, options: FetchOptions) => {
 const methodology = {
   UserFees: "All trading fees including protocol fees, partner fees, and MEV blocker fees",
   Fees: "All trading fees including protocol fees, partner fees, and MEV blocker fees", 
-  Revenue: "Trading fees excluding partner fee share (protocol fees + MEV blocker fees)",
-  ProtocolRevenue: "Trading fees excluding partner fee share (protocol fees + MEV blocker fees)",
+  Revenue: "Trading fees (protocol fees + cow's MEV blocker fees + partner fee share)",
+  ProtocolRevenue: "Trading fees (protocol fees + cow's MEV blocker fees + partner fee share)",
 }
 
 const chainConfig = {

helpers/queries/cow-protocol.sql

@@ -13,9 +13,12 @@ mevblocker_eth as (
     select
         date_trunc('day', block_time) as date
         , blockchain as chain
-        , sum(protocol_fee_revenue_eth) as protocol_fee
-        , sum(partner_fee_cow_revenue_eth) as partner_fee
-        
+        , sum(protocol_fee_revenue_eth) as protocol_fee_revenue
+        , sum(limit_revenue_eth) as limit_revenue
+        , sum(market_revenue_eth) as market_revenue
+        , sum(ui_fee_revenue_eth) as ui_fee_revenue
+        , sum(partner_fee_partner_revenue_eth) as partner_fee_partner_revenue  
+        , sum(partner_fee_cow_revenue_eth) as partner_fee_cow_revenue        
     from dune.cowprotocol.result_fees_revenue_per_order as rev
     where 
         date_trunc('day', block_time) = from_unixtime({{start}})
@@ -25,8 +28,12 @@ mevblocker_eth as (
 select
     f.date,
     f.chain,
-    f.protocol_fee,
-    f.partner_fee,
+    f.protocol_fee_revenue,
+    f.limit_revenue,
+    f.market_revenue,
+    f.ui_fee_revenue,
+    f.partner_fee_partner_revenue,
+    f.partner_fee_cow_revenue,
     case 
         when f.chain = 'ethereum' then coalesce(m.mev_blocker_fee, 0)
         else 0