From cf964d867382808bedbdadead2fd4b2e0812ce1b Mon Sep 17 00:00:00 2001 From: kukoomomo Date: Thu, 28 Aug 2025 17:06:49 +0800 Subject: [PATCH 1/4] rm config submitter --- contracts/deploy/020-ContractInit.ts | 7 ++----- contracts/scripts/localDeploy.sh | 8 ++++---- contracts/src/deploy-config/l1.ts | 1 - 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/contracts/deploy/020-ContractInit.ts b/contracts/deploy/020-ContractInit.ts index a0e17dc19..b580e387d 100644 --- a/contracts/deploy/020-ContractInit.ts +++ b/contracts/deploy/020-ContractInit.ts @@ -54,12 +54,9 @@ export const ContractInit = async ( // import genesis batch const batchHeader: string = config.batchHeader - // submitter and challenger - const submitter: string = config.rollupProposer + // challenger const challenger: string = config.rollupChallenger - if (!ethers.utils.isAddress(submitter) - || !ethers.utils.isAddress(challenger) - ) { + if (!ethers.utils.isAddress(challenger)) { console.error('please check your address') return '' } diff --git a/contracts/scripts/localDeploy.sh b/contracts/scripts/localDeploy.sh index 41cd93f14..c0a281c4b 100644 --- a/contracts/scripts/localDeploy.sh +++ b/contracts/scripts/localDeploy.sh @@ -1,5 +1,5 @@ rm -rf ./deployFile.json && - yarn hardhat deploy --storagepath ./deployFile.json --network local && - yarn hardhat initialize --storagepath ./deployFile.json --network local && - yarn hardhat fund --network local && - yarn hardhat register --storagepath ./deployFile.json --network local + yarn hardhat deploy --storagepath ./deployFile.json --network l1 && + yarn hardhat initialize --storagepath ./deployFile.json --network l1 && + yarn hardhat fund --network l1 && + yarn hardhat register --storagepath ./deployFile.json --network l1 diff --git a/contracts/src/deploy-config/l1.ts b/contracts/src/deploy-config/l1.ts index 0aa7ee787..79787090c 100644 --- a/contracts/src/deploy-config/l1.ts +++ b/contracts/src/deploy-config/l1.ts @@ -24,7 +24,6 @@ const config = { rollupProofWindow: 86400, proofRewardPercent: 70, // challenge config - rollupProposer: '0x70997970C51812dc3A010C7d01b50e0d17dc79C8', rollupChallenger: '0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65', // genesis config batchHeader: '0x0000000000000000000000000000000000000000000000000043a758882ae97327ffcc63373e26fcd144a5a738eac834c167175d69713780c0010657f37554c781402a22917dee2f75def7ab966d7b770905398eba3c444014000000000000000000000000000000000000000000000000000000000000000020cd420e20d610897b8f2c5ac5259ab8b57cce1074212cec2815b2b73ff93d9f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000', From 38b5cd4127fa34a91f0478222954acfa17da29f0 Mon Sep 17 00:00:00 2001 From: kukoomomo Date: Thu, 28 Aug 2025 17:07:40 +0800 Subject: [PATCH 2/4] clean unused contract deploy config --- contracts/src/deploy-config/sepolia.ts | 101 ----------------------- contracts/src/deploy-config/testnetl1.ts | 60 -------------- 2 files changed, 161 deletions(-) delete mode 100644 contracts/src/deploy-config/sepolia.ts delete mode 100644 contracts/src/deploy-config/testnetl1.ts diff --git a/contracts/src/deploy-config/sepolia.ts b/contracts/src/deploy-config/sepolia.ts deleted file mode 100644 index e8838ba00..000000000 --- a/contracts/src/deploy-config/sepolia.ts +++ /dev/null @@ -1,101 +0,0 @@ -const config = { - finalSystemOwner: '0x77778E169A7A162aA0D926B0C1a1C0541Ed9E570', - controller: '0x77778E169A7A162aA0D926B0C1a1C0541Ed9E570', - portalGuardian: '0x77778E169A7A162aA0D926B0C1a1C0541Ed9E570', - proxyAdminOwner: '0x77778E169A7A162aA0D926B0C1a1C0541Ed9E570', - - l1StartingBlockTag: '0x126e52a0cc0ae18948f567ee9443f4a8f0db67c437706e35baee424eb314a0d0', - l1ChainID: 11155111, - l2ChainID: 2710, - l1BlockTime: 12, - l2BlockTime: 2, - /** - * ---from---legacy property - */ - maxSequencerDrift: 300, - sequencerWindowSize: 200, - channelTimeout: 120, - /** - * ---to---legacy property - */ - programVkey: '0x006c835a4c049b699a3675fefa51b182c7efe404a656151c0410245966724bc3', - rollupMinDeposit: 0.0001, - rollupProofWindow: 86400, - rollupGenesisBlockNumber: 0, - rollupProposer: '0x77774B33aFa9Ecef8835D25ff749ff84950e83af', - rollupChallenger: '0x77776ab9Ed7479Ff446f1E3135145e245f2B71B1', - rollupGenesisStateRoot: '', - withdrawRoot: '', - batchHeader: '', - finalizationPeriodSeconds: 600, - - stakingSequencerSize: 7, - stakingLockNumber: 3, - stakingMinDeposit: 0.1, - - baseFeeVaultRecipient: '0x77772Fb3715C4B8FC621e23Eda5ABbb34a9D6EAd', - l1FeeVaultRecipient: '0x77772Fb3715C4B8FC621e23Eda5ABbb34a9D6EAd', - sequencerFeeVaultRecipient: '0x77772Fb3715C4B8FC621e23Eda5ABbb34a9D6EAd', - - /** - * Only used for SystemConfig - * --------from-------- - */ - p2pSequencerAddress: '0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc', - batchInboxAddress: '0xff00000000000000000000000000000000000010', - batchSenderAddress: '0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC', - - l2GenesisBlockGasLimit: '0x1c9c380', - l2GenesisBlockCoinbase: '0x4200000000000000000000000000000000000011', - l2GenesisBlockBaseFeePerGas: '0x3B9ACA00', - /** - * -----------to-------- - */ - - /** - * ---from---legacy property - */ - governanceTokenName: 'Morph', - governanceTokenSymbol: 'MORPH', - governanceTokenOwner: '0x7777519b6680965136155F8EdA5D865Fc775528E', - l2GenesisRegolithTimeOffset: '0x0', - /** - * ---to---legacy property - */ - - gasPriceOracleOverhead: 2100, - gasPriceOracleScalar: 1000000, - - eip1559Denominator: 8, - eip1559Elasticity: 2, - - l2SequencerAddresses: [ - "0xfd0043f13c5586E6B97e984a3E233CFDB39A5125", - "0x58bA3ec73524832a642d34808fe93816437264a9", - "0x1e7Aa39A5153813deE8209d365bD4e830A8a8e63", - "0x986929D12382876fdeD38eA1ee3847161d7Eb9b7", - "0xd774Bce3D786A692A03EF915bD135A814daf2D58", - "0xA321f3696dEc1ea4Dbd5BA2b777a8EEC4f09e148", - "0x07A2Ba25526a564f972ebEAFECca8fA978aae55F" - ], - l2SequencerTmKeys: [ - "0xa599b93e87801f8fb19442df0fb07cd1729f31fd5a6261341ef0b41bc3ad5122", - "0xc1ecf69700b972cf40c8753055ad3a09deb9bafcdd2b99f35f8a6926e3db5b67", - "0xe2289ba44bc6eb371eccc203b2f69d42c064a6bbafd1708d98f6cb987bb30736", - "0x6490e859fd1d73df2d0459f3913cdabc45b37e1acd1deaeef591b423089f5969", - "0x7a72e99f75214284f8609101ebbc2410981fd04ee79ba1cbb8a921d8a19780a2", - "0x53eb51bafdd2e2365bc03d773da22f083a4617b799c107f0aacb524e4a7d8d45", - "0xc503fa8024801efbe1f5468d7202facce2132f8e45439b6d6e57be63940f9189" - ], - l2SequencerBlsKeys: [ - "0x0000000000000000000000000000000008d446bfcf1d9c8be39ed09b11faf4604ae30f69d598fa5c0fd1d093b01793ca27b981efc9469090826d529d7be87477000000000000000000000000000000000a786c32ffeb508a318f56aa732e7451da571033ae96ec20c4eff9e35e86ab6dc2db4d2aa945fadcd54fb4dc5416657e0000000000000000000000000000000007b81fb3110ff3669a9bbbc701140fa2aba51b25282944ee6b949aeed0c7db12b51cef337d485939b4514bca4164c011000000000000000000000000000000000ecc4bedb5d2e3250c6c4d333107eaa00abe96197ef282f8225ba0d3de5329511c492914d25f05f6c07c4798d00892a0", - "0x0000000000000000000000000000000010b0c1a6a58fc8ce7af702f5a3c2e8efe4d28deb5f3fcef59ec9cbd4ff9c241e3ec745ba64f12b481625cf5ad937e40d000000000000000000000000000000000e12918a26de24f7c821af9f6422a5fecc485099364354884dee843b62717568210468cd373e5fc34870b534e96ff5120000000000000000000000000000000005a86a84e149a412b32ea1855730698b43a6794994f42449eb6aef6c1fdf0a826e2fdfaf07276589804ea65470551e00000000000000000000000000000000001320516e63304cbe5981cb42f848e4a83ad34b43be890ee9047f7d735c9b4876d6decf2b8c69462f47866ea72321979c", - "0x000000000000000000000000000000000416c03a752d2c0f0567db5b16c45a10dafaf911a49e2db3bb7c34eb94a02daeb555b802ebfe2f58061ec402008c1b5b0000000000000000000000000000000005664b82b25c9db3f90ac841af8c1ac8bc593f3eb0e63f28e4218fc45c8dfb804899714324ac5e012e29e722a85320a90000000000000000000000000000000007e587cdf757991db4cbedc396a0904adb4ab22088412a5e4f15ec120b8a5658965efddf2de9b931b8c8c2f650721f870000000000000000000000000000000006c21c0e467b5f548cc4e010b4f438efb29fd06144732fcd10fd9cc414c76ae37dffe0c290e0ab0bad8d6b99e3eb4a11", - "0x00000000000000000000000000000000127964288ad423ab900d1e2085b648a4b2e608b03c131360729630ab0e495ce790507bb4e2356ad19f4acc4862ff11300000000000000000000000000000000005a1ef5fbc311a7b189b0cb71f7431bce6d24c8f69ba012ed7efa41290296b1252e5b8bd1439bdd6f2995c3c271e18c600000000000000000000000000000000111872272dc1962e968a3f04ad22a5daf61b1bffc0c955ac977848e48b1d8f78fa8a1eea30682967b8505714ac1acf2700000000000000000000000000000000177349858cf03976c38c4d75075d46044baea470f84688bd4ccda3d5c84125ae10c5bbd2b2a721d340f1576fb9b6daad", - "0x000000000000000000000000000000000809aedcfa10e959973e8cbb8882ca654b1a161c5062e79b973863d685613971e2f4c938dd243e3be8e5084179d9085000000000000000000000000000000000198be3927ee9a75d932d14195dcbbc62df88116859d6658dcc61b7b7bd48c116021abe4ad4a589e904a68214c4f798760000000000000000000000000000000010828cea18edbe9c66c4429ca46faee210cfd19d8231a4d8cea8dcd9d51b7b8572f4c83b9d75e963f9ee32286537ff860000000000000000000000000000000000f96b8cf7c3733712f33e61e6cb4f4248ae3eccc12566b1fe6cdfceeef702b987842bbcc4f3fa872366294c3132e0aa", - "0x0000000000000000000000000000000011d3781ed4b75e002b1248cc88f3c6d14356e026520518ca64845a295c2bf6ef5b5aac7f387338b16d7b35af349e8d2d00000000000000000000000000000000165ded3bb263e31c18ca1571def34fa7d4b27c789c4ef75136b63208e0f90bcc83d0d0deeb5a4684a2fc8a9fb142d0ee0000000000000000000000000000000012a01cead027fb7e22677fa16017054498eedf4f5a1c2b58f8ef48f7ac502ae2018336b326322acf3d952ed71b91025d000000000000000000000000000000000dfd0c585099e1d6b7826f0e6bdcce3220efd5687d585a2889d74548eca4bcd7b6f9166c800ef5e2eea578b6bfb31d57", - "0x0000000000000000000000000000000019d09b98ebea07d6b17bd98eeeb71f06a8033c197ed79383c32da28969cbae31a3acc2a9f667b2e1f34f1b1a22c7907600000000000000000000000000000000141becd55b186ff31d2ce6844c915bd6d89a4f8efaa4807f627f8ebf13f758ebea1ec1f4f55ddb033f584fbc7c48cde3000000000000000000000000000000000464814e2a7276b674ce82065038df7368782165eafaff6ce3eee87bb32d6cfc2a75106a618a3c602340b4ee51d1cff5000000000000000000000000000000000f1651ce08ae92dcb99eb9486b28ca9bd4965560fb9ef86f987c49e922a2fa0a98e43d10e2eb06862efa0503fbb0d409" - ], -} - -export default config diff --git a/contracts/src/deploy-config/testnetl1.ts b/contracts/src/deploy-config/testnetl1.ts deleted file mode 100644 index 2d95a2324..000000000 --- a/contracts/src/deploy-config/testnetl1.ts +++ /dev/null @@ -1,60 +0,0 @@ -const config = { - finalSystemOwner: '0xD77c708607e72f520c2841E359cF54fca75d9C04', - controller: '0xD77c708607e72f520c2841E359cF54fca75d9C04', - portalGuardian: '0xD77c708607e72f520c2841E359cF54fca75d9C04', - proxyAdminOwner: '0xD77c708607e72f520c2841E359cF54fca75d9C04', - - l1StartingBlockTag: - '0x126e52a0cc0ae18948f567ee9443f4a8f0db67c437706e35baee424eb314a0d0', - l1ChainID: 900, - l2ChainID: 2710, - - maxSequencerDrift: 300, - sequencerWindowSize: 200, - channelTimeout: 120, - - programVkey: '0x006c835a4c049b699a3675fefa51b182c7efe404a656151c0410245966724bc3', - rollupMinDeposit: 1, - rollupProofWindow: 100, - rollupGenesisBlockNumber: 0, - proofRewardPercent: 70, - rollupProposer: '0xE70a4102e4caA3d9B8968FFb142E6A2ceFd22Ec3', - rollupChallenger: '0xF730477971E88b3162ed7FD950Be63474975bdC3', - rollupGenesisStateRoot: '', - finalizationPeriodSeconds: 2, - - stakingMinDeposit: 1, - stakingSequencerSize: 3, - stakingLockNumber: 3, - /** - * Only used for SystemConfig - * --------from-------- - */ - p2pSequencerAddress: '0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc', - batchInboxAddress: '0xff00000000000000000000000000000000000010', - batchSenderAddress: '0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC', - - baseFeeVaultRecipient: '0x90F79bf6EB2c4f870365E785982E1f101E93b906', - l1FeeVaultRecipient: '0x90F79bf6EB2c4f870365E785982E1f101E93b906', - sequencerFeeVaultRecipient: '0x90F79bf6EB2c4f870365E785982E1f101E93b906', - /** - * -----------to-------- - */ - governanceTokenName: 'Morph', - governanceTokenSymbol: 'MORPH', - governanceTokenOwner: '0xD77c708607e72f520c2841E359cF54fca75d9C04', - - l2GenesisBlockGasLimit: '0x1c9c380', - l2GenesisBlockCoinbase: '0x4200000000000000000000000000000000000011', - l2GenesisBlockBaseFeePerGas: '0x3B9ACA00', - - gasPriceOracleOverhead: 2100, - gasPriceOracleScalar: 1000000, - eip1559Denominator: 8, - eip1559Elasticity: 2, - - l2GenesisRegolithTimeOffset: '0x0', - l2BlockTime: 1, -} - -export default config From 50ba52bc520d2fd5dc06fa4bb629234cb656efb0 Mon Sep 17 00:00:00 2001 From: kukoomomo Date: Thu, 28 Aug 2025 17:08:53 +0800 Subject: [PATCH 3/4] fix --- contracts/tasks/staking_upgrade.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contracts/tasks/staking_upgrade.ts b/contracts/tasks/staking_upgrade.ts index d9f5e2e7b..69c4e6248 100644 --- a/contracts/tasks/staking_upgrade.ts +++ b/contracts/tasks/staking_upgrade.ts @@ -222,10 +222,9 @@ task("rollup-import-genesis-batch") // import genesis batch const batchHeader: string = config.batchHeader - // submitter and challenger - const submitter: string = config.rollupProposer + //challenger const challenger: string = config.rollupChallenger - if (!ethers.utils.isAddress(submitter) || !ethers.utils.isAddress(challenger)) { + if (!ethers.utils.isAddress(challenger)) { console.error("please check your address") return "" } From e2edb5d49b72df46f81645fb7a0dedaa92a66986 Mon Sep 17 00:00:00 2001 From: kukoomomo Date: Thu, 28 Aug 2025 17:10:55 +0800 Subject: [PATCH 4/4] clean qanet config --- contracts/src/deploy-config/qanetl1.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/contracts/src/deploy-config/qanetl1.ts b/contracts/src/deploy-config/qanetl1.ts index 3b95afb4a..bde5753fa 100644 --- a/contracts/src/deploy-config/qanetl1.ts +++ b/contracts/src/deploy-config/qanetl1.ts @@ -23,7 +23,6 @@ const config = { rollupProofWindow: 86400, proofRewardPercent: 70, // challenge config - rollupProposer: '0x7161aE5B767Df97BAc34e5776311Ded4Cb01691d', rollupChallenger: '0x71616250f7CAaa8a5DC295dc5851D6b1E49188a7', // genesis config batchHeader: '',