up

OpenZeppelin · Jan 28, 2025 · e9047b2 · e9047b2
1 parent 9f53296
commit e9047b2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 36 deletions.
diff --git a/contracts/account/paymaster/PaymasterSigner.sol b/contracts/account/paymaster/PaymasterSigner.sol
@@ -89,13 +89,4 @@ abstract contract PaymasterSigner is PaymasterCore, AbstractSigner, EIP712 {
         bytes calldata paymasterData = userOp.paymasterData();
         return (uint48(bytes6(paymasterData[0:6])), uint48(bytes6(paymasterData[6:12])), paymasterData[12:]);
     }
-
-    function _postOp(
-        PostOpMode /* mode */,
-        bytes calldata /* context */,
-        uint256 /* actualGasCost */,
-        uint256 /* actualUserOpFeePerGas */
-    ) internal virtual override {
-        // No context for postop
-    }
 }
diff --git a/contracts/mocks/account/paymaster/PaymasterCoreMock.sol b/contracts/mocks/account/paymaster/PaymasterCoreMock.sol
@@ -13,7 +13,7 @@ contract PaymasterCoreContextNoPostOpMock is PaymasterCore {
         PackedUserOperation calldata userOp,
         bytes32 /* userOpHash */,
         uint256 /* requiredPreFund */
-    ) internal virtual override returns (bytes memory context, uint256 validationData) {
+    ) internal pure override returns (bytes memory context, uint256 validationData) {
         bytes calldata paymasterData = userOp.paymasterData();
         return (
             paymasterData,
@@ -30,26 +30,11 @@ contract PaymasterCoreContextNoPostOpMock is PaymasterCore {
     }
 }
 
-contract PaymasterCoreMock is PaymasterCore {
+contract PaymasterCoreMock is PaymasterCoreContextNoPostOpMock {
     using ERC4337Utils for *;
 
     event PaymasterDataPostOp(bytes paymasterData);
 
-    function _validatePaymasterUserOp(
-        PackedUserOperation calldata userOp,
-        bytes32 /* userOpHash */,
-        uint256 /* requiredPreFund */
-    ) internal virtual override returns (bytes memory context, uint256 validationData) {
-        bytes calldata paymasterData = userOp.paymasterData();
-        return (
-            paymasterData,
-            (bytes1(paymasterData[0:1]) == bytes1(0x01)).packValidationData(
-                uint48(bytes6(paymasterData[1:7])),
-                uint48(bytes6(paymasterData[7:13]))
-            )
-        );
-    }
-
     function _postOp(
         PostOpMode /* mode */,
         bytes calldata context,
@@ -59,11 +44,6 @@ contract PaymasterCoreMock is PaymasterCore {
         emit PaymasterDataPostOp(context);
     }
 
-    // WARNING: No access control
-    function deposit() external payable {
-        _deposit();
-    }
-
     // WARNING: No access control
     function addStake(uint32 unstakeDelaySec) external payable {
         _addStake(unstakeDelaySec);

diff --git a/test/account/paymaster/PaymasterCore.test.js b/test/account/paymaster/PaymasterCore.test.js
@@ -58,12 +58,12 @@ describe('PaymasterCore', function () {
 
   shouldBehaveLikePaymaster({ postOp: true });
 
-  it('reverts if validatePaymasterUserOp returns context and was not overriden', async function () {
-    const mock = await ethers.deployContract('$PaymasterCoreContextNoPostOpMock');
+  it('still execute the user op if validatePaymasterUserOp returns context and _postOp was not overriden', async function () {
+    const paymaster = await ethers.deployContract('$PaymasterCoreContextNoPostOpMock');
     const paymasterDeposit = ethers.parseEther('1');
-    await mock.connect(this.depositor).deposit({ value: paymasterDeposit });
+    await paymaster.connect(this.depositor).deposit({ value: paymasterDeposit });
     const userOp = {
-      paymaster: this.mock,
+      paymaster,
     };
 
     userOp.callData = this.accountMock.interface.encodeFunctionData('execute', [
@@ -79,6 +79,8 @@ describe('PaymasterCore', function () {
     const userSignedUserOp = await this.signUserOp(operation);
     const paymasterSignedUserOp = await this.paymasterSignUserOp(userSignedUserOp, 0, 0);
 
-    await expect(entrypoint.handleOps([paymasterSignedUserOp.packed], this.receiver)).to.be.reverted;
+    await expect(this.accountMock.getNonce()).to.eventually.equal(0);
+    await entrypoint.handleOps([paymasterSignedUserOp.packed], this.receiver);
+    await expect(this.accountMock.getNonce()).to.eventually.equal(1); // Does execute
   });
 });