feat: downgrade solc version

foundry.toml

@@ -1,4 +1,5 @@
 [profile.default]
+solc_version = "0.8.25"
 evm_version = "cancun"
 src = "src"
 out = "out"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhinestone/modulekit",
-  "version": "0.4.17",
+  "version": "0.5.0",
   "description": "A development kit for building and testing smart account modules.",
   "license": "GPL-3.0",
   "author": {
@@ -29,24 +29,19 @@
   "dependencies": {
     "@ERC4337/account-abstraction": "github:kopy-kat/account-abstraction#develop",
     "@ERC4337/account-abstraction-v0.6": "github:eth-infinitism/account-abstraction#v0.6.0",
-    "@prb/math": "^4.0.2",
+    "@prb/math": "^4.1.0",
     "@rhinestone/erc4337-validation": "^0.0.4",
-    "@rhinestone/module-bases": "github:rhinestonewtf/module-bases#6ed072249860c7143d3f29b153187ab6d5924e84",
-    "@rhinestone/safe7579": "github:rhinestonewtf/safe7579#v1.0.0",
     "@rhinestone/sentinellist": "github:rhinestonewtf/sentinellist",
-    "@rhinestone/registry": "github:rhinestonewtf/registry#v1.0",
     "@safe-global/safe-contracts": "^1.4.1",
-    "@zerodev/kernel": "github:kopy-kat/kernel#patch",
     "ds-test": "github:dapphub/ds-test",
-    "erc7579": "github:erc7579/erc7579-implementation",
     "excessively-safe-call": "github:nomad-xyz/ExcessivelySafeCall",
     "forge-std": "github:foundry-rs/forge-std",
     "solady": "github:vectorized/solady",
     "solarray": "github:sablier-labs/solarray"
   },
   "devDependencies": {
-    "@changesets/cli": "^2.27.2",
-    "solhint": "^5.0.1"
+    "@changesets/cli": "^2.27.9",
+    "solhint": "^5.0.3"
   },
   "files": [
     "src",

remappings.txt

@@ -1,22 +1,13 @@
-@rhinestone/=node_modules/@rhinestone/
-sentinellist/=node_modules/@rhinestone/sentinellist/src/
 erc4337-validation/=node_modules/@rhinestone/erc4337-validation/src/
-safe7579/=node_modules/@rhinestone/safe7579/src/
-modulekit/=node_modules/@rhinestone/modulekit/src/
-module-bases/=node_modules/@rhinestone/module-bases/src/
-registry/=node_modules/@rhinestone/registry/src/
-
 @ERC4337/=node_modules/@ERC4337/
 account-abstraction/=node_modules/@ERC4337/account-abstraction/contracts/
 account-abstraction-v0.6/=node_modules/@ERC4337/account-abstraction-v0.6/contracts/
-
+modulekit/=node_modules/@rhinestone/modulekit/src/
 @openzeppelin/=node_modules/@openzeppelin/
 @safe-global/=node_modules/@safe-global/
 ds-test/=node_modules/ds-test/src/
-erc7579/=node_modules/erc7579/src/
 forge-std/=node_modules/forge-std/src/
 solady/=node_modules/solady/src/
 solarray/=node_modules/solarray/src/
 @prb/math/=node_modules/@prb/math/src/
-kernel/=node_modules/@zerodev/kernel/src/
 ExcessivelySafeCall/=node_modules/excessively-safe-call/src/

src/Accounts.sol

@@ -1,5 +1,28 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
+pragma solidity >=0.8.23 <0.9.0;
 
 /* solhint-disable no-unused-import */
-import { Execution, IERC7579Account } from "./external/ERC7579.sol";
+
+/*//////////////////////////////////////////////////////////////
+                            COMMON
+//////////////////////////////////////////////////////////////*/
+
+import { IERC7579Account } from "./accounts/common/interfaces/IERC7579Account.sol";
+
+/*//////////////////////////////////////////////////////////////
+                        7579 REFERENCE
+//////////////////////////////////////////////////////////////*/
+
+import { IMSA } from "./accounts/erc7579/interfaces/IMSA.sol";
+
+/*//////////////////////////////////////////////////////////////
+                            KERNEL
+//////////////////////////////////////////////////////////////*/
+
+import { IERC7579Account as IKernelAccount } from "./accounts/kernel/interfaces/IERC7579Account.sol";
+
+/*//////////////////////////////////////////////////////////////
+                             SAFE
+//////////////////////////////////////////////////////////////*/
+
+import { ISafe7579 } from "./accounts/safe/interfaces/ISafe7579.sol";

src/Helpers.sol

@@ -1,12 +1,40 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
+pragma solidity >=0.8.23 <0.9.0;
 
 /* solhint-disable no-unused-import */
+
+/*//////////////////////////////////////////////////////////////
+                            4337
+//////////////////////////////////////////////////////////////*/
+
 import { ERC4337Helpers } from "./test/utils/ERC4337Helpers.sol";
+
+/*//////////////////////////////////////////////////////////////
+                        7579 REFERENCE
+//////////////////////////////////////////////////////////////*/
+
 import { ERC7579Helpers } from "./test/helpers/ERC7579Helpers.sol";
-import { sign as vmSign } from "./test/utils/Vm.sol";
 
-function ecdsaSign(uint256 privKey, bytes32 digest) pure returns (bytes memory signature) {
-    (uint8 v, bytes32 r, bytes32 s) = vmSign(privKey, digest);
-    return abi.encodePacked(r, s, v);
-}
+/*//////////////////////////////////////////////////////////////
+                            KERNEL
+//////////////////////////////////////////////////////////////*/
+
+import { KernelHelpers } from "./test/helpers/KernelHelpers.sol";
+
+/*//////////////////////////////////////////////////////////////
+                            NEXUS
+//////////////////////////////////////////////////////////////*/
+
+import { NexusHelpers } from "./test/helpers/NexusHelpers.sol";
+
+/*//////////////////////////////////////////////////////////////
+                            SAFE
+//////////////////////////////////////////////////////////////*/
+
+import { SafeHelpers } from "./test/helpers/SafeHelpers.sol";
+
+/*//////////////////////////////////////////////////////////////
+                            UTIL
+//////////////////////////////////////////////////////////////*/
+
+import { ecdsaSign } from "./test/utils/ECDSA.sol";

src/Integrations.sol

@@ -1,8 +1,18 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
+pragma solidity >=0.8.23 <0.9.0;
 
 /* solhint-disable no-unused-import */
+
+/*//////////////////////////////////////////////////////////////
+                             ERCs
+//////////////////////////////////////////////////////////////*/
+
 import { ERC20Integration } from "./integrations/ERC20.sol";
 import { ERC721Integration } from "./integrations/ERC721.sol";
 import { ERC4626Integration } from "./integrations/ERC4626.sol";
+
+/*//////////////////////////////////////////////////////////////
+                            UNIV3
+//////////////////////////////////////////////////////////////*/
+
 import { UniswapV3Integration, SWAPROUTER_ADDRESS } from "./integrations/uniswap/v3/Uniswap.sol";

src/Interfaces.sol

@@ -1,24 +1,29 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
+pragma solidity >=0.8.23 <0.9.0;
 
 /* solhint-disable no-unused-import */
+
 /*//////////////////////////////////////////////////////////////
                              ERCs
 //////////////////////////////////////////////////////////////*/
-import { IERC1271, EIP1271_MAGIC_VALUE } from "module-bases/interfaces/IERC1271.sol";
-import { IERC7484 } from "module-bases/interfaces/IERC7484.sol";
+
+import { IERC1271, EIP1271_MAGIC_VALUE } from "./module-bases/interfaces/IERC1271.sol";
+import { IERC7484 } from "./module-bases/interfaces/IERC7484.sol";
+import {
+    IERC6682,
+    IERC3156FlashLender,
+    IERC3156FlashBorrower
+} from "./module-bases/interfaces/Flashloan.sol";
 
 /*//////////////////////////////////////////////////////////////
-                             Modules
+                            MODULES
 //////////////////////////////////////////////////////////////*/
-import { IStatelessValidator } from "module-bases/interfaces/IStatelessValidator.sol";
+
+import { IStatelessValidator } from "./module-bases/interfaces/IStatelessValidator.sol";
+import { IPolicy } from "./module-bases/interfaces/IPolicy.sol";
 
 /*//////////////////////////////////////////////////////////////
-                             Misc
+                            TYPES
 //////////////////////////////////////////////////////////////*/
-import {
-    FlashLoanType,
-    IERC6682,
-    IERC3156FlashLender,
-    IERC3156FlashBorrower
-} from "module-bases/interfaces/Flashloan.sol";
+
+import { FlashLoanType } from "./module-bases/interfaces/Flashloan.sol";

src/Mocks.sol

@@ -1,29 +1,31 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
+pragma solidity >=0.8.23 <0.9.0;
 
 /* solhint-disable no-unused-import */
+
 /*//////////////////////////////////////////////////////////////
-                             Aux
+                              AUX
 //////////////////////////////////////////////////////////////*/
 
-import { MockRegistry } from "module-bases/mocks/MockRegistry.sol";
-import { MockTarget } from "module-bases/mocks/MockTarget.sol";
-import { MockHookMultiPlexer } from "module-bases/mocks/MockHookMultiPlexer.sol";
-import { MockPolicy } from "module-bases/mocks/MockPolicy.sol";
+import { MockRegistry } from "./module-bases/mocks/MockRegistry.sol";
+import { MockTarget } from "./module-bases/mocks/MockTarget.sol";
+import { MockHookMultiPlexer } from "./module-bases/mocks/MockHookMultiPlexer.sol";
+import { MockPolicy } from "./module-bases/mocks/MockPolicy.sol";
 
 /*//////////////////////////////////////////////////////////////
-                             Modules
+                            MODULES
 //////////////////////////////////////////////////////////////*/
 
-import { MockValidator } from "module-bases/mocks/MockValidator.sol";
-import { MockStatelessValidator } from "module-bases/mocks/MockStatelessValidator.sol";
-import { MockHybridValidator } from "module-bases/mocks/MockHybridValidator.sol";
-import { MockExecutor } from "module-bases/mocks/MockExecutor.sol";
-import { MockHook } from "module-bases/mocks/MockHook.sol";
-import { MockFallback } from "module-bases/mocks/MockFallback.sol";
+import { MockValidator } from "./module-bases/mocks/MockValidator.sol";
+import { MockStatelessValidator } from "./module-bases/mocks/MockStatelessValidator.sol";
+import { MockHybridValidator } from "./module-bases/mocks/MockHybridValidator.sol";
+import { MockExecutor } from "./module-bases/mocks/MockExecutor.sol";
+import { MockHook } from "./module-bases/mocks/MockHook.sol";
+import { MockFallback } from "./module-bases/mocks/MockFallback.sol";
 
 /*//////////////////////////////////////////////////////////////
-                             Tokens
+                            TOKENS
 //////////////////////////////////////////////////////////////*/
+
 import { MockERC20 } from "forge-std/mocks/MockERC20.sol";
 import { MockERC721 } from "forge-std/mocks/MockERC721.sol";

src/ModuleKit.sol

@@ -1,14 +1,22 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
+pragma solidity >=0.8.23 <0.9.0;
 
 /* solhint-disable no-unused-import */
+
+/*//////////////////////////////////////////////////////////////
+                            MODULEKIT
+//////////////////////////////////////////////////////////////*/
+
 import {
     UserOpData,
     AccountInstance,
     RhinestoneModuleKit,
     AccountType
 } from "./test/RhinestoneModuleKit.sol";
 import { ModuleKitHelpers } from "./test/ModuleKitHelpers.sol";
-import { ModuleKitUserOp } from "./test/ModuleKitUserOp.sol";
+
+/*//////////////////////////////////////////////////////////////
+                             4337
+////////////////////////////////////////////////////////////*/
+
 import { PackedUserOperation } from "./external/ERC4337.sol";
-/* solhint-enable no-unused-import */

src/Modules.sol

@@ -1,24 +1,54 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
+pragma solidity >=0.8.23 <0.9.0;
 
 /* solhint-disable no-unused-import */
-import { ERC7579ValidatorBase } from "module-bases/ERC7579ValidatorBase.sol";
-import { ERC7579StatelessValidatorBase } from "module-bases/ERC7579StatelessValidatorBase.sol";
-import { ERC7579ExecutorBase } from "module-bases/ERC7579ExecutorBase.sol";
-import { ERC7579HookBase } from "module-bases/ERC7579HookBase.sol";
-import { ERC7579HookDestruct } from "module-bases/ERC7579HookDestruct.sol";
-import { ERC7579FallbackBase } from "module-bases/ERC7579FallbackBase.sol";
-import { SchedulingBase } from "module-bases/SchedulingBase.sol";
+
+/*//////////////////////////////////////////////////////////////
+                          INTERFACES
+//////////////////////////////////////////////////////////////*/
+
 import {
-    IERC7579Validator,
-    IERC7579Executor,
-    IERC7579Fallback,
-    IERC7579Hook
-} from "./external/ERC7579.sol";
-import { ERC7484RegistryAdapter } from "module-bases/ERC7484RegistryAdapter.sol";
-import { ERC7579ModuleBase } from "module-bases/ERC7579ModuleBase.sol";
-import { TrustedForwarder } from "module-bases/utils/TrustedForwarder.sol";
-import { ERC1271Policy } from "module-bases/ERC1271Policy.sol";
-import { ERC7579ActionPolicy } from "module-bases/ERC7579ActionPolicy.sol";
-import { ERC7579PolicyBase } from "module-bases/ERC7579PolicyBase.sol";
-import { ERC7579UserOpPolicy } from "module-bases/ERC7579UserOpPolicy.sol";
+    IValidator as IERC7579Validator,
+    IExecutor as IERC7579Executor,
+    IFallback as IERC7579Fallback,
+    IHook as IERC7579Hook,
+    IModule as IERC7579Module
+} from "./accounts/common/interfaces/IERC7579Module.sol";
+
+/*//////////////////////////////////////////////////////////////
+                            BASES
+//////////////////////////////////////////////////////////////*/
+
+// Core
+import { ERC7579ModuleBase } from "./module-bases/ERC7579ModuleBase.sol";
+
+// Validators
+import { ERC7579ValidatorBase } from "./module-bases/ERC7579ValidatorBase.sol";
+import { ERC7579StatelessValidatorBase } from "./module-bases/ERC7579StatelessValidatorBase.sol";
+import { ERC7579HybridValidatorBase } from "./module-bases/ERC7579HybridValidatorBase.sol";
+
+// Executors
+import { ERC7579ExecutorBase } from "./module-bases/ERC7579ExecutorBase.sol";
+
+// Hooks
+import { ERC7579HookBase } from "./module-bases/ERC7579HookBase.sol";
+import { ERC7579HookDestruct } from "./module-bases/ERC7579HookDestruct.sol";
+
+// Fallbacks
+import { ERC7579FallbackBase } from "./module-bases/ERC7579FallbackBase.sol";
+
+// Misc
+import { SchedulingBase } from "./module-bases/SchedulingBase.sol";
+import { ERC7484RegistryAdapter } from "./module-bases/ERC7484RegistryAdapter.sol";
+
+// Policies
+import { ERC7579PolicyBase } from "./module-bases/ERC7579PolicyBase.sol";
+import { ERC1271Policy } from "./module-bases/ERC1271Policy.sol";
+import { ERC7579ActionPolicy } from "./module-bases/ERC7579ActionPolicy.sol";
+import { ERC7579UserOpPolicy } from "./module-bases/ERC7579UserOpPolicy.sol";
+
+/*//////////////////////////////////////////////////////////////
+                            UTIL
+//////////////////////////////////////////////////////////////*/
+
+import { TrustedForwarder } from "./module-bases/utils/TrustedForwarder.sol";