Fix scripts

zkemail · Sep 13, 2024 · 5342f0a · 5342f0a
1 parent 6ed6e87
commit 5342f0a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 27 deletions.
diff --git a/packages/contracts/script/DeployRecoveryController.s.sol b/packages/contracts/script/DeployRecoveryController.s.sol
@@ -35,7 +35,7 @@ contract Deploy is Script {
         }
 
         vm.startBroadcast(deployerPrivateKey);
-        address initialOwner = msg.sender;
+        address initialOwner = vm.addr(deployerPrivateKey);
 
         // Deploy ECDSAOwned DKIM registry
         dkim = ECDSAOwnedDKIMRegistry(vm.envOr("ECDSA_DKIM", address(0)));

diff --git a/packages/contracts/script/DeployRecoveryControllerZKSync.s.sol b/packages/contracts/script/DeployRecoveryControllerZKSync.s.sol
@@ -37,7 +37,7 @@ contract Deploy is Script {
         }
 
         vm.startBroadcast(deployerPrivateKey);
-        address initialOwner = msg.sender;
+        address initialOwner = vm.addr(deployerPrivateKey);
 
         // Deploy ECDSAOwned DKIM registry
         dkim = ECDSAOwnedDKIMRegistry(vm.envOr("ECDSA_DKIM", address(0)));

diff --git a/packages/contracts/script/DeploySimpleWallet.s.sol b/packages/contracts/script/DeploySimpleWallet.s.sol
@@ -3,37 +3,18 @@ pragma solidity ^0.8.13;
 
 import "forge-std/Script.sol";
 
-import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import "../test/helpers/SimpleWallet.sol";
-import "../src/utils/Verifier.sol";
-import "../src/utils/ECDSAOwnedDKIMRegistry.sol";
-import "../src/EmailAuth.sol";
 
 contract Deploy is Script {
-    using ECDSA for *;
-
     function run() external {
         uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
         if (deployerPrivateKey == 0) {
             console.log("PRIVATE_KEY env var not set");
             return;
         }
-        address dkim = vm.envAddress("DKIM");
-        if (dkim == address(0)) {
-            console.log("DKIM env var not set");
-            return;
-        }
-        address verifier = vm.envAddress("VERIFIER");
-        if (verifier == address(0)) {
-            console.log("VERIFIER env var not set");
-            return;
-        }
-        address emailAuthImpl = vm.envAddress("EMAIL_AUTH_IMPL");
-        if (emailAuthImpl == address(0)) {
-            console.log("EMAIL_AUTH_IMPL env var not set");
-            return;
-        }
+        address initOwner = vm.addr(deployerPrivateKey);
+        address controller = vm.envAddress("CONTROLLER");
         address simpleWalletImpl = vm.envAddress("SIMPLE_WALLET_IMPL");
         if (simpleWalletImpl == address(0)) {
             console.log("SIMPLE_WALLET_IMPL env var not set");
@@ -43,10 +24,8 @@ contract Deploy is Script {
         vm.startBroadcast(deployerPrivateKey);
         bytes memory data = abi.encodeWithSelector(
             SimpleWallet(payable(simpleWalletImpl)).initialize.selector,
-            vm.addr(deployerPrivateKey),
-            verifier,
-            dkim,
-            emailAuthImpl
+            initOwner,
+            controller
         );
         ERC1967Proxy proxy = new ERC1967Proxy(address(simpleWalletImpl), data);
         console.log("SimpleWallet deployed at: %s", address(proxy));