Merge pull request #5 from rhinestonewtf/feat/update-modulekit-dep

chore: update to latest modulekit
rhinestonewtf · Dec 9, 2024 · 3cc2715 · 3cc2715
2 parents 251adea + 2ed9dd1
commit 3cc2715
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 285 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rhinestone/module-template",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "A Foundry template for building modules using the ModuleKit",
   "license": "GPL-3.0",
   "author": {
@@ -25,7 +25,7 @@
     "test:optimized": "pnpm run build:optimized && FOUNDRY_PROFILE=test-optimized forge test"
   },
   "dependencies": {
-    "@rhinestone/modulekit": "^0.4.17"
+    "@rhinestone/modulekit": "^0.5.1"
   },
   "files": [
     "src",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/remappings.txt b/remappings.txt
@@ -1,22 +1,16 @@
 @rhinestone/=node_modules/@rhinestone/
 sentinellist/=node_modules/@rhinestone/sentinellist/src/
 erc4337-validation/=node_modules/@rhinestone/erc4337-validation/src/
-safe7579/=node_modules/@rhinestone/safe7579/src/
 modulekit/=node_modules/@rhinestone/modulekit/src/
-module-bases/=node_modules/@rhinestone/module-bases/src/
-registry/=node_modules/@rhinestone/registry/src/
 
 @ERC4337/=node_modules/@ERC4337/
 account-abstraction/=node_modules/@ERC4337/account-abstraction/contracts/
 account-abstraction-v0.6/=node_modules/@ERC4337/account-abstraction-v0.6/contracts/
 
 @openzeppelin/=node_modules/@openzeppelin/
-@safe-global/=node_modules/@safe-global/
 ds-test/=node_modules/ds-test/src/
-erc7579/=node_modules/erc7579/src/
 forge-std/=node_modules/forge-std/src/
 solady/=node_modules/solady/src/
 solarray/=node_modules/solarray/src/
 @prb/math/=node_modules/@prb/math/src/
-kernel/=node_modules/@zerodev/kernel/src/
 ExcessivelySafeCall/=node_modules/excessively-safe-call/src/
diff --git a/script/DeployModule.s.sol b/script/DeployModule.s.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.23;
 
 import "forge-std/Script.sol";
-import { RegistryDeployer } from "modulekit/deployment/RegistryDeployer.sol";
+import { RegistryDeployer } from "modulekit/deployment/registry/RegistryDeployer.sol";
 
 // Import modules here
 import { ValidatorTemplate } from "src/ValidatorTemplate.sol";

diff --git a/src/ExecutorTemplate.sol b/src/ExecutorTemplate.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.23;
 
 import { ERC7579ExecutorBase } from "modulekit/Modules.sol";
 import { IERC7579Account } from "modulekit/Accounts.sol";
-import { ModeLib } from "erc7579/lib/ModeLib.sol";
+import { ModeLib } from "modulekit/accounts/common/lib/ModeLib.sol";
 
 contract ExecutorTemplate is ERC7579ExecutorBase {
     /*//////////////////////////////////////////////////////////////////////////

diff --git a/src/ValidatorTemplate.sol b/src/ValidatorTemplate.sol
@@ -104,7 +104,6 @@ contract ValidatorTemplate is ERC7579ValidatorBase {
         external
         view
         virtual
-        override
         returns (bool validSig)
     {
         return false;

diff --git a/test/ExecutorTemplate.t.sol b/test/ExecutorTemplate.t.sol
@@ -2,19 +2,13 @@
 pragma solidity ^0.8.23;
 
 import { Test } from "forge-std/Test.sol";
-import {
-    RhinestoneModuleKit,
-    ModuleKitHelpers,
-    ModuleKitUserOp,
-    AccountInstance
-} from "modulekit/ModuleKit.sol";
-import { MODULE_TYPE_EXECUTOR } from "modulekit/external/ERC7579.sol";
-import { ExecutionLib } from "erc7579/lib/ExecutionLib.sol";
+import { RhinestoneModuleKit, ModuleKitHelpers, AccountInstance } from "modulekit/ModuleKit.sol";
+import { MODULE_TYPE_EXECUTOR } from "modulekit/accounts/common/interfaces/IERC7579Module.sol";
+import { ExecutionLib } from "modulekit/accounts/erc7579/lib/ExecutionLib.sol";
 import { ExecutorTemplate } from "src/ExecutorTemplate.sol";
 
 contract ExecutorTemplateTest is RhinestoneModuleKit, Test {
     using ModuleKitHelpers for *;
-    using ModuleKitUserOp for *;
 
     // account and modules
     AccountInstance internal instance;

diff --git a/test/HookTemplate.t.sol b/test/HookTemplate.t.sol
@@ -2,18 +2,12 @@
 pragma solidity ^0.8.23;
 
 import { Test } from "forge-std/Test.sol";
-import {
-    RhinestoneModuleKit,
-    ModuleKitHelpers,
-    ModuleKitUserOp,
-    AccountInstance
-} from "modulekit/ModuleKit.sol";
-import { MODULE_TYPE_HOOK } from "modulekit/external/ERC7579.sol";
+import { RhinestoneModuleKit, ModuleKitHelpers, AccountInstance } from "modulekit/ModuleKit.sol";
+import { MODULE_TYPE_HOOK } from "modulekit/accounts/common/interfaces/IERC7579Module.sol";
 import { HookTemplate } from "src/HookTemplate.sol";
 
 contract HookTemplateTest is RhinestoneModuleKit, Test {
     using ModuleKitHelpers for *;
-    using ModuleKitUserOp for *;
 
     // account and modules
     AccountInstance internal instance;

diff --git a/test/ValidatorTemplate.t.sol b/test/ValidatorTemplate.t.sol
@@ -5,16 +5,14 @@ import { Test } from "forge-std/Test.sol";
 import {
     RhinestoneModuleKit,
     ModuleKitHelpers,
-    ModuleKitUserOp,
     AccountInstance,
     UserOpData
 } from "modulekit/ModuleKit.sol";
-import { MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
+import { MODULE_TYPE_VALIDATOR } from "modulekit/accounts/common/interfaces/IERC7579Module.sol";
 import { ValidatorTemplate } from "src/ValidatorTemplate.sol";
 
 contract ValidatorTemplateTest is RhinestoneModuleKit, Test {
     using ModuleKitHelpers for *;
-    using ModuleKitUserOp for *;
 
     // account and modules
     AccountInstance internal instance;