ERC721Permit

.forge-snapshots/PositionManager_burn_empty.snap

@@ -1 +1 @@
-50237
+50219

.forge-snapshots/PositionManager_burn_empty_native.snap

@@ -1 +1 @@
-50055
+50036

.forge-snapshots/PositionManager_burn_nonEmpty.snap

@@ -1 +1 @@
-135881
+135863

.forge-snapshots/PositionManager_burn_nonEmpty_native.snap

@@ -1 +1 @@
-128803
+128784

.forge-snapshots/PositionManager_collect.snap

@@ -1 +1 @@
-158176
+158153

.forge-snapshots/PositionManager_collect_native.snap

@@ -1 +1 @@
-149328
+149305

.forge-snapshots/PositionManager_collect_sameRange.snap

@@ -1 +1 @@
-158176
+158153

.forge-snapshots/PositionManager_decreaseLiquidity.snap

@@ -1 +1 @@
-123719
+123696

.forge-snapshots/PositionManager_decreaseLiquidity_native.snap

@@ -1 +1 @@
-114937
+114919

.forge-snapshots/PositionManager_decrease_burnEmpty.snap

@@ -1 +1 @@
-142224
+142205

.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap

@@ -1 +1 @@
-134963
+134944

.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap

@@ -1 +1 @@
-136435
+136412

.forge-snapshots/PositionManager_increaseLiquidity_erc20.snap

@@ -1 +1 @@
-152896
+152873

.forge-snapshots/PositionManager_increaseLiquidity_native.snap

@@ -1 +1 @@
-138106
+138083

.forge-snapshots/PositionManager_increase_autocompoundExactUnclaimedFees.snap

@@ -1 +1 @@
-144757
+144734

.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap

@@ -1 +1 @@
-180911
+180888

.forge-snapshots/PositionManager_mint.snap

@@ -1 +1 @@
-370660
+370637

.forge-snapshots/PositionManager_mint_native.snap

@@ -1 +1 @@
-338770
+338747

.forge-snapshots/PositionManager_mint_nativeWithSweep.snap

@@ -1 +1 @@
-345708
+345685

.forge-snapshots/PositionManager_mint_onSameTickLower.snap

@@ -1 +1 @@
-313342
+313319

.forge-snapshots/PositionManager_mint_onSameTickUpper.snap

@@ -1 +1 @@
-313984
+313961

.forge-snapshots/PositionManager_mint_sameRange.snap

@@ -1 +1 @@
-239566
+239543

.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap

@@ -1 +1 @@
-319360
+319337

.forge-snapshots/PositionManager_multicall_initialize_mint.snap

@@ -1 +1 @@
-415150
+415127

.forge-snapshots/PositionManager_permit.snap

@@ -0,0 +1 @@
+76544

.forge-snapshots/PositionManager_permit_secondPosition.snap

@@ -0,0 +1 @@
+59444

.forge-snapshots/PositionManager_permit_twice.snap

@@ -0,0 +1 @@
+42344

src/PositionManager.sol

@@ -54,6 +54,11 @@ contract PositionManager is
         _;
     }
 
+    // TODO: implement
+    function tokenURI(uint256) public pure override returns (string memory) {
+        return "https://example.com";
+    }    
+
     /// @param unlockData is an encoding of actions, params, and currencies
     /// @return returnData is the endocing of each actions return information
     function modifyLiquidities(bytes calldata unlockData, uint256 deadline)

src/base/ERC721Permit.sol

@@ -2,19 +2,93 @@
 pragma solidity ^0.8.24;
 
 import {ERC721} from "solmate/src/tokens/ERC721.sol";
+import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";
+import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
+import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 
-/// @notice An ERC721 contract that supports permit.
-/// TODO: Support permit.
-contract ERC721Permit is ERC721 {
-    constructor(string memory name_, string memory symbol_, string memory version_) ERC721(name_, symbol_) {}
+import {IERC721Permit} from "../interfaces/IERC721Permit.sol";
+import {UnorderedNonce} from "./UnorderedNonce.sol";
+
+/// @title ERC721 with permit
+/// @notice Nonfungible tokens that support an approve via signature, i.e. permit
+abstract contract ERC721Permit is ERC721, IERC721Permit, EIP712, UnorderedNonce {
+    /// @inheritdoc IERC721Permit
+    /// @dev Value is equal to keccak256("Permit(address spender,uint256 tokenId,uint256 nonce,uint256 deadline)");
+    bytes32 public constant override PERMIT_TYPEHASH =
+        0x49ecf333e5b8c95c40fdafc95c1ad136e8914a8fb55e9dc8bb01eaa83a2df9ad;
+
+    /// @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) {
+        return _domainSeparatorV4();
+    }
+
+    /// @inheritdoc IERC721Permit
+    function permit(address spender, uint256 tokenId, uint256 deadline, uint256 nonce, uint8 v, bytes32 r, bytes32 s)
+        external
+        payable
+        override
+    {
+        if (block.timestamp > deadline) revert DeadlineExpired();
+
+        address owner = ownerOf(tokenId);
+        if (spender == owner) revert NoSelfPermit();
+
+        bytes32 digest = getDigest(spender, tokenId, nonce, deadline);
+
+        if (owner.code.length != 0) {
+            if (
+                IERC1271(owner).isValidSignature(digest, abi.encodePacked(r, s, v))
+                    != IERC1271.isValidSignature.selector
+            ) {
+                revert Unauthorized();
+            }
+        } else {
+            address recoveredAddress = ecrecover(digest, v, r, s);
+            if (recoveredAddress == address(0)) revert InvalidSignature();
+            if (recoveredAddress != owner) revert Unauthorized();
+        }
+
+        _useUnorderedNonce(owner, nonce);
+        _approve(owner, spender, tokenId);
+    }
+
+    function approve(address spender, uint256 id) public override {
+        // override Solmate's ERC721 approve so approve() and permit() share the same code paths
+
+        address owner = _ownerOf[id];
+
+        if (msg.sender != owner && !isApprovedForAll[owner][msg.sender]) revert Unauthorized();
+
+        _approve(owner, spender, id);
+    }
+
+    function _approve(address owner, address spender, uint256 id) internal {
+        getApproved[id] = spender;
+        emit Approval(owner, spender, id);
+    }
+
+    function getDigest(address spender, uint256 tokenId, uint256 _nonce, uint256 deadline)
+        public
+        view
+        returns (bytes32 digest)
+    {
+        digest = keccak256(
+            abi.encodePacked(
+                "\x19\x01",
+                DOMAIN_SEPARATOR(),
+                keccak256(abi.encode(PERMIT_TYPEHASH, spender, tokenId, _nonce, deadline))
+            )
+        );
+    }
 
     function _isApprovedOrOwner(address spender, uint256 tokenId) internal view returns (bool) {
         return spender == ownerOf(tokenId) || getApproved[tokenId] == spender
             || isApprovedForAll[ownerOf(tokenId)][spender];
     }
-
-    // TODO: Use PositionDescriptor.
-    function tokenURI(uint256 id) public pure override returns (string memory) {
-        return string(abi.encode(id));
-    }
 }

src/base/UnorderedNonce.sol

@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+pragma solidity ^0.8.24;
+
+contract UnorderedNonce {
+    error NonceAlreadyUsed();
+
+    mapping(address owner => mapping(uint256 word => uint256 bitmap)) public nonces;
+
+    /// @notice Consume a nonce, reverting if its already been used
+    /// @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();
+    }
+
+    /// @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);
+    }
+}

src/interfaces/IERC721Permit.sol

@@ -4,7 +4,10 @@ pragma solidity >=0.7.5;
 /// @title ERC721 with permit
 /// @notice Extension to ERC721 that includes a permit function for signature based approvals
 interface IERC721Permit {
-    error NonceAlreadyUsed();
+    error DeadlineExpired();
+    error NoSelfPermit();
+    error Unauthorized();
+    error InvalidSignature();
 
     /// @notice The permit typehash used in the permit signature
     /// @return The typehash for the permit