Rename PaymasterNFT to PaymasterERC721Owner (#102)

Author: Amxx

CHANGELOG.md

@@ -1,7 +1,7 @@
 ## 03-04-2025
 
-- `PaymasterNFT`: Extension of `PaymasterCore` that approves sponsoring of user operation based on ownership of an ERC-721 NFT.
 - `PaymasterERC20`: Extension of `PaymasterCore` that sponsors user operations against payment in ERC-20 tokens.
+- `PaymasterERC721Owner`: Extension of `PaymasterCore` that approves sponsoring of user operation based on ownership of an ERC-721 NFT.
 
 ## 28-03-2025
 

contracts/account/paymaster/PaymasterNFT.sol renamed to contracts/account/paymaster/PaymasterERC721Owner.sol

@@ -12,11 +12,11 @@ import {PaymasterCore} from "./PaymasterCore.sol";
  * This paymaster will sponsor user operations if the user has at least 1 token of the token specified
  * during construction (or via {_setToken}).
  */
-abstract contract PaymasterNFT is PaymasterCore {
+abstract contract PaymasterERC721Owner is PaymasterCore {
     IERC721 private _token;
 
     /// @dev Emitted when the paymaster token is set.
-    event PaymasterNFTTokenSet(IERC721 token);
+    event PaymasterERC721OwnerTokenSet(IERC721 token);
 
     constructor(IERC721 token_) {
         _setToken(token_);
@@ -30,7 +30,7 @@ abstract contract PaymasterNFT is PaymasterCore {
     /// @dev Sets the ERC-721 token used to validate the user operation.
     function _setToken(IERC721 token_) internal virtual {
         _token = token_;
-        emit PaymasterNFTTokenSet(token_);
+        emit PaymasterERC721OwnerTokenSet(token_);
     }
 
     /**

contracts/mocks/account/paymaster/PaymasterNFTMock.sol renamed to contracts/mocks/account/paymaster/PaymasterERC721OwnerMock.sol

@@ -4,9 +4,9 @@ pragma solidity ^0.8.20;
 
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {ERC4337Utils, PackedUserOperation} from "@openzeppelin/contracts/account/utils/draft-ERC4337Utils.sol";
-import {PaymasterNFT} from "../../../account/paymaster/PaymasterNFT.sol";
+import {PaymasterERC721Owner} from "../../../account/paymaster/PaymasterERC721Owner.sol";
 
-abstract contract PaymasterNFTContextNoPostOpMock is PaymasterNFT, Ownable {
+abstract contract PaymasterERC721OwnerContextNoPostOpMock is PaymasterERC721Owner, Ownable {
     using ERC4337Utils for *;
 
     function _validatePaymasterUserOp(
@@ -16,14 +16,14 @@ abstract contract PaymasterNFTContextNoPostOpMock is PaymasterNFT, Ownable {
     ) internal override returns (bytes memory context, uint256 validationData) {
         // use the userOp's callData as context;
         context = userOp.callData;
-        // super call (PaymasterNFT) for the validation data
+        // super call (PaymasterERC721Owner) for the validation data
         (, validationData) = super._validatePaymasterUserOp(userOp, userOpHash, requiredPreFund);
     }
 
     function _authorizeWithdraw() internal override onlyOwner {}
 }
 
-abstract contract PaymasterNFTMock is PaymasterNFTContextNoPostOpMock {
+abstract contract PaymasterERC721OwnerMock is PaymasterERC721OwnerContextNoPostOpMock {
     event PaymasterDataPostOp(bytes paymasterData);
 
     function _postOp(

test/account/paymaster/PaymasterNFT.test.js renamed to test/account/paymaster/PaymasterERC721Owner.test.js

@@ -8,8 +8,8 @@ const { ERC4337Helper } = require('../../helpers/erc4337');
 const { shouldBehaveLikePaymaster } = require('./Paymaster.behavior');
 
 for (const [name, opts] of Object.entries({
-  PaymasterNFT: { postOp: true, timeRange: false },
-  PaymasterNFTContextNoPostOp: { postOp: false, timeRange: false },
+  PaymasterERC721Owner: { postOp: true, timeRange: false },
+  PaymasterERC721OwnerContextNoPostOp: { postOp: false, timeRange: false },
 })) {
   async function fixture() {
     // EOAs and environment