From e6b26ff330a49e96714cb75bb5e8b7d9f83bfa05 Mon Sep 17 00:00:00 2001 From: Shijiang Guo Date: Mon, 19 Jun 2023 22:10:12 +0800 Subject: [PATCH] =?UTF-8?q?[R4R]update=20mainnet=20and=20hardhat=20config?= =?UTF-8?q?=20items=20for=20contracts=20and=20mantl=E2=80=A6=20(#1032)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: update mainnet and hardhat config items for contracts and mantle da * fix l1BlockTimeSeconds config --- mt-challenger/challenger/challenger.go | 2 +- packages/contracts/deploy-config/hardhat.ts | 34 ++++++++++------- packages/contracts/deploy-config/mainnet.ts | 42 ++++++++++++--------- 3 files changed, 46 insertions(+), 32 deletions(-) diff --git a/mt-challenger/challenger/challenger.go b/mt-challenger/challenger/challenger.go index dccf0d235..a7107464d 100644 --- a/mt-challenger/challenger/challenger.go +++ b/mt-challenger/challenger/challenger.go @@ -712,7 +712,7 @@ func (c *Challenger) dataCompensateForDlNodeExitsLoop() { nodeNum, err := c.GetEigenLayerNode() if err != nil { log.Error("MtChallenger data compensate get da node", "err", err) - return + continue } if nodeNum == totalDaNode { log.Info("MtChallenger current da node and history da node", "current", nodeNum, "history", totalDaNode) diff --git a/packages/contracts/deploy-config/hardhat.ts b/packages/contracts/deploy-config/hardhat.ts index 4ca316dbd..70983bea4 100644 --- a/packages/contracts/deploy-config/hardhat.ts +++ b/packages/contracts/deploy-config/hardhat.ts @@ -1,4 +1,6 @@ const config = { + numDeployConfirmations: 4, + gasPrice: 150_000_000_000, l1BlockTimeSeconds: 15, l2BlockGasLimit: 15_000_000, l2ChainId: 17, @@ -9,19 +11,25 @@ const config = { blockStaleMeasure: 100, daFraudProofPeriod: 120, l2SubmittedBlockNumber: 1, - bvmSequencerAddress: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8', - bvmProposerAddress: '0x3c44cdddb6a900fa2b585dd299e03d12fa4293bc', - bvmRolluperAddress: '0x3c44cdddb6a900fa2b585dd299e03d12fa4293bc', - bvmBlockSignerAddress: '0x00000398232E2064F896018496b4b44b3D62751F', - bvmFeeWalletAddress: '0x391716d440c151c42cdf1c95c1d83a5427bca52c', - bvmAddressManagerOwner: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266', - bvmGasPriceOracleOwner: '0x9965507d1a55bcc2695c58ba16fb37d819b0a4dc', - l1MantleAddress: '0x1A4b46696b2bB4794Eb3D4c26f1c55F9170fa4C5', - proxyL1MantleAddress: '0x1A4b46696b2bB4794Eb3D4c26f1c55F9170fa4C5', - bvmTssRewardContractOwner: '0xc8910a1957d276cE5634B978d908B5ef9fB0e05B', - bvmFeeWalletOwner: '0xc8910a1957d276cE5634B978d908B5ef9fB0e05B', - dataManagerAddress: '0xE5C3D068e2160c67e09afaCEff3E765e30163Eb8', - bvmEigenSequencerAddress: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8', + bvmSequencerAddress: process.env.BVM_SEQUENCER_ADDRESS || '0x70997970c51812dc3a010c7d01b50e0d17dc79c8', + bvmProposerAddress: process.env.BVM_PROPOSER_ADDRESS || '0x3c44cdddb6a900fa2b585dd299e03d12fa4293bc', + bvmRolluperAddress: process.env.BVM_ROLLUPER_ADDRESS || '0x3c44cdddb6a900fa2b585dd299e03d12fa4293bc', + bvmBlockSignerAddress: process.env.BVM_BLOCK_SIGNER_ADDRESS || '0x00000398232E2064F896018496b4b44b3D62751F', + bvmFeeWalletAddress: process.env.BVM_FEE_WALLET_ADDRESS || '0x391716d440c151c42cdf1c95c1d83a5427bca52c', + bvmAddressManagerOwner: process.env.BVM_ADDRESS_MANAGER_OWNER || '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266', + bvmCrossDomainPauseOwner: process.env.BVM_CROSS_DOMAIN_PAUSE_OWNER || '0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A', + bvmGasPriceOracleOwner: process.env.BVM_GAS_PRICE_ORACLE_OWNER || '0x9965507d1a55bcc2695c58ba16fb37d819b0a4dc', + bvmFeeWalletOwner: process.env.BVM_FEE_WALLETOWNER_OWNER || '0xc8910a1957d276cE5634B978d908B5ef9fB0e05B', + bvmWhitelistOwner: process.env.BVM_WHITE_LIST_OWNER || '0x648E3e8101BFaB7bf5997Bd007Fb473786019159', + bvmTssRewardContractOwner: process.env.BVM_TSS_REWARD_CONTRACT_OWNER || '0xc8910a1957d276cE5634B978d908B5ef9fB0e05B', + l1MantleAddress: process.env.L1_MANTLE_ADDRESS || '0x1A4b46696b2bB4794Eb3D4c26f1c55F9170fa4C5', + proxyL1MantleAddress: process.env.PROXY_L1_MANTLE_ADDRESS || '0x1A4b46696b2bB4794Eb3D4c26f1c55F9170fa4C5', + dataManagerAddress: process.env.DATA_MANAGER_ADDRESS || '0xE5C3D068e2160c67e09afaCEff3E765e30163Eb8', + bvmEigenSequencerAddress: process.env.BVM_EIGENDA_SEQUENCER_ADDRESS || '0x70997970c51812dc3a010c7d01b50e0d17dc79c8', + bvmEigenFeeAddress: process.env.BVM_EIGENDA_FEE_ADDRESS || '0x6887246668a3b87F54DeB3b94Ba47a6f63F32985', + bvmEigenChallengerAddress: process.env.BVM_EIGENDA_CHALLENGER_ADDRESS || '0x6887246668a3b87F54DeB3b94Ba47a6f63F32985', + contractsDeployerKey: process.env.CONTRACTS_DEPLOYER_KEY, + contractsRpcUrl: process.env.CONTRACTS_RPC_URL, } export default config diff --git a/packages/contracts/deploy-config/mainnet.ts b/packages/contracts/deploy-config/mainnet.ts index c237af2b2..5bcdac01e 100644 --- a/packages/contracts/deploy-config/mainnet.ts +++ b/packages/contracts/deploy-config/mainnet.ts @@ -1,29 +1,35 @@ const config = { numDeployConfirmations: 4, gasPrice: 150_000_000_000, - l1BlockTimeSeconds: 15, - l2BlockGasLimit: 15_000_000, - l2ChainId: 10, + l1BlockTimeSeconds: 12, + l2BlockGasLimit: 30_000_000, + l2ChainId: 5000, ctcL2GasDiscountDivisor: 32, ctcEnqueueGasCost: 60_000, sccFaultProofWindowSeconds: 604800, sccSequencerPublishWindowSeconds: 12592000, - blockStaleMeasure: 100, - daFraudProofPeriod: 120, + blockStaleMeasure: 500, + daFraudProofPeriod: 3600, l2SubmittedBlockNumber: 1, - bvmSequencerAddress: '0x6887246668a3b87F54DeB3b94Ba47a6f63F32985', - bvmProposerAddress: '0x473300df21D047806A082244b417f96b32f13A33', - bvmBlockSignerAddress: '0x00000398232E2064F896018496b4b44b3D62751F', - bvmFeeWalletAddress: '0x391716d440c151c42cdf1c95c1d83a5427bca52c', - bvmAddressManagerOwner: '0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A', - bvmCrossDomainPauseOwner: '0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A', - bvmGasPriceOracleOwner: '0x7107142636C85c549690b1Aca12Bdb8052d26Ae6', - bvmFeeWalletOwner: '0x7107142636C85c549690b1Aca12Bdb8052d26Ae6', - bvmWhitelistOwner: '0x648E3e8101BFaB7bf5997Bd007Fb473786019159', - dataManagerAddress: '0xE5C3D068e2160c67e09afaCEff3E765e30163Eb8', - bvmEigenSequencerAddress: '0x6887246668a3b87F54DeB3b94Ba47a6f63F32985', - bvmEigenFeeAddress: '0x6887246668a3b87F54DeB3b94Ba47a6f63F32985', - bvmEigenChallengerAddress: '0x6887246668a3b87F54DeB3b94Ba47a6f63F32985', + bvmSequencerAddress: process.env.BVM_SEQUENCER_ADDRESS || '0x6887246668a3b87F54DeB3b94Ba47a6f63F32985', + bvmProposerAddress: process.env.BVM_PROPOSER_ADDRESS || '0x473300df21D047806A082244b417f96b32f13A33', + bvmRolluperAddress: process.env.BVM_ROLLUPER_ADDRESS || '0x3079Be9D8622173f02618bA2B793F00795D4f320', + bvmBlockSignerAddress: process.env.BVM_BLOCK_SIGNER_ADDRESS || '0x00000398232E2064F896018496b4b44b3D62751F', + bvmFeeWalletAddress: process.env.BVM_FEE_WALLET_ADDRESS || '0x391716d440c151c42cdf1c95c1d83a5427bca52c', + bvmAddressManagerOwner: process.env.BVM_ADDRESS_MANAGER_OWNER || '0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A', + bvmCrossDomainPauseOwner: process.env.BVM_CROSS_DOMAIN_PAUSE_OWNER || '0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A', + bvmGasPriceOracleOwner: process.env.BVM_GAS_PRICE_ORACLE_OWNER || '0x7107142636C85c549690b1Aca12Bdb8052d26Ae6', + bvmFeeWalletOwner: process.env.BVM_FEE_WALLETOWNER_OWNER || '0x7107142636C85c549690b1Aca12Bdb8052d26Ae6', + bvmWhitelistOwner: process.env.BVM_WHITE_LIST_OWNER || '0x648E3e8101BFaB7bf5997Bd007Fb473786019159', + bvmTssRewardContractOwner: process.env.BVM_TSS_REWARD_CONTRACT_OWNER || '0xAe3e6f7Df1CC6Cf18Fe9F3E69BCFC3351eb4fB45', + l1MantleAddress: process.env.L1_MANTLE_ADDRESS || '0x5a94Dc6cc85fdA49d8E9A8b85DDE8629025C42be', + proxyL1MantleAddress: process.env.PROXY_L1_MANTLE_ADDRESS || '0x5a94Dc6cc85fdA49d8E9A8b85DDE8629025C42be', + dataManagerAddress: process.env.DATA_MANAGER_ADDRESS || '0xE5C3D068e2160c67e09afaCEff3E765e30163Eb8', + bvmEigenSequencerAddress: process.env.BVM_EIGENDA_SEQUENCER_ADDRESS || '0x6887246668a3b87F54DeB3b94Ba47a6f63F32985', + bvmEigenFeeAddress: process.env.BVM_EIGENDA_FEE_ADDRESS || '0x6887246668a3b87F54DeB3b94Ba47a6f63F32985', + bvmEigenChallengerAddress: process.env.BVM_EIGENDA_CHALLENGER_ADDRESS || '0x6887246668a3b87F54DeB3b94Ba47a6f63F32985', + contractsDeployerKey: process.env.CONTRACTS_DEPLOYER_KEY, + contractsRpcUrl: process.env.CONTRACTS_RPC_URL, } export default config