From 822a474261e2eb26ebe0b94f73b641b3337a5fd6 Mon Sep 17 00:00:00 2001 From: Sha3n Date: Thu, 29 Jun 2023 17:38:12 +0800 Subject: [PATCH] [R4R] - {0.4.2}: fix qa deployer config (#1169) [fix]: fix deployer config --- packages/contracts/deploy-config/goerli-qa.ts | 13 ++++++------- packages/contracts/deploy-config/hardhat.ts | 12 ++++++------ packages/contracts/deploy-config/local.ts | 14 +++++++------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/packages/contracts/deploy-config/goerli-qa.ts b/packages/contracts/deploy-config/goerli-qa.ts index 09df123c4..7cf6ae59a 100644 --- a/packages/contracts/deploy-config/goerli-qa.ts +++ b/packages/contracts/deploy-config/goerli-qa.ts @@ -1,16 +1,15 @@ const config = { numDeployConfirmations: 1, - l1BlockTimeSeconds: 15, - l2BlockGasLimit: 15_000_000, + gasPrice: 150_000_000_000, + l1BlockTimeSeconds: 12, + l2BlockGasLimit: 30_000_000, l2ChainId: 1705003, - updateGaslimitBlock: 90000, - eigenDaBlock: 2512521, ctcL2GasDiscountDivisor: 32, ctcEnqueueGasCost: 60_000, - sccFaultProofWindowSeconds: 0, + sccFaultProofWindowSeconds: 10, sccSequencerPublishWindowSeconds: 12592000, - blockStaleMeasure: 100, - daFraudProofPeriod: 120, + blockStaleMeasure: 500, + daFraudProofPeriod: 3600, l2SubmittedBlockNumber: 1, bvmSequencerAddress: process.env.BVM_SEQUENCER_ADDRESS || '0x2B1D033ddCc36cd6f4DE10A9a9C2Bc329a443bEB', bvmProposerAddress: process.env.BVM_PROPOSER_ADDRESS || '0x4e1614113AF6a1a41cA85d1a5Fe41De105BD65fA', diff --git a/packages/contracts/deploy-config/hardhat.ts b/packages/contracts/deploy-config/hardhat.ts index 3eb590645..c62afaadc 100644 --- a/packages/contracts/deploy-config/hardhat.ts +++ b/packages/contracts/deploy-config/hardhat.ts @@ -1,15 +1,15 @@ const config = { - numDeployConfirmations: 4, + numDeployConfirmations: 1, gasPrice: 150_000_000_000, - l1BlockTimeSeconds: 15, - l2BlockGasLimit: 15_000_000, + l1BlockTimeSeconds: 12, + l2BlockGasLimit: 30_000_000, l2ChainId: 17, ctcL2GasDiscountDivisor: 32, ctcEnqueueGasCost: 60_000, - sccFaultProofWindowSeconds: 0, + sccFaultProofWindowSeconds: 10, sccSequencerPublishWindowSeconds: 12592000, - blockStaleMeasure: 100, - daFraudProofPeriod: 120, + blockStaleMeasure: 500, + daFraudProofPeriod: 3600, l2SubmittedBlockNumber: 1, bvmSequencerAddress: process.env.BVM_SEQUENCER_ADDRESS || '0x70997970c51812dc3a010c7d01b50e0d17dc79c8', bvmProposerAddress: process.env.BVM_PROPOSER_ADDRESS || '0x3c44cdddb6a900fa2b585dd299e03d12fa4293bc', diff --git a/packages/contracts/deploy-config/local.ts b/packages/contracts/deploy-config/local.ts index 90b71d15b..00b234cca 100644 --- a/packages/contracts/deploy-config/local.ts +++ b/packages/contracts/deploy-config/local.ts @@ -1,15 +1,15 @@ const config = { - l1BlockTimeSeconds: 15, - l2BlockGasLimit: 15_000_000, + numDeployConfirmations: 1, + gasPrice: 150_000_000_000, + l1BlockTimeSeconds: 12, + l2BlockGasLimit: 30_000_000, l2ChainId: 17, - updateGaslimitBlock: 10, - eigenDaBlock: 100, ctcL2GasDiscountDivisor: 32, ctcEnqueueGasCost: 60_000, - sccFaultProofWindowSeconds: 60, + sccFaultProofWindowSeconds: 10, sccSequencerPublishWindowSeconds: 12592000, - blockStaleMeasure: 100, - daFraudProofPeriod: 120, + blockStaleMeasure: 500, + daFraudProofPeriod: 3600, l2SubmittedBlockNumber: 1, bvmSequencerAddress: process.env.BVM_SEQUENCER_ADDRESS || '0x70997970c51812dc3a010c7d01b50e0d17dc79c8', bvmProposerAddress: process.env.BVM_PROPOSER_ADDRESS || '0x4f958F2C2303BDca22b739339cD633F8543BB07D',