Skip to content

Commit

Permalink
Update validium mode cmd and env name
Browse files Browse the repository at this point in the history
  • Loading branch information
ilitteri committed Dec 20, 2023
1 parent a654bdc commit a9f0b62
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions l1-contracts/scripts/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ async function main() {
.option("--create2-salt <create2-salt>")
.option("--diamond-upgrade-init <version>")
.option("--only-verifier")
.option("--validium")
.option("--validium-mode")
.action(async (cmd) => {
const deployWallet = cmd.privateKey
? new Wallet(cmd.privateKey, provider)
Expand Down Expand Up @@ -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 });
Expand Down
8 changes: 4 additions & 4 deletions l1-contracts/src.ts/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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`);

Check failure on line 247 in l1-contracts/src.ts/deploy.ts

View workflow job for this annotation

GitHub Actions / lint

Strings must use doublequote

Check failure on line 247 in l1-contracts/src.ts/deploy.ts

View workflow job for this annotation

GitHub Actions / lint

Strings must use doublequote

Check failure on line 247 in l1-contracts/src.ts/deploy.ts

View workflow job for this annotation

GitHub Actions / lint

Strings must use doublequote
console.log(`CONTRACTS_EXECUTOR_FACET_ADDR=${contractAddress}`);
}

Expand All @@ -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`);

Check failure on line 259 in l1-contracts/src.ts/deploy.ts

View workflow job for this annotation

GitHub Actions / lint

Strings must use doublequote

Check failure on line 259 in l1-contracts/src.ts/deploy.ts

View workflow job for this annotation

GitHub Actions / lint

Strings must use doublequote

Check failure on line 259 in l1-contracts/src.ts/deploy.ts

View workflow job for this annotation

GitHub Actions / lint

Strings must use doublequote
console.log(`CONTRACTS_EXECUTOR_FACET_ADDR=${contractAddress}`);
}

Expand Down Expand Up @@ -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 });

Expand Down

0 comments on commit a9f0b62

Please sign in to comment.