Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix EntryPoint revert if postOp reverts with short revert reason #308

Merged
merged 16 commits into from
Aug 15, 2023
Merged

Fix EntryPoint revert if postOp reverts with short revert reason #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ebbf21a
Makes comments and formatting consistent
gigamesh Mar 3, 2023
64cbdf6
@inheritdoc IEntryPoint
gigamesh Mar 4, 2023
d43bc94
Reverts contracts/test/TestHelpers.sol
gigamesh Mar 6, 2023
105d122
fix: entrypoint does not revert even first postOp reverts with short …
leekt May 30, 2023
3a6b0a5
lint
leekt May 30, 2023
66688cb
gas-report
leekt May 30, 2023
b56ef7b
Merge branch 'next_v0.7' into gigamesh/comments
forshtat Jun 25, 2023
74ed53b
Update IEntryPoint.sol - add missing 'INonceManager'
forshtat Jun 25, 2023
649daf8
Update EntryPoint.sol - fix lint errors
forshtat Jun 25, 2023
aa20d5d
Update gas-checker.txt manually
forshtat Jun 25, 2023
e3111fe
Update gas-checker.txt - add newline for the 'diff'
forshtat Jun 25, 2023
10f0502
Merge pull request #235 from gigamesh/gigamesh/comments
forshtat Jun 25, 2023
6a5ce09
Merge branch 'next_v0.7' into develop
forshtat Jun 25, 2023
8116f81
Update gas-checker.txt manually
forshtat Jun 25, 2023
74a3c37
Merge pull request #293 from leekt/develop
forshtat Jun 25, 2023
c5cae60
Merge branch 'develop' into next_v0.7
forshtat Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions contracts/core/EntryPoint.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,11 @@ contract EntryPoint is IEntryPoint, StakeManager, NonceManager, ReentrancyGuard
} catch {
bytes32 innerRevertCode;
assembly {
returndatacopy(0, 0, 32)
innerRevertCode := mload(0)
let len := returndatasize()
if eq(32,len) {
returndatacopy(0, 0, 32)
innerRevertCode := mload(0)
}
}
// handleOps was called with gas limit too low. abort entire bundle.
if (innerRevertCode == INNER_OUT_OF_GAS) {
Expand Down
30 changes: 30 additions & 0 deletions contracts/test/TestPaymasterRevertCustomError.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// SPDX-License-Identifier: GPL-3.0-only
pragma solidity ^0.8.12;

import "../core/BasePaymaster.sol";

/**
* test postOp revert with custom error
*/
error CustomError();

contract TestPaymasterRevertCustomError is BasePaymaster {
// solhint-disable no-empty-blocks
constructor(IEntryPoint _entryPoint) BasePaymaster(_entryPoint)
{}

function _validatePaymasterUserOp(UserOperation calldata userOp, bytes32, uint256)
internal virtual override view
returns (bytes memory context, uint256 validationData) {
validationData = 0;
context = abi.encodePacked(userOp.sender);
}

function _postOp(PostOpMode mode, bytes calldata, uint256) internal override {
if(mode == PostOpMode.postOpReverted) {
return;
}

revert CustomError();
}
}
24 changes: 12 additions & 12 deletions reports/gas-checker.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,28 @@
║ │ │ │ (delta for │ (compared to ║
║ │ │ │ one UserOp) │ account.exec()) ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ simple │ 1 │ 81891 │ │ ║
║ simple │ 1 │ 81921 │ │ ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ simple - diff from previous │ 2 │ │ 44154 │ 15140 ║
║ simple - diff from previous │ 2 │ │ 44208 │ 15194 ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ simple │ 10 │ 479586 │ │ ║
║ simple │ 10 │ 479922 │ │ ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ simple - diff from previous │ 11 │ │ 44250 │ 15236 ║
║ simple - diff from previous │ 11 │ │ 44244 │ 15230 ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ simple paymaster │ 1 │ 88162 │ │ ║
║ simple paymaster │ 1 │ 88192 │ │ ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ simple paymaster with diff │ 2 │ │ 43143 │ 14129 ║
║ simple paymaster with diff │ 2 │ │ 43197 │ 14183 ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ simple paymaster │ 10 │ 476798 │ │ ║
║ simple paymaster │ 10 │ 477170 │ │ ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ simple paymaster with diff │ 11 │ │ 43214 │ 14200 ║
║ simple paymaster with diff │ 11 │ │ 43220 │ 14206 ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ big tx 5k │ 1 │ 182948 │ │ ║
║ big tx 5k │ 1 │ 182978 │ │ ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ big tx - diff from previous │ 2 │ │ 144689 │ 19429 ║
║ big tx - diff from previous │ 2 │ │ 144683 │ 19423 ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ big tx 5k │ 10 │ 1485278 │ │ ║
║ big tx 5k │ 10 │ 1485506 │ │ ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ big tx - diff from previous │ 11 │ │ 144750 │ 19490 ║
║ big tx - diff from previous │ 11 │ │ 144744 │ 19484 ║
╚════════════════════════════════╧═══════╧═══════════════╧════════════════╧═════════════════════╝

21 changes: 20 additions & 1 deletion test/entrypoint.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import {
TestSignatureAggregator,
TestSignatureAggregator__factory,
MaliciousAccount__factory,
TestWarmColdAccount__factory
TestWarmColdAccount__factory,
TestPaymasterRevertCustomError__factory
} from '../typechain'
import {
AddressZero,
Expand Down Expand Up @@ -1171,6 +1172,24 @@ describe('EntryPoint', function () {
await expect(entryPoint.handleOps([op], beneficiaryAddress)).to.revertedWith('"AA31 paymaster deposit too low"')
})

it('should not revert when paymaster reverts with custom error on postOp', async function () {
const account3Owner = createAccountOwner()
const errorPostOp = await new TestPaymasterRevertCustomError__factory(ethersSigner).deploy(entryPoint.address)
await errorPostOp.addStake(globalUnstakeDelaySec, { value: paymasterStake })
await errorPostOp.deposit({ value: ONE_ETH })

const op = await fillAndSign({
paymasterAndData: errorPostOp.address,
callData: accountExecFromEntryPoint.data,
initCode: getAccountInitCode(account3Owner.address, simpleAccountFactory),

verificationGasLimit: 3e6,
callGasLimit: 1e6
}, account3Owner, entryPoint)
const beneficiaryAddress = createAddress()
await entryPoint.handleOps([op], beneficiaryAddress)
})

it('paymaster should pay for tx', async function () {
await paymaster.deposit({ value: ONE_ETH })
const op = await fillAndSign({
Expand Down