[PART-2] support same owner multiple positions

.forge-snapshots/BinHookTest#testBurnSucceedsWithHook.snap

@@ -1 +1 @@
-181453
+182049

.forge-snapshots/BinHookTest#testDonateSucceedsWithHook.snap

@@ -1 +1 @@
-185322
+185296

.forge-snapshots/BinHookTest#testInitializeSucceedsWithHook.snap

@@ -1 +1 @@
-137514
+137576

.forge-snapshots/BinHookTest#testMintSucceedsWithHook.snap

@@ -1 +1 @@
-330672
+331250

.forge-snapshots/BinHookTest#testSwapSucceedsWithHook.snap

@@ -1 +1 @@
-193574
+193526

.forge-snapshots/BinPoolManagerTest#testBurnNativeCurrency.snap

@@ -1 +1 @@
-137944
+138533

.forge-snapshots/BinPoolManagerTest#testFuzzUpdateDynamicLPFee.snap

@@ -1 +1 @@
-29761
+32551

.forge-snapshots/BinPoolManagerTest#testFuzz_SetMaxBinStep.snap

@@ -1 +1 @@
-30350
+30417

.forge-snapshots/BinPoolManagerTest#testGasBurnHalfBin.snap

@@ -1 +1 @@
-147904
+148635

.forge-snapshots/BinPoolManagerTest#testGasBurnNineBins.snap

@@ -1 +1 @@
-295588
+296486

.forge-snapshots/BinPoolManagerTest#testGasBurnOneBin.snap

@@ -1 +1 @@
-131153
+131743

.forge-snapshots/BinPoolManagerTest#testGasDonate.snap

@@ -1 +1 @@
-120046
+120042

.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-1.snap

@@ -1 +1 @@
-976344
+977200

.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-2.snap

@@ -1 +1 @@
-338538
+339390

.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-1.snap

@@ -1 +1 @@
-342112
+342867

.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-2.snap

@@ -1 +1 @@
-145053
+145810

.forge-snapshots/BinPoolManagerTest#testGasSwapMultipleBins.snap

@@ -1 +1 @@
-180358
+180348

.forge-snapshots/BinPoolManagerTest#testGasSwapOverBigBinIdGate.snap

@@ -1 +1 @@
-186343
+186331

.forge-snapshots/BinPoolManagerTest#testGasSwapSingleBin.snap

@@ -1 +1 @@
-138725
+138711

.forge-snapshots/BinPoolManagerTest#testMintNativeCurrency.snap

@@ -1 +1 @@
-308628
+309383

.forge-snapshots/BinPoolManagerTest#testSetProtocolFee.snap

@@ -1 +1 @@
-34422
+34487

.forge-snapshots/CLPoolManagerTest#addLiquidity_fromEmpty.snap

@@ -1 +1 @@
-362191
+362973

.forge-snapshots/CLPoolManagerTest#addLiquidity_fromNonEmpty.snap

@@ -1 +1 @@
-177359
+178141

.forge-snapshots/CLPoolManagerTest#addLiquidity_nativeToken.snap

@@ -1 +1 @@
-247478
+248256

.forge-snapshots/CLPoolManagerTest#donateBothTokens.snap

@@ -1 +1 @@
-170385
+170426

.forge-snapshots/CLPoolManagerTest#gasDonateOneToken.snap

@@ -1 +1 @@
-114308
+114349

.forge-snapshots/CLPoolManagerTest#initializeWithoutHooks.snap

@@ -1 +1 @@
-59812
+59779

.forge-snapshots/CLPoolManagerTest#removeLiquidity_toNonEmpty.snap

@@ -1 +1 @@
-123719
+124483

.forge-snapshots/CLPoolManagerTest#swap_againstLiquidity.snap

@@ -1 +1 @@
-141376
+141394

.forge-snapshots/CLPoolManagerTest#swap_leaveSurplusTokenInVault.snap

@@ -1 +1 @@
-175053
+175073

.forge-snapshots/CLPoolManagerTest#swap_runOutOfLiquidity.snap

@@ -1 +1 @@
-25079271
+25093869

.forge-snapshots/CLPoolManagerTest#swap_simple.snap

@@ -1 +1 @@
-79245
+79260

.forge-snapshots/CLPoolManagerTest#swap_useSurplusTokenAsInput.snap

@@ -1 +1 @@
-153591
+153609

.forge-snapshots/CLPoolManagerTest#swap_withHooks.snap

@@ -1 +1 @@
-95978
+95925

.forge-snapshots/CLPoolManagerTest#swap_withNative.snap

@@ -1 +1 @@
-79248
+79263

.forge-snapshots/ExtsloadTest#extsload.snap

@@ -1 +1 @@
-7468
+7446

src/pool-bin/BinPoolManager.sol

@@ -69,13 +69,13 @@ contract BinPoolManager is IBinPoolManager, ProtocolFees, Extsload {
     }
 
     /// @inheritdoc IBinPoolManager
-    function getPosition(PoolId id, address owner, uint24 binId)
+    function getPosition(PoolId id, address owner, uint24 binId, bytes32 salt)
         external
         view
         override
         returns (BinPosition.Info memory position)
     {
-        return pools[id].positions.get(owner, binId);
+        return pools[id].positions.get(owner, binId, salt);
     }
 
     /// @inheritdoc IBinPoolManager
@@ -248,7 +248,8 @@ contract BinPoolManager is IBinPoolManager, ProtocolFees, Extsload {
                 to: msg.sender,
                 liquidityConfigs: params.liquidityConfigs,
                 amountIn: params.amountIn,
-                binStep: key.parameters.getBinStep()
+                binStep: key.parameters.getBinStep(),
+                salt: params.salt
             })
         );
 
@@ -260,7 +261,7 @@ contract BinPoolManager is IBinPoolManager, ProtocolFees, Extsload {
         }
 
         /// @notice Make sure the first event is noted, so that later events from afterHook won't get mixed up with this one
-        emit Mint(id, msg.sender, mintArray.ids, mintArray.amounts, compositionFee, feeForProtocol);
+        emit Mint(id, msg.sender, mintArray.ids, params.salt, mintArray.amounts, compositionFee, feeForProtocol);
 
         BalanceDelta hookDelta;
         (delta, hookDelta) = BinHooks.afterMint(key, params, delta, hookData);
@@ -290,11 +291,17 @@ contract BinPoolManager is IBinPoolManager, ProtocolFees, Extsload {
 
         uint256[] memory binIds;
         bytes32[] memory amountRemoved;
-        (delta, binIds, amountRemoved) =
-            pools[id].burn(BinPool.BurnParams({from: msg.sender, ids: params.ids, amountsToBurn: params.amountsToBurn}));
+        (delta, binIds, amountRemoved) = pools[id].burn(
+            BinPool.BurnParams({
+                from: msg.sender,
+                ids: params.ids,
+                amountsToBurn: params.amountsToBurn,
+                salt: params.salt
+            })
+        );
 
         /// @notice Make sure the first event is noted, so that later events from afterHook won't get mixed up with this one
-        emit Burn(id, msg.sender, binIds, amountRemoved);
+        emit Burn(id, msg.sender, binIds, params.salt, amountRemoved);
 
         BalanceDelta hookDelta;
         (delta, hookDelta) = BinHooks.afterBurn(key, params, delta, hookData);

src/pool-bin/interfaces/IBinPoolManager.sol

@@ -73,13 +73,15 @@ interface IBinPoolManager is IProtocolFees, IPoolManager, IExtsload {
     /// @param id The abi encoded hash of the pool key struct for the pool that was modified
     /// @param sender The address that modified the pool
     /// @param ids List of binId with liquidity added
+    /// @param salt The salt to distinguish different mint from the same owner
     /// @param amounts List of amount added to each bin
     /// @param compositionFee fee occurred
     /// @param pFee Protocol fee from the swap: token0 and token1 amount
     event Mint(
         PoolId indexed id,
         address indexed sender,
         uint256[] ids,
+        bytes32 salt,
         bytes32[] amounts,
         bytes32 compositionFee,
         bytes32 pFee
@@ -89,8 +91,9 @@ interface IBinPoolManager is IProtocolFees, IPoolManager, IExtsload {
     /// @param id The abi encoded hash of the pool key struct for the pool that was modified
     /// @param sender The address that modified the pool
     /// @param ids List of binId with liquidity removed
+    /// @param salt The salt to specify the position to burn if multiple positions are available
     /// @param amounts List of amount removed from each bin
-    event Burn(PoolId indexed id, address indexed sender, uint256[] ids, bytes32[] amounts);
+    event Burn(PoolId indexed id, address indexed sender, uint256[] ids, bytes32 salt, bytes32[] amounts);
 
     /// @notice Emitted when donate happen
     /// @param id The abi encoded hash of the pool key struct for the pool that was modified
@@ -107,13 +110,17 @@ interface IBinPoolManager is IProtocolFees, IPoolManager, IExtsload {
         bytes32[] liquidityConfigs;
         /// @dev amountIn intended
         bytes32 amountIn;
+        /// the salt to distinguish different mint from the same owner
+        bytes32 salt;
     }
 
     struct BurnParams {
         /// @notice id of the bin from which to withdraw
         uint256[] ids;
         /// @notice amount of share to burn for each bin
         uint256[] amountsToBurn;
+        /// the salt to specify the position to burn if multiple positions are available
+        bytes32 salt;
     }
 
     /// @notice Get the current value in slot0 of the given pool
@@ -129,7 +136,8 @@ interface IBinPoolManager is IProtocolFees, IPoolManager, IExtsload {
     /// @param id The id of PoolKey
     /// @param owner Address of the owner
     /// @param binId The id of the bin
-    function getPosition(PoolId id, address owner, uint24 binId)
+    /// @param salt The salt to distinguish different positions for the same owner
+    function getPosition(PoolId id, address owner, uint24 binId, bytes32 salt)
         external
         view
         returns (BinPosition.Info memory position);

src/pool-bin/libraries/BinHooks.sol

@@ -141,6 +141,7 @@ library BinHooks {
                 revert Hooks.InvalidHookResponse();
             }
 
+            // TODO: Potentially optimization: skip decoding the second return value when afterSwapReturnDelta not set
             if (!key.parameters.hasOffsetEnabled(HOOKS_AFTER_SWAP_RETURNS_DELTA_OFFSET)) {
                 hookDeltaUnspecified = 0;
             }

src/pool-bin/libraries/BinPool.sol

@@ -264,6 +264,7 @@ library BinPool {
         bytes32[] liquidityConfigs;
         bytes32 amountIn;
         uint16 binStep;
+        bytes32 salt;
     }
 
     struct MintArrays {
@@ -318,6 +319,7 @@ library BinPool {
         address from;
         uint256[] ids;
         uint256[] amountsToBurn;
+        bytes32 salt;
     }
 
     /// @notice Burn user's share and withdraw tokens form the pool.
@@ -342,7 +344,7 @@ library BinPool {
             bytes32 binReserves = self.reserveOfBin[id];
             uint256 supply = self.shareOfBin[id];
 
-            _subShare(self, params.from, id, amountToBurn);
+            _subShare(self, params.from, id, params.salt, amountToBurn);
 
             bytes32 amountsOutFromBin = binReserves.getAmountOutOfBin(amountToBurn, supply);
 
@@ -395,11 +397,21 @@ library BinPool {
     {
         amountsLeft = params.amountIn;
 
+        uint24 id;
+        uint256 shares;
+        bytes32 amountsIn;
+        bytes32 amountsInToBin;
+        bytes32 binFeeAmt;
+        bytes32 binCompositionFee;
         for (uint256 i; i < params.liquidityConfigs.length;) {
-            (bytes32 maxAmountsInToBin, uint24 id) = params.liquidityConfigs[i].getAmountsAndId(params.amountIn);
+            // fix stack too deep
+            {
+                bytes32 maxAmountsInToBin;
+                (maxAmountsInToBin, id) = params.liquidityConfigs[i].getAmountsAndId(params.amountIn);
 
-            (uint256 shares, bytes32 amountsIn, bytes32 amountsInToBin, bytes32 binFeeAmt, bytes32 binCompositionFee) =
-                _updateBin(self, params, id, maxAmountsInToBin);
+                (shares, amountsIn, amountsInToBin, binFeeAmt, binCompositionFee) =
+                    _updateBin(self, params, id, maxAmountsInToBin);
+            }
 
             amountsLeft = amountsLeft.sub(amountsIn);
             feeForProtocol = feeForProtocol.add(binFeeAmt);
@@ -408,7 +420,7 @@ library BinPool {
             arrays.amounts[i] = amountsInToBin;
             arrays.liquidityMinted[i] = shares;
 
-            _addShare(self, params.to, id, shares);
+            _addShare(self, params.to, id, params.salt, shares);
 
             compositionFee = compositionFee.add(binCompositionFee);
 
@@ -475,14 +487,14 @@ library BinPool {
     }
 
     /// @notice Subtract share from user's position and update total share supply of bin
-    function _subShare(State storage self, address owner, uint24 binId, uint256 shares) internal {
-        self.positions.get(owner, binId).subShare(shares);
+    function _subShare(State storage self, address owner, uint24 binId, bytes32 salt, uint256 shares) internal {
+        self.positions.get(owner, binId, salt).subShare(shares);
         self.shareOfBin[binId] -= shares;
     }
 
     /// @notice Add share to user's position and update total share supply of bin
-    function _addShare(State storage self, address owner, uint24 binId, uint256 shares) internal {
-        self.positions.get(owner, binId).addShare(shares);
+    function _addShare(State storage self, address owner, uint24 binId, bytes32 salt, uint256 shares) internal {
+        self.positions.get(owner, binId, salt).addShare(shares);
         self.shareOfBin[binId] += shares;
     }