Merge pull request #26 from Unhosted-Wallet/release/1.2.1

Release/1.2.1

strategy-module/src/StrategyModule.sol

@@ -5,7 +5,7 @@ import {ReentrancyGuard} from "@openzeppelin/contracts/utils/ReentrancyGuard.sol
 import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
-import {IStrategyModule, ISignatureValidatorConstants, ISignatureValidator, IExecFromModule, Enum} from "src/interfaces/IStrategyModule.sol";
+import {IStrategyModule, ISignatureValidatorConstants, ISignatureValidator, IExecFromModule, Enum} from "./interface/IStrategyModule.sol";
 
 /**
  * @title Strategy module for Biconomy Smart Accounts.

strategy-module/src/interfaces/IStrategyModule.sol → strategy-module/src/interface/IStrategyModule.sol

@@ -1,8 +1,26 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.20;
 
-// solhint-disable-next-line
-import {ISignatureValidator, ISignatureValidatorConstants} from "src/interfaces/ISignatureValidator.sol";
+contract ISignatureValidatorConstants {
+    // bytes4(keccak256("isValidSignature(bytes32,bytes)")
+    bytes4 internal constant EIP1271_MAGIC_VALUE = 0x1626ba7e;
+}
+
+abstract contract ISignatureValidator is ISignatureValidatorConstants {
+    /**
+     * @dev Should return whether the signature provided is valid for the provided data
+     * @param _dataHash Arbitrary length data signed on behalf of address(this)
+     * @param _signature Signature byte array associated with _data
+     *
+     * MUST return the bytes4 magic value 0x1626ba7e when function passes.
+     * MUST NOT modify state (using STATICCALL for solc < 0.5, view modifier for solc > 0.5)
+     * MUST allow external calls
+     */
+    function isValidSignature(
+        bytes32 _dataHash,
+        bytes memory _signature
+    ) public view virtual returns (bytes4);
+}
 
 abstract contract Enum {
     enum Operation {

strategy-module/test/StrategyModule.t.sol

@@ -20,7 +20,7 @@ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {UserOperation, IAccount} from "I4337/interfaces/IAccount.sol";
 import {IUniswapV3Factory} from "test/interfaces/IUniswapV3Factory.sol";
 import {StrategyModule, Enum, ReentrancyGuard} from "src/StrategyModule.sol";
-import {IStrategyModule} from "src/interfaces/IStrategyModule.sol";
+import {IStrategyModule} from "src/interface/IStrategyModule.sol";
 import {ISwapRouter} from "test/interfaces/ISwapRouter.sol";
 
 import "src/mocks/MockERC20.sol";