ERC721Permit

.forge-snapshots/PositionManager_burn_empty.snap

@@ -1 +1 @@
-46796
+47094

.forge-snapshots/PositionManager_burn_empty_native.snap

@@ -1 +1 @@
-46614
+46912

.forge-snapshots/PositionManager_burn_nonEmpty.snap

@@ -1 +1 @@
-129656
+129887

.forge-snapshots/PositionManager_burn_nonEmpty_native.snap

@@ -1 +1 @@
-122578
+122808

.forge-snapshots/PositionManager_collect.snap

@@ -1 +1 @@
-149762
+150028

.forge-snapshots/PositionManager_collect_native.snap

@@ -1 +1 @@
-140914
+141180

.forge-snapshots/PositionManager_collect_sameRange.snap

@@ -1 +1 @@
-149762
+150028

.forge-snapshots/PositionManager_decreaseLiquidity.snap

@@ -1 +1 @@
-115305
+115571

.forge-snapshots/PositionManager_decreaseLiquidity_native.snap

@@ -1 +1 @@
-108206
+108419

.forge-snapshots/PositionManager_decrease_burnEmpty.snap

@@ -1 +1 @@
-133522
+133920

.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap

@@ -1 +1 @@
-126261
+126660

.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap

@@ -1 +1 @@
-128021
+128287

.forge-snapshots/PositionManager_increaseLiquidity_erc20.snap

@@ -1 +1 @@
-151241
+152144

.forge-snapshots/PositionManager_increaseLiquidity_native.snap

@@ -1 +1 @@
-133041
+133944

.forge-snapshots/PositionManager_increase_autocompoundExactUnclaimedFees.snap

@@ -1 +1 @@
-133968
+130109

.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap

@@ -1 +1 @@
-170124
+170803

.forge-snapshots/PositionManager_increase_autocompound_clearExcess.snap

@@ -1 +1 @@
-140581
+140625

.forge-snapshots/PositionManager_mint.snap

@@ -1 +1 @@
-371276
+372056

.forge-snapshots/PositionManager_mint_native.snap

@@ -1 +1 @@
-335976
+336756

.forge-snapshots/PositionManager_mint_nativeWithSweep.snap

@@ -1 +1 @@
-344606
+345288

.forge-snapshots/PositionManager_mint_onSameTickLower.snap

@@ -1 +1 @@
-313958
+314738

.forge-snapshots/PositionManager_mint_onSameTickUpper.snap

@@ -1 +1 @@
-314600
+315380

.forge-snapshots/PositionManager_mint_sameRange.snap

@@ -1 +1 @@
-240182
+240962

.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap

@@ -1 +1 @@
-369444
+370062

.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap

@@ -1 +1 @@
-319976
+320756

.forge-snapshots/PositionManager_multicall_initialize_mint.snap

@@ -1 +1 @@
-415651
+416476

.forge-snapshots/PositionManager_permit.snap

@@ -1 +1 @@
-79585
+79569

.forge-snapshots/PositionManager_permit_secondPosition.snap

@@ -1 +1 @@
-62497
+62481

.forge-snapshots/PositionManager_permit_twice.snap

@@ -1 +1 @@
-45397
+45381

src/base/ERC721Permit.sol

@@ -15,18 +15,14 @@ import {UnorderedNonce} from "./UnorderedNonce.sol";
 abstract contract ERC721Permit is ERC721, IERC721Permit, EIP712, UnorderedNonce {
     using SignatureVerification for bytes;
 
-    /// @inheritdoc IERC721Permit
-    /// @dev Value is equal to keccak256("Permit(address spender,uint256 tokenId,uint256 nonce,uint256 deadline)");
-    bytes32 public constant override PERMIT_TYPEHASH = ERC721PermitHashLibrary.PERMIT_TYPEHASH;
-
     /// @notice Computes the nameHash and versionHash
     constructor(string memory name_, string memory symbol_, string memory version_)
         ERC721(name_, symbol_)
         EIP712(name_, version_)
     {}
 
     /// @inheritdoc IERC721Permit
-    function DOMAIN_SEPARATOR() public view returns (bytes32) {
+    function DOMAIN_SEPARATOR() external view returns (bytes32) {
         return _domainSeparatorV4();
     }
 

src/base/UnorderedNonce.sol

@@ -12,21 +12,42 @@ contract UnorderedNonce {
     /// @param owner address, the owner/signer of the nonce
     /// @param nonce uint256, the nonce to consume
     function _useUnorderedNonce(address owner, uint256 nonce) internal {
-        (uint256 wordPos, uint256 bitPos) = bitmapPositions(nonce);
-        uint256 bit = 1 << bitPos;
-        uint256 flipped = nonces[owner][wordPos] ^= bit;
-
-        if (flipped & bit == 0) revert NonceAlreadyUsed();
+        // consume the bit by flipping it in storage
+        // reverts if the bit was already spent
+        _flipBit(nonces[owner], nonce);
     }
 
-    /// @notice Returns the index of the bitmap and the bit position within the bitmap. Used for unordered nonces
-    /// @param nonce The nonce to get the associated word and bit positions
-    /// @return wordPos The word position or index into the nonceBitmap
-    /// @return bitPos The bit position
-    /// @dev The first 248 bits of the nonce value is the index of the desired bitmap
-    /// @dev The last 8 bits of the nonce value is the position of the bit in the bitmap
-    function bitmapPositions(uint256 nonce) private pure returns (uint256 wordPos, uint256 bitPos) {
-        wordPos = uint248(nonce >> 8);
-        bitPos = uint8(nonce);
+    function _flipBit(mapping(uint256 => uint256) storage bitmap, uint256 nonce) private {
+        // equivalent to:
+        //   uint256 wordPos = uint248(nonce >> 8);
+        //   uint256 bitPos = uint8(nonce);
+        //   uint256 bit = 1 << bitPos;
+        //   uint256 flipped = nonces[owner][wordPos] ^= bit;
+        //   if (flipped & bit == 0) revert NonceAlreadyUsed();
+
+        assembly ("memory-safe") {
+            // wordPos = uint248(nonce >> 8)
+            let wordPos := shr(8, nonce)
+
+            // bit = 1 << uint8(nonce)
+            let bit := shl(and(nonce, 0xFF), 1)
+
+            // slot of bitmap[wordPos] is keccak256(abi.encode(wordPos, bitmap.slot))
+            mstore(0, wordPos)
+            mstore(0x20, bitmap.slot)
+            let slot := keccak256(0, 0x40)
+
+            // uint256 previousBits = bitmap[wordPos]
+            let previousBits := sload(slot)
+
+            // revert if it's already been used
+            if eq(and(previousBits, bit), bit) {
+                mstore(0, 0x1fb09b80) // 4 bytes of NonceAlreadyUsed.selector
+                revert(0x1c, 0x04)
+            }
+
+            // bitmap[wordPos] = (previousBits | bit)
+            sstore(slot, or(previousBits, bit))
+        }
     }
 }

src/interfaces/IERC721Permit.sol

@@ -7,11 +7,6 @@ interface IERC721Permit {
     error DeadlineExpired();
     error NoSelfPermit();
     error Unauthorized();
-    error InvalidSignature();
-
-    /// @notice The permit typehash used in the permit signature
-    /// @return The typehash for the permit
-    function PERMIT_TYPEHASH() external pure returns (bytes32);
 
     /// @notice The domain separator used in the permit signature
     /// @return The domain seperator used in encoding of permit signature

test/ERC721Permit.t.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.24;
 import "forge-std/Test.sol";
 import {SignatureVerification} from "permit2/src/libraries/SignatureVerification.sol";
 
+import {ERC721PermitHashLibrary} from "../src/libraries/ERC721PermitHash.sol";
 import {MockERC721Permit} from "./mocks/MockERC721Permit.sol";
 import {IERC721Permit} from "../src/interfaces/IERC721Permit.sol";
 import {IERC721} from "forge-std/interfaces/IERC721.sol";
@@ -28,7 +29,7 @@ contract ERC721PermitTest is Test {
     }
 
     // --- Test the overriden approval ---
-    function test_approve(address spender) public {
+    function test_fuzz_approve(address spender) public {
         uint256 tokenId = erc721Permit.mint();
         assertEq(erc721Permit.getApproved(tokenId), address(0));
         vm.expectEmit(true, true, true, true, address(erc721Permit));
@@ -37,7 +38,7 @@ contract ERC721PermitTest is Test {
         assertEq(erc721Permit.getApproved(tokenId), spender);
     }
 
-    function test_approvedOperator_reapproves(address operator, address spender) public {
+    function test_fuzz_approvedOperator_reapproves(address operator, address spender) public {
         uint256 tokenId = erc721Permit.mint();
         erc721Permit.setApprovalForAll(operator, true);
         assertEq(erc721Permit.isApprovedForAll(address(this), operator), true);
@@ -51,7 +52,7 @@ contract ERC721PermitTest is Test {
         assertEq(erc721Permit.getApproved(tokenId), spender);
     }
 
-    function test_approve_unauthorizedRevert(address caller) public {
+    function test_fuzz_approve_unauthorizedRevert(address caller) public {
         uint256 tokenId = erc721Permit.mint();
         vm.prank(caller);
         if (caller != address(this)) vm.expectRevert(IERC721Permit.Unauthorized.selector);
@@ -61,7 +62,7 @@ contract ERC721PermitTest is Test {
     // --- Test the signature-based approvals (permit) ---
     function test_permitTypeHash() public view {
         assertEq(
-            IERC721Permit(address(erc721Permit)).PERMIT_TYPEHASH(),
+            ERC721PermitHashLibrary.PERMIT_TYPEHASH,
             keccak256("Permit(address spender,uint256 tokenId,uint256 nonce,uint256 deadline)")
         );
     }
@@ -82,7 +83,7 @@ contract ERC721PermitTest is Test {
     }
 
     /// @dev spender uses alice's signature to approve itself
-    function test_erc721permit_spender(address spender) public {
+    function test_fuzz_erc721permit_spender(address spender) public {
         vm.assume(spender != alice);
         vm.prank(alice);
         uint256 tokenId = erc721Permit.mint();
@@ -116,7 +117,7 @@ contract ERC721PermitTest is Test {
     }
 
     /// @dev a third party caller uses alice's signature to give `spender` the approval
-    function test_erc721permit_caller(address caller, address spender) public {
+    function test_fuzz_erc721permit_caller(address caller, address spender) public {
         vm.assume(spender != alice);
         vm.prank(alice);
         uint256 tokenId = erc721Permit.mint();
@@ -149,7 +150,7 @@ contract ERC721PermitTest is Test {
         assertEq(erc721Permit.nonces(alice, wordPos) & (1 << bitPos), 2); // 2 = 0010
     }
 
-    function test_erc721permit_nonceAlreadyUsed() public {
+    function test_fuzz_erc721permit_nonceAlreadyUsed() public {
         vm.prank(alice);
         uint256 tokenIdAlice = erc721Permit.mint();
 
@@ -169,7 +170,7 @@ contract ERC721PermitTest is Test {
         vm.stopPrank();
     }
 
-    function test_erc721permit_nonceAlreadyUsed_twoPositions() public {
+    function test_fuzz_erc721permit_nonceAlreadyUsed_twoPositions() public {
         vm.prank(alice);
         uint256 tokenIdAlice = erc721Permit.mint();
 
@@ -192,7 +193,7 @@ contract ERC721PermitTest is Test {
         vm.stopPrank();
     }
 
-    function test_erc721permit_unauthorized() public {
+    function test_fuzz_erc721permit_unauthorized() public {
         vm.prank(alice);
         uint256 tokenId = erc721Permit.mint();
 
@@ -224,7 +225,7 @@ contract ERC721PermitTest is Test {
         assertEq(erc721Permit.nonces(alice, wordPos) & (1 << bitPos), 0);
     }
 
-    function test_erc721Permit_deadlineExpired(address spender) public {
+    function test_fuzz_erc721Permit_deadlineExpired(address spender) public {
         vm.prank(alice);
         uint256 tokenId = erc721Permit.mint();
 
@@ -279,7 +280,7 @@ contract ERC721PermitTest is Test {
             abi.encodePacked(
                 "\x19\x01",
                 erc721Permit.DOMAIN_SEPARATOR(),
-                keccak256(abi.encode(erc721Permit.PERMIT_TYPEHASH(), spender, tokenId, nonce, deadline))
+                keccak256(abi.encode(ERC721PermitHashLibrary.PERMIT_TYPEHASH, spender, tokenId, nonce, deadline))
             )
         );
     }