enmerable map dep

erc7579 · Sep 25, 2024 · 633d1bb · 633d1bb
1 parent 701e50c
commit 633d1bb
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 659 deletions.
diff --git a/package.json b/package.json
@@ -27,7 +27,8 @@
   },
   "dependencies": {
     "@rhinestone/modulekit": "^0.4.8",
-    "stringutils": "github:Arachnid/solidity-stringutils"
+    "stringutils": "github:Arachnid/solidity-stringutils",
+    "enumerablemap": "https://github.com/erc7579/enumerablemap"
   },
   "files": [
     "src",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/remappings.txt b/remappings.txt
@@ -19,4 +19,5 @@ 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/
-stringutils/=node_modules/stringutils/src/
+stringutils/=node_modules/stringutils/src/
+enumerableset4337/=node_modules/enumerablemap/src/
diff --git a/src/SampleK1ValidatorWithERC7739.sol b/src/SampleK1ValidatorWithERC7739.sol
@@ -5,7 +5,7 @@ import { ERC7739Validator } from "./ERC7739Validator.sol";
 import { SignatureCheckerLib } from "solady/utils/SignatureCheckerLib.sol";
 import { ERC7579ValidatorBase } from "modulekit/Modules.sol";
 import { PackedUserOperation } from "modulekit/external/ERC4337.sol";
-import { EnumerableSet } from "./utils/EnumerableSet4337.sol";
+import { EnumerableSet } from "enumerableset4337/EnumerableSet4337.sol";
 import { ModuleInstallLib } from "./utils/ModuleInstallLib.sol";
 import { MessageHashUtils } from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 

diff --git a/src/utils/AssociatedArrayLib.sol b/src/utils/AssociatedArrayLib.sol