Address PR comments

eth-infinitism · Oct 31, 2023 · 081ee7a · 081ee7a
1 parent ad86d8a
commit 081ee7a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/contracts/core/EntryPoint.sol b/contracts/core/EntryPoint.sol
@@ -665,8 +665,9 @@ contract EntryPoint is IEntryPoint, StakeManager, NonceManager, ReentrancyGuard,
                         try IPaymaster(paymaster).postOp{
                             gas: mUserOp.verificationGasLimit
                         }(mode, context, actualGasCost)
+                        // solhint-disable-next-line no-empty-blocks
                         {} catch (bytes memory reason) {
-                            revert(string(abi.encodePacked("AA96 postOp reverted", reason)));
+                            revert(string(abi.encodePacked("AA96 reverted:", reason)));
                         }
                     }
                 }

diff --git a/test/entrypoint.test.ts b/test/entrypoint.test.ts
@@ -1107,7 +1107,9 @@ describe('EntryPoint', function () {
           callGasLimit: 1e6
         }, account3Owner, entryPoint)
         const beneficiaryAddress = createAddress()
-        await entryPoint.handleOps([op], beneficiaryAddress)
+        const rcpt1 = await entryPoint.handleOps([op], beneficiaryAddress).then(async t => await t.wait())
+        const logs1 = await entryPoint.queryFilter(entryPoint.filters.UserOperationEvent(), rcpt1.blockHash)
+        expect(logs1[0].args.success).to.be.false
       })
 
       it('paymaster should pay for tx', async function () {