refactor: organize files

script/DeployAllowlistModule.s.sol

@@ -5,7 +5,7 @@ import {Script, console} from "forge-std/Script.sol";
 
 import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
 
-import {AllowlistModule} from "../src/modules/permissionhooks/AllowlistModule.sol";
+import {AllowlistModule} from "../src/modules/permissions/AllowlistModule.sol";
 
 contract DeployAllowlistModuleScript is Script {
     address public allowlistModule = vm.envOr("ALLOWLIST_MODULE", address(0));

src/account/AccountFactory.sol

@@ -9,7 +9,7 @@ import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
 
 import {ReferenceModularAccount} from "../account/ReferenceModularAccount.sol";
 import {SemiModularAccount} from "../account/SemiModularAccount.sol";
-import {ValidationConfigLib} from "../helpers/ValidationConfigLib.sol";
+import {ValidationConfigLib} from "../libraries/ValidationConfigLib.sol";
 
 import {LibClone} from "solady/utils/LibClone.sol";
 

src/account/ModularAccountView.sol

@@ -5,9 +5,9 @@ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeab
 import {EnumerableMap} from "@openzeppelin/contracts/utils/structs/EnumerableMap.sol";
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
-import {HookConfigLib} from "../helpers/HookConfigLib.sol";
 import {HookConfig, IModularAccount, ModuleEntity} from "../interfaces/IModularAccount.sol";
 import {ExecutionDataView, IModularAccountView, ValidationDataView} from "../interfaces/IModularAccountView.sol";
+import {HookConfigLib} from "../libraries/HookConfigLib.sol";
 import {ExecutionData, ValidationData, getAccountStorage, toHookConfig} from "./AccountStorage.sol";
 
 abstract contract ModularAccountView is IModularAccountView {

src/account/ModuleManagerInternals.sol

@@ -6,16 +6,16 @@ import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet
 
 import {collectReturnData} from "../helpers/CollectReturnData.sol";
 import {MAX_PRE_VALIDATION_HOOKS} from "../helpers/Constants.sol";
-import {HookConfigLib} from "../helpers/HookConfigLib.sol";
-import {KnownSelectors} from "../helpers/KnownSelectors.sol";
-import {ModuleEntityLib} from "../helpers/ModuleEntityLib.sol";
-import {ValidationConfigLib} from "../helpers/ValidationConfigLib.sol";
 import {IExecutionHookModule} from "../interfaces/IExecutionHookModule.sol";
 import {ExecutionManifest, ManifestExecutionHook} from "../interfaces/IExecutionModule.sol";
 import {HookConfig, IModularAccount, ModuleEntity, ValidationConfig} from "../interfaces/IModularAccount.sol";
 import {IModule} from "../interfaces/IModule.sol";
 import {IValidationHookModule} from "../interfaces/IValidationHookModule.sol";
 import {IValidationModule} from "../interfaces/IValidationModule.sol";
+import {HookConfigLib} from "../libraries/HookConfigLib.sol";
+import {KnownSelectorsLib} from "../libraries/KnownSelectorsLib.sol";
+import {ModuleEntityLib} from "../libraries/ModuleEntityLib.sol";
+import {ValidationConfigLib} from "../libraries/ValidationConfigLib.sol";
 
 import {
     AccountStorage,
@@ -61,12 +61,12 @@ abstract contract ModuleManagerInternals is IModularAccount {
 
         // Make sure incoming execution function does not collide with any native functions (data are stored on the
         // account implementation contract)
-        if (KnownSelectors.isNativeFunction(selector)) {
+        if (KnownSelectorsLib.isNativeFunction(selector)) {
             revert NativeFunctionNotAllowed(selector);
         }
 
         // Make sure incoming execution function is not a function in IModule
-        if (KnownSelectors.isIModuleFunction(selector)) {
+        if (KnownSelectorsLib.isIModuleFunction(selector)) {
             revert IModuleFunctionNotAllowed(selector);
         }
 
@@ -75,7 +75,7 @@ abstract contract ModuleManagerInternals is IModularAccount {
         // sneaking in a function with the same selector as e.g.
         // `validatePaymasterUserOp` and turning the account into their own
         // personal paymaster.
-        if (KnownSelectors.isErc4337Function(selector)) {
+        if (KnownSelectorsLib.isErc4337Function(selector)) {
             revert Erc4337FunctionNotAllowed(selector);
         }
 

src/account/ReferenceModularAccount.sol

@@ -13,16 +13,16 @@ import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet
 
 import {collectReturnData} from "../helpers/CollectReturnData.sol";
 import {DIRECT_CALL_VALIDATION_ENTITYID} from "../helpers/Constants.sol";
-import {HookConfig, HookConfigLib} from "../helpers/HookConfigLib.sol";
-import {ModuleEntityLib} from "../helpers/ModuleEntityLib.sol";
-import {SparseCalldataSegmentLib} from "../helpers/SparseCalldataSegmentLib.sol";
-import {ValidationConfigLib} from "../helpers/ValidationConfigLib.sol";
 import {_coalescePreValidation, _coalesceValidation} from "../helpers/ValidationResHelpers.sol";
 import {IExecutionHookModule} from "../interfaces/IExecutionHookModule.sol";
 import {ExecutionManifest} from "../interfaces/IExecutionModule.sol";
 import {Call, IModularAccount, ModuleEntity, ValidationConfig} from "../interfaces/IModularAccount.sol";
 import {IValidationHookModule} from "../interfaces/IValidationHookModule.sol";
 import {IValidationModule} from "../interfaces/IValidationModule.sol";
+import {HookConfig, HookConfigLib} from "../libraries/HookConfigLib.sol";
+import {ModuleEntityLib} from "../libraries/ModuleEntityLib.sol";
+import {SparseCalldataSegmentLib} from "../libraries/SparseCalldataSegmentLib.sol";
+import {ValidationConfigLib} from "../libraries/ValidationConfigLib.sol";
 import {AccountExecutor} from "./AccountExecutor.sol";
 import {AccountStorage, getAccountStorage, toHookConfig, toSetValue} from "./AccountStorage.sol";
 import {AccountStorageInitializable} from "./AccountStorageInitializable.sol";

src/account/SemiModularAccount.sol

@@ -5,7 +5,7 @@ import {ReferenceModularAccount} from "./ReferenceModularAccount.sol";
 import {IEntryPoint} from "@eth-infinitism/account-abstraction/interfaces/IEntryPoint.sol";
 import {PackedUserOperation} from "@eth-infinitism/account-abstraction/interfaces/PackedUserOperation.sol";
 
-import {ModuleEntityLib} from "../helpers/ModuleEntityLib.sol";
+import {ModuleEntityLib} from "../libraries/ModuleEntityLib.sol";
 
 import {IModularAccount, ModuleEntity, ValidationConfig} from "../interfaces/IModularAccount.sol";
 

src/helpers/KnownSelectors.sol → src/libraries/KnownSelectorsLib.sol

@@ -17,7 +17,7 @@ import {IValidationModule} from "../interfaces/IValidationModule.sol";
 
 /// @dev Library to help to check if a selector is a know function selector of the modular account or ERC-4337
 /// contract.
-library KnownSelectors {
+library KnownSelectorsLib {
     function isNativeFunction(bytes4 selector) internal pure returns (bool) {
         return
         // check against IAccount methods

src/helpers/SparseCalldataSegmentLib.sol → src/libraries/SparseCalldataSegmentLib.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.20;
 
-import {RESERVED_VALIDATION_DATA_INDEX} from "./Constants.sol";
+import {RESERVED_VALIDATION_DATA_INDEX} from "../helpers/Constants.sol";
 
 /// @title Sparse Calldata Segment Library
 /// @notice Library for working with sparsely-packed calldata segments, identified with an index.

src/modules/ERC20TokenLimitModule.sol → src/modules/permissions/ERC20TokenLimitModule.sol

@@ -5,11 +5,11 @@ import {UserOperationLib} from "@eth-infinitism/account-abstraction/core/UserOpe
 import {PackedUserOperation} from "@eth-infinitism/account-abstraction/interfaces/PackedUserOperation.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-import {IExecutionHookModule} from "../interfaces/IExecutionHookModule.sol";
-import {Call, IModularAccount} from "../interfaces/IModularAccount.sol";
-import {IModule} from "../interfaces/IModule.sol";
+import {IExecutionHookModule} from "../../interfaces/IExecutionHookModule.sol";
+import {Call, IModularAccount} from "../../interfaces/IModularAccount.sol";
+import {IModule} from "../../interfaces/IModule.sol";
 
-import {BaseModule, IERC165} from "./BaseModule.sol";
+import {BaseModule, IERC165} from "../BaseModule.sol";
 
 /// @title ERC20 Token Limit Module
 /// @author ERC-6900 Authors

src/modules/NativeTokenLimitModule.sol → src/modules/permissions/NativeTokenLimitModule.sol

@@ -5,11 +5,11 @@ import {UserOperationLib} from "@eth-infinitism/account-abstraction/core/UserOpe
 import {PackedUserOperation} from "@eth-infinitism/account-abstraction/interfaces/PackedUserOperation.sol";
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
-import {IExecutionHookModule} from "../interfaces/IExecutionHookModule.sol";
-import {Call, IModularAccount} from "../interfaces/IModularAccount.sol";
-import {IModule} from "../interfaces/IModule.sol";
-import {IValidationHookModule} from "../interfaces/IValidationHookModule.sol";
-import {BaseModule, IERC165} from "./BaseModule.sol";
+import {IExecutionHookModule} from "../../interfaces/IExecutionHookModule.sol";
+import {Call, IModularAccount} from "../../interfaces/IModularAccount.sol";
+import {IModule} from "../../interfaces/IModule.sol";
+import {IValidationHookModule} from "../../interfaces/IValidationHookModule.sol";
+import {BaseModule, IERC165} from "../BaseModule.sol";
 
 /// @title Native Token Limit Module
 /// @author ERC-6900 Authors

test/account/AccountReturnData.t.sol

@@ -2,9 +2,9 @@
 pragma solidity ^0.8.20;
 
 import {DIRECT_CALL_VALIDATION_ENTITYID} from "../../src/helpers/Constants.sol";
-import {ValidationConfigLib} from "../../src/helpers/ValidationConfigLib.sol";
 import {Call} from "../../src/interfaces/IModularAccount.sol";
 import {IModularAccount} from "../../src/interfaces/IModularAccount.sol";
+import {ValidationConfigLib} from "../../src/libraries/ValidationConfigLib.sol";
 
 import {
     RegularResultContract,

test/account/DirectCallsFromModule.t.sol

@@ -3,10 +3,10 @@ pragma solidity ^0.8.20;
 
 import {ReferenceModularAccount} from "../../src/account/ReferenceModularAccount.sol";
 
-import {HookConfigLib} from "../../src/helpers/HookConfigLib.sol";
-import {ModuleEntity, ModuleEntityLib} from "../../src/helpers/ModuleEntityLib.sol";
-import {ValidationConfig, ValidationConfigLib} from "../../src/helpers/ValidationConfigLib.sol";
 import {Call, IModularAccount} from "../../src/interfaces/IModularAccount.sol";
+import {HookConfigLib} from "../../src/libraries/HookConfigLib.sol";
+import {ModuleEntity, ModuleEntityLib} from "../../src/libraries/ModuleEntityLib.sol";
+import {ValidationConfig, ValidationConfigLib} from "../../src/libraries/ValidationConfigLib.sol";
 import {DirectCallModule} from "../mocks/modules/DirectCallModule.sol";
 
 import {AccountTestBase} from "../utils/AccountTestBase.sol";

test/account/GlobalValidationTest.t.sol

@@ -5,7 +5,7 @@ import {PackedUserOperation} from "@eth-infinitism/account-abstraction/interface
 import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 
 import {ReferenceModularAccount} from "../../src/account/ReferenceModularAccount.sol";
-import {ModuleEntityLib} from "../../src/helpers/ModuleEntityLib.sol";
+import {ModuleEntityLib} from "../../src/libraries/ModuleEntityLib.sol";
 
 import {AccountTestBase} from "../utils/AccountTestBase.sol";
 

test/account/ModularAccountView.t.sol

@@ -3,8 +3,8 @@ pragma solidity ^0.8.20;
 
 import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
 
-import {HookConfigLib} from "../../src/helpers/HookConfigLib.sol";
-import {ModuleEntity, ModuleEntityLib} from "../../src/helpers/ModuleEntityLib.sol";
+import {HookConfigLib} from "../../src/libraries/HookConfigLib.sol";
+import {ModuleEntity, ModuleEntityLib} from "../../src/libraries/ModuleEntityLib.sol";
 
 import {HookConfig, IModularAccount} from "../../src/interfaces/IModularAccount.sol";
 import {ExecutionDataView, ValidationDataView} from "../../src/interfaces/IModularAccountView.sol";

test/account/MultiValidation.t.sol

@@ -9,8 +9,8 @@ import {IEntryPoint} from "@eth-infinitism/account-abstraction/interfaces/IEntry
 
 import {ReferenceModularAccount} from "../../src/account/ReferenceModularAccount.sol";
 
-import {ModuleEntityLib} from "../../src/helpers/ModuleEntityLib.sol";
-import {ValidationConfigLib} from "../../src/helpers/ValidationConfigLib.sol";
+import {ModuleEntityLib} from "../../src/libraries/ModuleEntityLib.sol";
+import {ValidationConfigLib} from "../../src/libraries/ValidationConfigLib.sol";
 
 import {IModularAccount, ModuleEntity} from "../../src/interfaces/IModularAccount.sol";
 import {SingleSignerValidationModule} from "../../src/modules/validation/SingleSignerValidationModule.sol";

test/account/PerHookData.t.sol

@@ -6,10 +6,10 @@ import {PackedUserOperation} from "@eth-infinitism/account-abstraction/interface
 import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 
 import {ReferenceModularAccount} from "../../src/account/ReferenceModularAccount.sol";
-import {HookConfigLib} from "../../src/helpers/HookConfigLib.sol";
-import {ModuleEntity, ModuleEntityLib} from "../../src/helpers/ModuleEntityLib.sol";
-import {SparseCalldataSegmentLib} from "../../src/helpers/SparseCalldataSegmentLib.sol";
-import {ValidationConfigLib} from "../../src/helpers/ValidationConfigLib.sol";
+import {HookConfigLib} from "../../src/libraries/HookConfigLib.sol";
+import {ModuleEntity, ModuleEntityLib} from "../../src/libraries/ModuleEntityLib.sol";
+import {SparseCalldataSegmentLib} from "../../src/libraries/SparseCalldataSegmentLib.sol";
+import {ValidationConfigLib} from "../../src/libraries/ValidationConfigLib.sol";
 
 import {Counter} from "../mocks/Counter.sol";
 import {MockAccessControlHookModule} from "../mocks/modules/MockAccessControlHookModule.sol";

test/account/ReferenceModularAccount.t.sol

@@ -12,11 +12,11 @@ import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/Messa
 import {ModuleManagerInternals} from "../../src/account/ModuleManagerInternals.sol";
 import {ReferenceModularAccount} from "../../src/account/ReferenceModularAccount.sol";
 import {SemiModularAccount} from "../../src/account/SemiModularAccount.sol";
-import {ModuleEntityLib} from "../../src/helpers/ModuleEntityLib.sol";
-import {ValidationConfigLib} from "../../src/helpers/ValidationConfigLib.sol";
 import {ExecutionManifest} from "../../src/interfaces/IExecutionModule.sol";
 import {Call} from "../../src/interfaces/IModularAccount.sol";
 import {ExecutionDataView} from "../../src/interfaces/IModularAccountView.sol";
+import {ModuleEntityLib} from "../../src/libraries/ModuleEntityLib.sol";
+import {ValidationConfigLib} from "../../src/libraries/ValidationConfigLib.sol";
 import {TokenReceiverModule} from "../../src/modules/TokenReceiverModule.sol";
 import {SingleSignerValidationModule} from "../../src/modules/validation/SingleSignerValidationModule.sol";
 

test/account/ReplaceModule.t.sol

@@ -2,22 +2,19 @@
 pragma solidity ^0.8.20;
 
 import {ReferenceModularAccount} from "../../src/account/ReferenceModularAccount.sol";
-
-import {ModuleEntityLib} from "../../src/helpers/ModuleEntityLib.sol";
-
-import {ValidationConfigLib} from "../../src/helpers/ValidationConfigLib.sol";
+import {IExecutionHookModule} from "../../src/interfaces/IExecutionHookModule.sol";
 import {
     ExecutionManifest,
     ManifestExecutionFunction,
     ManifestExecutionHook
 } from "../../src/interfaces/IExecutionModule.sol";
-
-import {HookConfigLib} from "../../src/helpers/HookConfigLib.sol";
-import {IExecutionHookModule} from "../../src/interfaces/IExecutionHookModule.sol";
-
 import {Call, IModularAccount, ModuleEntity} from "../../src/interfaces/IModularAccount.sol";
 import {IValidationHookModule} from "../../src/interfaces/IValidationHookModule.sol";
+import {HookConfigLib} from "../../src/libraries/HookConfigLib.sol";
+import {ModuleEntityLib} from "../../src/libraries/ModuleEntityLib.sol";
+import {ValidationConfigLib} from "../../src/libraries/ValidationConfigLib.sol";
 import {SingleSignerValidationModule} from "../../src/modules/validation/SingleSignerValidationModule.sol";
+
 import {MockModule} from "../mocks/MockModule.sol";
 import {AccountTestBase} from "../utils/AccountTestBase.sol";
 

test/account/SelfCallAuthorization.t.sol

@@ -7,9 +7,9 @@ import {PackedUserOperation} from "@eth-infinitism/account-abstraction/interface
 
 import {ReferenceModularAccount} from "../../src/account/ReferenceModularAccount.sol";
 
-import {ModuleEntity, ModuleEntityLib} from "../../src/helpers/ModuleEntityLib.sol";
-import {ValidationConfigLib} from "../../src/helpers/ValidationConfigLib.sol";
 import {Call, IModularAccount} from "../../src/interfaces/IModularAccount.sol";
+import {ModuleEntity, ModuleEntityLib} from "../../src/libraries/ModuleEntityLib.sol";
+import {ValidationConfigLib} from "../../src/libraries/ValidationConfigLib.sol";
 
 import {ComprehensiveModule} from "../mocks/modules/ComprehensiveModule.sol";
 import {AccountTestBase} from "../utils/AccountTestBase.sol";

test/account/ValidationIntersection.t.sol

@@ -5,9 +5,9 @@ import {PackedUserOperation} from "@eth-infinitism/account-abstraction/interface
 
 import {ReferenceModularAccount} from "../../src/account/ReferenceModularAccount.sol";
 
-import {HookConfigLib} from "../../src/helpers/HookConfigLib.sol";
-import {ModuleEntity, ModuleEntityLib} from "../../src/helpers/ModuleEntityLib.sol";
-import {ValidationConfigLib} from "../../src/helpers/ValidationConfigLib.sol";
+import {HookConfigLib} from "../../src/libraries/HookConfigLib.sol";
+import {ModuleEntity, ModuleEntityLib} from "../../src/libraries/ModuleEntityLib.sol";
+import {ValidationConfigLib} from "../../src/libraries/ValidationConfigLib.sol";
 
 import {
     MockBaseUserOpValidationModule,

test/libraries/HookConfigLib.t.sol

@@ -3,9 +3,9 @@ pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 
-import {HookConfigLib} from "../../src/helpers/HookConfigLib.sol";
-import {ModuleEntityLib} from "../../src/helpers/ModuleEntityLib.sol";
 import {HookConfig, ModuleEntity} from "../../src/interfaces/IModularAccount.sol";
+import {HookConfigLib} from "../../src/libraries/HookConfigLib.sol";
+import {ModuleEntityLib} from "../../src/libraries/ModuleEntityLib.sol";
 
 contract HookConfigLibTest is Test {
     using ModuleEntityLib for ModuleEntity;

test/libraries/KnowSelectors.t.sol → test/libraries/KnowSelectorsLib.t.sol

@@ -5,19 +5,19 @@ import {IAccount} from "@eth-infinitism/account-abstraction/interfaces/IAccount.
 import {IPaymaster} from "@eth-infinitism/account-abstraction/interfaces/IPaymaster.sol";
 import {Test} from "forge-std/Test.sol";
 
-import {KnownSelectors} from "../../src/helpers/KnownSelectors.sol";
 import {IModule} from "../../src/interfaces/IModule.sol";
+import {KnownSelectorsLib} from "../../src/libraries/KnownSelectorsLib.sol";
 
-contract KnownSelectorsTest is Test {
+contract KnownSelectorsLibTest is Test {
     function test_isNativeFunction() public {
-        assertTrue(KnownSelectors.isNativeFunction(IAccount.validateUserOp.selector));
+        assertTrue(KnownSelectorsLib.isNativeFunction(IAccount.validateUserOp.selector));
     }
 
     function test_isErc4337Function() public {
-        assertTrue(KnownSelectors.isErc4337Function(IPaymaster.validatePaymasterUserOp.selector));
+        assertTrue(KnownSelectorsLib.isErc4337Function(IPaymaster.validatePaymasterUserOp.selector));
     }
 
     function test_isIModuleFunction() public {
-        assertTrue(KnownSelectors.isIModuleFunction(IModule.moduleId.selector));
+        assertTrue(KnownSelectorsLib.isIModuleFunction(IModule.moduleId.selector));
     }
 }

test/libraries/ModuleEntityLib.t.sol

@@ -3,8 +3,8 @@ pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 
-import {ModuleEntityLib} from "../../src/helpers/ModuleEntityLib.sol";
 import {ModuleEntity} from "../../src/interfaces/IModularAccount.sol";
+import {ModuleEntityLib} from "../../src/libraries/ModuleEntityLib.sol";
 
 contract ModuleEntityLibTest is Test {
     using ModuleEntityLib for ModuleEntity;

test/libraries/SparseCalldataSegmentLib.t.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 
-import {SparseCalldataSegmentLib} from "../../src/helpers/SparseCalldataSegmentLib.sol";
+import {SparseCalldataSegmentLib} from "../../src/libraries/SparseCalldataSegmentLib.sol";
 
 contract SparseCalldataSegmentLibTest is Test {
     using SparseCalldataSegmentLib for bytes;

test/libraries/ValidationConfigLib.t.sol

@@ -3,8 +3,8 @@ pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 
-import {ModuleEntity, ModuleEntityLib} from "../../src/helpers/ModuleEntityLib.sol";
-import {ValidationConfig, ValidationConfigLib} from "../../src/helpers/ValidationConfigLib.sol";
+import {ModuleEntity, ModuleEntityLib} from "../../src/libraries/ModuleEntityLib.sol";
+import {ValidationConfig, ValidationConfigLib} from "../../src/libraries/ValidationConfigLib.sol";
 
 contract ValidationConfigLibTest is Test {
     using ModuleEntityLib for ModuleEntity;