upd deps & lib, resolved conflicts

.gitmodules

@@ -4,22 +4,18 @@
 [submodule "compression/lib/openzeppelin-contracts"]
 	path = packages/compression/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-	commit = dbb6104
 [submodule "packages/plugins/lib/forge-std"]
 	path = packages/plugins/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-	commit = f73c73d
 [submodule "packages/plugins/lib/openzeppelin-contracts"]
 	path = packages/plugins/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
 [submodule "packages/plugins/lib/safe-contracts"]
 	path = packages/plugins/lib/safe-contracts
 	url = https://github.com/safe-global/safe-contracts
-	commit = bf943f8
 [submodule "packages/plugins/lib/account-abstraction"]
 	path = packages/plugins/lib/account-abstraction
 	url = https://github.com/eth-infinitism/account-abstraction
-	commit = 7af70c8
 [submodule "packages/zkp/lib/circom"]
 	path = packages/zkp/lib/circom
 	url = https://github.com/iden3/circom.git
@@ -32,12 +28,9 @@
 [submodule "packages/plugins/lib/kernel"]
 	path = packages/plugins/lib/kernel
 	url = https://github.com/zerodevapp/kernel
-	commit = 90fa72e
 [submodule "packages/plugins/lib/erc7579-implementation"]
 	path = packages/plugins/lib/erc7579-implementation
 	url = https://github.com/erc7579/erc7579-implementation
-	commit = 42aa538
 [submodule "packages/plugins/lib/reference-implementation"]
 	path = packages/plugins/lib/reference-implementation
 	url = https://github.com/erc6900/reference-implementation
-	commit = 8b9ba71

packages/plugins/src/safe/SafeAnonAadhaarFactory.sol

@@ -6,7 +6,7 @@ import {Safe} from "safe-contracts/contracts/Safe.sol";
 import {SafeProxyFactory} from "safe-contracts/contracts/proxies/SafeProxyFactory.sol";
 import {SafeProxy} from "safe-contracts/contracts/proxies/SafeProxy.sol";
 
-import {EntryPoint} from "account-abstraction/contracts/core/EntryPoint.sol";
+import {EntryPoint} from "account-abstraction/core/EntryPoint.sol";
 
 import {SafeAnonAadhaarPlugin} from "./SafeAnonAadhaarPlugin.sol";
 

packages/plugins/src/safe/SafeAnonAadhaarPlugin.sol

@@ -2,9 +2,9 @@
 pragma solidity >=0.7.0 <0.9.0;
 pragma abicoder v2;
 
-import {Safe4337Base} from "./utils/Safe4337Base.sol";
-import {IEntryPoint, UserOperation} from "account-abstraction/contracts/interfaces/IEntryPoint.sol";
-import {UserOperation} from "account-abstraction/contracts/interfaces/IEntryPoint.sol";
+import {Safe4337Base, SIG_VALIDATION_FAILED} from "./utils/Safe4337Base.sol";
+import {IEntryPoint, PackedUserOperation} from "account-abstraction/interfaces/IEntryPoint.sol";
+import {PackedUserOperation} from "account-abstraction/interfaces/IEntryPoint.sol";
 import {IAnonAadhaar} from "./utils/anonAadhaar/interfaces/IAnonAadhaar.sol";
 
 interface ISafe {
@@ -102,7 +102,7 @@ contract SafeAnonAadhaarPlugin is Safe4337Base {
     }
 
     function _validateSignature(
-        UserOperation calldata userOp,
+        PackedUserOperation calldata userOp,
         bytes32 userOpHash
     ) internal view override returns (uint256 validationData) {
         (

packages/plugins/test/e2e/utils/createUserOp.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/comma-dangle */
+/* eslint-disable prettier/prettier */
 import { ethers, getBytes, NonceManager, Signer } from "ethers";
 import { AddressZero } from "@ethersproject/constants";
 
@@ -10,7 +12,7 @@ import {
 } from "../../../typechain-types";
 import receiptOf from "./receiptOf";
 import { calculateProxyAddress } from "./calculateProxyAddress";
-import { getGasEstimates } from "./getGasEstimates";
+import { getFeeData, getGasEstimates } from "./getGasEstimates";
 import sendUserOpAndWait from "./sendUserOpAndWait";
 import {
 	FactoryParams,
@@ -193,16 +195,15 @@ export const createAnonAadhaarOperation = async (
 	const unsignedUserOperation = {
 		sender: accountAddress,
 		nonce: nonceHex,
-		initCode: "0x",
 		callData: userOpCallData,
 		callGasLimit: ethers.toBeHex(150000n),
 		verificationGasLimit: ethers.toBeHex(1000000n),
 		preVerificationGas: ethers.toBeHex(200000n),
 		maxFeePerGas,
 		maxPriorityFeePerGas,
-		paymasterAndData: "0x",
+		paymasterData: "0x",
 		signature: "0x",
-	} satisfies UserOperationStruct;
+	} satisfies UserOperation;
 
 	return await ethers.resolveProperties(unsignedUserOperation);
 };
@@ -210,8 +211,8 @@ export const createAnonAadhaarOperation = async (
 export const sendUserOpWithAnonAadhaarSig = async (
 	bundlerProvider: ethers.JsonRpcProvider,
 	entryPointAddress: string,
-	unsignedUserOperation: UserOperationStruct,
-	userOpSignature: BytesLike
+	unsignedUserOperation: UserOperation,
+	userOpSignature: string
 ) => {
 	const userOperation = {
 		...unsignedUserOperation,

packages/plugins/test/e2e/utils/getGasEstimates.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/comma-dangle */
+/* eslint-disable prettier/prettier */
 import { ethers } from "ethers";
 import { UserOperation } from "./userOpUtils";
 

packages/plugins/yarn.lock

@@ -912,6 +912,11 @@
     "@nomicfoundation/solidity-analyzer-win32-ia32-msvc" "0.1.1"
     "@nomicfoundation/solidity-analyzer-win32-x64-msvc" "0.1.1"
 
+"@nomiclabs/hardhat-ethers@npm:hardhat-deploy-ethers":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/hardhat-deploy-ethers/-/hardhat-deploy-ethers-0.4.1.tgz#dd70b0cc413ed99e98994047b383a004cf1c14f8"
+  integrity sha512-RM6JUcD0dOCjemxnKLtK7XQQI7NWn+LxF5qicGYax0PtWayEUXAewOb4WIHZ/yearhj+s2t6dL0MnHyLTENwJg==
+
 "@openzeppelin/contracts@3.4.2-solc-0.7":
   version "3.4.2-solc-0.7"
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-3.4.2-solc-0.7.tgz#38f4dbab672631034076ccdf2f3201fab1726635"
@@ -927,6 +932,16 @@
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.0.2.tgz#b1d03075e49290d06570b2fd42154d76c2a5d210"
   integrity sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==
 
+"@pcd/pcd-types@^0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@pcd/pcd-types/-/pcd-types-0.10.0.tgz#2076b37fe3d95fd2545e321a37c7b3a24bfd70a5"
+  integrity sha512-QoBlHYVhNA8nbjpl8hmwHLkV78XolFCC7hdpt0U+STY7dfQO+aAegVYbx18yHo4G76nFj9xRUSfjVFV8ZzxIlQ==
+
+"@pcd/tsconfig@^0.6.0":
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/@pcd/tsconfig/-/tsconfig-0.6.2.tgz#64d3b279eb69f40c58d218b628828b9c9e51ce33"
+  integrity sha512-sdva2fJW+fB1a4xQ63oNhDwSJFrNn1Rc5TyJpuSeRH48U7YAQOYkYiKJz1jlRW6Ak0QJaSDgVhBmzsIE2DmNIg==
+
 "@pkgr/utils@^2.3.1":
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.4.2.tgz#9e638bbe9a6a6f165580dc943f138fd3309a2cbc"
@@ -1354,6 +1369,23 @@
     "@uniswap/v3-core" "^1.0.0"
     base64-sol "1.0.1"
 
+"@zk-email/helpers@^3.1.3":
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/@zk-email/helpers/-/helpers-3.2.3.tgz#a31aa06f6fc97938cc6ae766233febb1f477298e"
+  integrity sha512-jhHqRqnCkwg6a2k3OkNRUd99sO7zkG/H/Pd/HL4PHhtS17Lqby/btOu0W3y7AX7wWn13xhNdonjuMEsISYRpQg==
+  dependencies:
+    addressparser "^1.0.1"
+    atob "^2.1.2"
+    circomlibjs "^0.1.7"
+    libmime "^5.2.1"
+    localforage "^1.10.0"
+    lodash "^4.17.21"
+    node-forge "^1.3.1"
+    pako "^2.1.0"
+    pki "^1.1.0"
+    psl "^1.9.0"
+    snarkjs "https://github.com/sampritipanda/snarkjs.git#fef81fc51d17a734637555c6edbd585ecda02d9e"
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"