remove phantom bad token fees

Author: noateden

fees/phantom.ts

@@ -14,25 +14,32 @@ const solana_fee_wallet_addresses = [
   'D1NJy3Qq3RKBG29EDRj28ozbGwnhmM5yBUp8PonSYUnm',
 ];
 
+const solana_blacklist_mints = [
+  'DWxU1Ew5yjFebSui8xzRYPE3FwgGzp8F1iKcQFyUezJX',
+];
+
 // ETH fee wallet addresses
 const eth_fee_wallet_addresses = [
   '0x1bcc58d165e5374d7b492b21c0a572fd61c0c2a0',
   '0x7afa9d836d2fccf172b66622625e56404e465dbd',
-  '0x2cffed5d56eb6a17662756ca0fdf350e732c9818'
+  '0x2cffed5d56eb6a17662756ca0fdf350e732c9818',
 ];
 
 // Solana fetch function
 const fetchSolana = async (_a: any, _b: any, options: FetchOptions) => {
+  // throw new Error('Fix bug that inflates fees')
   const dailyFees = await getSolanaReceived({ 
     options, 
     targets: solana_fee_wallet_addresses, 
-    blacklist_signers: solana_fee_wallet_addresses 
+    blacklist_signers: solana_fee_wallet_addresses,
+    blacklist_mints: solana_blacklist_mints,
   });
   return { dailyFees, dailyRevenue: dailyFees, dailyProtocolRevenue: dailyFees };
 };
 
 // ETH fetch function for each chain
 const fetch = async (_a: any, _b: any, options: FetchOptions) => {
+  // throw new Error('Fix bug that inflates fees')
   const dailyFees = await getETHReceived({
     options,
     targets: eth_fee_wallet_addresses,

helpers/token.ts

@@ -410,19 +410,32 @@ export async function getSolanaReceived({ options, balances, target, targets, bl
 
   // Construct SQL query to get sum of received token values in USD and native amount
   const query = `
-      SELECT '${ADDRESSES.solana.USDC}' as token, SUM(usd_amount * 1000000) as amount
-      FROM solana.assets.transfers
-      WHERE to_address IN (${formattedAddresses})
-      AND block_timestamp BETWEEN TO_TIMESTAMP_NTZ(${options.startTimestamp}) AND TO_TIMESTAMP_NTZ(${options.endTimestamp})
-      ${blacklistCondition}
-      ${blacklist_signersCondition}
-      ${blacklist_mintsCondition}
-      GROUP BY mint
-    `;
+    SELECT '${ADDRESSES.solana.USDC}' as token, SUM(usd_amount * 1000000) as amount
+    FROM solana.assets.transfers
+    WHERE to_address IN (${formattedAddresses})
+    AND block_timestamp BETWEEN TO_TIMESTAMP_NTZ(${options.startTimestamp}) AND TO_TIMESTAMP_NTZ(${options.endTimestamp})
+    ${blacklistCondition}
+    ${blacklist_signersCondition}
+    ${blacklist_mintsCondition}
+    GROUP BY mint
+  `;
 
   // Execute query against Allium database
   const res = await queryAllium(query);
 
+  // for debug purpose
+  // const query2 = `
+  //   SELECT mint, SUM(usd_amount * 1000000) as amount
+  //   FROM solana.assets.transfers
+  //   WHERE to_address IN (${formattedAddresses})
+  //   AND block_timestamp BETWEEN TO_TIMESTAMP_NTZ(${options.startTimestamp}) AND TO_TIMESTAMP_NTZ(${options.endTimestamp})
+  //   ${blacklistCondition}
+  //   ${blacklist_signersCondition}
+  //   ${blacklist_mintsCondition}
+  //   GROUP BY mint
+  //   ORDER BY amount DESC
+  // `;
+
   // Add the USD value to the balances object (defaulting to 0 if no results)
   res.forEach((row: any) => {
     balances!.add(row.token, row.amount)