Merge pull request #76 from bnb-party/issue-71

add `isTokenTargetReached`

Author: YouStillAlive

contracts/BNBPartyFactory.sol

@@ -49,7 +49,6 @@ contract BNBPartyFactory is BNBPartyLiquidity, ReentrancyGuard, BNBPartyManageab
         lpToCreator[liquidityPool] = msg.sender; // Set the creator of the liquidity pool
         lpToTokenId[liquidityPool] = tokenId; // Set the token ID of the liquidity pool
         isParty[liquidityPool] = true; // Mark the liquidity pool as a party pool
-        isTokenOnPartyLP[address(newToken)] = true; // Mark the token as part of the party LP
         if (msg.value > party.createTokenFee) {
             _executeSwap(address(newToken));
         }

contracts/BNBPartyLiquidity.sol

@@ -25,7 +25,7 @@ abstract contract BNBPartyLiquidity is BNBPartyLiquidityHelper {
 
         if (token0 == address(WBNB)) {
             amount0 -= unwrapAmount; // Deduct unwrap amount from token0 if it is WBNB
-            isTokenOnPartyLP[token1] = false;
+            isTokenTargetReached[token1] = true;
             newSqrtPriceX96 = sqrtPriceCalculator.getNextSqrtPriceFromAmount0RoundingUp(
                 sqrtPriceX96,
                 liquidity,
@@ -34,7 +34,7 @@ abstract contract BNBPartyLiquidity is BNBPartyLiquidityHelper {
             );
         } else {
             amount1 -= unwrapAmount; // Deduct unwrap amount from token1 if it is WBNB
-            isTokenOnPartyLP[token0] = false;
+            isTokenTargetReached[token0] = true;
             newSqrtPriceX96 = sqrtPriceCalculator.getNextSqrtPriceFromAmount1RoundingDown(
                 sqrtPriceX96,
                 liquidity,

contracts/BNBPartyState.sol

@@ -17,8 +17,8 @@ abstract contract BNBPartyState is BNBPartyModifiers, Ownable {
     mapping(address => bool) public isParty; // Mapping to track if a LiquidityPool is a party
     mapping(address => uint256) public lpToTokenId; // Mapping from LiquidityPool to its NFT tokenId
     mapping(address => address) public lpToCreator; // Mapping from LiquidityPool to its creator
-    mapping(address => bool) public isTokenOnPartyLP; // Mapping to track if a token is part of a party
-    uint256 constant FEE_GROWTH_GLOBAL_SCALE = 2 ** 128;
+    mapping(address => bool) public isTokenTargetReached; // Mapping to track if a token has reached its target
+    uint256 constant public FEE_GROWTH_GLOBAL_SCALE = 2**128;
 
     Party public party; // store party parameters
 

contracts/BNBPartySwaps.sol

@@ -81,12 +81,12 @@ abstract contract BNBPartySwaps is BNBPartyView {
     /// @return router The address of the swap router
     /// @return fee The fee amount for the swap
     function _getRouterAndFee(address token) internal view returns (ISwapRouter router, uint24 fee) {
-        if (isTokenOnPartyLP[token]) {
-            router = BNBSwapRouter;
-            fee = party.partyLpFee;
-        } else {
+        if (isTokenTargetReached[token]) {
             router = swapRouter;
             fee = party.lpFee;
+        } else {
+            router = BNBSwapRouter;
+            fee = party.partyLpFee;
         }
     }
 }