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

create sender before finding paymaster gasLimit #13

Merged
merged 1 commit into from
Jan 16, 2025
Merged

create sender before finding paymaster gasLimit #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/v07/EntryPoint.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ contract EntryPoint is IEntryPoint, StakeManager, NonceManager, ReentrancyGuard

using UserOperationLib for PackedUserOperation;

SenderCreator private immutable _senderCreator = new SenderCreator();
SenderCreator internal immutable _senderCreator = new SenderCreator();

function senderCreator() internal view virtual returns (SenderCreator) {
return _senderCreator;
Expand Down
23 changes: 5 additions & 18 deletions src/v07/EntryPointSimulations.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,11 @@ struct SimulationArgs {
contract EntryPointSimulations is EntryPoint, IEntryPointSimulations {
EntryPointSimulations immutable thisContract = this;
AggregatorStakeInfo private NOT_AGGREGATED = AggregatorStakeInfo(address(0), StakeInfo(0, 0));
SenderCreator private _senderCreator;

// Thrown when the binary search fails due hitting the simulation gasLimit.
error SimulationOutOfGas(uint256 optimalGas, uint256 minGas, uint256 maxGas);
error innerCallResult(uint256 remainingGas);

function initSenderCreator() internal virtual {
//this is the address of the first contract created with CREATE by this address.
address createdObj = address(uint160(uint256(keccak256(abi.encodePacked(hex"d694", address(this), hex"01")))));
_senderCreator = SenderCreator(createdObj);
}

function senderCreator() internal view virtual override returns (SenderCreator) {
// return the same senderCreator as real EntryPoint.
// this call is slightly (100) more expensive than EntryPoint's access to immutable member
return _senderCreator;
}

/**
* simulation contract should not be deployed, and specifically, accounts should not trust
* it as entrypoint, since the simulation functions don't check the signatures
Expand Down Expand Up @@ -231,9 +218,12 @@ contract EntryPointSimulations is EntryPoint, IEntryPointSimulations {
uint256 toleranceDelta,
uint256 gasAllowance
) public returns (TargetCallResult memory) {
UserOpInfo memory setupOpInfo;
_copyUserOpToMemory(targetUserOp.op, setupOpInfo.mUserOp);
_validateAccountPrepayment(0, targetUserOp.op, setupOpInfo, 0, gasleft());

UserOpInfo memory opInfo;
bytes memory payload = abi.encodeWithSelector(this._paymasterValidation.selector, 0, targetUserOp.op, opInfo);

return binarySearchGasLimit(
queuedUserOps, targetUserOp, entryPoint, initialMinGas, toleranceDelta, gasAllowance, payload
);
Expand Down Expand Up @@ -404,10 +394,7 @@ contract EntryPointSimulations is EntryPoint, IEntryPointSimulations {
return results[ops.length - 1];
}

function _simulationOnlyValidations(PackedUserOperation calldata userOp) internal {
//initialize senderCreator(). we can't rely on constructor
initSenderCreator();

function _simulationOnlyValidations(PackedUserOperation calldata userOp) internal view {
string memory revertReason =
_validateSenderAndPaymaster(userOp.initCode, userOp.sender, userOp.paymasterAndData);
// solhint-disable-next-line no-empty-blocks
Expand Down
Loading