rename deploy script

hattizai · Feb 13, 2023 · 455b2ba · 455b2ba
1 parent 49c008f
commit 455b2ba
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/deployment/deployContracts.js → deployment/deployTestnet.js b/deployment/deployContracts.js → deployment/deployTestnet.js
@@ -77,6 +77,7 @@ async function main() {
     const admin = deployParameters.admin || deployer.address;
     const trustedAggregator = deployParameters.trustedAggregator || deployer.address;
     const timelockAddress = deployParameters.timelockAddress || deployer.address;
+    const zkEVMOwner = deployParameters.zkEVMOwner || deployer.address;
 
     /*
      *Deployment MATIC
@@ -316,7 +317,9 @@ async function main() {
     if (!deployParameters.forceBatchAllowed) {
         await (await polygonZkEVMContract.setForcedBatchesAllowed(1)).wait();
     }
-
+    if (zkEVMOwner !== deployer.address) {
+        await (await polygonZkEVMContract.transferOwnership(zkEVMOwner)).wait();
+    }
     /*
      *Deployment Time lock
      */

diff --git a/deployment/deploy_parameters.json.example b/deployment/deploy_parameters.json.example
@@ -13,6 +13,7 @@
     "trustedAggregator":"0x617b3a3528F9cDd6630fd3301B9c8911F7Bf063D",
     "minDelayTimelock": 3600,
     "timelockAddress": "0x617b3a3528F9cDd6630fd3301B9c8911F7Bf063D",
+    "zkEVMOwner": "0x617b3a3528F9cDd6630fd3301B9c8911F7Bf063D",
     "pendingStateTimeout": 604799,
     "trustedAggregatorTimeout": 604799,
     "forkID": 1,

diff --git a/docker/scripts/deploy-docker.sh b/docker/scripts/deploy-docker.sh
@@ -5,7 +5,7 @@ sleep 5
 node docker/scripts/fund-accounts.js
 cp docker/scripts/deploy_parameters_docker.json deployment/deploy_parameters.json
 cp docker/scripts/genesis_docker.json deployment/genesis.json
-npx hardhat run deployment/deployContracts.js --network localhost
+npx hardhat run deployment/deployTestnet.js --network localhost
 mkdir docker/deploymentOutput
 mv deployment/deploy_output.json docker/deploymentOutput
 docker-compose -f docker/docker-compose.geth.yml down

diff --git a/package.json b/package.json
@@ -62,8 +62,8 @@
     "saveDeployment:goerli": "mkdir -p deployments/goerli_$(date +%s) && cp -r deployment/deploy_*.json deployments/goerli_$(date +%s) && cp .openzeppelin/goerli.json deployments/goerli_$(date +%s) && cp deployment/genesis.json deployments/goerli_$(date +%s)",
     "test": "npx hardhat test test/contracts/**.test.js",
     "docgen": "npx solidity-docgen --solc-module solc-0.8 -t ./docs/templates -e ./contracts/verifiers,./contracts/mocks",
-    "deploy:ZkEVM:hardhat": "rm -f .openzeppelin/unknown-31337.json && node deployment/createGenesis.js && npx hardhat run deployment/deployContracts.js --network hardhat",
-    "deploy:ZkEVM:goerli": "node deployment/createGenesis.js && npx hardhat run deployment/deployContracts.js --network goerli && npm run saveDeployment:goerli",
+    "deploy:ZkEVM:hardhat": "rm -f .openzeppelin/unknown-31337.json && node deployment/createGenesis.js && npx hardhat run deployment/deployTestnet.js --network hardhat",
+    "deploy:ZkEVM:goerli": "node deployment/createGenesis.js && npx hardhat run deployment/deployTestnet.js --network goerli && npm run saveDeployment:goerli",
     "upgrade:timelock:goerli": "npx hardhat run upgrade/timeLockUpgrade.js --network goerli",
     "verify:ZkEVM:goerli": "npx hardhat run deployment/verifyContracts.js --network goerli",
     "lint": "npx eslint ./test && npx eslint ./docker/scripts && npx eslint ./deployment && npx eslint ./src",