Skip to content

Commit

Permalink
Fix remapping
Browse files Browse the repository at this point in the history
  • Loading branch information
@SoraSuegami
SoraSuegami committed Sep 12, 2024
1 parent dc78af3 commit 6dbfc03
Show file tree
Hide file tree
Showing 21 changed files with 64 additions and 45 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zk-email/email-recovery",
"version": "0.0.5",
"version": "0.0.6",
"description": "Smart account module and related contracts to enable email recovery for validators",
"license": "MIT",
"author": {
Expand Down
2 changes: 1 addition & 1 deletion remappings.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ solady/=node_modules/solady/src/
solarray/=node_modules/solarray/src/
@prb/math/=node_modules/@prb/math/src/

ether-email-auth-contracts/=node_modules/@zk-email/ether-email-auth-contracts/
@zk-email/ether-email-auth-contracts/=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/
Expand Down
3 changes: 2 additions & 1 deletion script/Deploy7579TestAccount.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ 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-contracts/src/EmailAccountRecovery.sol";
import { EmailAccountRecovery } from
"@zk-email/ether-email-auth-contracts/src/EmailAccountRecovery.sol";
import { IGuardianManager } from "src/interfaces/IGuardianManager.sol";
import { RhinestoneModuleKit } from "modulekit/ModuleKit.sol";
import { OwnableValidator } from "src/test/OwnableValidator.sol";
Expand Down
8 changes: 4 additions & 4 deletions script/DeployEmailRecoveryModule.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ 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-contracts/src/utils/Verifier.sol";
import { Groth16Verifier } from "ether-email-auth-contracts/src/utils/Groth16Verifier.sol";
import { Verifier } from "@zk-email/ether-email-auth-contracts/src/utils/Verifier.sol";
import { Groth16Verifier } from "@zk-email/ether-email-auth-contracts/src/utils/Groth16Verifier.sol";
import { ECDSAOwnedDKIMRegistry } from
"ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
import { EmailAuth } from "ether-email-auth-contracts/src/EmailAuth.sol";
"@zk-email/ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
import { EmailAuth } from "@zk-email/ether-email-auth-contracts/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";
Expand Down
8 changes: 4 additions & 4 deletions script/DeploySafeNativeRecovery.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ 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-contracts/src/utils/Verifier.sol";
import { Groth16Verifier } from "ether-email-auth-contracts/src/utils/Groth16Verifier.sol";
import { Verifier } from "@zk-email/ether-email-auth-contracts/src/utils/Verifier.sol";
import { Groth16Verifier } from "@zk-email/ether-email-auth-contracts/src/utils/Groth16Verifier.sol";
import { ECDSAOwnedDKIMRegistry } from
"ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
import { EmailAuth } from "ether-email-auth-contracts/src/EmailAuth.sol";
"@zk-email/ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
import { EmailAuth } from "@zk-email/ether-email-auth-contracts/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";
Expand Down
8 changes: 4 additions & 4 deletions script/DeploySafeRecovery.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ 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-contracts/src/utils/Verifier.sol";
import { Groth16Verifier } from "ether-email-auth-contracts/src/utils/Groth16Verifier.sol";
import { Verifier } from "@zk-email/ether-email-auth-contracts/src/utils/Verifier.sol";
import { Groth16Verifier } from "@zk-email/ether-email-auth-contracts/src/utils/Groth16Verifier.sol";
import { ECDSAOwnedDKIMRegistry } from
"ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
import { EmailAuth } from "ether-email-auth-contracts/src/EmailAuth.sol";
"@zk-email/ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
import { EmailAuth } from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";

import { Safe7579 } from "safe7579/Safe7579.sol";
import { Safe7579Launchpad } from "safe7579/Safe7579Launchpad.sol";
Expand Down
8 changes: 4 additions & 4 deletions script/DeployUniversalEmailRecoveryModule.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ 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-contracts/src/utils/Verifier.sol";
import { Groth16Verifier } from "ether-email-auth-contracts/src/utils/Groth16Verifier.sol";
import { Verifier } from "@zk-email/ether-email-auth-contracts/src/utils/Verifier.sol";
import { Groth16Verifier } from "@zk-email/ether-email-auth-contracts/src/utils/Groth16Verifier.sol";
import { ECDSAOwnedDKIMRegistry } from
"ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
import { EmailAuth } from "ether-email-auth-contracts/src/EmailAuth.sol";
"@zk-email/ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
import { EmailAuth } from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";
import { EmailRecoveryUniversalFactory } from "src/factories/EmailRecoveryUniversalFactory.sol";
import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";

Expand Down
3 changes: 2 additions & 1 deletion src/EmailRecoveryManager.sol
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.25;

import { EmailAccountRecovery } from "ether-email-auth-contracts/src/EmailAccountRecovery.sol";
import { EmailAccountRecovery } from
"@zk-email/ether-email-auth-contracts/src/EmailAccountRecovery.sol";
import { IEmailRecoveryManager } from "./interfaces/IEmailRecoveryManager.sol";
import { IEmailRecoveryCommandHandler } from "./interfaces/IEmailRecoveryCommandHandler.sol";
import { GuardianManager } from "./GuardianManager.sol";
Expand Down
5 changes: 3 additions & 2 deletions src/EmailRecoveryManagerZkSync.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
pragma solidity ^0.8.25;

import { EmailRecoveryManager } from "./EmailRecoveryManager.sol";
import { EmailAccountRecovery } from "ether-email-auth-contracts/src/EmailAccountRecovery.sol";
import { EmailAccountRecovery } from
"@zk-email/ether-email-auth-contracts/src/EmailAccountRecovery.sol";
import { EmailAccountRecoveryZKSync } from
"ether-email-auth-contracts/src/EmailAccountRecoveryZKSync.sol";
"@zk-email/ether-email-auth-contracts/src/EmailAccountRecoveryZKSync.sol";

/**
* @title EmailRecoveryManagerZkSync
Expand Down
2 changes: 1 addition & 1 deletion test/integration/EmailRecoveryManager/EmailRecoveryManager.integration.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity ^0.8.25;
import { console2 } from "forge-std/console2.sol";
import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
import { EmailAuthMsg } from "ether-email-auth-contracts/src/EmailAuth.sol";
import { EmailAuthMsg } from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";

import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
import { IGuardianManager } from "src/interfaces/IGuardianManager.sol";
Expand Down
4 changes: 2 additions & 2 deletions test/integration/IntegrationBase.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { console2 } from "forge-std/console2.sol";

import { RhinestoneModuleKit, AccountInstance } from "modulekit/ModuleKit.sol";
import { ECDSAOwnedDKIMRegistry } from
"ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
import { EmailAuth } from "ether-email-auth-contracts/src/EmailAuth.sol";
"@zk-email/ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
import { EmailAuth } from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";
import { ECDSA } from "solady/utils/ECDSA.sol";

import { MockGroth16Verifier } from "src/test/MockGroth16Verifier.sol";
Expand Down
4 changes: 2 additions & 2 deletions test/integration/OwnableValidatorRecovery/EmailRecoveryModule/EmailRecoveryModule.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ pragma solidity ^0.8.25;
import { console2 } from "forge-std/console2.sol";
import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
import { EmailAuthMsg } from "ether-email-auth-contracts/src/EmailAuth.sol";
import { CommandUtils } from "ether-email-auth-contracts/src/libraries/CommandUtils.sol";
import { EmailAuthMsg } from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";
import { CommandUtils } from "@zk-email/ether-email-auth-contracts/src/libraries/CommandUtils.sol";
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";

import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
Expand Down
8 changes: 6 additions & 2 deletions test/integration/OwnableValidatorRecovery/EmailRecoveryModule/EmailRecoveryModuleBase.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@ import { console2 } from "forge-std/console2.sol";
import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
import { EmailAuth, EmailAuthMsg, EmailProof } from "ether-email-auth-contracts/src/EmailAuth.sol";
import { CommandUtils } from "ether-email-auth-contracts/src/libraries/CommandUtils.sol";
import {
EmailAuth,
EmailAuthMsg,
EmailProof
} from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";
import { CommandUtils } from "@zk-email/ether-email-auth-contracts/src/libraries/CommandUtils.sol";
import { EmailRecoveryCommandHandler } from "src/handlers/EmailRecoveryCommandHandler.sol";
import { EmailRecoveryFactory } from "src/factories/EmailRecoveryFactory.sol";
import { EmailRecoveryManager } from "src/EmailRecoveryManager.sol";
Expand Down
2 changes: 1 addition & 1 deletion .../OwnableValidatorRecovery/UniversalEmailRecoveryModule/UniversalEmailRecoveryModule.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity ^0.8.25;
import { console2 } from "forge-std/console2.sol";
import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
import { EmailAuthMsg } from "ether-email-auth-contracts/src/EmailAuth.sol";
import { EmailAuthMsg } from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";

import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
import { IGuardianManager } from "src/interfaces/IGuardianManager.sol";
Expand Down
8 changes: 6 additions & 2 deletions ...ableValidatorRecovery/UniversalEmailRecoveryModule/UniversalEmailRecoveryModuleBase.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@ import { console2 } from "forge-std/console2.sol";
import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
import { EmailAuth, EmailAuthMsg, EmailProof } from "ether-email-auth-contracts/src/EmailAuth.sol";
import { CommandUtils } from "ether-email-auth-contracts/src/libraries/CommandUtils.sol";
import {
EmailAuth,
EmailAuthMsg,
EmailProof
} from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";
import { CommandUtils } from "@zk-email/ether-email-auth-contracts/src/libraries/CommandUtils.sol";
import { EmailRecoveryCommandHandler } from "src/handlers/EmailRecoveryCommandHandler.sol";
import { EmailRecoveryFactory } from "src/factories/EmailRecoveryFactory.sol";
import { EmailRecoveryUniversalFactory } from "src/factories/EmailRecoveryUniversalFactory.sol";
Expand Down
4 changes: 2 additions & 2 deletions test/integration/SafeRecovery/SafeIntegrationBase.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { console2 } from "forge-std/console2.sol";

import { ModuleKitHelpers } from "modulekit/ModuleKit.sol";
import { MODULE_TYPE_EXECUTOR } from "modulekit/external/ERC7579.sol";
import { EmailAuthMsg, EmailProof } from "ether-email-auth-contracts/src/EmailAuth.sol";
import { CommandUtils } from "ether-email-auth-contracts/src/libraries/CommandUtils.sol";
import { EmailAuthMsg, EmailProof } from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";
import { CommandUtils } from "@zk-email/ether-email-auth-contracts/src/libraries/CommandUtils.sol";
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";

import { EmailRecoveryManager } from "src/EmailRecoveryManager.sol";
Expand Down
4 changes: 2 additions & 2 deletions test/integration/SafeRecovery/SafeNativeIntegrationBase.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { console2 } from "forge-std/console2.sol";

import { ModuleKitHelpers } from "modulekit/ModuleKit.sol";
import { MODULE_TYPE_EXECUTOR } from "modulekit/external/ERC7579.sol";
import { EmailAuthMsg, EmailProof } from "ether-email-auth-contracts/src/EmailAuth.sol";
import { CommandUtils } from "ether-email-auth-contracts/src/libraries/CommandUtils.sol";
import { EmailAuthMsg, EmailProof } from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";
import { CommandUtils } from "@zk-email/ether-email-auth-contracts/src/libraries/CommandUtils.sol";
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";

import { Safe } from "@safe-global/safe-contracts/contracts/Safe.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/integration/SafeRecovery/SafeRecoveryNativeModule.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { IERC7579Account } from "erc7579/interfaces/IERC7579Account.sol";
import { Safe } from "@safe-global/safe-contracts/contracts/Safe.sol";
import { SafeProxy } from "@safe-global/safe-contracts/contracts/proxies/SafeProxy.sol";
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
import { EmailAuthMsg } from "ether-email-auth-contracts/src/EmailAuth.sol";
import { EmailAuthMsg } from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";
import { SafeEmailRecoveryModule } from "src/modules/SafeEmailRecoveryModule.sol";
import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
import { AccountHidingRecoveryCommandHandler } from
Expand Down
4 changes: 2 additions & 2 deletions test/unit/SafeUnitBase.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ pragma solidity ^0.8.25;
import { console2 } from "forge-std/console2.sol";
import { ModuleKitHelpers } from "modulekit/ModuleKit.sol";
import { MODULE_TYPE_EXECUTOR } from "modulekit/external/ERC7579.sol";
import { EmailAuthMsg, EmailProof } from "ether-email-auth-contracts/src/EmailAuth.sol";
import { CommandUtils } from "ether-email-auth-contracts/src/libraries/CommandUtils.sol";
import { EmailAuthMsg, EmailProof } from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";
import { CommandUtils } from "@zk-email/ether-email-auth-contracts/src/libraries/CommandUtils.sol";
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";

import { EmailRecoveryManager } from "src/EmailRecoveryManager.sol";
Expand Down
10 changes: 7 additions & 3 deletions test/unit/UnitBase.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@ import {
} from "modulekit/ModuleKit.sol";
import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
import { ECDSAOwnedDKIMRegistry } from
"ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
import { CommandUtils } from "ether-email-auth-contracts/src/libraries/CommandUtils.sol";
import { EmailAuth, EmailAuthMsg, EmailProof } from "ether-email-auth-contracts/src/EmailAuth.sol";
"@zk-email/ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
import { CommandUtils } from "@zk-email/ether-email-auth-contracts/src/libraries/CommandUtils.sol";
import {
EmailAuth,
EmailAuthMsg,
EmailProof
} from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
import { ECDSA } from "solady/utils/ECDSA.sol";

Expand Down
10 changes: 7 additions & 3 deletions test/unit/modules/EmailRecoveryModule/EmailRecoveryModuleBase.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@ import {
} from "modulekit/ModuleKit.sol";
import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
import { ECDSAOwnedDKIMRegistry } from
"ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
import { CommandUtils } from "ether-email-auth-contracts/src/libraries/CommandUtils.sol";
import { EmailAuth, EmailAuthMsg, EmailProof } from "ether-email-auth-contracts/src/EmailAuth.sol";
"@zk-email/ether-email-auth-contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
import { CommandUtils } from "@zk-email/ether-email-auth-contracts/src/libraries/CommandUtils.sol";
import {
EmailAuth,
EmailAuthMsg,
EmailProof
} from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
import { ECDSA } from "solady/utils/ECDSA.sol";

Expand Down

0 comments on commit 6dbfc03

Please sign in to comment.