AA-173: Remove simulation and view-only methods from the EntryPoint contract #321
+934
−644
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| // SPDX-License-Identifier: GPL-3.0 | ||
| pragma solidity ^0.8.12; | ||
|
|
||
| /* solhint-disable avoid-low-level-calls */ | ||
| /* solhint-disable no-inline-assembly */ | ||
|
|
||
| import "./EntryPoint.sol"; | ||
| import "../interfaces/IEntryPointSimulations.sol"; | ||
|
|
||
| /* | ||
| * This contract inherits the EntryPoint and extends it with the view-only methods that are executed by | ||
| * the bundler in order to check UserOperation validity and estimate its gas consumption. | ||
| */ | ||
| contract EntryPointSimulations is EntryPoint, IEntryPointSimulations { | ||
| // solhint-disable-next-line var-name-mixedcase | ||
| AggregatorStakeInfo private NOT_AGGREGATED = AggregatorStakeInfo(address(0), StakeInfo(0, 0)); | ||
|
|
||
| /// @inheritdoc IEntryPointSimulations | ||
| function simulateValidation( | ||
| UserOperation calldata userOp | ||
| ) | ||
| external | ||
| returns ( | ||
| ValidationResult memory | ||
| ){ | ||
| UserOpInfo memory outOpInfo; | ||
|
|
||
| _simulationOnlyValidations(userOp); | ||
| ( | ||
| uint256 validationData, | ||
| uint256 paymasterValidationData | ||
| ) = _validatePrepayment(0, userOp, outOpInfo); | ||
| StakeInfo memory paymasterInfo = _getStakeInfo( | ||
| outOpInfo.mUserOp.paymaster | ||
| ); | ||
| StakeInfo memory senderInfo = _getStakeInfo(outOpInfo.mUserOp.sender); | ||
| StakeInfo memory factoryInfo; | ||
| { | ||
| bytes calldata initCode = userOp.initCode; | ||
| address factory = initCode.length >= 20 | ||
| ? address(bytes20(initCode[0 : 20])) | ||
| : address(0); | ||
| factoryInfo = _getStakeInfo(factory); | ||
| } | ||
|
|
||
| ValidationData memory data = _intersectTimeRange( | ||
| validationData, | ||
| paymasterValidationData | ||
| ); | ||
| address aggregator = data.aggregator; | ||
| bool sigFailed = aggregator == address(1); | ||
| ReturnInfo memory returnInfo = ReturnInfo( | ||
| outOpInfo.preOpGas, | ||
| outOpInfo.prefund, | ||
| sigFailed, | ||
| data.validAfter, | ||
| data.validUntil, | ||
| getMemoryBytesFromOffset(outOpInfo.contextOffset) | ||
| ); | ||
|
|
||
| if (aggregator != address(0) && aggregator != address(1)) { | ||
| AggregatorStakeInfo memory aggregatorInfo = AggregatorStakeInfo( | ||
| aggregator, | ||
| _getStakeInfo(aggregator) | ||
| ); | ||
| return ValidationResult( | ||
| returnInfo, | ||
| senderInfo, | ||
| factoryInfo, | ||
| paymasterInfo, | ||
| aggregatorInfo | ||
| ); | ||
| } | ||
| return ValidationResult( | ||
| returnInfo, | ||
| senderInfo, | ||
| factoryInfo, | ||
| paymasterInfo, | ||
| NOT_AGGREGATED | ||
| ); | ||
| } | ||
|
|
||
| /// @inheritdoc IEntryPointSimulations | ||
| function simulateHandleOp( | ||
| UserOperation calldata op, | ||
| address target, | ||
| bytes calldata targetCallData | ||
| ) | ||
| external nonReentrant | ||
| returns ( | ||
| ExecutionResult memory | ||
| ){ | ||
| UserOpInfo memory opInfo; | ||
| _simulationOnlyValidations(op); | ||
| ( | ||
| uint256 validationData, | ||
| uint256 paymasterValidationData | ||
| ) = _validatePrepayment(0, op, opInfo); | ||
| ValidationData memory data = _intersectTimeRange( | ||
| validationData, | ||
| paymasterValidationData | ||
| ); | ||
|
|
||
| numberMarker(); | ||
| uint256 paid = _executeUserOp(0, op, opInfo); | ||
| numberMarker(); | ||
| bool targetSuccess; | ||
| bytes memory targetResult; | ||
| if (target != address(0)) { | ||
| (targetSuccess, targetResult) = target.call(targetCallData); | ||
| } | ||
| return ExecutionResult( | ||
| opInfo.preOpGas, | ||
| paid, | ||
| data.validAfter, | ||
| data.validUntil, | ||
| targetSuccess, | ||
| targetResult | ||
| ); | ||
| } | ||
|
|
||
| function _simulationOnlyValidations( | ||
| UserOperation calldata userOp | ||
| ) private view { | ||
|
|
||
| try | ||
| this._validateSenderAndPaymaster( | ||
| userOp.initCode, | ||
| userOp.sender, | ||
| userOp.paymasterAndData | ||
| ) | ||
| // solhint-disable-next-line no-empty-blocks | ||
| {} catch Error(string memory revertReason) { | ||
| if (bytes(revertReason).length != 0) { | ||
| revert FailedOp(0, revertReason); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Called only during simulation. | ||
| * This function always reverts to prevent warm/cold storage differentiation in simulation vs execution. | ||
| * @param initCode - The smart account constructor code. | ||
| * @param sender - The sender address. | ||
| * @param paymasterAndData - The paymaster address followed by the token address to use. | ||
| */ | ||
| function _validateSenderAndPaymaster( | ||
| bytes calldata initCode, | ||
| address sender, | ||
| bytes calldata paymasterAndData | ||
| ) external view { | ||
| if (initCode.length == 0 && sender.code.length == 0) { | ||
| // it would revert anyway. but give a meaningful message | ||
| revert("AA20 account not deployed"); | ||
| } | ||
| if (paymasterAndData.length >= 20) { | ||
| address paymaster = address(bytes20(paymasterAndData[0:20])); | ||
| if (paymaster.code.length == 0) { | ||
| // It would revert anyway. but give a meaningful message. | ||
| revert("AA30 paymaster not deployed"); | ||
| } | ||
| } | ||
| // always revert | ||
| revert(""); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
better "merge" the 2 separate struct returns.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed.