Skip to content

fix: propagate user op validation reverts from plugins #35

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

Merged
merged 1 commit into from
Mar 4, 2024
Merged

fix: propagate user op validation reverts from plugins #35

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
17 changes: 3 additions & 14 deletions src/account/UpgradeableModularAccount.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,13 +365,7 @@ contract UpgradeableModularAccount is

if (!preUserOpValidationHook.isEmptyOrMagicValue()) {
(address plugin, uint8 functionId) = preUserOpValidationHook.unpack();
try IPlugin(plugin).preUserOpValidationHook(functionId, userOp, userOpHash) returns (
uint256 returnData
) {
currentValidationData = returnData;
} catch {
currentValidationData = SIG_VALIDATION_FAILED;
}
currentValidationData = IPlugin(plugin).preUserOpValidationHook(functionId, userOp, userOpHash);

if (uint160(currentValidationData) > 1) {
// If the aggregator is not 0 or 1, it is an unexpected value
Expand All @@ -392,13 +386,8 @@ contract UpgradeableModularAccount is
{
if (!userOpValidationFunction.isEmptyOrMagicValue()) {
(address plugin, uint8 functionId) = userOpValidationFunction.unpack();
try IPlugin(plugin).userOpValidationFunction(functionId, userOp, userOpHash) returns (
uint256 returnData
) {
currentValidationData = returnData;
} catch {
currentValidationData = SIG_VALIDATION_FAILED;
}
currentValidationData = IPlugin(plugin).userOpValidationFunction(functionId, userOp, userOpHash);

if (preUserOpValidationHooksLength != 0) {
// If we have other validation data we need to coalesce with
validationData = _coalesceValidation(validationData, currentValidationData);
Expand Down