Import ether-email-auth as npm package

zkemail · Sep 12, 2024 · 5775930 · 5775930
1 parent 092adb4
commit 5775930
Show file tree

Hide file tree

Showing 21 changed files with 94 additions and 98 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zk-email/email-recovery",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Smart account module and related contracts to enable email recovery for validators",
   "license": "MIT",
   "author": {
@@ -29,7 +29,7 @@
     "@openzeppelin/contracts-upgradeable": "5.0.1",
     "@rhinestone/modulekit": "github:rhinestonewtf/modulekit",
     "@zk-email/contracts": "6.0.3",
-    "@zk-email/ether-email-auth": "github:zkemail/ether-email-auth#feat/body-parsing-with-audit-fix",
+    "@zk-email/ether-email-auth-contracts": "0.0.1-preview",
     "email-wallet-sdk": "github:zkemail/email-wallet-sdk",
     "erc7579-implementation": "github:erc7579/erc7579-implementation",
     "solidity-stringutils": "github:Arachnid/solidity-stringutils"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/remappings.txt b/remappings.txt
@@ -18,7 +18,7 @@ solady/=node_modules/solady/src/
 solarray/=node_modules/solarray/src/
 @prb/math/=node_modules/@prb/math/src/
 
-ether-email-auth/=node_modules/@zk-email/ether-email-auth/
+ether-email-auth/=node_modules/@zk-email/ether-email-auth-contracts/
 @zk-email/contracts/=node_modules/@zk-email/contracts/
 solidity-stringutils/=node_modules/solidity-stringutils/
 @matterlabs/zksync-contracts/l2/contracts/=src/libraries/

diff --git a/script/Deploy7579TestAccount.s.sol b/script/Deploy7579TestAccount.s.sol
@@ -3,8 +3,7 @@ pragma solidity ^0.8.25;
 
 import { Script } from "forge-std/Script.sol";
 import { console } from "forge-std/console.sol";
-import { EmailAccountRecovery } from
-    "ether-email-auth/packages/contracts/src/EmailAccountRecovery.sol";
+import { EmailAccountRecovery } from "ether-email-auth/src/EmailAccountRecovery.sol";
 import { IGuardianManager } from "src/interfaces/IGuardianManager.sol";
 import { RhinestoneModuleKit } from "modulekit/ModuleKit.sol";
 import { OwnableValidator } from "src/test/OwnableValidator.sol";

diff --git a/script/DeployEmailRecoveryModule.s.sol b/script/DeployEmailRecoveryModule.s.sol
@@ -4,11 +4,10 @@ pragma solidity ^0.8.25;
 import { Script } from "forge-std/Script.sol";
 import { console } from "forge-std/console.sol";
 import { EmailRecoveryCommandHandler } from "src/handlers/EmailRecoveryCommandHandler.sol";
-import { Verifier } from "ether-email-auth/packages/contracts/src/utils/Verifier.sol";
-import { Groth16Verifier } from "ether-email-auth/packages/contracts/src/utils/Groth16Verifier.sol";
-import { ECDSAOwnedDKIMRegistry } from
-    "ether-email-auth/packages/contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
-import { EmailAuth } from "ether-email-auth/packages/contracts/src/EmailAuth.sol";
+import { Verifier } from "ether-email-auth/src/utils/Verifier.sol";
+import { Groth16Verifier } from "ether-email-auth/src/utils/Groth16Verifier.sol";
+import { ECDSAOwnedDKIMRegistry } from "ether-email-auth/src/utils/ECDSAOwnedDKIMRegistry.sol";
+import { EmailAuth } from "ether-email-auth/src/EmailAuth.sol";
 import { EmailRecoveryFactory } from "src/factories/EmailRecoveryFactory.sol";
 import { OwnableValidator } from "src/test/OwnableValidator.sol";
 import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";

diff --git a/script/DeploySafeNativeRecovery.s.sol b/script/DeploySafeNativeRecovery.s.sol
@@ -3,11 +3,10 @@ pragma solidity ^0.8.25;
 
 import { Script } from "forge-std/Script.sol";
 import { console } from "forge-std/console.sol";
-import { Verifier } from "ether-email-auth/packages/contracts/src/utils/Verifier.sol";
-import { Groth16Verifier } from "ether-email-auth/packages/contracts/src/utils/Groth16Verifier.sol";
-import { ECDSAOwnedDKIMRegistry } from
-    "ether-email-auth/packages/contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
-import { EmailAuth } from "ether-email-auth/packages/contracts/src/EmailAuth.sol";
+import { Verifier } from "ether-email-auth/src/utils/Verifier.sol";
+import { Groth16Verifier } from "ether-email-auth/src/utils/Groth16Verifier.sol";
+import { ECDSAOwnedDKIMRegistry } from "ether-email-auth/src/utils/ECDSAOwnedDKIMRegistry.sol";
+import { EmailAuth } from "ether-email-auth/src/EmailAuth.sol";
 import { SafeRecoveryCommandHandler } from "src/handlers/SafeRecoveryCommandHandler.sol";
 import { SafeEmailRecoveryModule } from "src/modules/SafeEmailRecoveryModule.sol";
 import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";

diff --git a/script/DeploySafeRecovery.s.sol b/script/DeploySafeRecovery.s.sol
@@ -6,11 +6,10 @@ import { console } from "forge-std/console.sol";
 import { SafeRecoveryCommandHandler } from "src/handlers/SafeRecoveryCommandHandler.sol";
 import { EmailRecoveryFactory } from "src/factories/EmailRecoveryFactory.sol";
 import { EmailRecoveryUniversalFactory } from "src/factories/EmailRecoveryUniversalFactory.sol";
-import { Verifier } from "ether-email-auth/packages/contracts/src/utils/Verifier.sol";
-import { Groth16Verifier } from "ether-email-auth/packages/contracts/src/utils/Groth16Verifier.sol";
-import { ECDSAOwnedDKIMRegistry } from
-    "ether-email-auth/packages/contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
-import { EmailAuth } from "ether-email-auth/packages/contracts/src/EmailAuth.sol";
+import { Verifier } from "ether-email-auth/src/utils/Verifier.sol";
+import { Groth16Verifier } from "ether-email-auth/src/utils/Groth16Verifier.sol";
+import { ECDSAOwnedDKIMRegistry } from "ether-email-auth/src/utils/ECDSAOwnedDKIMRegistry.sol";
+import { EmailAuth } from "ether-email-auth/src/EmailAuth.sol";
 
 import { Safe7579 } from "safe7579/Safe7579.sol";
 import { Safe7579Launchpad } from "safe7579/Safe7579Launchpad.sol";

diff --git a/script/DeployUniversalEmailRecoveryModule.s.sol b/script/DeployUniversalEmailRecoveryModule.s.sol
@@ -4,11 +4,10 @@ pragma solidity ^0.8.25;
 import { Script } from "forge-std/Script.sol";
 import { console } from "forge-std/console.sol";
 import { EmailRecoveryCommandHandler } from "src/handlers/EmailRecoveryCommandHandler.sol";
-import { Verifier } from "ether-email-auth/packages/contracts/src/utils/Verifier.sol";
-import { Groth16Verifier } from "ether-email-auth/packages/contracts/src/utils/Groth16Verifier.sol";
-import { ECDSAOwnedDKIMRegistry } from
-    "ether-email-auth/packages/contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
-import { EmailAuth } from "ether-email-auth/packages/contracts/src/EmailAuth.sol";
+import { Verifier } from "ether-email-auth/src/utils/Verifier.sol";
+import { Groth16Verifier } from "ether-email-auth/src/utils/Groth16Verifier.sol";
+import { ECDSAOwnedDKIMRegistry } from "ether-email-auth/src/utils/ECDSAOwnedDKIMRegistry.sol";
+import { EmailAuth } from "ether-email-auth/src/EmailAuth.sol";
 import { EmailRecoveryUniversalFactory } from "src/factories/EmailRecoveryUniversalFactory.sol";
 import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 

diff --git a/src/EmailRecoveryManager.sol b/src/EmailRecoveryManager.sol
@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.25;
 
-import { EmailAccountRecovery } from
-    "ether-email-auth/packages/contracts/src/EmailAccountRecovery.sol";
+import { EmailAccountRecovery } from "ether-email-auth/src/EmailAccountRecovery.sol";
 import { IEmailRecoveryManager } from "./interfaces/IEmailRecoveryManager.sol";
 import { IEmailRecoveryCommandHandler } from "./interfaces/IEmailRecoveryCommandHandler.sol";
 import { GuardianManager } from "./GuardianManager.sol";
@@ -226,9 +225,7 @@ abstract contract EmailRecoveryManager is
      * that no recovery is in process.
      * @param recoveryConfig The new recovery configuration to be set for the caller's account
      */
-    function updateRecoveryConfig(
-        RecoveryConfig memory recoveryConfig
-    )
+    function updateRecoveryConfig(RecoveryConfig memory recoveryConfig)
         public
         onlyWhenNotRecovering
     {