fix superchain

Author: g1nt0ki

fees/superchain.ts

@@ -1,42 +1,40 @@
 import { FetchOptions, SimpleAdapter } from "../adapters/types"
 import { CHAIN } from "../helpers/chains"
-import ADDRESSES from '../helpers/coreAssets.json'
 
 const fees: any = {
   [CHAIN.BASE]: ['0x9c3631dDE5c8316bE5B7554B0CcD2631C15a9A05'],
   [CHAIN.ETHEREUM]: [
     '0xa3d596eafab6b13ab18d40fae1a962700c84adea',
-    '0x793e01dCf6F9759Bf26dd7869b03129e64217537',
-    '0x4a4962275DF8C60a80d3a25faEc5AA7De116A746',
-    '0xe900b3Edc1BA0430CFa9a204A1027B90825ac951',
-    '0xed4811010a86f7c39134fbc20206d906ad1176b6',
-    '0x13f37e6b638ca83e7090bb3722b3ae04bf884019',
-    '0x99c9fc46f92e8a1c0dec1b1747d010903e884be1',
-    '0xC2eC5Dd60CBD5242b8cdeB9d0d37Ff6024584631', 
+    // '0xC2eC5Dd60CBD5242b8cdeB9d0d37Ff6024584631',
   ]
 }
-const fetchFees = async (options: FetchOptions) => {
-  const { api, fromApi, createBalances } = options;
-  await api.sumTokens({ owners: fees[options.chain], tokens: [ADDRESSES.null] })
-  await fromApi.sumTokens({ owners: fees[options.chain], tokens: [ADDRESSES.null] })
-  const balances = createBalances()
-  balances.addBalances(api.getBalancesV2())
-  balances.subtract(fromApi.getBalancesV2())
-  const dailyFees = balances.clone()
+const fetchFees = async (_: any, _1: any, options: FetchOptions) => {
+  const logs = await options.getLogs({
+    targets: fees[options.chain],
+    eventAbi: 'event SafeReceived (address indexed sender, uint256 value)',
+  })
+  const logs2 = await options.getLogs({
+    targets: fees[options.chain],
+    eventAbi: 'event Deposited (address from, uint256 value, bytes data)',
+  })
+  const dailyFees = options.createBalances()
+  for (const log of logs) dailyFees.addGasToken(log.value)
+  for (const log of logs2) dailyFees.addGasToken(log.value)
+
   return {
     dailyFees,
+    dailyRevenue: dailyFees,
   }
 }
 
 const adapter: SimpleAdapter = {
-  version: 2,
   adapter: {
     [CHAIN.BASE]: {
       fetch: fetchFees,
-          },
+    },
     [CHAIN.ETHEREUM]: {
       fetch: fetchFees,
-          },
+    },
   }
 }
 

helpers/token.ts

@@ -30,7 +30,7 @@ export async function addGasTokensReceived(params: {
   const fromBlock = (await options.getFromBlock()) - 200
   const toBlock = (await options.getToBlock()) - 200
 
-  for (;;) {
+  for (; ;) {
     batchLogs = await sdk.indexer.getLogs({
       chain: options.chain,
       targets: multisigs,
@@ -153,7 +153,7 @@ export async function addTokensReceived(params: AddTokensReceivedParams) {
 }
 
 async function _addTokensReceivedIndexer(params: AddTokensReceivedParams) {
-  let { balances, fromAddressFilter, target, targets, options, fromAdddesses, tokenTransform = (i: string) => i, tokens,  logFilter = () => true,  } = params
+  let { balances, fromAddressFilter, target, targets, options, fromAdddesses, tokenTransform = (i: string) => i, tokens, logFilter = () => true, } = params
   const { createBalances, chain, getFromBlock, getToBlock } = options
   if (!balances) balances = createBalances()
   if (fromAdddesses && fromAdddesses.length) (fromAddressFilter as any) = fromAdddesses
@@ -329,10 +329,10 @@ export const evmReceivedGasAndTokens = (receiverWallet: string, tokens: string[]
     if (tokens.length > 0) {
       await addTokensReceived({ options, tokens: tokens, target: receiverWallet, balances: dailyFees })
     }
-  //   const nativeTransfers = await queryDuneSql(options, `select sum(value) as received from CHAIN.traces
-  // where to = ${receiverWallet} AND tx_success = TRUE
-  // AND TIME_RANGE`)
-  //   dailyFees.add(nullAddress, nativeTransfers[0].received)
+    //   const nativeTransfers = await queryDuneSql(options, `select sum(value) as received from CHAIN.traces
+    // where to = ${receiverWallet} AND tx_success = TRUE
+    // AND TIME_RANGE`)
+    //   dailyFees.add(nullAddress, nativeTransfers[0].received)
     await getETHReceived({ options, balances: dailyFees, target: receiverWallet })
 
     return {
@@ -341,53 +341,53 @@ export const evmReceivedGasAndTokens = (receiverWallet: string, tokens: string[]
     }
   }
 
-  /**
-   * Retrieves the total value of tokens received by a Solana address or addresses within a specified time period
-   * 
-   * @param options - FetchOptions containing timestamp range and other configuration
-   * @param balances - Optional sdk.Balances object to add the results to
-   * @param target - Single Solana address to query
-   * @param targets - Array of Solana addresses to query (alternative to target)
-   * @param blacklists - Optional array of addresses to exclude from the sender side
-   * @param blacklist_signers - Optional array of transaction signers to exclude
-   * @returns The balances object with added USD value from received tokens
-   */
-  export async function getSolanaReceived({ options, balances, target, targets, blacklists, blacklist_signers }: {
-    options: FetchOptions;
-    balances?: sdk.Balances;
-    target?: string;
-    targets?: string[];
-    blacklists?: string[];
-    blacklist_signers?: string[];
-  }) {
-    // Initialize balances if not provided
-    if (!balances) balances = options.createBalances();
-
-    // If targets is provided, use that instead of single target
-    const addresses = targets?.length ? targets : target ? [target] : [];
-    if (addresses.length === 0) return balances;
-
-    // Build SQL condition to exclude blacklisted sender addresses
-    let blacklistCondition = '';
-    
-    if (blacklists && blacklists.length > 0) {
-      const formattedBlacklist = blacklists.map(addr => `'${addr}'`).join(', ');
-      blacklistCondition = `AND from_address NOT IN (${formattedBlacklist})`;
-    }
-    
-    // Build SQL condition to exclude blacklisted transaction signers
-    let blacklist_signersCondition = '';
-    
-    if (blacklist_signers && blacklist_signers.length > 0) {
-      const formattedBlacklist = blacklist_signers.map(addr => `'${addr}'`).join(', ');
-      blacklist_signersCondition = `AND signer NOT IN (${formattedBlacklist})`;
-    }
+/**
+ * Retrieves the total value of tokens received by a Solana address or addresses within a specified time period
+ * 
+ * @param options - FetchOptions containing timestamp range and other configuration
+ * @param balances - Optional sdk.Balances object to add the results to
+ * @param target - Single Solana address to query
+ * @param targets - Array of Solana addresses to query (alternative to target)
+ * @param blacklists - Optional array of addresses to exclude from the sender side
+ * @param blacklist_signers - Optional array of transaction signers to exclude
+ * @returns The balances object with added USD value from received tokens
+ */
+export async function getSolanaReceived({ options, balances, target, targets, blacklists, blacklist_signers }: {
+  options: FetchOptions;
+  balances?: sdk.Balances;
+  target?: string;
+  targets?: string[];
+  blacklists?: string[];
+  blacklist_signers?: string[];
+}) {
+  // Initialize balances if not provided
+  if (!balances) balances = options.createBalances();
+
+  // If targets is provided, use that instead of single target
+  const addresses = targets?.length ? targets : target ? [target] : [];
+  if (addresses.length === 0) return balances;
+
+  // Build SQL condition to exclude blacklisted sender addresses
+  let blacklistCondition = '';
+
+  if (blacklists && blacklists.length > 0) {
+    const formattedBlacklist = blacklists.map(addr => `'${addr}'`).join(', ');
+    blacklistCondition = `AND from_address NOT IN (${formattedBlacklist})`;
+  }
+
+  // Build SQL condition to exclude blacklisted transaction signers
+  let blacklist_signersCondition = '';
+
+  if (blacklist_signers && blacklist_signers.length > 0) {
+    const formattedBlacklist = blacklist_signers.map(addr => `'${addr}'`).join(', ');
+    blacklist_signersCondition = `AND signer NOT IN (${formattedBlacklist})`;
+  }
 
-    // Format addresses for IN clause
-    const formattedAddresses = addresses.map(addr => `'${addr}'`).join(', ');
-  
-    // Construct SQL query to get sum of received token values in USD and native amount
-    const query = `
+  // Format addresses for IN clause
+  const formattedAddresses = addresses.map(addr => `'${addr}'`).join(', ');
+
+  // Construct SQL query to get sum of received token values in USD and native amount
+  const query = `
       SELECT mint as token, SUM(raw_amount) as amount
       FROM solana.assets.transfers
       WHERE to_address IN (${formattedAddresses})
@@ -396,28 +396,27 @@ export const evmReceivedGasAndTokens = (receiverWallet: string, tokens: string[]
       ${blacklist_signersCondition}
       GROUP BY mint
     `;
-  
-    // Execute query against Allium database
-    const res = await queryAllium(query);
-    
-    // Add the USD value to the balances object (defaulting to 0 if no results)
-    res.forEach((row: any) => {
-      balances!.add(row.token, row.amount)
-    })
-    return balances;
-  }
-  
 
-export async function getETHReceived({ options, balances, target, targets }: { options: FetchOptions, balances?: sdk.Balances, target?: string, targets?: string[] }) {
+  // Execute query against Allium database
+  const res = await queryAllium(query);
+
+  // Add the USD value to the balances object (defaulting to 0 if no results)
+  res.forEach((row: any) => {
+    balances!.add(row.token, row.amount)
+  })
+  return balances;
+}
+
+
+export async function getETHReceived({ options, balances, target, targets = [] }: { options: FetchOptions, balances?: sdk.Balances, target?: string, targets?: string[] }) {
   if (!balances) balances = options.createBalances()
 
-  if (targets?.length) {
-    for (const target of targets)
-      await getETHReceived({ options, balances, target })
-    return balances
-  }
+  if (!target && !targets?.length) return balances
 
-  target = target?.toLowerCase()
+  if (target) targets.push(target)
+
+  targets = targets.map(i => i.toLowerCase())
+  targets = [...new Set(targets)]
 
   // you can find the supported chains and the documentation here: https://docs.allium.so/historical-chains/supported-blockchains/evm/ethereum
   const chainMap: any = {
@@ -461,13 +460,17 @@ export async function getETHReceived({ options, balances, target, targets }: { o
   const chainKey = chainMap[options.chain]
   if (!chainKey) throw new Error('[Pull eth transfers] Chain not supported: ' + options.chain)
 
+  const targetList = '( ' + targets.map(i => `'${i}'`).join(', ') + ' )'
+
   const query = `
     SELECT SUM(raw_amount) as value
     FROM ${chainKey}.assets.${tableMap[options.chain] ?? 'eth_token_transfers'}
-    WHERE to_address = '${target}' 
+    WHERE to_address in ${targetList} 
+    ${targets.length > 1 ? `AND from_Address not in ${targetList} ` : ' '}
     AND transfer_type = 'value_transfer'
     AND block_timestamp BETWEEN TO_TIMESTAMP_NTZ(${options.startTimestamp}) AND TO_TIMESTAMP_NTZ(${options.endTimestamp})
     `
+
   const res = await queryAllium(query)
   balances.add(nullAddress, res[0].value)
   return balances

tsconfig.json

@@ -5,7 +5,7 @@
     }
   },
   "compilerOptions": {
-    "target": "es2019",
+    "target": "ES2020",
     "skipLibCheck": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,