Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deployment scripts with more combinations #63

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Update deployment scripts with more combinations #63

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93344c7
Update deployment scripts with more combinations
JohnGuilding Nov 11, 2024
1db7a8a
conditionally deploy factory & linting/formating
JohnGuilding Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
conditionally deploy factory & linting/formating
  • Loading branch information
@JohnGuilding
JohnGuilding committed Nov 11, 2024
commit 1db7a8aae2eab0f215713f778e256d47ef1f440b
36 changes: 17 additions & 19 deletions script/7579/EmailRecoveryModule/DeployEmailRecoveryModule.s.sol
View file
Original file line number Diff line number Diff line change
@@ -5,36 +5,35 @@ pragma solidity ^0.8.25;

import { console } from "forge-std/console.sol";
import { EmailRecoveryCommandHandler } from "src/handlers/EmailRecoveryCommandHandler.sol";
import { UserOverrideableDKIMRegistry } from "@zk-email/contracts/UserOverrideableDKIMRegistry.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 { BaseDeployScript } from "../../BaseDeployScript.s.sol";

contract DeployEmailRecoveryModuleScript is BaseDeployScript {
address verifier;
address dkim;
address emailAuthImpl;
address commandHandler;
uint256 minimumDelay;
address killSwitchAuthorizer;
address validatorAddr;
address public verifier;
address public dkim;
address public emailAuthImpl;
uint256 public minimumDelay;
address public killSwitchAuthorizer;
address public validatorAddr;
address public factory;

address initialOwner;
address dkimRegistrySigner;
uint256 dkimDelay;
uint256 salt;
address public initialOwner;
address public dkimRegistrySigner;
uint256 public dkimDelay;
uint256 public salt;

function run() public override {
super.run();
vm.startBroadcast(vm.envUint("PRIVATE_KEY"));
verifier = vm.envOr("VERIFIER", address(0));
dkim = vm.envOr("DKIM_REGISTRY", address(0));
emailAuthImpl = vm.envOr("EMAIL_AUTH_IMPL", address(0));
commandHandler = vm.envOr("COMMAND_HANDLER", address(0));
minimumDelay = vm.envOr("MINIMUM_DELAY", uint256(0));
killSwitchAuthorizer = vm.envAddress("KILL_SWITCH_AUTHORIZER");
validatorAddr = vm.envOr("VALIDATOR", address(0));
factory = vm.envOr("RECOVERY_FACTORY", address(0));

initialOwner = vm.addr(vm.envUint("PRIVATE_KEY"));
dkimRegistrySigner = vm.envOr("DKIM_SIGNER", address(0));
@@ -62,15 +61,14 @@ contract DeployEmailRecoveryModuleScript is BaseDeployScript {
console.log("OwnableValidator deployed at", validatorAddr);
}

address _factory = vm.envOr("RECOVERY_FACTORY", address(0));
if (_factory == address(0)) {
_factory =
if (factory == address(0)) {
factory =
address(new EmailRecoveryFactory{ salt: bytes32(salt) }(verifier, emailAuthImpl));
console.log("EmailRecoveryFactory deployed at", _factory);
console.log("EmailRecoveryFactory deployed at", factory);
}

EmailRecoveryFactory factory = EmailRecoveryFactory(_factory);
(address module, address commandHandler) = factory.deployEmailRecoveryModule(
EmailRecoveryFactory emailRecoveryFactory = EmailRecoveryFactory(factory);
(address module, address commandHandler) = emailRecoveryFactory.deployEmailRecoveryModule(
bytes32(uint256(0)),
bytes32(uint256(0)),
type(EmailRecoveryCommandHandler).creationCode,
36 changes: 17 additions & 19 deletions script/7579/EmailRecoveryModule/DeployEmailRecoveryModuleWithAccountHiding.s.sol
View file
Original file line number Diff line number Diff line change
@@ -6,36 +6,35 @@ pragma solidity ^0.8.25;
import { console } from "forge-std/console.sol";
import { AccountHidingRecoveryCommandHandler } from
"src/handlers/AccountHidingRecoveryCommandHandler.sol";
import { UserOverrideableDKIMRegistry } from "@zk-email/contracts/UserOverrideableDKIMRegistry.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 { BaseDeployScript } from "../../BaseDeployScript.s.sol";

contract DeployEmailRecoveryModuleScript is BaseDeployScript {
address verifier;
address dkim;
address emailAuthImpl;
address commandHandler;
uint256 minimumDelay;
address killSwitchAuthorizer;
address validatorAddr;
address public verifier;
address public dkim;
address public emailAuthImpl;
uint256 public minimumDelay;
address public killSwitchAuthorizer;
address public validatorAddr;
address public factory;

address initialOwner;
address dkimRegistrySigner;
uint256 dkimDelay;
uint256 salt;
address public initialOwner;
address public dkimRegistrySigner;
uint256 public dkimDelay;
uint256 public salt;

function run() public override {
super.run();
vm.startBroadcast(vm.envUint("PRIVATE_KEY"));
verifier = vm.envOr("VERIFIER", address(0));
dkim = vm.envOr("DKIM_REGISTRY", address(0));
emailAuthImpl = vm.envOr("EMAIL_AUTH_IMPL", address(0));
commandHandler = vm.envOr("COMMAND_HANDLER", address(0));
minimumDelay = vm.envOr("MINIMUM_DELAY", uint256(0));
killSwitchAuthorizer = vm.envAddress("KILL_SWITCH_AUTHORIZER");
validatorAddr = vm.envOr("VALIDATOR", address(0));
factory = vm.envOr("RECOVERY_FACTORY", address(0));

initialOwner = vm.addr(vm.envUint("PRIVATE_KEY"));
dkimRegistrySigner = vm.envOr("DKIM_SIGNER", address(0));
@@ -62,15 +61,14 @@ contract DeployEmailRecoveryModuleScript is BaseDeployScript {
console.log("OwnableValidator deployed at", validatorAddr);
}

address _factory = vm.envOr("RECOVERY_FACTORY", address(0));
if (_factory == address(0)) {
_factory =
if (factory == address(0)) {
factory =
address(new EmailRecoveryFactory{ salt: bytes32(salt) }(verifier, emailAuthImpl));
console.log("EmailRecoveryFactory deployed at", _factory);
console.log("EmailRecoveryFactory deployed at", factory);
}

EmailRecoveryFactory factory = EmailRecoveryFactory(_factory);
(address module, address commandHandler) = factory.deployEmailRecoveryModule(
EmailRecoveryFactory emailRecoveryFactory = EmailRecoveryFactory(factory);
(address module, address commandHandler) = emailRecoveryFactory.deployEmailRecoveryModule(
bytes32(uint256(0)),
bytes32(uint256(0)),
type(AccountHidingRecoveryCommandHandler).creationCode,
36 changes: 18 additions & 18 deletions script/7579/UniversalEmailRecoveryModule/DeployUniversalEmailRecoveryModule.s.sol
View file
Original file line number Diff line number Diff line change
@@ -5,33 +5,32 @@ pragma solidity ^0.8.25;

import { console } from "forge-std/console.sol";
import { EmailRecoveryCommandHandler } from "src/handlers/EmailRecoveryCommandHandler.sol";
import { UserOverrideableDKIMRegistry } from "@zk-email/contracts/UserOverrideableDKIMRegistry.sol";
import { EmailAuth } from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";
import { EmailRecoveryUniversalFactory } from "src/factories/EmailRecoveryUniversalFactory.sol";
import { BaseDeployScript } from "../../BaseDeployScript.s.sol";

contract DeployUniversalEmailRecoveryModuleScript is BaseDeployScript {
address verifier;
address dkim;
address emailAuthImpl;
address commandHandler;
uint256 minimumDelay;
address killSwitchAuthorizer;
address public verifier;
address public dkim;
address public emailAuthImpl;
uint256 public minimumDelay;
address public killSwitchAuthorizer;
address public factory;

address initialOwner;
address dkimRegistrySigner;
uint256 dkimDelay;
uint256 salt;
address public initialOwner;
address public dkimRegistrySigner;
uint256 public dkimDelay;
uint256 public salt;

function run() public override {
super.run();
vm.startBroadcast(vm.envUint("PRIVATE_KEY"));
verifier = vm.envOr("VERIFIER", address(0));
dkim = vm.envOr("DKIM_REGISTRY", address(0));
emailAuthImpl = vm.envOr("EMAIL_AUTH_IMPL", address(0));
commandHandler = vm.envOr("COMMAND_HANDLER", address(0));
minimumDelay = vm.envOr("MINIMUM_DELAY", uint256(0));
killSwitchAuthorizer = vm.envAddress("KILL_SWITCH_AUTHORIZER");
factory = vm.envOr("RECOVERY_FACTORY", address(0));

initialOwner = vm.addr(vm.envUint("PRIVATE_KEY"));
dkimRegistrySigner = vm.envOr("DKIM_SIGNER", address(0));
@@ -53,16 +52,17 @@ contract DeployUniversalEmailRecoveryModuleScript is BaseDeployScript {
console.log("EmailAuth implemenation deployed at", emailAuthImpl);
}

address _factory = vm.envOr("RECOVERY_FACTORY", address(0));
if (_factory == address(0)) {
_factory = address(
if (factory == address(0)) {
factory = address(
new EmailRecoveryUniversalFactory{ salt: bytes32(salt) }(verifier, emailAuthImpl)
);
console.log("EmailRecoveryUniversalFactory deployed at", _factory);
console.log("EmailRecoveryUniversalFactory deployed at", factory);
}

EmailRecoveryUniversalFactory factory = EmailRecoveryUniversalFactory(_factory);
(address module, address commandHandler) = factory.deployUniversalEmailRecoveryModule(
EmailRecoveryUniversalFactory emailRecoveryUniversalFactory =
EmailRecoveryUniversalFactory(factory);
(address module, address commandHandler) = emailRecoveryUniversalFactory
.deployUniversalEmailRecoveryModule(
bytes32(uint256(0)),
bytes32(uint256(0)),
type(EmailRecoveryCommandHandler).creationCode,
36 changes: 18 additions & 18 deletions ...79/UniversalEmailRecoveryModule/DeployUniversalEmailRecoveryModuleWithAccountHiding.s.sol
View file
Original file line number Diff line number Diff line change
@@ -6,33 +6,32 @@ pragma solidity ^0.8.25;
import { console } from "forge-std/console.sol";
import { AccountHidingRecoveryCommandHandler } from
"src/handlers/AccountHidingRecoveryCommandHandler.sol";
import { UserOverrideableDKIMRegistry } from "@zk-email/contracts/UserOverrideableDKIMRegistry.sol";
import { EmailAuth } from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";
import { EmailRecoveryUniversalFactory } from "src/factories/EmailRecoveryUniversalFactory.sol";
import { BaseDeployScript } from "../../BaseDeployScript.s.sol";

contract DeployUniversalEmailRecoveryModuleScript is BaseDeployScript {
address verifier;
address dkim;
address emailAuthImpl;
address commandHandler;
uint256 minimumDelay;
address killSwitchAuthorizer;
address public verifier;
address public dkim;
address public emailAuthImpl;
uint256 public minimumDelay;
address public killSwitchAuthorizer;
address public factory;

address initialOwner;
address dkimRegistrySigner;
uint256 dkimDelay;
uint256 salt;
address public initialOwner;
address public dkimRegistrySigner;
uint256 public dkimDelay;
uint256 public salt;

function run() public override {
super.run();
vm.startBroadcast(vm.envUint("PRIVATE_KEY"));
verifier = vm.envOr("VERIFIER", address(0));
dkim = vm.envOr("DKIM_REGISTRY", address(0));
emailAuthImpl = vm.envOr("EMAIL_AUTH_IMPL", address(0));
commandHandler = vm.envOr("COMMAND_HANDLER", address(0));
minimumDelay = vm.envOr("MINIMUM_DELAY", uint256(0));
killSwitchAuthorizer = vm.envAddress("KILL_SWITCH_AUTHORIZER");
factory = vm.envOr("RECOVERY_FACTORY", address(0));

initialOwner = vm.addr(vm.envUint("PRIVATE_KEY"));
dkimRegistrySigner = vm.envOr("DKIM_SIGNER", address(0));
@@ -54,16 +53,17 @@ contract DeployUniversalEmailRecoveryModuleScript is BaseDeployScript {
console.log("EmailAuth implemenation deployed at", emailAuthImpl);
}

address _factory = vm.envOr("RECOVERY_FACTORY", address(0));
if (_factory == address(0)) {
_factory = address(
if (factory == address(0)) {
factory = address(
new EmailRecoveryUniversalFactory{ salt: bytes32(salt) }(verifier, emailAuthImpl)
);
console.log("EmailRecoveryUniversalFactory deployed at", _factory);
console.log("EmailRecoveryUniversalFactory deployed at", factory);
}

EmailRecoveryUniversalFactory factory = EmailRecoveryUniversalFactory(_factory);
(address module, address commandHandler) = factory.deployUniversalEmailRecoveryModule(
EmailRecoveryUniversalFactory emailRecoveryUniversalFactory =
EmailRecoveryUniversalFactory(factory);
(address module, address commandHandler) = emailRecoveryUniversalFactory
.deployUniversalEmailRecoveryModule(
bytes32(uint256(0)),
bytes32(uint256(0)),
type(AccountHidingRecoveryCommandHandler).creationCode,
21 changes: 10 additions & 11 deletions script/Safe/DeploySafeNativeRecovery.s.sol
View file
Original file line number Diff line number Diff line change
@@ -4,24 +4,23 @@ pragma solidity ^0.8.25;
/* solhint-disable no-console, gas-custom-errors */

import { console } from "forge-std/console.sol";
import { UserOverrideableDKIMRegistry } from "@zk-email/contracts/UserOverrideableDKIMRegistry.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 { BaseDeployScript } from "../BaseDeployScript.s.sol";

contract DeploySafeNativeRecovery_Script is BaseDeployScript {
address verifier;
address dkim;
address emailAuthImpl;
address commandHandler;
uint256 minimumDelay;
address killSwitchAuthorizer;
address public verifier;
address public dkim;
address public emailAuthImpl;
address public commandHandler;
uint256 public minimumDelay;
address public killSwitchAuthorizer;

address initialOwner;
address dkimRegistrySigner;
uint256 dkimDelay;
uint256 salt;
address public initialOwner;
address public dkimRegistrySigner;
uint256 public dkimDelay;
uint256 public salt;

function run() public override {
super.run();
21 changes: 10 additions & 11 deletions script/Safe/DeploySafeNativeRecoveryWithAccountHiding.s.sol
View file
Original file line number Diff line number Diff line change
@@ -4,25 +4,24 @@ pragma solidity ^0.8.25;
/* solhint-disable no-console, gas-custom-errors */

import { console } from "forge-std/console.sol";
import { UserOverrideableDKIMRegistry } from "@zk-email/contracts/UserOverrideableDKIMRegistry.sol";
import { EmailAuth } from "@zk-email/ether-email-auth-contracts/src/EmailAuth.sol";
import { AccountHidingRecoveryCommandHandler } from
"src/handlers/AccountHidingRecoveryCommandHandler.sol";
import { SafeEmailRecoveryModule } from "src/modules/SafeEmailRecoveryModule.sol";
import { BaseDeployScript } from "../BaseDeployScript.s.sol";

contract DeploySafeNativeRecovery_Script is BaseDeployScript {
address verifier;
address dkim;
address emailAuthImpl;
address commandHandler;
uint256 minimumDelay;
address killSwitchAuthorizer;
address public verifier;
address public dkim;
address public emailAuthImpl;
address public commandHandler;
uint256 public minimumDelay;
address public killSwitchAuthorizer;

address initialOwner;
address dkimRegistrySigner;
uint256 dkimDelay;
uint256 salt;
address public initialOwner;
address public dkimRegistrySigner;
uint256 public dkimDelay;
uint256 public salt;

function run() public override {
super.run();
Loading