pancakeswap · ChefMist · May 31, 2024 · May 30, 2024 · May 30, 2024 · May 30, 2024
diff --git a/.forge-snapshots/BinHookTest#testMintSucceedsWithHook.snap b/.forge-snapshots/BinHookTest#testMintSucceedsWithHook.snap
@@ -1 +1 @@
-331249
+331216
diff --git a/.forge-snapshots/BinPoolManagerTest#testBurnNativeCurrency.snap b/.forge-snapshots/BinPoolManagerTest#testBurnNativeCurrency.snap
@@ -1 +1 @@
-137063
+137002
diff --git a/.forge-snapshots/BinPoolManagerTest#testExtLoadPoolActiveId.snap b/.forge-snapshots/BinPoolManagerTest#testExtLoadPoolActiveId.snap
@@ -1 +1 @@
-1866
+1824
diff --git a/.forge-snapshots/BinPoolManagerTest#testFuzz_SetMaxBinStep.snap b/.forge-snapshots/BinPoolManagerTest#testFuzz_SetMaxBinStep.snap
@@ -1 +1 @@
-30417
+30405
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasBurnHalfBin.snap b/.forge-snapshots/BinPoolManagerTest#testGasBurnHalfBin.snap
@@ -1 +1 @@
-146800
+146702
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasBurnNineBins.snap b/.forge-snapshots/BinPoolManagerTest#testGasBurnNineBins.snap
@@ -1 +1 @@
-294359
+294281
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasBurnOneBin.snap b/.forge-snapshots/BinPoolManagerTest#testGasBurnOneBin.snap
@@ -1 +1 @@
-130273
+130194
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasDonate.snap b/.forge-snapshots/BinPoolManagerTest#testGasDonate.snap
@@ -1 +1 @@
-119515
+119509
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-1.snap b/.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-1.snap
@@ -1 +1 @@
-976064
+976097
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-2.snap b/.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-2.snap
@@ -1 +1 @@
-338254
+338287
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-1.snap b/.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-1.snap
@@ -1 +1 @@
-341835
+341796
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-2.snap b/.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-2.snap
@@ -1 +1 @@
-144778
+144739
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasSwapMultipleBins.snap b/.forge-snapshots/BinPoolManagerTest#testGasSwapMultipleBins.snap
@@ -1 +1 @@
-179149
+179097
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasSwapOverBigBinIdGate.snap b/.forge-snapshots/BinPoolManagerTest#testGasSwapOverBigBinIdGate.snap
@@ -1 +1 @@
-185132
+185080
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasSwapSingleBin.snap b/.forge-snapshots/BinPoolManagerTest#testGasSwapSingleBin.snap
@@ -1 +1 @@
-137587
+137535
diff --git a/.forge-snapshots/BinPoolManagerTest#testMintNativeCurrency.snap b/.forge-snapshots/BinPoolManagerTest#testMintNativeCurrency.snap
@@ -1 +1 @@
-308314
+308275
diff --git a/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromEmpty.snap b/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromEmpty.snap
@@ -1 +1 @@
-360107
+360023
diff --git a/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromNonEmpty.snap b/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromNonEmpty.snap
@@ -1 +1 @@
-175275
+175191
diff --git a/.forge-snapshots/CLPoolManagerTest#addLiquidity_nativeToken.snap b/.forge-snapshots/CLPoolManagerTest#addLiquidity_nativeToken.snap
@@ -1 +1 @@
-245216
+245111
diff --git a/.forge-snapshots/CLPoolManagerTest#donateBothTokens.snap b/.forge-snapshots/CLPoolManagerTest#donateBothTokens.snap
@@ -1 +1 @@
-168619
+168607
diff --git a/.forge-snapshots/CLPoolManagerTest#gasDonateOneToken.snap b/.forge-snapshots/CLPoolManagerTest#gasDonateOneToken.snap
@@ -1 +1 @@
-112426
+112417
diff --git a/.forge-snapshots/CLPoolManagerTest#removeLiquidity_toNonEmpty.snap b/.forge-snapshots/CLPoolManagerTest#removeLiquidity_toNonEmpty.snap
@@ -1 +1 @@
-121370
+121271
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_againstLiquidity.snap b/.forge-snapshots/CLPoolManagerTest#swap_againstLiquidity.snap
@@ -1 +1 @@
-138739
+137753
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_leaveSurplusTokenInVault.snap b/.forge-snapshots/CLPoolManagerTest#swap_leaveSurplusTokenInVault.snap
@@ -1 +1 @@
-172226
+170905
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_runOutOfLiquidity.snap b/.forge-snapshots/CLPoolManagerTest#swap_runOutOfLiquidity.snap
@@ -1 +1 @@
-158653
+157667
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_simple.snap b/.forge-snapshots/CLPoolManagerTest#swap_simple.snap
@@ -1 +1 @@
-76594
+76212
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_useSurplusTokenAsInput.snap b/.forge-snapshots/CLPoolManagerTest#swap_useSurplusTokenAsInput.snap
@@ -1 +1 @@
-150915
+149916
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_withHooks.snap b/.forge-snapshots/CLPoolManagerTest#swap_withHooks.snap
@@ -1 +1 @@
-93486
+93104
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_withNative.snap b/.forge-snapshots/CLPoolManagerTest#swap_withNative.snap
@@ -1 +1 @@
-76597
+76215
diff --git a/.forge-snapshots/CLPoolManagerTest#testFuzzUpdateDynamicLPFee.snap b/.forge-snapshots/CLPoolManagerTest#testFuzzUpdateDynamicLPFee.snap
@@ -1 +1 @@
-32328
+32316
diff --git a/.forge-snapshots/ExtsloadTest#extsload.snap b/.forge-snapshots/ExtsloadTest#extsload.snap
@@ -1 +1 @@
-7446
+7404
diff --git a/.forge-snapshots/ExtsloadTest#extsloadInBatch.snap b/.forge-snapshots/ExtsloadTest#extsloadInBatch.snap
@@ -1 +1 @@
-11394
+10654
diff --git a/.forge-snapshots/SqrtPriceMathTest#getAmount0Delta_gasCostForAmount0WhereRoundUpIsFalse.snap b/.forge-snapshots/SqrtPriceMathTest#getAmount0Delta_gasCostForAmount0WhereRoundUpIsFalse.snap
@@ -1 +1 @@
-516
+502
diff --git a/.forge-snapshots/SqrtPriceMathTest#getAmount0Delta_gasCostForAmount0WhereRoundUpIsTrue.snap b/.forge-snapshots/SqrtPriceMathTest#getAmount0Delta_gasCostForAmount0WhereRoundUpIsTrue.snap
@@ -1 +1 @@
-665
+651
diff --git a/.forge-snapshots/SqrtPriceMathTest#getNextSqrtPriceFromInput_zeroForOneEqualsFalse.snap b/.forge-snapshots/SqrtPriceMathTest#getNextSqrtPriceFromInput_zeroForOneEqualsFalse.snap
@@ -1 +1 @@
-594
+520
diff --git a/.forge-snapshots/SqrtPriceMathTest#getNextSqrtPriceFromInput_zeroForOneEqualsTrue.snap b/.forge-snapshots/SqrtPriceMathTest#getNextSqrtPriceFromInput_zeroForOneEqualsTrue.snap
@@ -1 +1 @@
-776
+724
diff --git a/.forge-snapshots/SqrtPriceMathTest#getNextSqrtPriceFromOutput_zeroForOneEqualsFalse.snap b/.forge-snapshots/SqrtPriceMathTest#getNextSqrtPriceFromOutput_zeroForOneEqualsFalse.snap
@@ -1 +1 @@
-878
+759
diff --git a/.forge-snapshots/SqrtPriceMathTest#getNextSqrtPriceFromOutput_zeroForOneEqualsTrue.snap b/.forge-snapshots/SqrtPriceMathTest#getNextSqrtPriceFromOutput_zeroForOneEqualsTrue.snap
@@ -1 +1 @@
-468
+398
diff --git a/.forge-snapshots/SwapMathTest#SwapOneForZeroExactInCapped.snap b/.forge-snapshots/SwapMathTest#SwapOneForZeroExactInCapped.snap
@@ -1 +1 @@
-2234
+1942
diff --git a/.forge-snapshots/SwapMathTest#SwapOneForZeroExactInPartial.snap b/.forge-snapshots/SwapMathTest#SwapOneForZeroExactInPartial.snap
@@ -1 +1 @@
-3019
+2697
diff --git a/.forge-snapshots/SwapMathTest#SwapOneForZeroExactOutCapped.snap b/.forge-snapshots/SwapMathTest#SwapOneForZeroExactOutCapped.snap
@@ -1 +1 @@
-1976
+1692
diff --git a/.forge-snapshots/SwapMathTest#SwapOneForZeroExactOutPartial.snap b/.forge-snapshots/SwapMathTest#SwapOneForZeroExactOutPartial.snap
@@ -1 +1 @@
-3019
+2697
diff --git a/.forge-snapshots/SwapMathTest#SwapZeroForOneExactInCapped.snap b/.forge-snapshots/SwapMathTest#SwapZeroForOneExactInCapped.snap
@@ -1 +1 @@
-2224
+1911
diff --git a/.forge-snapshots/SwapMathTest#SwapZeroForOneExactInPartial.snap b/.forge-snapshots/SwapMathTest#SwapZeroForOneExactInPartial.snap
@@ -1 +1 @@
-3177
+2831
diff --git a/.forge-snapshots/SwapMathTest#SwapZeroForOneExactOutCapped.snap b/.forge-snapshots/SwapMathTest#SwapZeroForOneExactOutCapped.snap
@@ -1 +1 @@
-1966
+1661
diff --git a/.forge-snapshots/SwapMathTest#SwapZeroForOneExactOutPartial.snap b/.forge-snapshots/SwapMathTest#SwapZeroForOneExactOutPartial.snap
@@ -1 +1 @@
-3177
+2831
diff --git a/.forge-snapshots/VaultTest#Vault.snap b/.forge-snapshots/VaultTest#Vault.snap
@@ -1 +1 @@
-7181
+7124
diff --git a/.forge-snapshots/VaultTest#collectFee.snap b/.forge-snapshots/VaultTest#collectFee.snap
@@ -1 +1 @@
-25187
+25138
diff --git a/.forge-snapshots/VaultTest#lockSettledWhenAddLiquidity.snap b/.forge-snapshots/VaultTest#lockSettledWhenAddLiquidity.snap
@@ -1 +1 @@
-81469
+81463
diff --git a/.forge-snapshots/VaultTest#lockSettledWhenFlashloan.snap b/.forge-snapshots/VaultTest#lockSettledWhenFlashloan.snap
@@ -1 +1 @@
-121465
+121269
diff --git a/.forge-snapshots/VaultTest#lockSettledWhenMultiHopSwap.snap b/.forge-snapshots/VaultTest#lockSettledWhenMultiHopSwap.snap
@@ -1 +1 @@
-45057
+45005
diff --git a/.forge-snapshots/VaultTest#lockSettledWhenSwap.snap b/.forge-snapshots/VaultTest#lockSettledWhenSwap.snap
@@ -1 +1 @@
-45056
+45004
diff --git a/src/Extsload.sol b/src/Extsload.sol
@@ -10,22 +10,34 @@ import {IExtsload} from "./interfaces/IExtsload.sol";
 /// @notice Allows the inheriting contract make it's state accessable to other contracts
 /// https://ethereum-magicians.org/t/extsload-opcode-proposal/2410/11
 abstract contract Extsload is IExtsload {
-    function extsload(bytes32 slot) external view returns (bytes32 val) {
-        assembly {
-            val := sload(slot)
+    /// @inheritdoc IExtsload
+    function extsload(bytes32 slot) external view returns (bytes32) {
+        assembly ("memory-safe") {
+            mstore(0, sload(slot))
+            return(0, 0x20)
         }
     }
 
-    function extsload(bytes32[] memory slots) external view returns (bytes32[] memory) {
-        assembly {
-            let end := add(0x20, add(slots, mul(mload(slots), 0x20)))
-            for { let pointer := add(slots, 32) } lt(pointer, end) {} {
-                let value := sload(mload(pointer))
-                mstore(pointer, value)
-                pointer := add(pointer, 0x20)
+    /// @inheritdoc IExtsload
+    function extsload(bytes32[] calldata slots) external view returns (bytes32[] memory) {
+        // since the function is external and enters a new call context and exits right
+        // after execution, Solidity's memory management convention can be disregarded
+        // and a direct slice of memory can be returned
+        assembly ("memory-safe") {
+            // Copy the abi offset of dynamic array and the length of the array to memory.
+            calldatacopy(0, 0x04, 0x40)
+            // A left bit-shift of 5 is equivalent to multiplying by 32 but costs less gas.
+            let end := add(0x40, shl(5, slots.length))
+            let calldataptr := slots.offset
+            // Return values will start at 64 while calldata offset is 68.
+            for { let memptr := 0x40 } 1 {} {
+                mstore(memptr, sload(calldataload(calldataptr)))
+                memptr := add(memptr, 0x20)
+                calldataptr := add(calldataptr, 0x20)
+                if iszero(lt(memptr, end)) { break }
             }
+            // The end offset is also the length of the returndata.
+            return(0, end)
         }
-
-        return slots;
     }
 }
diff --git a/src/ProtocolFees.sol b/src/ProtocolFees.sol
@@ -50,7 +50,7 @@ abstract contract ProtocolFees is IProtocolFees, PausableRole {
             if (gasleft() < controllerGasLimit) revert ProtocolFeeCannotBeFetched();
 
             (bool _success, bytes memory _data) = address(protocolFeeController).call{gas: controllerGasLimit}(
-                abi.encodeWithSelector(IProtocolFeeController.protocolFeeForPool.selector, key)
+                abi.encodeCall(IProtocolFeeController.protocolFeeForPool, (key))
             );
             // Ensure that the return data fits within a word
             if (!_success || _data.length > 32) return (false, 0);

diff --git a/src/interfaces/IExtsload.sol b/src/interfaces/IExtsload.sol
@@ -1,15 +1,14 @@
 //SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-/// @title This is an interface to read contract's state that supports extsload.
 interface IExtsload {
-    /// @notice Returns a value from the storage.
-    /// @param slot to read from.
-    /// @return value stored at the slot.
+    /// @notice Called by external contracts to access granular pool state
+    /// @param slot Key of slot to sload
+    /// @return value The value of the slot as bytes32
     function extsload(bytes32 slot) external view returns (bytes32 value);
 
-    /// @notice Returns multiple values from storage.
-    /// @param slots to read from.
-    /// @return values stored at the slots.
-    function extsload(bytes32[] memory slots) external view returns (bytes32[] memory);
+    /// @notice Called by external contracts to access sparse pool state
+    /// @param slots List of slots to SLOAD from.
+    /// @return values List of loaded values.
+    function extsload(bytes32[] calldata slots) external view returns (bytes32[] memory values);
 }