lint

erc6900 · Mar 19, 2024 · 6c9f6e5 · 6c9f6e5
1 parent 0882535
commit 6c9f6e5
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 25 deletions.
diff --git a/src/interfaces/IPlugin.sol b/src/interfaces/IPlugin.sol
@@ -137,17 +137,6 @@ interface IPlugin {
     /// @param data The calldata sent.
     function validateRuntime(address sender, uint256 value, bytes calldata data) external;
 
-    /// @notice Validates a signature using ERC-1271.
-    /// @param sender the address that sent the ERC-1271 request to the smart account
-    /// @param hash the hash of the ERC-1271 request
-    /// @param signature the signature of the ERC-1271 request
-    ///
-    /// @return the ERC-1271 `MAGIC_VALUE` if the signature is valid, or 0xFFFFFFFF if invalid.
-    function isValidSignatureWithSender(address sender, bytes32 hash, bytes calldata signature)
-        external
-        view
-        returns (bytes4);
-
     /// @notice Run the pre execution hook.
     /// @dev To indicate the entire call should revert, the function MUST revert.
     /// @param sender The caller address.
@@ -163,6 +152,17 @@ interface IPlugin {
     /// @param preExecHookData The context returned by its associated pre execution hook.
     function postExecutionHook(bytes calldata preExecHookData) external;
 
+    /// @notice Validates a signature using ERC-1271.
+    /// @param sender the address that sent the ERC-1271 request to the smart account
+    /// @param hash the hash of the ERC-1271 request
+    /// @param signature the signature of the ERC-1271 request
+    ///
+    /// @return the ERC-1271 `MAGIC_VALUE` if the signature is valid, or 0xFFFFFFFF if invalid.
+    function isValidSignatureWithSender(address sender, bytes32 hash, bytes calldata signature)
+        external
+        view
+        returns (bytes4);
+
     /// @notice Describe the contents and intended configuration of the plugin.
     /// @dev This manifest MUST stay constant over time.
     /// @return A manifest describing the contents and intended configuration of the plugin.

diff --git a/src/plugins/BasePlugin.sol b/src/plugins/BasePlugin.sol
@@ -57,17 +57,6 @@ abstract contract BasePlugin is ERC165, IPlugin {
         revert NotImplemented();
     }
 
-    /// @inheritdoc IPlugin
-    function isValidSignatureWithSender(address sender, bytes32 hash, bytes calldata signature)
-        external
-        virtual
-        view
-        returns (bytes4)
-    {
-        (sender, hash, signature);
-        revert NotImplemented();
-    }
-
     /// @inheritdoc IPlugin
     function preExecutionHook(address sender, uint256 value, bytes calldata data)
         external
@@ -84,6 +73,17 @@ abstract contract BasePlugin is ERC165, IPlugin {
         revert NotImplemented();
     }
 
+    /// @inheritdoc IPlugin
+    function isValidSignatureWithSender(address sender, bytes32 hash, bytes calldata signature)
+        external
+        view
+        virtual
+        returns (bytes4)
+    {
+        (sender, hash, signature);
+        revert NotImplemented();
+    }
+
     /// @inheritdoc IPlugin
     function pluginManifest() external pure virtual returns (PluginManifest memory) {
         revert NotImplemented();

diff --git a/src/plugins/owner/SingleOwnerPlugin.sol b/src/plugins/owner/SingleOwnerPlugin.sol
@@ -65,7 +65,12 @@ contract SingleOwnerPlugin is BasePlugin, ISingleOwnerPlugin {
     /// validation used in `validateUserOp`, this does///*not** wrap the digest in
     /// an "Ethereum Signed Message" envelope before checking the signature in
     /// the EOA-owner case.
-    function isValidSignatureWithSender(address sender, bytes32 digest, bytes memory signature) public view override returns (bytes4) {
+    function isValidSignatureWithSender(address sender, bytes32 digest, bytes memory signature)
+        public
+        view
+        override
+        returns (bytes4)
+    {
         (sender);
         if (SignatureChecker.isValidSignatureNow(_owners[msg.sender], digest, signature)) {
             return _1271_MAGIC_VALUE;

diff --git a/test/plugin/SingleOwnerPlugin.t.sol b/test/plugin/SingleOwnerPlugin.t.sol
@@ -151,14 +151,18 @@ contract SingleOwnerPluginTest is OptimizedTest {
         (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, digest);
 
         // sig check should fail
-        assertEq(plugin.isValidSignatureWithSender(address(0), digest, abi.encodePacked(r, s, v)), bytes4(0xFFFFFFFF));
+        assertEq(
+            plugin.isValidSignatureWithSender(address(0), digest, abi.encodePacked(r, s, v)), bytes4(0xFFFFFFFF)
+        );
 
         // transfer ownership to signer
         plugin.transferOwnership(signer);
         assertEq(signer, plugin.owner());
 
         // sig check should pass
-        assertEq(plugin.isValidSignatureWithSender(address(0), digest, abi.encodePacked(r, s, v)), _1271_MAGIC_VALUE);
+        assertEq(
+            plugin.isValidSignatureWithSender(address(0), digest, abi.encodePacked(r, s, v)), _1271_MAGIC_VALUE
+        );
     }
 
     function testFuzz_isValidSignatureForContractOwner(bytes32 digest) public {