reorganize folders

README.md

@@ -151,9 +151,9 @@ catch them.
 
 4. **(Optional) Automate with a Script**
 
-   For more complex or repeated runs, you can create a JS script in `scripts/`,
+   For more complex or repeated runs, you can create a JS script in `test/scripts/`,
    e.g.
-   [`scripts/runEnsoCheckoutMutationTests.mjs`](./scripts/runEnsoCheckoutMutationTests.mjs).
+   [`test/scripts/runEnsoCheckoutMutationTests.mjs`](./scripts/runEnsoCheckoutMutationTests.mjs).
 
 #### **Script Options and Advanced Usage**
 

package.json

@@ -11,7 +11,7 @@
     "format:fix:sol": "forge fmt",
     "test:enso_checkout:fork": "forge test --match-path 'test/fork/enso-checkout/*.t.sol'",
     "test:enso_checkout:unit": "forge test --match-path 'test/unit/concrete/{delegate/ensoReceiver,factory/erc4337CloneFactory,paymaster/signaturePaymaster}/*.t.sol'",
-    "test:enso_checkout:mutation": "node scripts/runEnsoCheckoutMutationTests.mjs",
+    "test:enso_checkout:mutation": "node test/scripts/runEnsoCheckoutMutationTests.mjs",
     "test:enso_wallet_v2:unit": "forge test --match-path 'test/unit/concrete/wallet/{ensoWalletV2,ensoWalletV2Factory}/*.t.sol'"
   },
   "keywords": [],

src/wallet/EnsoWalletV2Factory.sol → src/factory/EnsoWalletV2Factory.sol

@@ -2,8 +2,8 @@
 pragma solidity ^0.8.28;
 
 import { Token, TokenType } from "../interfaces/IEnsoRouter.sol";
-import { IEnsoWalletV2 } from "./interfaces/IEnsoWalletV2.sol";
-import { IEnsoWalletV2Factory } from "./interfaces/IEnsoWalletV2Factory.sol";
+import { IEnsoWalletV2 } from "../interfaces/IEnsoWalletV2.sol";
+import { IEnsoWalletV2Factory } from "../interfaces/IEnsoWalletV2Factory.sol";
 import { IERC1155 } from "openzeppelin-contracts/token/ERC1155/IERC1155.sol";
 import { IERC20, SafeERC20 } from "openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol";
 import { IERC721 } from "openzeppelin-contracts/token/ERC721/IERC721.sol";

src/wallet/interfaces/IEnsoWalletV2Factory.sol → src/interfaces/IEnsoWalletV2Factory.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.20;
 
-import { Token, TokenType } from "../../interfaces/IEnsoRouter.sol";
+import { Token, TokenType } from "./IEnsoRouter.sol";
 
 /// @title IEnsoWalletV2Factory
 /// @author Enso

src/wallet/EnsoWalletV2.sol

@@ -3,8 +3,8 @@ pragma solidity ^0.8.28;
 
 import { AbstractEnsoShortcuts } from "../AbstractEnsoShortcuts.sol";
 import { AbstractMultiSend } from "../AbstractMultiSend.sol";
+import { IEnsoWalletV2 } from "../interfaces/IEnsoWalletV2.sol";
 import { Withdrawable } from "../utils/Withdrawable.sol";
-import { IEnsoWalletV2 } from "./interfaces/IEnsoWalletV2.sol";
 import { Initializable } from "openzeppelin-contracts/proxy/utils/Initializable.sol";
 
 /// @title EnsoWalletV2

test/MaverickV2Helpers.t.sol

@@ -14,7 +14,7 @@ contract MaverickV2HelpersTest is Test {
     address public lens = 0xBf0D89E67351f68a0a921943332c5bE0f7a0FF8A;
     address public refund = 0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045;
 
-    address public usdce_holder = 0x329C395D83493ea909ba3CE76b04766E17De4Ea8;
+    address public usdce_holder = 0x816f722424B49Cf1275cc86DA9840Fbd5a6167e9;
     address public pusd_holder = 0x131C4558343BC50c2c08164972f9748738902705;
 
     string _rpcURL = vm.envString("PLUME_RPC_URL");

test/unit/concrete/wallet/ensoWalletV2/EnsoWalletV2.t.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.20;
 
+import { EnsoWalletV2Factory } from "../../../../../src/factory/EnsoWalletV2Factory.sol";
 import { EnsoWalletV2 } from "../../../../../src/wallet/EnsoWalletV2.sol";
-import { EnsoWalletV2Factory } from "../../../../../src/wallet/EnsoWalletV2Factory.sol";
 
 import { MockERC1155 } from "../../../../mocks/MockERC1155.sol";
 import { MockERC20 } from "../../../../mocks/MockERC20.sol";

test/unit/concrete/wallet/ensoWalletV2/execute.t.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.20;
 
+import { IEnsoWalletV2 } from "../../../../../src/interfaces/IEnsoWalletV2.sol";
 import { EnsoWalletV2 } from "../../../../../src/wallet/EnsoWalletV2.sol";
-import { IEnsoWalletV2 } from "../../../../../src/wallet/interfaces/IEnsoWalletV2.sol";
 import { EnsoWalletV2_Unit_Concrete_Test } from "./EnsoWalletV2.t.sol";
 
 contract Target {

test/unit/concrete/wallet/ensoWalletV2/executeShortcut.t.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.20;
 
+import { IEnsoWalletV2 } from "../../../../../src/interfaces/IEnsoWalletV2.sol";
 import { EnsoWalletV2 } from "../../../../../src/wallet/EnsoWalletV2.sol";
-import { IEnsoWalletV2 } from "../../../../../src/wallet/interfaces/IEnsoWalletV2.sol";
 import { WeirollPlanner } from "../../../../utils/WeirollPlanner.sol";
 
 import { EnsoWalletV2_Unit_Concrete_Test } from "./EnsoWalletV2.t.sol";

test/unit/concrete/wallet/ensoWalletV2/owner.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.20;
 
-import { IEnsoWalletV2 } from "../../../../../src/wallet/interfaces/IEnsoWalletV2.sol";
+import { IEnsoWalletV2 } from "../../../../../src/interfaces/IEnsoWalletV2.sol";
 import { EnsoWalletV2_Unit_Concrete_Test } from "./EnsoWalletV2.t.sol";
 
 contract EnsoWalletV2_Owner_Unit_Concrete_Test is EnsoWalletV2_Unit_Concrete_Test {

test/unit/concrete/wallet/ensoWalletV2Factory/deploy.t.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.20;
 
+import { EnsoWalletV2Factory } from "../../../../../src/factory/EnsoWalletV2Factory.sol";
 import { EnsoWalletV2 } from "../../../../../src/wallet/EnsoWalletV2.sol";
-import { EnsoWalletV2Factory } from "../../../../../src/wallet/EnsoWalletV2Factory.sol";
 import { EnsoWalletV2_Unit_Concrete_Test } from "../ensoWalletV2/EnsoWalletV2.t.sol";
 
 contract EnsoWalletV2Factory_Deploy_Unit_Concrete_Test is EnsoWalletV2_Unit_Concrete_Test {

test/unit/concrete/wallet/ensoWalletV2Factory/deployAndExecute.t.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.20;
 
+import { EnsoWalletV2Factory } from "../../../../../src/factory/EnsoWalletV2Factory.sol";
 import { Token, TokenType } from "../../../../../src/interfaces/IEnsoRouter.sol";
+import { IEnsoWalletV2Factory } from "../../../../../src/interfaces/IEnsoWalletV2Factory.sol";
 import { EnsoWalletV2 } from "../../../../../src/wallet/EnsoWalletV2.sol";
-import { EnsoWalletV2Factory } from "../../../../../src/wallet/EnsoWalletV2Factory.sol";
-import { IEnsoWalletV2Factory } from "../../../../../src/wallet/interfaces/IEnsoWalletV2Factory.sol";
 import { WeirollPlanner } from "../../../../utils/WeirollPlanner.sol";
 import { EnsoWalletV2_Unit_Concrete_Test } from "../ensoWalletV2/EnsoWalletV2.t.sol";
 import { WETH } from "solady/tokens/WETH.sol";

test/unit/concrete/wallet/ensoWalletV2Factory/getAddress.t.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.20;
 
-import { EnsoWalletV2Factory } from "../../../../../src/wallet/EnsoWalletV2Factory.sol";
-import { IEnsoWalletV2Factory } from "../../../../../src/wallet/interfaces/IEnsoWalletV2Factory.sol";
+import { EnsoWalletV2Factory } from "../../../../../src/factory/EnsoWalletV2Factory.sol";
+import { IEnsoWalletV2Factory } from "../../../../../src/interfaces/IEnsoWalletV2Factory.sol";
 import { EnsoWalletV2_Unit_Concrete_Test } from "../ensoWalletV2/EnsoWalletV2.t.sol";
 import { Vm } from "forge-std/Test.sol";