Restructure (#71)

* restructured to seprate plugins folder * removed via-ir based plugins, todo: remove all plugins to kernel-plugins * fix: import path fix for kerneltestbase
zerodevapp · Jan 22, 2024 · 5eb3450 · eunseong-theori · Feb 2, 2024 · 5eb3450
1 parent c79d855
commit 5eb3450
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 47 deletions.
diff --git a/src/factory/AdminLessERC1967Factory.sol b/src/factory/AdminLessERC1967Factory.sol
@@ -249,7 +249,6 @@ contract AdminLessERC1967Factory {
              * fd          | REVERT         |                     | [0..returndatasize): returndata |
              * -------------------------------------------------------------------------------------+
              */
-
             m := mload(0x40)
             // forgefmt: disable-start
             switch shr(112, address())

diff --git a/test/foundry/mock/TestCallee.sol → src/mock/TestCallee.sol b/test/foundry/mock/TestCallee.sol → src/mock/TestCallee.sol
diff --git a/test/foundry/mock/TestCounter.sol → src/mock/TestCounter.sol b/test/foundry/mock/TestCounter.sol → src/mock/TestCounter.sol
diff --git a/test/foundry/mock/TestERC1155.sol → src/mock/TestERC1155.sol b/test/foundry/mock/TestERC1155.sol → src/mock/TestERC1155.sol
diff --git a/test/foundry/mock/TestERC20.sol → src/mock/TestERC20.sol b/test/foundry/mock/TestERC20.sol → src/mock/TestERC20.sol
diff --git a/test/foundry/mock/TestERC721.sol → src/mock/TestERC721.sol b/test/foundry/mock/TestERC721.sol → src/mock/TestERC721.sol
diff --git a/test/foundry/mock/TestExecutor.sol → src/mock/TestExecutor.sol b/test/foundry/mock/TestExecutor.sol → src/mock/TestExecutor.sol
diff --git a/test/foundry/mock/TestKernel.sol → src/mock/TestKernel.sol b/test/foundry/mock/TestKernel.sol → src/mock/TestKernel.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.8.0;
 
-import "src/Kernel.sol";
+import "../Kernel.sol";
 
 contract TestKernel is Kernel {
     constructor(IEntryPoint _entryPoint) Kernel(_entryPoint) {}

diff --git a/test/foundry/mock/TestPaymaster.sol → src/mock/TestPaymaster.sol b/test/foundry/mock/TestPaymaster.sol → src/mock/TestPaymaster.sol
diff --git a/test/foundry/mock/TestValidator.sol → src/mock/TestValidator.sol b/test/foundry/mock/TestValidator.sol → src/mock/TestValidator.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "src/interfaces/IKernelValidator.sol";
-import "src/common/Types.sol";
-import "src/utils/KernelHelper.sol";
-import "src/common/Constants.sol";
+import "../interfaces/IKernelValidator.sol";
+import "../common/Types.sol";
+import "../utils/KernelHelper.sol";
+import "../common/Constants.sol";
 
 contract TestValidator is IKernelValidator {
     event TestValidateUserOp(bytes32 indexed opHash);

diff --git a/test/foundry/utils/ERC4337Utils.sol → src/utils/ERC4337Utils.sol b/test/foundry/utils/ERC4337Utils.sol → src/utils/ERC4337Utils.sol
diff --git a/test/foundry/KernelTestBase.sol → src/utils/KernelTestBase.sol b/test/foundry/KernelTestBase.sol → src/utils/KernelTestBase.sol
@@ -5,24 +5,24 @@ import {IEntryPoint} from "I4337/interfaces/IEntryPoint.sol";
 import {ENTRYPOINT_0_6_ADDRESS, ENTRYPOINT_0_6_BYTECODE} from "I4337/artifacts/EntryPoint_0_6.sol";
 import {CREATOR_0_6_BYTECODE, CREATOR_0_6_ADDRESS} from "I4337/artifacts/EntryPoint_0_6.sol";
 import {UserOperation} from "I4337/interfaces/UserOperation.sol";
-import {Kernel} from "src/Kernel.sol";
-import {Operation} from "src/common/Enums.sol";
-import {Compatibility} from "src/abstract/Compatibility.sol";
-import {IKernel} from "src/interfaces/IKernel.sol";
-import {KernelFactory} from "src/factory/KernelFactory.sol";
-import {IKernelValidator} from "src/interfaces/IKernelValidator.sol";
-
-import {Call, ExecutionDetail} from "src/common/Structs.sol";
-import {ValidationData, ValidUntil, ValidAfter} from "src/common/Types.sol";
-import {KERNEL_VERSION, KERNEL_NAME} from "src/common/Constants.sol";
-
-import {ERC4337Utils} from "test/foundry/utils/ERC4337Utils.sol";
+import {Kernel} from "../Kernel.sol";
+import {Operation} from "../common/Enums.sol";
+import {Compatibility} from "../abstract/Compatibility.sol";
+import {IKernel} from "../interfaces/IKernel.sol";
+import {KernelFactory} from "../factory/KernelFactory.sol";
+import {IKernelValidator} from "../interfaces/IKernelValidator.sol";
+
+import {Call, ExecutionDetail} from "../common/Structs.sol";
+import {ValidationData, ValidUntil, ValidAfter} from "../common/Types.sol";
+import {KERNEL_VERSION, KERNEL_NAME} from "../common/Constants.sol";
+
+import {ERC4337Utils} from "./ERC4337Utils.sol";
 import {Test} from "forge-std/Test.sol";
 import {console} from "forge-std/Console.sol";
-import {TestValidator} from "./mock/TestValidator.sol";
-import {TestExecutor} from "./mock/TestExecutor.sol";
-import {TestERC721} from "./mock/TestERC721.sol";
-import {TestERC1155} from "./mock/TestERC1155.sol";
+import {TestValidator} from "../mock/TestValidator.sol";
+import {TestExecutor} from "../mock/TestExecutor.sol";
+import {TestERC721} from "../mock/TestERC721.sol";
+import {TestERC1155} from "../mock/TestERC1155.sol";
 
 using ERC4337Utils for IEntryPoint;
 

diff --git a/test/foundry/KernelECDSA.t.sol b/test/foundry/KernelECDSA.t.sol
@@ -7,10 +7,10 @@ import "src/validator/ECDSAValidator.sol";
 // test artifacts
 // test utils
 import "forge-std/Test.sol";
-import {ERC4337Utils} from "./utils/ERC4337Utils.sol";
-import {KernelTestBase} from "./KernelTestBase.sol";
-import {TestExecutor} from "./mock/TestExecutor.sol";
-import {TestValidator} from "./mock/TestValidator.sol";
+import {ERC4337Utils} from "src/utils/ERC4337Utils.sol";
+import {KernelTestBase} from "src/utils/KernelTestBase.sol";
+import {TestExecutor} from "src/mock/TestExecutor.sol";
+import {TestValidator} from "src/mock/TestValidator.sol";
 import {IKernel} from "src/interfaces/IKernel.sol";
 
 using ERC4337Utils for IEntryPoint;

diff --git a/test/foundry/KernelLiteECDSA.t.sol b/test/foundry/KernelLiteECDSA.t.sol
@@ -7,10 +7,10 @@ import "src/lite/KernelLiteECDSA.sol";
 // test artifacts
 // test utils
 import "forge-std/Test.sol";
-import {ERC4337Utils} from "./utils/ERC4337Utils.sol";
-import {KernelTestBase} from "./KernelTestBase.sol";
-import {TestExecutor} from "./mock/TestExecutor.sol";
-import {TestValidator} from "./mock/TestValidator.sol";
+import {ERC4337Utils} from "src/utils/ERC4337Utils.sol";
+import {KernelTestBase} from "src/utils/KernelTestBase.sol";
+import {TestExecutor} from "src/mock/TestExecutor.sol";
+import {TestValidator} from "src/mock/TestValidator.sol";
 import {ECDSAValidator} from "src/validator/ECDSAValidator.sol";
 
 using ERC4337Utils for IEntryPoint;

diff --git a/test/foundry/validator/KernelECDSATyped.t.sol b/test/foundry/validator/KernelECDSATyped.t.sol
@@ -7,10 +7,10 @@ import "src/validator/ECDSATypedValidator.sol";
 // test artifacts
 // test utils
 import "forge-std/Test.sol";
-import {ERC4337Utils} from "../utils/ERC4337Utils.sol";
-import {KernelTestBase} from "../KernelTestBase.sol";
-import {TestExecutor} from "../mock/TestExecutor.sol";
-import {TestValidator} from "../mock/TestValidator.sol";
+import {ERC4337Utils} from "src/utils/ERC4337Utils.sol";
+import {KernelTestBase} from "src/utils/KernelTestBase.sol";
+import {TestExecutor} from "src/mock/TestExecutor.sol";
+import {TestValidator} from "src/mock/TestValidator.sol";
 import {IKernel} from "src/interfaces/IKernel.sol";
 
 using ERC4337Utils for IEntryPoint;
@@ -140,9 +140,6 @@ contract KernelECDSATypedTest is KernelTestBase {
         view
         returns (bytes memory)
     {
-        // Get the kernel private key owner address
-        address owner = vm.addr(_privateKey);
-
         // Get the validator domain separator
         bytes32 domainSeparator = ecdsaTypedValidator.getDomainSeperator();
         bytes32 typedMsgHash = keccak256(

diff --git a/test/foundry/validator/KillSwitchValidator.t.sol b/test/foundry/validator/KillSwitchValidator.t.sol
@@ -8,8 +8,8 @@ import "src/validator/KillSwitchValidator.sol";
 import "src/executor/KillSwitchAction.sol";
 // test utils
 import "forge-std/Test.sol";
-import "../utils/ERC4337Utils.sol";
-import {KernelTestBase} from "../KernelTestBase.sol";
+import "src/utils/ERC4337Utils.sol";
+import {KernelTestBase} from "src/utils/KernelTestBase.sol";
 import {KernelECDSATest} from "../KernelECDSA.t.sol";
 
 using ERC4337Utils for IEntryPoint;

diff --git a/test/foundry/validator/SessionKeyValidator.t.sol b/test/foundry/validator/SessionKeyValidator.t.sol
@@ -7,21 +7,21 @@ import "src/validator/ECDSAValidator.sol";
 import "src/factory/KernelFactory.sol";
 import {Call} from "src/common/Structs.sol";
 // test artifacts
-import "../mock/TestValidator.sol";
-import "../mock/TestExecutor.sol";
-import "../mock/TestERC721.sol";
-import "../mock/TestERC20.sol";
-import "../mock/TestPaymaster.sol";
+import "src/mock/TestValidator.sol";
+import "src/mock/TestExecutor.sol";
+import "src/mock/TestERC721.sol";
+import "src/mock/TestERC20.sol";
+import "src/mock/TestPaymaster.sol";
 // test utils
 import "forge-std/Test.sol";
-import "../utils/ERC4337Utils.sol";
+import "src/utils/ERC4337Utils.sol";
 import "../utils/Merkle.sol";
 // test actions/validators
 import "src/validator/SessionKeyValidator.sol";
 
 import {KernelECDSATest} from "../KernelECDSA.t.sol";
-import "../mock/TestCallee.sol";
-import "../mock/TestERC20.sol";
+import "src/mock/TestCallee.sol";
+import "src/mock/TestERC20.sol";
 
 using ERC4337Utils for IEntryPoint;