misc: Organized imports

alchemyplatform · May 10, 2024 · f1c5485 · f1c5485
1 parent fd8aa73
commit f1c5485
Show file tree

Hide file tree

Showing 47 changed files with 133 additions and 148 deletions.
diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
@@ -19,7 +19,6 @@ pragma solidity ^0.8.22;
 
 import {Script} from "forge-std/Script.sol";
 import {console} from "forge-std/Test.sol";
-
 import {IEntryPoint as I4337EntryPoint} from "@eth-infinitism/account-abstraction/interfaces/IEntryPoint.sol";
 
 import {UpgradeableModularAccount} from "../src/account/UpgradeableModularAccount.sol";

diff --git a/src/account/AccountExecutor.sol b/src/account/AccountExecutor.sol
@@ -17,10 +17,9 @@
 
 pragma solidity ^0.8.22;
 
-import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
-
 import {UserOperation} from "modular-account-libs/interfaces/UserOperation.sol";
 import {IPlugin} from "modular-account-libs/interfaces/IPlugin.sol";
+import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
 
 /// @title Account Executor
 /// @author Alchemy

diff --git a/src/account/AccountLoupe.sol b/src/account/AccountLoupe.sol
@@ -17,14 +17,15 @@
 
 pragma solidity ^0.8.22;
 
-import {AccountStorageV1} from "../account/AccountStorageV1.sol";
-import {CastLib} from "../helpers/CastLib.sol";
-import {KnownSelectors} from "../helpers/KnownSelectors.sol";
 import {IAccountLoupe} from "modular-account-libs/interfaces/IAccountLoupe.sol";
 import {FunctionReference} from "modular-account-libs/interfaces/IPluginManager.sol";
 import {CountableLinkedListSetLib} from "modular-account-libs/libraries/CountableLinkedListSetLib.sol";
 import {LinkedListSet, LinkedListSetLib} from "modular-account-libs/libraries/LinkedListSetLib.sol";
 
+import {AccountStorageV1} from "../account/AccountStorageV1.sol";
+import {CastLib} from "../helpers/CastLib.sol";
+import {KnownSelectors} from "../helpers/KnownSelectors.sol";
+
 /// @title Account Loupe
 /// @author Alchemy
 /// @notice Provides view functions for querying the configuration of a modular account.

diff --git a/src/account/PluginManagerInternals.sol b/src/account/PluginManagerInternals.sol
@@ -17,8 +17,6 @@
 
 pragma solidity ^0.8.22;
 
-import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
-
 import {FunctionReferenceLib} from "modular-account-libs/libraries/FunctionReferenceLib.sol";
 import {
     IPlugin,
@@ -32,9 +30,10 @@ import {
 import {FunctionReference, IPluginManager} from "modular-account-libs/interfaces/IPluginManager.sol";
 import {CountableLinkedListSetLib} from "modular-account-libs/libraries/CountableLinkedListSetLib.sol";
 import {LinkedListSet, LinkedListSetLib} from "modular-account-libs/libraries/LinkedListSetLib.sol";
+import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
 
-import {KnownSelectors} from "../helpers/KnownSelectors.sol";
 import {AccountStorageV1} from "../account/AccountStorageV1.sol";
+import {KnownSelectors} from "../helpers/KnownSelectors.sol";
 import {CastLib} from "../helpers/CastLib.sol";
 import {FunctionReferenceHelpers} from "../helpers/FunctionReferenceHelpers.sol";
 

diff --git a/src/account/UpgradeableModularAccount.sol b/src/account/UpgradeableModularAccount.sol
@@ -17,11 +17,6 @@
 
 pragma solidity ^0.8.22;
 
-import {IERC1155Receiver} from "@openzeppelin/contracts/interfaces/IERC1155Receiver.sol";
-import {IERC777Recipient} from "@openzeppelin/contracts/interfaces/IERC777Recipient.sol";
-import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
-import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-
 import {IAccount} from "modular-account-libs/interfaces/IAccount.sol";
 import {UserOperation} from "modular-account-libs/interfaces/UserOperation.sol";
 import {IPlugin, PluginManifest} from "modular-account-libs/interfaces/IPlugin.sol";
@@ -31,18 +26,22 @@ import {Call, IStandardExecutor} from "modular-account-libs/interfaces/IStandard
 import {CountableLinkedListSetLib} from "modular-account-libs/libraries/CountableLinkedListSetLib.sol";
 import {LinkedListSet, LinkedListSetLib} from "modular-account-libs/libraries/LinkedListSetLib.sol";
 import {FunctionReference, IPluginManager} from "modular-account-libs/interfaces/IPluginManager.sol";
+import {IERC1155Receiver} from "@openzeppelin/contracts/interfaces/IERC1155Receiver.sol";
+import {IERC777Recipient} from "@openzeppelin/contracts/interfaces/IERC777Recipient.sol";
+import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
-import {UUPSUpgradeable} from "../../ext/UUPSUpgradeable.sol";
-import {CastLib} from "../helpers/CastLib.sol";
-import {_coalescePreValidation, _coalesceValidation} from "../helpers/ValidationDataHelpers.sol";
 import {IEntryPoint} from "../interfaces/erc4337/IEntryPoint.sol";
 import {IAccountInitializable} from "../interfaces/IAccountInitializable.sol";
 import {IAccountView} from "../interfaces/IAccountView.sol";
+import {CastLib} from "../helpers/CastLib.sol";
+import {_coalescePreValidation, _coalesceValidation} from "../helpers/ValidationDataHelpers.sol";
+import {FunctionReferenceHelpers} from "../helpers/FunctionReferenceHelpers.sol";
+import {UUPSUpgradeable} from "../../ext/UUPSUpgradeable.sol";
 import {AccountExecutor} from "./AccountExecutor.sol";
 import {AccountLoupe} from "./AccountLoupe.sol";
 import {AccountStorageInitializable} from "./AccountStorageInitializable.sol";
 import {PluginManagerInternals} from "./PluginManagerInternals.sol";
-import {FunctionReferenceHelpers} from "../helpers/FunctionReferenceHelpers.sol";
 
 /// @title Upgradeable Modular Account
 /// @author Alchemy

diff --git a/src/helpers/KnownSelectors.sol b/src/helpers/KnownSelectors.sol
@@ -17,22 +17,22 @@
 
 pragma solidity ^0.8.22;
 
-import {UUPSUpgradeable} from "../../ext/UUPSUpgradeable.sol";
+import {IAccount} from "modular-account-libs/interfaces/IAccount.sol";
+import {IAccountLoupe} from "modular-account-libs/interfaces/IAccountLoupe.sol";
+import {IPluginManager} from "modular-account-libs/interfaces/IPluginManager.sol";
+import {IPlugin} from "modular-account-libs/interfaces/IPlugin.sol";
+import {IPluginExecutor} from "modular-account-libs/interfaces/IPluginExecutor.sol";
+import {IStandardExecutor} from "modular-account-libs/interfaces/IStandardExecutor.sol";
 import {IERC1155Receiver} from "@openzeppelin/contracts/interfaces/IERC1155Receiver.sol";
 import {IERC777Recipient} from "@openzeppelin/contracts/interfaces/IERC777Recipient.sol";
 import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
-import {IAccount} from "modular-account-libs/interfaces/IAccount.sol";
+import {UUPSUpgradeable} from "../../ext/UUPSUpgradeable.sol";
 import {IAggregator} from "../../src/interfaces/erc4337/IAggregator.sol";
 import {IPaymaster} from "../../src/interfaces/erc4337/IPaymaster.sol";
-import {IAccountLoupe} from "modular-account-libs/interfaces/IAccountLoupe.sol";
 import {IAccountView} from "../../src/interfaces/IAccountView.sol";
-import {IPluginManager} from "modular-account-libs/interfaces/IPluginManager.sol";
 import {IAccountInitializable} from "../interfaces/IAccountInitializable.sol";
-import {IPlugin} from "modular-account-libs/interfaces/IPlugin.sol";
-import {IPluginExecutor} from "modular-account-libs/interfaces/IPluginExecutor.sol";
-import {IStandardExecutor} from "modular-account-libs/interfaces/IStandardExecutor.sol";
 
 /// @title Known Selectors
 /// @author Alchemy

diff --git a/src/plugins/BasePlugin.sol b/src/plugins/BasePlugin.sol
@@ -17,9 +17,8 @@
 
 pragma solidity ^0.8.22;
 
-import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
-
 import {UserOperation} from "modular-account-libs/interfaces/UserOperation.sol";
+import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {IPlugin, PluginManifest, PluginMetadata} from "modular-account-libs/interfaces/IPlugin.sol";
 
 /// @title Base contract for plugins

diff --git a/src/plugins/owner/MultiOwnerPlugin.sol b/src/plugins/owner/MultiOwnerPlugin.sol
@@ -17,12 +17,6 @@
 
 pragma solidity ^0.8.22;
 
-import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";
-import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
-import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol";
-
-import {UpgradeableModularAccount, UUPSUpgradeable} from "../../account/UpgradeableModularAccount.sol";
-import {CastLib} from "../../helpers/CastLib.sol";
 import {UserOperation} from "modular-account-libs/interfaces/UserOperation.sol";
 import {
     ManifestAssociatedFunction,
@@ -40,6 +34,12 @@ import {
 import {
     SetValue, SIG_VALIDATION_PASSED, SIG_VALIDATION_FAILED
 } from "modular-account-libs/libraries/Constants.sol";
+import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";
+import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol";
+
+import {UpgradeableModularAccount, UUPSUpgradeable} from "../../account/UpgradeableModularAccount.sol";
+import {CastLib} from "../../helpers/CastLib.sol";
 import {BasePlugin} from "../BasePlugin.sol";
 import {IMultiOwnerPlugin} from "./IMultiOwnerPlugin.sol";
 

diff --git a/src/plugins/session/SessionKeyPlugin.sol b/src/plugins/session/SessionKeyPlugin.sol
@@ -17,9 +17,6 @@
 
 pragma solidity ^0.8.22;
 
-import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
-
-import {CastLib} from "../../helpers/CastLib.sol";
 import {UserOperation} from "modular-account-libs/interfaces/UserOperation.sol";
 import {IPlugin} from "modular-account-libs/interfaces/IPlugin.sol";
 import {
@@ -43,6 +40,9 @@ import {
     SIG_VALIDATION_FAILED
 } from "modular-account-libs/libraries/Constants.sol";
 import {BasePlugin} from "modular-account-libs/plugins/BasePlugin.sol";
+import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+
+import {CastLib} from "../../helpers/CastLib.sol";
 import {ISessionKeyPlugin} from "./ISessionKeyPlugin.sol";
 import {SessionKeyPermissions} from "./permissions/SessionKeyPermissions.sol";
 

diff --git a/src/plugins/session/permissions/SessionKeyPermissions.sol b/src/plugins/session/permissions/SessionKeyPermissions.sol
@@ -17,12 +17,12 @@
 
 pragma solidity ^0.8.22;
 
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-
 import {UserOperation} from "modular-account-libs/interfaces/UserOperation.sol";
 import {Call} from "modular-account-libs/interfaces/IStandardExecutor.sol";
 import {IStandardExecutor} from "modular-account-libs/interfaces/IStandardExecutor.sol";
 import {SIG_VALIDATION_PASSED, SIG_VALIDATION_FAILED} from "modular-account-libs/libraries/Constants.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+
 import {ISessionKeyPlugin} from "../ISessionKeyPlugin.sol";
 import {ISessionKeyPermissionsUpdates} from "./ISessionKeyPermissionsUpdates.sol";
 import {SessionKeyPermissionsLoupe} from "./SessionKeyPermissionsLoupe.sol";

diff --git a/src/plugins/session/permissions/SessionKeyPermissionsBase.sol b/src/plugins/session/permissions/SessionKeyPermissionsBase.sol
@@ -18,6 +18,7 @@
 pragma solidity ^0.8.22;
 
 import {PluginStorageLib, StoragePointer} from "modular-account-libs/libraries/PluginStorageLib.sol";
+
 import {ISessionKeyPlugin} from "../ISessionKeyPlugin.sol";
 
 abstract contract SessionKeyPermissionsBase is ISessionKeyPlugin {

diff --git a/test/account/AccountExecHooks.t.sol b/test/account/AccountExecHooks.t.sol
@@ -18,15 +18,8 @@
 pragma solidity ^0.8.22;
 
 import {Test} from "forge-std/Test.sol";
-
 import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
-import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
-
-import {PluginManagerInternals} from "../../src/account/PluginManagerInternals.sol";
-import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
-import {MultiOwnerModularAccountFactory} from "../../src/factory/MultiOwnerModularAccountFactory.sol";
 import {FunctionReferenceLib} from "modular-account-libs/libraries/FunctionReferenceLib.sol";
-import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
 import {
     IPlugin,
     ManifestExecutionHook,
@@ -36,6 +29,12 @@ import {
     ManifestAssociatedFunction
 } from "modular-account-libs/interfaces/IPlugin.sol";
 import {FunctionReference} from "modular-account-libs/interfaces/IPluginManager.sol";
+import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+
+import {PluginManagerInternals} from "../../src/account/PluginManagerInternals.sol";
+import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
+import {MultiOwnerModularAccountFactory} from "../../src/factory/MultiOwnerModularAccountFactory.sol";
+import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
 import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
 import {MockPlugin} from "../mocks/MockPlugin.sol";
 

diff --git a/test/account/AccountLoupe.t.sol b/test/account/AccountLoupe.t.sol
@@ -18,14 +18,8 @@
 pragma solidity ^0.8.22;
 
 import {Test} from "forge-std/Test.sol";
-
 import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
-import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
-
-import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
-import {MultiOwnerModularAccountFactory} from "../../src/factory/MultiOwnerModularAccountFactory.sol";
 import {FunctionReferenceLib} from "modular-account-libs/libraries/FunctionReferenceLib.sol";
-import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
 import {IAccountLoupe} from "modular-account-libs/interfaces/IAccountLoupe.sol";
 import {
     ManifestAssociatedFunctionType,
@@ -35,6 +29,11 @@ import {
 } from "modular-account-libs/interfaces/IPlugin.sol";
 import {FunctionReference, IPluginManager} from "modular-account-libs/interfaces/IPluginManager.sol";
 import {IStandardExecutor} from "modular-account-libs/interfaces/IStandardExecutor.sol";
+import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
+
+import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
+import {MultiOwnerModularAccountFactory} from "../../src/factory/MultiOwnerModularAccountFactory.sol";
+import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
 import {IMultiOwnerPlugin} from "../../src/plugins/owner/IMultiOwnerPlugin.sol";
 import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
 import {MockPlugin} from "../mocks/MockPlugin.sol";

diff --git a/test/account/AccountPreValidationHooks.t.sol b/test/account/AccountPreValidationHooks.t.sol
@@ -18,15 +18,8 @@
 pragma solidity ^0.8.22;
 
 import {Test} from "forge-std/Test.sol";
-
 import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
-import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
-
-import {PluginManagerInternals} from "../../src/account/PluginManagerInternals.sol";
-import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
-import {MultiOwnerModularAccountFactory} from "../../src/factory/MultiOwnerModularAccountFactory.sol";
 import {FunctionReferenceLib} from "modular-account-libs/libraries/FunctionReferenceLib.sol";
-import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
 import {UserOperation} from "modular-account-libs/interfaces/UserOperation.sol";
 import {
     IPlugin,
@@ -36,6 +29,12 @@ import {
     ManifestAssociatedFunction
 } from "modular-account-libs/interfaces/IPlugin.sol";
 import {FunctionReference} from "modular-account-libs/interfaces/IPluginManager.sol";
+import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+
+import {PluginManagerInternals} from "../../src/account/PluginManagerInternals.sol";
+import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
+import {MultiOwnerModularAccountFactory} from "../../src/factory/MultiOwnerModularAccountFactory.sol";
+import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
 import {IMultiOwnerPlugin} from "../../src/plugins/owner/IMultiOwnerPlugin.sol";
 import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
 import {MockPlugin} from "../mocks/MockPlugin.sol";

diff --git a/test/account/AccountReturnData.t.sol b/test/account/AccountReturnData.t.sol
@@ -18,14 +18,13 @@
 pragma solidity ^0.8.22;
 
 import {Test} from "forge-std/Test.sol";
-
 import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
+import {FunctionReference} from "modular-account-libs/interfaces/IPluginManager.sol";
+import {Call} from "modular-account-libs/interfaces/IStandardExecutor.sol";
 
 import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
 import {MultiOwnerModularAccountFactory} from "../../src/factory/MultiOwnerModularAccountFactory.sol";
 import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
-import {FunctionReference} from "modular-account-libs/interfaces/IPluginManager.sol";
-import {Call} from "modular-account-libs/interfaces/IStandardExecutor.sol";
 import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
 import {
     RegularResultContract,

diff --git a/test/account/ExecuteFromPluginPermissions.t.sol b/test/account/ExecuteFromPluginPermissions.t.sol
@@ -18,14 +18,13 @@
 pragma solidity ^0.8.22;
 
 import {Test, console} from "forge-std/Test.sol";
-
 import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
+import {IPlugin} from "modular-account-libs/interfaces/IPlugin.sol";
+import {FunctionReference} from "modular-account-libs/interfaces/IPluginManager.sol";
 
 import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
 import {MultiOwnerModularAccountFactory} from "../../src/factory/MultiOwnerModularAccountFactory.sol";
 import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
-import {IPlugin} from "modular-account-libs/interfaces/IPlugin.sol";
-import {FunctionReference} from "modular-account-libs/interfaces/IPluginManager.sol";
 import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
 import {Counter} from "../mocks/Counter.sol";
 import {

diff --git a/test/account/ManifestValidity.t.sol b/test/account/ManifestValidity.t.sol
@@ -18,14 +18,13 @@
 pragma solidity ^0.8.22;
 
 import {Test} from "forge-std/Test.sol";
-
 import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
+import {FunctionReference} from "modular-account-libs/interfaces/IPluginManager.sol";
 
 import {PluginManagerInternals} from "../../src/account/PluginManagerInternals.sol";
 import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
 import {MultiOwnerModularAccountFactory} from "../../src/factory/MultiOwnerModularAccountFactory.sol";
 import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
-import {FunctionReference} from "modular-account-libs/interfaces/IPluginManager.sol";
 import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
 import {
     BadValidationMagicValue_UserOp_Plugin,

diff --git a/test/account/TokenReceiver.t.sol b/test/account/TokenReceiver.t.sol
@@ -18,25 +18,24 @@
 pragma solidity ^0.8.22;
 
 import {Test} from "forge-std/Test.sol";
-
+import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
+import {FunctionReference} from "modular-account-libs/interfaces/IPluginManager.sol";
+import {
+    IPlugin,
+    ManifestExecutionHook,
+    ManifestAssociatedFunctionType,
+    ManifestFunction,
+    PluginManifest
+} from "modular-account-libs/interfaces/IPlugin.sol";
 import {ERC721PresetMinterPauserAutoId} from
     "@openzeppelin/contracts/token/ERC721/presets/ERC721PresetMinterPauserAutoId.sol";
-import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
 import {IERC1155Receiver} from "@openzeppelin/contracts/token/ERC1155/IERC1155Receiver.sol";
 import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import {IERC777Recipient} from "@openzeppelin/contracts/token/ERC777/IERC777Recipient.sol";
 
 import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
 import {MultiOwnerModularAccountFactory} from "../../src/factory/MultiOwnerModularAccountFactory.sol";
 import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
-import {
-    IPlugin,
-    ManifestExecutionHook,
-    ManifestAssociatedFunctionType,
-    ManifestFunction,
-    PluginManifest
-} from "modular-account-libs/interfaces/IPlugin.sol";
-import {FunctionReference} from "modular-account-libs/interfaces/IPluginManager.sol";
 import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
 import {MockPlugin} from "../mocks/MockPlugin.sol";
 import {MockERC1155} from "../mocks/tokens/MockERC1155.sol";