From 919489964bdd5c75dc55997838533fb72f9d7bc1 Mon Sep 17 00:00:00 2001
From: AntonGulak <antongulak7@gmail.com>
Date: Fri, 7 Feb 2025 21:22:53 +0400
Subject: [PATCH] fix dynamic fee tracking

---
 schema.graphql         | 2 ++
 src/mappings/swap.ts   | 9 +++++----
 src/utils/chains.ts    | 9 +++++++++
 src/utils/constants.ts | 2 ++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/schema.graphql b/schema.graphql
index caf7a4b..418d035 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -208,6 +208,8 @@ type Swap @entity {
   amount1: BigDecimal!
   # derived info
   amountUSD: BigDecimal!
+  # fee amount
+  feeTier: BigInt!
   # The sqrt(price) of the pool after the swap, as a Q64.96
   sqrtPriceX96: BigInt!
   # the tick after the swap
diff --git a/src/mappings/swap.ts b/src/mappings/swap.ts
index 941c15e..1517dbc 100644
--- a/src/mappings/swap.ts
+++ b/src/mappings/swap.ts
@@ -3,7 +3,7 @@ import { BigDecimal, BigInt } from '@graphprotocol/graph-ts'
 import { Swap as SwapEvent } from '../types/PoolManager/PoolManager'
 import { Bundle, Pool, PoolManager, Swap, Token } from '../types/schema'
 import { getSubgraphConfig, SubgraphConfig } from '../utils/chains'
-import { ONE_BI, ZERO_BD } from '../utils/constants'
+import { MAX_LP_FEE, ONE_BI, ZERO_BD } from '../utils/constants'
 import { convertTokenToDecimal, loadTransaction, safeDiv } from '../utils/index'
 import {
   updatePoolDayData,
@@ -69,8 +69,9 @@ export function handleSwapHelper(event: SwapEvent, subgraphConfig: SubgraphConfi
     const amountTotalETHTracked = safeDiv(amountTotalUSDTracked, bundle.ethPriceUSD)
     const amountTotalUSDUntracked = amount0USD.plus(amount1USD).div(BigDecimal.fromString('2'))
 
-    const feesETH = amountTotalETHTracked.times(pool.feeTier.toBigDecimal()).div(BigDecimal.fromString('1000000'))
-    const feesUSD = amountTotalUSDTracked.times(pool.feeTier.toBigDecimal()).div(BigDecimal.fromString('1000000'))
+    const currentFeeTier = BigInt.fromI32(event.params.fee as i32).toBigDecimal()
+    const feesETH = amountTotalETHTracked.times(currentFeeTier).div(MAX_LP_FEE)
+    const feesUSD = amountTotalUSDTracked.times(currentFeeTier).div(MAX_LP_FEE)
 
     // global updates
     poolManager.txCount = poolManager.txCount.plus(ONE_BI)
@@ -155,6 +156,7 @@ export function handleSwapHelper(event: SwapEvent, subgraphConfig: SubgraphConfi
     swap.amount0 = amount0
     swap.amount1 = amount1
     swap.amountUSD = amountTotalUSDTracked
+    swap.feeTier = BigInt.fromI32(event.params.fee as i32)
     swap.tick = BigInt.fromI32(event.params.tick as i32)
     swap.sqrtPriceX96 = event.params.sqrtPriceX96
     swap.logIndex = event.logIndex
@@ -211,7 +213,6 @@ export function handleSwapHelper(event: SwapEvent, subgraphConfig: SubgraphConfi
     poolHourData.save()
     token0HourData.save()
     token1HourData.save()
-    poolHourData.save()
     poolManager.save()
     pool.save()
     token0.save()
diff --git a/src/utils/chains.ts b/src/utils/chains.ts
index 082f106..f733197 100644
--- a/src/utils/chains.ts
+++ b/src/utils/chains.ts
@@ -182,6 +182,7 @@ export function getSubgraphConfig(): SubgraphConfig {
         '0xaf88d065e77c8cc2239327c5edb3a432268e5831', // USDC
       ],
       whitelistTokens: [
+        '0x0000000000000000000000000000000000000000', // Native ETH
         '0x82af49447d8a07e3bd95bd0d56f35241523fbab1', // WETH
         '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', // USDC.e
         '0xda10009cbd5d07dd0cecc66161fc93d7c9000da1', // DAI
@@ -221,6 +222,7 @@ export function getSubgraphConfig(): SubgraphConfig {
         '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913', // USDC
       ],
       whitelistTokens: [
+        '0x0000000000000000000000000000000000000000', // Native ETH
         '0x4200000000000000000000000000000000000006', // WETH
         '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913', // USDC
       ],
@@ -246,6 +248,7 @@ export function getSubgraphConfig(): SubgraphConfig {
         '0x3c499c542cef5e3811e1192ce70d8cc03d5c3359', // USDC
       ],
       whitelistTokens: [
+        '0x0000000000000000000000000000000000000000', // Native ETH
         '0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270', // WMATIC
         '0x7ceb23fd6bc0add59e62ac25578270cff1b9f619', // WETH
         '0x2791bca1f2de4661ed88a30c99a7a9449aa84174', // USDC.e
@@ -273,6 +276,7 @@ export function getSubgraphConfig(): SubgraphConfig {
         '0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d', // USDC
       ],
       whitelistTokens: [
+        '0x0000000000000000000000000000000000000000', // Native ETH
         '0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c', // WBNB
         '0x55d398326f99059ff775485246999027b3197955', // USDT
         '0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d', // USDC
@@ -300,6 +304,7 @@ export function getSubgraphConfig(): SubgraphConfig {
         '0x0b2c639c533813f4aa9d7837caf62653d097ff85', // USDC
       ],
       whitelistTokens: [
+        '0x0000000000000000000000000000000000000000', // Native ETH
         '0x4200000000000000000000000000000000000006', // WETH
         '0xda10009cbd5d07dd0cecc66161fc93d7c9000da1', // DAI
         '0x7f5c764cbc14f9669b88837ca1490cca17c31607', // USDC.e
@@ -342,6 +347,7 @@ export function getSubgraphConfig(): SubgraphConfig {
         '0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7', // USDT
       ],
       whitelistTokens: [
+        '0x0000000000000000000000000000000000000000', // Native ETH
         '0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7', // WAVAX
         '0xd586e7f844cea2f87f50152665bcbc2c279d8d70', // DAI_E
         '0xba7deebbfc5fa1100fb055a87773e1e99cd3507a', // DAI
@@ -371,6 +377,7 @@ export function getSubgraphConfig(): SubgraphConfig {
         '0x79a02482a880bce3f13e09da970dc34db4cd24d1', // USDC.e
       ],
       whitelistTokens: [
+        '0x0000000000000000000000000000000000000000', // Native ETH
         '0x4200000000000000000000000000000000000006', // WETH
         '0x79a02482a880bce3f13e09da970dc34db4cd24d1', // USDC.e
         '0x03c7054bcb39f7b2e5b2c7acb37583e32d70cfa3', // WBTC
@@ -397,6 +404,7 @@ export function getSubgraphConfig(): SubgraphConfig {
         '0xcccccccc7021b32ebb4e8c08314bd62f7c653ec4', // USDzC
       ],
       whitelistTokens: [
+        '0x0000000000000000000000000000000000000000', // Native ETH
         '0x4200000000000000000000000000000000000006', // WETH
         '0xcccccccc7021b32ebb4e8c08314bd62f7c653ec4', // USDzC
       ],
@@ -504,6 +512,7 @@ export function getSubgraphConfig(): SubgraphConfig {
         '0x4300000000000000000000000000000000000003', // USDB
       ],
       whitelistTokens: [
+        '0x0000000000000000000000000000000000000000', // Native ETH
         '0x4300000000000000000000000000000000000004', // WETH
         '0x4300000000000000000000000000000000000003', // USDB
       ],
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 27ff634..6a80fca 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -10,3 +10,5 @@ export const ZERO_BD = BigDecimal.fromString('0')
 export const ONE_BD = BigDecimal.fromString('1')
 export const Q96 = BigInt.fromI32(2).pow(96)
 export const MaxUint256 = hexToBigInt('ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff')
+
+export const MAX_LP_FEE = BigDecimal.fromString('1000000')