Merge a172122 into 9b689c6

Author: YouStillAlive

contracts/BNBPartyCreation.sol

@@ -13,12 +13,12 @@ abstract contract BNBPartyCreation is BNBPartySwaps {
     /// @param _token Address of the token to be used in the liquidity pool
     /// @return liquidityPool Address of the newly created liquidity pool
     /// @dev Sets the token amounts based on the balance and initializes the pool
-    function _createFLP(address _token) internal returns (address liquidityPool) {
+    function _createFLP(address _token) internal returns (address liquidityPool, uint256 tokenId) {
         (address token0, address token1, uint160 sqrtPrice, Ticks memory ticks) = _getTokenPairAndPrice(_token);
         // Determine the token amounts
         (uint256 amount0, uint256 amount1) = _calculateAmounts(token0);
         IERC20(_token).safeIncreaseAllowance(address(BNBPositionManager), party.initialTokenAmount);
-        liquidityPool = _createLP(
+        (liquidityPool, tokenId) = _createLP(
             BNBPositionManager,
             token0,
             token1,
@@ -28,8 +28,6 @@ abstract contract BNBPartyCreation is BNBPartySwaps {
             party.partyLpFee,
             ticks
         );
-        isParty[liquidityPool] = true; // Mark the liquidity pool as a party pool
-        isTokenOnPartyLP[_token] = true; // Mark the token as part of the party LP
     }
 
     /// @notice Creates a new liquidity pool and mints liquidity positions.
@@ -51,7 +49,7 @@ abstract contract BNBPartyCreation is BNBPartySwaps {
         uint160 sqrtPriceX96,
         uint24 fee,
         Ticks memory ticks
-    ) internal returns (address liquidityPool) {
+    ) internal returns (address liquidityPool, uint256 tokenId) {
         // Create LP
         liquidityPool = liquidityManager.createAndInitializePoolIfNecessary(
             token0,
@@ -61,7 +59,7 @@ abstract contract BNBPartyCreation is BNBPartySwaps {
         );
 
         // Mint LP
-        (lpToTokenId[liquidityPool], , , ) = liquidityManager.mint(
+        (tokenId, , , ) = liquidityManager.mint(
             INonfungiblePositionManager.MintParams({
                 token0: token0,
                 token1: token1,

contracts/BNBPartyFactory.sol

@@ -45,8 +45,11 @@ contract BNBPartyFactory is BNBPartyLiquidity, ReentrancyGuard, BNBPartyManageab
         // Create new token
         newToken = new ERC20Token(name, symbol, party.initialTokenAmount);
         // Create First Liquidity Pool
-        address liquidityPool = _createFLP(address(newToken));
-        lpToCreator[liquidityPool] = msg.sender;
+        (address liquidityPool, uint256 tokenId) = _createFLP(address(newToken));
+        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));
         }
@@ -65,7 +68,8 @@ contract BNBPartyFactory is BNBPartyLiquidity, ReentrancyGuard, BNBPartyManageab
 
         if (WBNBBalance - feesEarned < party.partyTarget) return;
         // Handle liquidity
-        _handleLiquidity(recipient);
+        (address liquidityPool, uint256 tokenId) = _handleLiquidity(recipient);
+        lpToTokenId[liquidityPool] = tokenId;
     }
 
     /// @notice Allows users to join the party by swapping BNB for the specified token

contracts/BNBPartyLiquidity.sol

@@ -11,7 +11,7 @@ abstract contract BNBPartyLiquidity is BNBPartyLiquidityHelper {
     /// @notice Handles liquidity by decreasing the liquidity, collecting tokens, and creating a new liquidity pool.
     /// @param recipient Address receiving the bonus BNB
     /// @dev Decreases liquidity, collects tokens, creates a new pool, and sends bonuses
-    function _handleLiquidity(address recipient) internal {
+    function _handleLiquidity(address recipient) internal returns (address liquidityPool, uint256 tokenId){
         IUniswapV3Pool pool = IUniswapV3Pool(msg.sender);
         (uint160 sqrtPriceX96, , , , , , ) = pool.slot0();
         address token0 = pool.token0();
@@ -47,7 +47,7 @@ abstract contract BNBPartyLiquidity is BNBPartyLiquidityHelper {
         IERC20(token0).safeIncreaseAllowance(address(positionManager), amount0);
         IERC20(token1).safeIncreaseAllowance(address(positionManager), amount1);
         // Create new Liquidity Pool
-        _createLP(positionManager, token0, token1, amount0, amount1, newSqrtPriceX96, party.lpFee, _getTicks(token0, party.lpTicks));
+        (liquidityPool, tokenId) = _createLP(positionManager, token0, token1, amount0, amount1, newSqrtPriceX96, party.lpFee, _getTicks(token0, party.lpTicks));
 
         // Send bonuses
         _unwrapAndSendBNB(recipient, unwrapAmount);

hardhat.config.ts

@@ -23,7 +23,7 @@ const LOW_OPTIMIZER_COMPILER_SETTINGS = {
 }
 
 const BNB_FACTORY_COMPILER_SETTINGS = {
-    version: "0.8.25",
+    version: "0.8.26",
     settings: {
         evmVersion: "istanbul",
         optimizer: {