From a9f0b624a1863144c543721c880349cce664a22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Litteri?= Date: Wed, 20 Dec 2023 14:40:13 -0300 Subject: [PATCH] Update validium mode cmd and env name --- l1-contracts/scripts/deploy.ts | 4 ++-- l1-contracts/src.ts/deploy.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/l1-contracts/scripts/deploy.ts b/l1-contracts/scripts/deploy.ts index a41e3cc61..6bdedadf2 100644 --- a/l1-contracts/scripts/deploy.ts +++ b/l1-contracts/scripts/deploy.ts @@ -23,7 +23,7 @@ async function main() { .option("--create2-salt ") .option("--diamond-upgrade-init ") .option("--only-verifier") - .option("--validium") + .option("--validium-mode") .action(async (cmd) => { const deployWallet = cmd.privateKey ? new Wallet(cmd.privateKey, provider) @@ -82,7 +82,7 @@ async function main() { await deployer.deployGovernance(create2Salt, { gasPrice, nonce }); await deployer.deployAllowList(create2Salt, { gasPrice, nonce: nonce + 1 }); - await deployer.deployZkSyncContract(create2Salt, gasPrice, nonce + 2, cmd.validium); + await deployer.deployZkSyncContract(create2Salt, gasPrice, nonce + 2, cmd.validiumMode); await deployer.deployBridgeContracts(create2Salt, gasPrice); // Do not pass nonce, since it was increment after deploying zkSync contracts await deployer.deployWethBridgeContracts(create2Salt, gasPrice); await deployer.deployValidatorTimelock(create2Salt, { gasPrice }); diff --git a/l1-contracts/src.ts/deploy.ts b/l1-contracts/src.ts/deploy.ts index ee4dee7ad..2a11b8ab4 100644 --- a/l1-contracts/src.ts/deploy.ts +++ b/l1-contracts/src.ts/deploy.ts @@ -244,7 +244,7 @@ export class Deployer { const contractAddress = await this.deployViaCreate2("ExecutorFacet", [], create2Salt, ethTxOptions); if (this.verbose) { - console.log(`VALIDIUM=false`); + console.log(`VALIDIUM_MODE=false`); console.log(`CONTRACTS_EXECUTOR_FACET_ADDR=${contractAddress}`); } @@ -256,7 +256,7 @@ export class Deployer { const contractAddress = await this.deployViaCreate2("ValidiumExecutorFacet", [], create2Salt, ethTxOptions); if (this.verbose) { - console.log(`VALIDIUM=true`); + console.log(`VALIDIUM_MODE=true`); console.log(`CONTRACTS_EXECUTOR_FACET_ADDR=${contractAddress}`); } @@ -422,10 +422,10 @@ export class Deployer { this.addresses.ZkSync.DiamondProxy = contractAddress; } - public async deployZkSyncContract(create2Salt: string, gasPrice?: BigNumberish, nonce?, validium?: boolean) { + public async deployZkSyncContract(create2Salt: string, gasPrice?: BigNumberish, nonce?, validiumMode?: boolean) { nonce = nonce ? parseInt(nonce) : await this.deployWallet.getTransactionCount(); - const executorFacetPromise = validium + const executorFacetPromise = validiumMode ? this.deployValidiumExecutorFacet(create2Salt, { gasPrice, nonce: nonce + 1 }) : this.deployExecutorFacet(create2Salt, { gasPrice, nonce: nonce + 1 });