calculate both fees

bnb-party · Sep 2, 2024 · dc249b2 · dc249b2
1 parent 780379c
commit dc249b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/scripts/curve.ts b/scripts/curve.ts
@@ -53,15 +53,15 @@ async function getTokenBalances(lpAddress: string, token: any) {
     ])
 
     const lpPool = await ethers.getContractAt("UniswapV3Pool", lpAddress)
+    const token0 = await lpPool.token0()
+    const isPartyPool = await bnbPartyFactory.isTokenOnPartyLP(token0 === wethAddress ? await token.getAddress() : token0)
     const [feeGrowthGlobal0X128, feeGrowthGlobal1X128, liquidity, getFeeGlobal] = await Promise.all([
         lpPool.feeGrowthGlobal0X128(),
         lpPool.feeGrowthGlobal1X128(),
         lpPool.liquidity(),
-        bnbPartyFactory.getFeeGrowthInsideLastX128(lpAddress, BNBPositionManager),
+        bnbPartyFactory.getFeeGrowthInsideLastX128(lpAddress, isPartyPool ? BNBPositionManager : positionManager),
     ])
-    const token0 = await lpPool.token0()
     let wbnbFee, memeFee
-
     if (token0 === wethAddress) {
         wbnbFee = await bnbPartyFactory.calculateFees(liquidity, feeGrowthGlobal0X128 - getFeeGlobal.feeGrowthInside0LastX128)
         memeFee = await bnbPartyFactory.calculateFees(liquidity, feeGrowthGlobal1X128 - getFeeGlobal.feeGrowthInside1LastX128)

diff --git a/test/SwapRouter.ts b/test/SwapRouter.ts
@@ -50,7 +50,7 @@ describe("Smart Router", function () {
 
     it("user should receive meme token after join party", async () => {
         const amountIn = ethers.parseUnits("5", 17)
-        
+
         const balanceBefore = await MEMEToken.balanceOf(await signers[0].getAddress())
         await bnbPartyFactory.joinParty(MEME, 0, { value: amountIn })
         const balanceAfter = await MEMEToken.balanceOf(await signers[0].getAddress())