From 8e17f9de3b4246035dba3bd520fe3532be815710 Mon Sep 17 00:00:00 2001 From: howydev <132113803+howydev@users.noreply.github.com> Date: Tue, 13 Aug 2024 11:11:21 -0400 Subject: [PATCH 1/2] chore: cleanup --- src/account/UpgradeableModularAccount.sol | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/account/UpgradeableModularAccount.sol b/src/account/UpgradeableModularAccount.sol index 8826d1d0..d99cd97c 100644 --- a/src/account/UpgradeableModularAccount.sol +++ b/src/account/UpgradeableModularAccount.sol @@ -68,24 +68,18 @@ contract UpgradeableModularAccount is event ModularAccountInitialized(IEntryPoint indexed entryPoint); - error AuthorizeUpgradeReverted(bytes revertReason); - error ExecFromModuleNotPermitted(address module, bytes4 selector); - error ExecFromModuleExternalNotPermitted(address module, address target, uint256 value, bytes data); - error NativeTokenSpendingNotPermitted(address module); error NonCanonicalEncoding(); error NotEntryPoint(); error PostExecHookReverted(address module, uint32 entityId, bytes revertReason); error PreExecHookReverted(address module, uint32 entityId, bytes revertReason); error PreRuntimeValidationHookFailed(address module, uint32 entityId, bytes revertReason); error RequireUserOperationContext(); - error RuntimeValidationFunctionMissing(bytes4 selector); error RuntimeValidationFunctionReverted(address module, uint32 entityId, bytes revertReason); error SelfCallRecursionDepthExceeded(); error SignatureValidationInvalid(address module, uint32 entityId); error UnexpectedAggregator(address module, uint32 entityId, address aggregator); error UnrecognizedFunction(bytes4 selector); error ValidationFunctionMissing(bytes4 selector); - error ValidationDoesNotApply(bytes4 selector, address module, uint32 entityId, bool isGlobal); error ValidationSignatureSegmentMissing(); error SignatureSegmentOutOfOrder(); @@ -481,7 +475,7 @@ contract UpgradeableModularAccount is ) // forgefmt: disable-start // solhint-disable-next-line no-empty-blocks - {} catch (bytes memory revertReason){ + {} catch (bytes memory revertReason) { // forgefmt: disable-end revert RuntimeValidationFunctionReverted(module, entityId, revertReason); } @@ -571,7 +565,7 @@ contract UpgradeableModularAccount is ) // forgefmt: disable-start // solhint-disable-next-line no-empty-blocks - {} catch (bytes memory revertReason){ + {} catch (bytes memory revertReason) { // forgefmt: disable-end revert PreRuntimeValidationHookFailed(hookModule, hookEntityId, revertReason); } From e41e94cb3400dfdd1278425b5468c737c4078efa Mon Sep 17 00:00:00 2001 From: howydev <132113803+howydev@users.noreply.github.com> Date: Tue, 13 Aug 2024 11:48:23 -0400 Subject: [PATCH 2/2] fix: lint --- src/account/UpgradeableModularAccount.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/account/UpgradeableModularAccount.sol b/src/account/UpgradeableModularAccount.sol index d99cd97c..8904c568 100644 --- a/src/account/UpgradeableModularAccount.sol +++ b/src/account/UpgradeableModularAccount.sol @@ -475,7 +475,7 @@ contract UpgradeableModularAccount is ) // forgefmt: disable-start // solhint-disable-next-line no-empty-blocks - {} catch (bytes memory revertReason) { + {} catch (bytes memory revertReason){ // forgefmt: disable-end revert RuntimeValidationFunctionReverted(module, entityId, revertReason); } @@ -565,7 +565,7 @@ contract UpgradeableModularAccount is ) // forgefmt: disable-start // solhint-disable-next-line no-empty-blocks - {} catch (bytes memory revertReason) { + {} catch (bytes memory revertReason){ // forgefmt: disable-end revert PreRuntimeValidationHookFailed(hookModule, hookEntityId, revertReason); }