From 8c5f1a8e372d45d5114f203a6f17f9a17dfa9ecc Mon Sep 17 00:00:00 2001 From: Jay Paik Date: Tue, 23 Jan 2024 00:32:18 -0500 Subject: [PATCH] refactor: sort imports (#105) --- src/account/AccountStorageV1.sol | 1 - src/factory/MultiOwnerMSCAFactory.sol | 8 ++++---- src/factory/MultiOwnerTokenReceiverMSCAFactory.sol | 8 ++++---- src/helpers/KnownSelectors.sol | 10 +++++----- src/libraries/CountableLinkedListSetLib.sol | 2 +- src/plugins/BasePlugin.sol | 2 +- src/plugins/TokenReceiverPlugin.sol | 4 ++-- src/plugins/session/ISessionKeyPlugin.sol | 2 +- .../session/permissions/SessionKeyPermissions.sol | 7 +++---- .../session/permissions/SessionKeyPermissionsBase.sol | 3 +-- test/account/AccountReturnData.t.sol | 5 ++--- test/account/ExecuteFromPluginPermissions.t.sol | 9 +++------ test/account/ManifestValidity.t.sol | 5 ++--- test/account/UpgradeableModularAccount.t.sol | 11 +++++------ test/account/ValidationIntersection.t.sol | 3 +-- test/account/phases/AccountStatePhasesExec.t.sol | 8 +++----- .../phases/AccountStatePhasesRTValidation.t.sol | 8 +++----- test/comparison/CompareSimpleAccount.t.sol | 2 +- test/factory/MultiOwnerMSCAFactoryTest.t.sol | 2 +- test/factory/MultiOwnerTokenReceiverFactoryTest.t.sol | 8 ++++---- test/helpers/KnownSelectors.t.sol | 6 +++--- test/invariant/LLSLRepro.t.sol | 2 +- .../handlers/AssociatedLinkedListSetHandler.sol | 3 ++- test/invariant/handlers/LinkedListSetHandler.sol | 5 +++-- test/libraries/CountableLinkedListSetLib.t.sol | 2 +- test/libraries/LinkedListSetLib.t.sol | 2 +- test/mocks/ContractOwner.sol | 3 +-- test/mocks/Counter.t.sol | 1 + test/mocks/plugins/AccountStateMutatingPlugin.sol | 3 +-- test/mocks/plugins/BadTransferOwnershipPlugin.sol | 6 +++--- test/mocks/plugins/BaseTestPlugin.sol | 2 +- test/mocks/plugins/ExecFromPluginPermissionsMocks.sol | 7 +++---- test/mocks/plugins/ManifestValidityMocks.sol | 4 ++-- test/mocks/plugins/ReturnDataPluginMocks.sol | 4 ++-- test/plugin/TokenReceiverPlugin.t.sol | 11 +++++------ test/plugin/owner/MultiOwnerPlugin.t.sol | 7 +++---- test/plugin/owner/MultiOwnerPluginIntegration.t.sol | 11 ++++------- test/upgrade/LightAccountToMSCA.t.sol | 3 +-- test/upgrade/MSCAToMSCA.t.sol | 7 +++---- 39 files changed, 88 insertions(+), 109 deletions(-) diff --git a/src/account/AccountStorageV1.sol b/src/account/AccountStorageV1.sol index 0cd213030..ceefd78c0 100644 --- a/src/account/AccountStorageV1.sol +++ b/src/account/AccountStorageV1.sol @@ -3,7 +3,6 @@ pragma solidity ^0.8.22; import {IPlugin} from "../interfaces/IPlugin.sol"; import {FunctionReference} from "../interfaces/IPluginManager.sol"; - import {LinkedListSet} from "../libraries/LinkedListSetLib.sol"; /// @title Account Storage V1 diff --git a/src/factory/MultiOwnerMSCAFactory.sol b/src/factory/MultiOwnerMSCAFactory.sol index 4fb7a27cf..47a76915a 100644 --- a/src/factory/MultiOwnerMSCAFactory.sol +++ b/src/factory/MultiOwnerMSCAFactory.sol @@ -1,15 +1,15 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.22; -import {Create2} from "@openzeppelin/contracts/utils/Create2.sol"; +import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol"; import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol"; import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol"; import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; +import {Create2} from "@openzeppelin/contracts/utils/Create2.sol"; -import {IAccountInitializable} from "../interfaces/IAccountInitializable.sol"; -import {IEntryPoint} from "../interfaces/erc4337/IEntryPoint.sol"; import {FactoryHelpers} from "../helpers/FactoryHelpers.sol"; +import {IEntryPoint} from "../interfaces/erc4337/IEntryPoint.sol"; +import {IAccountInitializable} from "../interfaces/IAccountInitializable.sol"; /// @title Multi Owner Plugin MSCA (Modular Smart Contract Account) Factory /// @author Alchemy diff --git a/src/factory/MultiOwnerTokenReceiverMSCAFactory.sol b/src/factory/MultiOwnerTokenReceiverMSCAFactory.sol index 14df1ea27..d204bd1a2 100644 --- a/src/factory/MultiOwnerTokenReceiverMSCAFactory.sol +++ b/src/factory/MultiOwnerTokenReceiverMSCAFactory.sol @@ -1,15 +1,15 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.22; -import {Create2} from "@openzeppelin/contracts/utils/Create2.sol"; +import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol"; import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol"; import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol"; import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; +import {Create2} from "@openzeppelin/contracts/utils/Create2.sol"; -import {IAccountInitializable} from "../interfaces/IAccountInitializable.sol"; -import {IEntryPoint} from "../interfaces/erc4337/IEntryPoint.sol"; import {FactoryHelpers} from "../helpers/FactoryHelpers.sol"; +import {IEntryPoint} from "../interfaces/erc4337/IEntryPoint.sol"; +import {IAccountInitializable} from "../interfaces/IAccountInitializable.sol"; /// @title Multi Owner Plugin + Token Receiver MSCA (Modular Smart Contract Account) Factory /// @author Alchemy diff --git a/src/helpers/KnownSelectors.sol b/src/helpers/KnownSelectors.sol index 2298f5e37..6c5efc398 100644 --- a/src/helpers/KnownSelectors.sol +++ b/src/helpers/KnownSelectors.sol @@ -1,18 +1,18 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.22; -import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; import {UUPSUpgradeable} from "../../ext/UUPSUpgradeable.sol"; +import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; import {IAccount} from "../../src/interfaces/erc4337/IAccount.sol"; -import {IAccountInitializable} from "../interfaces/IAccountInitializable.sol"; -import {IAccountLoupe} from "../../src/interfaces/IAccountLoupe.sol"; -import {IAccountView} from "../../src/interfaces/IAccountView.sol"; import {IAggregator} from "../../src/interfaces/erc4337/IAggregator.sol"; import {IPaymaster} from "../../src/interfaces/erc4337/IPaymaster.sol"; +import {IAccountLoupe} from "../../src/interfaces/IAccountLoupe.sol"; +import {IAccountView} from "../../src/interfaces/IAccountView.sol"; +import {IPluginManager} from "../../src/interfaces/IPluginManager.sol"; +import {IAccountInitializable} from "../interfaces/IAccountInitializable.sol"; import {IPlugin} from "../interfaces/IPlugin.sol"; import {IPluginExecutor} from "../interfaces/IPluginExecutor.sol"; -import {IPluginManager} from "../../src/interfaces/IPluginManager.sol"; import {IStandardExecutor} from "../interfaces/IStandardExecutor.sol"; /// @title Known Selectors diff --git a/src/libraries/CountableLinkedListSetLib.sol b/src/libraries/CountableLinkedListSetLib.sol index b04c7ff02..8b84da911 100644 --- a/src/libraries/CountableLinkedListSetLib.sol +++ b/src/libraries/CountableLinkedListSetLib.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.22; -import {LinkedListSet, LinkedListSetLib} from "./LinkedListSetLib.sol"; import {SetValue} from "./Constants.sol"; +import {LinkedListSet, LinkedListSetLib} from "./LinkedListSetLib.sol"; /// @title Countable Linked List Set Library /// @author Alchemy diff --git a/src/plugins/BasePlugin.sol b/src/plugins/BasePlugin.sol index d02900cbe..e873e5967 100644 --- a/src/plugins/BasePlugin.sol +++ b/src/plugins/BasePlugin.sol @@ -3,8 +3,8 @@ pragma solidity ^0.8.22; import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol"; -import {IPlugin, PluginManifest, PluginMetadata} from "../interfaces/IPlugin.sol"; import {UserOperation} from "../interfaces/erc4337/UserOperation.sol"; +import {IPlugin, PluginManifest, PluginMetadata} from "../interfaces/IPlugin.sol"; /// @title Base contract for plugins /// @dev Implements ERC-165 to support IPlugin's interface, which is a requirement diff --git a/src/plugins/TokenReceiverPlugin.sol b/src/plugins/TokenReceiverPlugin.sol index cb8c06060..a1e3b0333 100644 --- a/src/plugins/TokenReceiverPlugin.sol +++ b/src/plugins/TokenReceiverPlugin.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.22; -import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol"; -import {IERC777Recipient} from "@openzeppelin/contracts/interfaces/IERC777Recipient.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 { ManifestFunction, diff --git a/src/plugins/session/ISessionKeyPlugin.sol b/src/plugins/session/ISessionKeyPlugin.sol index 4041350aa..bb7cd040a 100644 --- a/src/plugins/session/ISessionKeyPlugin.sol +++ b/src/plugins/session/ISessionKeyPlugin.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.22; -import {Call} from "../../interfaces/IStandardExecutor.sol"; import {UserOperation} from "../../interfaces/erc4337/UserOperation.sol"; +import {Call} from "../../interfaces/IStandardExecutor.sol"; interface ISessionKeyPlugin { enum FunctionId { diff --git a/src/plugins/session/permissions/SessionKeyPermissions.sol b/src/plugins/session/permissions/SessionKeyPermissions.sol index bbce81206..dbfa56a70 100644 --- a/src/plugins/session/permissions/SessionKeyPermissions.sol +++ b/src/plugins/session/permissions/SessionKeyPermissions.sol @@ -3,15 +3,14 @@ pragma solidity ^0.8.22; import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import {UserOperation} from "../../../interfaces/erc4337/UserOperation.sol"; import {Call} from "../../../interfaces/IStandardExecutor.sol"; +import {IStandardExecutor} from "../../../interfaces/IStandardExecutor.sol"; +import {SIG_VALIDATION_PASSED, SIG_VALIDATION_FAILED} from "../../../libraries/Constants.sol"; import {ISessionKeyPlugin} from "../ISessionKeyPlugin.sol"; import {ISessionKeyPermissionsUpdates} from "./ISessionKeyPermissionsUpdates.sol"; import {SessionKeyPermissionsLoupe} from "./SessionKeyPermissionsLoupe.sol"; -import {IStandardExecutor} from "../../../interfaces/IStandardExecutor.sol"; -import {UserOperation} from "../../../interfaces/erc4337/UserOperation.sol"; -import {SIG_VALIDATION_PASSED, SIG_VALIDATION_FAILED} from "../../../libraries/Constants.sol"; - /// @title Session Key Permissions /// @author Alchemy /// @notice This plugin allows users to configure and enforce permissions on session keys that have been diff --git a/src/plugins/session/permissions/SessionKeyPermissionsBase.sol b/src/plugins/session/permissions/SessionKeyPermissionsBase.sol index bba2d288f..5519944b7 100644 --- a/src/plugins/session/permissions/SessionKeyPermissionsBase.sol +++ b/src/plugins/session/permissions/SessionKeyPermissionsBase.sol @@ -1,9 +1,8 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.22; -import {ISessionKeyPlugin} from "../ISessionKeyPlugin.sol"; - import {PluginStorageLib, StoragePointer} from "../../../libraries/PluginStorageLib.sol"; +import {ISessionKeyPlugin} from "../ISessionKeyPlugin.sol"; abstract contract SessionKeyPermissionsBase is ISessionKeyPlugin { type SessionKeyId is bytes32; diff --git a/test/account/AccountReturnData.t.sol b/test/account/AccountReturnData.t.sol index a4d67c067..4e27426cd 100644 --- a/test/account/AccountReturnData.t.sol +++ b/test/account/AccountReturnData.t.sol @@ -6,17 +6,16 @@ import {Test} from "forge-std/Test.sol"; import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol"; import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol"; +import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol"; import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol"; import {FunctionReference} from "../../src/interfaces/IPluginManager.sol"; -import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol"; import {Call} from "../../src/interfaces/IStandardExecutor.sol"; - +import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol"; import { RegularResultContract, ResultCreatorPlugin, ResultConsumerPlugin } from "../mocks/plugins/ReturnDataPluginMocks.sol"; -import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol"; // Tests all the different ways that return data can be read from plugins through an account contract AccountReturnDataTest is Test { diff --git a/test/account/ExecuteFromPluginPermissions.t.sol b/test/account/ExecuteFromPluginPermissions.t.sol index c6a52b0a6..f540e8b9f 100644 --- a/test/account/ExecuteFromPluginPermissions.t.sol +++ b/test/account/ExecuteFromPluginPermissions.t.sol @@ -5,23 +5,20 @@ import {Test, console} from "forge-std/Test.sol"; import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol"; -import {IPlugin} from "../../src/interfaces/IPlugin.sol"; import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol"; +import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol"; import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol"; +import {IPlugin} from "../../src/interfaces/IPlugin.sol"; import {FunctionReference} from "../../src/interfaces/IPluginManager.sol"; import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol"; - -import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol"; - import {Counter} from "../mocks/Counter.sol"; -import {ResultCreatorPlugin} from "../mocks/plugins/ReturnDataPluginMocks.sol"; - import { EFPCallerPlugin, EFPCallerPluginAnyExternal, EFPCallerPluginAnyExternalCanSpendNativeToken, EFPExecutionHookPlugin } from "../mocks/plugins/ExecFromPluginPermissionsMocks.sol"; +import {ResultCreatorPlugin} from "../mocks/plugins/ReturnDataPluginMocks.sol"; contract ExecuteFromPluginPermissionsTest is Test { Counter public counter1; diff --git a/test/account/ManifestValidity.t.sol b/test/account/ManifestValidity.t.sol index a547ab953..116a4022d 100644 --- a/test/account/ManifestValidity.t.sol +++ b/test/account/ManifestValidity.t.sol @@ -5,13 +5,12 @@ import {Test} from "forge-std/Test.sol"; import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol"; -import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol"; import {PluginManagerInternals} from "../../src/account/PluginManagerInternals.sol"; +import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol"; +import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol"; import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol"; import {FunctionReference} from "../../src/interfaces/IPluginManager.sol"; import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol"; - -import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol"; import { BadValidationMagicValue_UserOp_Plugin, BadValidationMagicValue_PreRuntimeValidationHook_Plugin, diff --git a/test/account/UpgradeableModularAccount.t.sol b/test/account/UpgradeableModularAccount.t.sol index e6debda81..f28729a65 100644 --- a/test/account/UpgradeableModularAccount.t.sol +++ b/test/account/UpgradeableModularAccount.t.sol @@ -10,19 +10,18 @@ import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.so import {AccountExecutor} from "../../src/account/AccountExecutor.sol"; import {PluginManagerInternals} from "../../src/account/PluginManagerInternals.sol"; import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol"; -import {IMultiOwnerPlugin} from "../../src/plugins/owner/IMultiOwnerPlugin.sol"; -import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol"; -import {SessionKeyPlugin} from "../../src/plugins/session/SessionKeyPlugin.sol"; -import {TokenReceiverPlugin} from "../../src/plugins/TokenReceiverPlugin.sol"; +import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol"; import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol"; import {UserOperation} from "../../src/interfaces/erc4337/UserOperation.sol"; import {IAccountInitializable} from "../../src/interfaces/IAccountInitializable.sol"; import {IPlugin, PluginManifest} from "../../src/interfaces/IPlugin.sol"; import {FunctionReference, IPluginManager} from "../../src/interfaces/IPluginManager.sol"; import {Call} from "../../src/interfaces/IStandardExecutor.sol"; - +import {IMultiOwnerPlugin} from "../../src/plugins/owner/IMultiOwnerPlugin.sol"; +import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol"; +import {SessionKeyPlugin} from "../../src/plugins/session/SessionKeyPlugin.sol"; +import {TokenReceiverPlugin} from "../../src/plugins/TokenReceiverPlugin.sol"; import {Counter} from "../mocks/Counter.sol"; -import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol"; import {MockPlugin} from "../mocks/MockPlugin.sol"; contract UpgradeableModularAccountTest is Test { diff --git a/test/account/ValidationIntersection.t.sol b/test/account/ValidationIntersection.t.sol index ced8e0297..7c3214fb7 100644 --- a/test/account/ValidationIntersection.t.sol +++ b/test/account/ValidationIntersection.t.sol @@ -6,13 +6,12 @@ import {Test} from "forge-std/Test.sol"; import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol"; import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol"; +import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol"; import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol"; import {UserOperation} from "../../src/interfaces/erc4337/UserOperation.sol"; import {FunctionReference} from "../../src/interfaces/IPluginManager.sol"; import {SIG_VALIDATION_FAILED, SIG_VALIDATION_PASSED} from "../../src/libraries/Constants.sol"; import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol"; - -import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol"; import { MockBaseUserOpValidationPlugin, MockUserOpValidation1HookPlugin, diff --git a/test/account/phases/AccountStatePhasesExec.t.sol b/test/account/phases/AccountStatePhasesExec.t.sol index 4107cba50..07551e78f 100644 --- a/test/account/phases/AccountStatePhasesExec.t.sol +++ b/test/account/phases/AccountStatePhasesExec.t.sol @@ -1,9 +1,6 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.22; -import {AccountStatePhasesTest} from "./AccountStatePhases.t.sol"; - -import {IPluginManager} from "../../../src/interfaces/IPluginManager.sol"; import { IPlugin, PluginManifest, @@ -12,10 +9,11 @@ import { ManifestAssociatedFunctionType, ManifestFunction } from "../../../src/interfaces/IPlugin.sol"; +import {IPluginManager} from "../../../src/interfaces/IPluginManager.sol"; import {IStandardExecutor, Call} from "../../../src/interfaces/IStandardExecutor.sol"; - -import {AccountStateMutatingPlugin} from "../../mocks/plugins/AccountStateMutatingPlugin.sol"; import {MockPlugin} from "../../mocks/MockPlugin.sol"; +import {AccountStateMutatingPlugin} from "../../mocks/plugins/AccountStateMutatingPlugin.sol"; +import {AccountStatePhasesTest} from "./AccountStatePhases.t.sol"; // Tests the account state phase behavior when the source of the state modification happens during execution. contract AccountStatePhasesUOValidationTest is AccountStatePhasesTest { diff --git a/test/account/phases/AccountStatePhasesRTValidation.t.sol b/test/account/phases/AccountStatePhasesRTValidation.t.sol index 809e2ed67..f572baaf2 100644 --- a/test/account/phases/AccountStatePhasesRTValidation.t.sol +++ b/test/account/phases/AccountStatePhasesRTValidation.t.sol @@ -1,14 +1,12 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.22; -import {AccountStatePhasesTest} from "./AccountStatePhases.t.sol"; - -import {IPluginManager} from "../../../src/interfaces/IPluginManager.sol"; +import {UpgradeableModularAccount} from "../../../src/account/UpgradeableModularAccount.sol"; import {IPlugin} from "../../../src/interfaces/IPlugin.sol"; +import {IPluginManager} from "../../../src/interfaces/IPluginManager.sol"; import {IStandardExecutor, Call} from "../../../src/interfaces/IStandardExecutor.sol"; -import {UpgradeableModularAccount} from "../../../src/account/UpgradeableModularAccount.sol"; - import {AccountStateMutatingPlugin} from "../../mocks/plugins/AccountStateMutatingPlugin.sol"; +import {AccountStatePhasesTest} from "./AccountStatePhases.t.sol"; // Tests the account state phase behavior when the source of the state modification // happens during runtime validation. diff --git a/test/comparison/CompareSimpleAccount.t.sol b/test/comparison/CompareSimpleAccount.t.sol index 3b742fb29..e48c2d3ed 100644 --- a/test/comparison/CompareSimpleAccount.t.sol +++ b/test/comparison/CompareSimpleAccount.t.sol @@ -3,10 +3,10 @@ pragma solidity ^0.8.22; import {Test} from "forge-std/Test.sol"; -import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol"; import {SimpleAccount} from "@eth-infinitism/account-abstraction/samples/SimpleAccount.sol"; import {SimpleAccountFactory} from "@eth-infinitism/account-abstraction/samples/SimpleAccountFactory.sol"; +import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol"; import {UserOperation} from "../../src/interfaces/erc4337/UserOperation.sol"; diff --git a/test/factory/MultiOwnerMSCAFactoryTest.t.sol b/test/factory/MultiOwnerMSCAFactoryTest.t.sol index 479594a74..07628e3f2 100644 --- a/test/factory/MultiOwnerMSCAFactoryTest.t.sol +++ b/test/factory/MultiOwnerMSCAFactoryTest.t.sol @@ -6,10 +6,10 @@ 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 {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol"; import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol"; import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol"; import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol"; -import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol"; contract MultiOwnerMSCAFactoryTest is Test { using ECDSA for bytes32; diff --git a/test/factory/MultiOwnerTokenReceiverFactoryTest.t.sol b/test/factory/MultiOwnerTokenReceiverFactoryTest.t.sol index eebae3d58..d771ca339 100644 --- a/test/factory/MultiOwnerTokenReceiverFactoryTest.t.sol +++ b/test/factory/MultiOwnerTokenReceiverFactoryTest.t.sol @@ -3,18 +3,18 @@ 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 {ERC721PresetMinterPauserAutoId} from "@openzeppelin/contracts/token/ERC721/presets/ERC721PresetMinterPauserAutoId.sol"; +import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol"; +import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; +import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol"; import {MultiOwnerTokenReceiverMSCAFactory} from "../../src/factory/MultiOwnerTokenReceiverMSCAFactory.sol"; import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol"; import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol"; import {TokenReceiverPlugin} from "../../src/plugins/TokenReceiverPlugin.sol"; -import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol"; -import {MockERC777} from "../mocks/tokens/MockERC777.sol"; import {MockERC1155} from "../mocks/tokens/MockERC1155.sol"; +import {MockERC777} from "../mocks/tokens/MockERC777.sol"; contract MultiOwnerTokenReceiverMSCAFactoryTest is Test { using ECDSA for bytes32; diff --git a/test/helpers/KnownSelectors.t.sol b/test/helpers/KnownSelectors.t.sol index 864f91130..978e3dbd6 100644 --- a/test/helpers/KnownSelectors.t.sol +++ b/test/helpers/KnownSelectors.t.sol @@ -3,15 +3,15 @@ pragma solidity ^0.8.22; import {Test} from "forge-std/Test.sol"; -import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; -import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol"; import {BaseAccount} from "@eth-infinitism/account-abstraction/core/BaseAccount.sol"; import {IAggregator} from "@eth-infinitism/account-abstraction/interfaces/IAggregator.sol"; import {IPaymaster} from "@eth-infinitism/account-abstraction/interfaces/IPaymaster.sol"; +import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol"; +import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; import {KnownSelectors} from "../../src/helpers/KnownSelectors.sol"; -import {IAccountLoupe} from "../../src/interfaces/IAccountLoupe.sol"; import {IAccountInitializable} from "../../src/interfaces/IAccountInitializable.sol"; +import {IAccountLoupe} from "../../src/interfaces/IAccountLoupe.sol"; import {IPlugin} from "../../src/interfaces/IPlugin.sol"; import {IPluginExecutor} from "../../src/interfaces/IPluginExecutor.sol"; import {IPluginManager} from "../../src/interfaces/IPluginManager.sol"; diff --git a/test/invariant/LLSLRepro.t.sol b/test/invariant/LLSLRepro.t.sol index 9a3f43074..6d9984c5d 100644 --- a/test/invariant/LLSLRepro.t.sol +++ b/test/invariant/LLSLRepro.t.sol @@ -3,8 +3,8 @@ pragma solidity ^0.8.22; import {Test} from "forge-std/Test.sol"; -import {LinkedListSetHandler} from "./handlers/LinkedListSetHandler.sol"; import {AssociatedLinkedListSetHandler} from "./handlers/AssociatedLinkedListSetHandler.sol"; +import {LinkedListSetHandler} from "./handlers/LinkedListSetHandler.sol"; contract LLSLReproTest is Test { LinkedListSetHandler public handler; diff --git a/test/invariant/handlers/AssociatedLinkedListSetHandler.sol b/test/invariant/handlers/AssociatedLinkedListSetHandler.sol index d0c387d3a..ffbec2168 100644 --- a/test/invariant/handlers/AssociatedLinkedListSetHandler.sol +++ b/test/invariant/handlers/AssociatedLinkedListSetHandler.sol @@ -5,8 +5,9 @@ import {CommonBase} from "forge-std/Base.sol"; import {StdCheats} from "forge-std/StdCheats.sol"; import {StdUtils} from "forge-std/StdUtils.sol"; -import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; import {EnumerableMap} from "@openzeppelin/contracts/utils/structs/EnumerableMap.sol"; +import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; + import { AssociatedLinkedListSet, AssociatedLinkedListSetLib diff --git a/test/invariant/handlers/LinkedListSetHandler.sol b/test/invariant/handlers/LinkedListSetHandler.sol index 1468ce5fc..a3d59bc43 100644 --- a/test/invariant/handlers/LinkedListSetHandler.sol +++ b/test/invariant/handlers/LinkedListSetHandler.sol @@ -5,10 +5,11 @@ import {CommonBase} from "forge-std/Base.sol"; import {StdCheats} from "forge-std/StdCheats.sol"; import {StdUtils} from "forge-std/StdUtils.sol"; -import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; import {EnumerableMap} from "@openzeppelin/contracts/utils/structs/EnumerableMap.sol"; -import {LinkedListSetLib, LinkedListSet as EnumerableSetType} from "../../../src/libraries/LinkedListSetLib.sol"; +import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; + import {SetValue} from "../../../src/libraries/Constants.sol"; +import {LinkedListSetLib, LinkedListSet as EnumerableSetType} from "../../../src/libraries/LinkedListSetLib.sol"; /// @notice A handler contract for differential invariant testing LinkedListSetLib /// This contract maps logic for adding, removeing, clearing, and inspecting a list diff --git a/test/libraries/CountableLinkedListSetLib.t.sol b/test/libraries/CountableLinkedListSetLib.t.sol index b971de1a1..0c57faaea 100644 --- a/test/libraries/CountableLinkedListSetLib.t.sol +++ b/test/libraries/CountableLinkedListSetLib.t.sol @@ -3,9 +3,9 @@ pragma solidity ^0.8.22; import {Test} from "forge-std/Test.sol"; +import {SetValue} from "../../src/libraries/Constants.sol"; import {CountableLinkedListSetLib} from "../../src/libraries/CountableLinkedListSetLib.sol"; import {LinkedListSet, LinkedListSetLib} from "../../src/libraries/LinkedListSetLib.sol"; -import {SetValue} from "../../src/libraries/Constants.sol"; contract CountableLinkedListSetLibTest is Test { using LinkedListSetLib for LinkedListSet; diff --git a/test/libraries/LinkedListSetLib.t.sol b/test/libraries/LinkedListSetLib.t.sol index 4373cc526..73a39b959 100644 --- a/test/libraries/LinkedListSetLib.t.sol +++ b/test/libraries/LinkedListSetLib.t.sol @@ -3,8 +3,8 @@ pragma solidity ^0.8.22; import {Test} from "forge-std/Test.sol"; -import {LinkedListSet, LinkedListSetLib} from "../../src/libraries/LinkedListSetLib.sol"; import {SetValue, SENTINEL_VALUE} from "../../src/libraries/Constants.sol"; +import {LinkedListSet, LinkedListSetLib} from "../../src/libraries/LinkedListSetLib.sol"; // Ported over from test/AssociatedLinkedListSetLib.t.sol, dropping test_no_address_collision contract LinkedListSetLibTest is Test { diff --git a/test/mocks/ContractOwner.sol b/test/mocks/ContractOwner.sol index e96f8044c..35704e199 100644 --- a/test/mocks/ContractOwner.sol +++ b/test/mocks/ContractOwner.sol @@ -1,9 +1,8 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.22; -import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; - import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol"; +import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; contract ContractOwner is IERC1271 { bytes4 internal constant _1271_MAGIC_VALUE = 0x1626ba7e; diff --git a/test/mocks/Counter.t.sol b/test/mocks/Counter.t.sol index 01b3d793f..70f98df79 100644 --- a/test/mocks/Counter.t.sol +++ b/test/mocks/Counter.t.sol @@ -2,6 +2,7 @@ pragma solidity ^0.8.22; import {Test} from "forge-std/Test.sol"; + import {Counter} from "./Counter.sol"; contract CounterTest is Test { diff --git a/test/mocks/plugins/AccountStateMutatingPlugin.sol b/test/mocks/plugins/AccountStateMutatingPlugin.sol index 5c2466382..1480d91d0 100644 --- a/test/mocks/plugins/AccountStateMutatingPlugin.sol +++ b/test/mocks/plugins/AccountStateMutatingPlugin.sol @@ -1,6 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.22; +import {UserOperation} from "../../../src/interfaces/erc4337/UserOperation.sol"; import { PluginManifest, ManifestExecutionHook, @@ -8,8 +9,6 @@ import { ManifestAssociatedFunctionType, ManifestAssociatedFunction } from "../../../src/interfaces/IPlugin.sol"; -import {UserOperation} from "../../../src/interfaces/erc4337/UserOperation.sol"; - import {BaseTestPlugin} from "./BaseTestPlugin.sol"; // Used in conjunction with AccountStatePhasesTest to verify that the account state is consistent when plugins are diff --git a/test/mocks/plugins/BadTransferOwnershipPlugin.sol b/test/mocks/plugins/BadTransferOwnershipPlugin.sol index 9403974be..27a5e07f0 100644 --- a/test/mocks/plugins/BadTransferOwnershipPlugin.sol +++ b/test/mocks/plugins/BadTransferOwnershipPlugin.sol @@ -9,10 +9,10 @@ import { PluginManifest, PluginMetadata } from "../../../src/interfaces/IPlugin.sol"; -import {BaseTestPlugin} from "./BaseTestPlugin.sol"; -import {IMultiOwnerPlugin} from "../../../src/plugins/owner/IMultiOwnerPlugin.sol"; -import {IStandardExecutor} from "../../../src/interfaces/IStandardExecutor.sol"; import {IPluginExecutor} from "../../../src/interfaces/IPluginExecutor.sol"; +import {IStandardExecutor} from "../../../src/interfaces/IStandardExecutor.sol"; +import {IMultiOwnerPlugin} from "../../../src/plugins/owner/IMultiOwnerPlugin.sol"; +import {BaseTestPlugin} from "./BaseTestPlugin.sol"; contract BadTransferOwnershipPlugin is BaseTestPlugin { string internal constant _NAME = "Evil Transfer Ownership Plugin"; diff --git a/test/mocks/plugins/BaseTestPlugin.sol b/test/mocks/plugins/BaseTestPlugin.sol index bbc388b08..cb28d43db 100644 --- a/test/mocks/plugins/BaseTestPlugin.sol +++ b/test/mocks/plugins/BaseTestPlugin.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.22; -import {BasePlugin} from "../../../src/plugins/BasePlugin.sol"; import {PluginMetadata} from "../../../src/interfaces/IPlugin.sol"; +import {BasePlugin} from "../../../src/plugins/BasePlugin.sol"; contract BaseTestPlugin is BasePlugin { // Don't need to implement this in each context diff --git a/test/mocks/plugins/ExecFromPluginPermissionsMocks.sol b/test/mocks/plugins/ExecFromPluginPermissionsMocks.sol index 23c581be8..3db37e369 100644 --- a/test/mocks/plugins/ExecFromPluginPermissionsMocks.sol +++ b/test/mocks/plugins/ExecFromPluginPermissionsMocks.sol @@ -9,14 +9,13 @@ import { ManifestExecutionHook, PluginManifest } from "../../../src/interfaces/IPlugin.sol"; -import {IStandardExecutor} from "../../../src/interfaces/IStandardExecutor.sol"; -import {IPluginExecutor} from "../../../src/interfaces/IPluginExecutor.sol"; import {IPlugin} from "../../../src/interfaces/IPlugin.sol"; +import {IPluginExecutor} from "../../../src/interfaces/IPluginExecutor.sol"; import {FunctionReference} from "../../../src/interfaces/IPluginManager.sol"; +import {IStandardExecutor} from "../../../src/interfaces/IStandardExecutor.sol"; +import {Counter} from "../Counter.sol"; import {BaseTestPlugin} from "./BaseTestPlugin.sol"; - import {ResultCreatorPlugin} from "./ReturnDataPluginMocks.sol"; -import {Counter} from "../Counter.sol"; // Hardcode the counter addresses from ExecuteFromPluginPermissionsTest to be able to have a pure plugin manifest // easily diff --git a/test/mocks/plugins/ManifestValidityMocks.sol b/test/mocks/plugins/ManifestValidityMocks.sol index 33b5d67f9..1cb17ee39 100644 --- a/test/mocks/plugins/ManifestValidityMocks.sol +++ b/test/mocks/plugins/ManifestValidityMocks.sol @@ -9,10 +9,10 @@ import { ManifestExternalCallPermission, PluginManifest } from "../../../src/interfaces/IPlugin.sol"; -import {IStandardExecutor} from "../../../src/interfaces/IStandardExecutor.sol"; -import {IPluginExecutor} from "../../../src/interfaces/IPluginExecutor.sol"; import {IPlugin} from "../../../src/interfaces/IPlugin.sol"; +import {IPluginExecutor} from "../../../src/interfaces/IPluginExecutor.sol"; import {FunctionReference} from "../../../src/interfaces/IPluginManager.sol"; +import {IStandardExecutor} from "../../../src/interfaces/IStandardExecutor.sol"; import {BaseTestPlugin} from "./BaseTestPlugin.sol"; contract BadValidationMagicValue_UserOp_Plugin is BaseTestPlugin { diff --git a/test/mocks/plugins/ReturnDataPluginMocks.sol b/test/mocks/plugins/ReturnDataPluginMocks.sol index 1c695a2e6..a1cc4da74 100644 --- a/test/mocks/plugins/ReturnDataPluginMocks.sol +++ b/test/mocks/plugins/ReturnDataPluginMocks.sol @@ -8,10 +8,10 @@ import { ManifestExternalCallPermission, PluginManifest } from "../../../src/interfaces/IPlugin.sol"; -import {IStandardExecutor} from "../../../src/interfaces/IStandardExecutor.sol"; -import {IPluginExecutor} from "../../../src/interfaces/IPluginExecutor.sol"; import {IPlugin} from "../../../src/interfaces/IPlugin.sol"; +import {IPluginExecutor} from "../../../src/interfaces/IPluginExecutor.sol"; import {FunctionReference} from "../../../src/interfaces/IPluginManager.sol"; +import {IStandardExecutor} from "../../../src/interfaces/IStandardExecutor.sol"; import {BaseTestPlugin} from "./BaseTestPlugin.sol"; contract RegularResultContract { diff --git a/test/plugin/TokenReceiverPlugin.t.sol b/test/plugin/TokenReceiverPlugin.t.sol index c9b1e656e..4fa9ecfc0 100644 --- a/test/plugin/TokenReceiverPlugin.t.sol +++ b/test/plugin/TokenReceiverPlugin.t.sol @@ -3,23 +3,22 @@ pragma solidity ^0.8.22; import {Test} from "forge-std/Test.sol"; -import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol"; -import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol"; import {ERC721PresetMinterPauserAutoId} from "@openzeppelin/contracts/token/ERC721/presets/ERC721PresetMinterPauserAutoId.sol"; -import {IERC777Recipient} from "@openzeppelin/contracts/token/ERC777/IERC777Recipient.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 {AccountStorageV1} from "../../src/account/AccountStorageV1.sol"; import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol"; +import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol"; import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol"; import {FunctionReference} from "../../src/interfaces/IPluginManager.sol"; import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol"; import {TokenReceiverPlugin} from "../../src/plugins/TokenReceiverPlugin.sol"; - -import {MockERC777} from "../mocks/tokens/MockERC777.sol"; import {MockERC1155} from "../mocks/tokens/MockERC1155.sol"; -import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol"; +import {MockERC777} from "../mocks/tokens/MockERC777.sol"; contract TokenReceiverPluginTest is Test, IERC1155Receiver, AccountStorageV1 { UpgradeableModularAccount public acct; diff --git a/test/plugin/owner/MultiOwnerPlugin.t.sol b/test/plugin/owner/MultiOwnerPlugin.t.sol index 3d68ce1d0..ca784690b 100644 --- a/test/plugin/owner/MultiOwnerPlugin.t.sol +++ b/test/plugin/owner/MultiOwnerPlugin.t.sol @@ -6,13 +6,12 @@ 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 {MultiOwnerPlugin} from "../../../src/plugins/owner/MultiOwnerPlugin.sol"; -import {IMultiOwnerPlugin} from "../../../src/plugins/owner/IMultiOwnerPlugin.sol"; -import {BasePlugin} from "../../../src/plugins/BasePlugin.sol"; import {IEntryPoint} from "../../../src/interfaces/erc4337/IEntryPoint.sol"; import {UserOperation} from "../../../src/interfaces/erc4337/UserOperation.sol"; import {PluginManifest} from "../../../src/interfaces/IPlugin.sol"; - +import {BasePlugin} from "../../../src/plugins/BasePlugin.sol"; +import {IMultiOwnerPlugin} from "../../../src/plugins/owner/IMultiOwnerPlugin.sol"; +import {MultiOwnerPlugin} from "../../../src/plugins/owner/MultiOwnerPlugin.sol"; import {ContractOwner} from "../../mocks/ContractOwner.sol"; import {Utils} from "../../Utils.sol"; diff --git a/test/plugin/owner/MultiOwnerPluginIntegration.t.sol b/test/plugin/owner/MultiOwnerPluginIntegration.t.sol index b086f1815..238535230 100644 --- a/test/plugin/owner/MultiOwnerPluginIntegration.t.sol +++ b/test/plugin/owner/MultiOwnerPluginIntegration.t.sol @@ -4,21 +4,18 @@ 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 {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol"; +import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; import {UpgradeableModularAccount} from "../../../src/account/UpgradeableModularAccount.sol"; +import {MultiOwnerMSCAFactory} from "../../../src/factory/MultiOwnerMSCAFactory.sol"; import {IEntryPoint} from "../../../src/interfaces/erc4337/IEntryPoint.sol"; import {UserOperation} from "../../../src/interfaces/erc4337/UserOperation.sol"; import {FunctionReference} from "../../../src/interfaces/IPluginManager.sol"; -import {MultiOwnerPlugin} from "../../../src/plugins/owner/MultiOwnerPlugin.sol"; -import {IMultiOwnerPlugin} from "../../../src/plugins/owner/IMultiOwnerPlugin.sol"; -import {Utils} from "../../Utils.sol"; import {Call} from "../../../src/interfaces/IStandardExecutor.sol"; - +import {IMultiOwnerPlugin} from "../../../src/plugins/owner/IMultiOwnerPlugin.sol"; +import {MultiOwnerPlugin} from "../../../src/plugins/owner/MultiOwnerPlugin.sol"; import {Counter} from "../../mocks/Counter.sol"; -import {MultiOwnerMSCAFactory} from "../../../src/factory/MultiOwnerMSCAFactory.sol"; import {Utils} from "../../Utils.sol"; contract MultiOwnerPluginIntegration is Test { diff --git a/test/upgrade/LightAccountToMSCA.t.sol b/test/upgrade/LightAccountToMSCA.t.sol index 4476fa8ee..2fa335cc8 100644 --- a/test/upgrade/LightAccountToMSCA.t.sol +++ b/test/upgrade/LightAccountToMSCA.t.sol @@ -9,9 +9,8 @@ import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.so import {IEntryPoint} from "@eth-infinitism/account-abstraction/interfaces/IEntryPoint.sol"; import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol"; -import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol"; import {IEntryPoint as IMSCAEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol"; - +import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol"; import {MockERC20} from "../mocks/tokens/MockERC20.sol"; contract LightAccountToMSCATest is Test { diff --git a/test/upgrade/MSCAToMSCA.t.sol b/test/upgrade/MSCAToMSCA.t.sol index cf365a0e4..222a1294c 100644 --- a/test/upgrade/MSCAToMSCA.t.sol +++ b/test/upgrade/MSCAToMSCA.t.sol @@ -7,13 +7,12 @@ import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.so import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol"; import {MultiOwnerTokenReceiverMSCAFactory} from "../../src/factory/MultiOwnerTokenReceiverMSCAFactory.sol"; -import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol"; -import {TokenReceiverPlugin} from "../../src/plugins/TokenReceiverPlugin.sol"; import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol"; import {Call} from "../../src/interfaces/IStandardExecutor.sol"; - -import {Utils} from "../Utils.sol"; +import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol"; +import {TokenReceiverPlugin} from "../../src/plugins/TokenReceiverPlugin.sol"; import {MockERC20} from "../mocks/tokens/MockERC20.sol"; +import {Utils} from "../Utils.sol"; contract MSCAToMSCATest is Test { IEntryPoint public entryPoint;