From 269baa617e31b729169227838bfd0b084b754890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Garamv=C3=B6lgyi?= Date: Thu, 20 Mar 2025 13:36:05 +0100 Subject: [PATCH 1/4] feat: mainnet Euclid params --- params/config.go | 17 +++++++++++++---- params/version.go | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/params/config.go b/params/config.go index a563041d2301..40f351bbf304 100644 --- a/params/config.go +++ b/params/config.go @@ -378,20 +378,29 @@ var ( CurieBlock: big.NewInt(7096836), DarwinTime: newUint64(1724227200), DarwinV2Time: newUint64(1725264000), + EuclidTime: newUint64(1744786800), + EuclidV2Time: newUint64(1745305200), Clique: &CliqueConfig{ Period: 3, Epoch: 30000, }, + SystemContract: &SystemContractConfig{ + Period: 3, + SystemContractAddress: common.HexToAddress("0x0000000000000000000000000000000000000000"), // TODO + SystemContractSlot: common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000067"), + }, Scroll: ScrollConfig{ UseZktrie: true, MaxTxPerBlock: &ScrollMaxTxPerBlock, MaxTxPayloadBytesPerBlock: &ScrollMaxTxPayloadBytesPerBlock, FeeVaultAddress: &rcfg.ScrollFeeVaultAddress, L1Config: &L1Config{ - L1ChainId: 1, - L1MessageQueueAddress: common.HexToAddress("0x0d7E906BD9cAFa154b048cFa766Cc1E54E39AF9B"), - NumL1MessagesPerBlock: 10, - ScrollChainAddress: common.HexToAddress("0xa13BAF47339d63B743e7Da8741db5456DAc1E556"), + L1ChainId: 1, + L1MessageQueueAddress: common.HexToAddress("0x0d7E906BD9cAFa154b048cFa766Cc1E54E39AF9B"), + L1MessageQueueV2Address: common.HexToAddress("0x0000000000000000000000000000000000000000"), // TODO + L1MessageQueueV2DeploymentBlock: 0, // TODO + NumL1MessagesPerBlock: 10, + ScrollChainAddress: common.HexToAddress("0xa13BAF47339d63B743e7Da8741db5456DAc1E556"), }, GenesisStateRoot: &ScrollMainnetGenesisState, }, diff --git a/params/version.go b/params/version.go index 99a9625f3fab..d3e1cbbc5057 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 5 // Major version component of the current release VersionMinor = 8 // Minor version component of the current release - VersionPatch = 28 // Patch version component of the current release + VersionPatch = 29 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string ) From 156ae102fb713c7dddf5a5e54ca85f68a3194969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Garamv=C3=B6lgyi?= Date: Thu, 20 Mar 2025 14:34:09 +0100 Subject: [PATCH 2/4] update params --- params/config.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/params/config.go b/params/config.go index 40f351bbf304..1573029e091f 100644 --- a/params/config.go +++ b/params/config.go @@ -386,7 +386,7 @@ var ( }, SystemContract: &SystemContractConfig{ Period: 3, - SystemContractAddress: common.HexToAddress("0x0000000000000000000000000000000000000000"), // TODO + SystemContractAddress: common.HexToAddress("0x8432728A257646449245558B8b7Dbe51A16c7a4D"), SystemContractSlot: common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000067"), }, Scroll: ScrollConfig{ @@ -397,8 +397,8 @@ var ( L1Config: &L1Config{ L1ChainId: 1, L1MessageQueueAddress: common.HexToAddress("0x0d7E906BD9cAFa154b048cFa766Cc1E54E39AF9B"), - L1MessageQueueV2Address: common.HexToAddress("0x0000000000000000000000000000000000000000"), // TODO - L1MessageQueueV2DeploymentBlock: 0, // TODO + L1MessageQueueV2Address: common.HexToAddress("0x56971da63A3C0205184FEF096E9ddFc7A8C2D18a"), + L1MessageQueueV2DeploymentBlock: 22088276, NumL1MessagesPerBlock: 10, ScrollChainAddress: common.HexToAddress("0xa13BAF47339d63B743e7Da8741db5456DAc1E556"), }, From f55b6bf2a612bea02a5a20229f40d11c8365a823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Garamv=C3=B6lgyi?= Date: Fri, 21 Mar 2025 13:07:12 +0100 Subject: [PATCH 3/4] adjust timestamp --- params/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/config.go b/params/config.go index 1573029e091f..d5f1a2166c21 100644 --- a/params/config.go +++ b/params/config.go @@ -378,7 +378,7 @@ var ( CurieBlock: big.NewInt(7096836), DarwinTime: newUint64(1724227200), DarwinV2Time: newUint64(1725264000), - EuclidTime: newUint64(1744786800), + EuclidTime: newUint64(1744815600), EuclidV2Time: newUint64(1745305200), Clique: &CliqueConfig{ Period: 3, From 112c35e23d2ec8f54dd5fcf28aab57c41a29a223 Mon Sep 17 00:00:00 2001 From: Thegaram <7571518+Thegaram@users.noreply.github.com> Date: Mon, 24 Mar 2025 18:30:09 +0000 Subject: [PATCH 4/4] =?UTF-8?q?chore:=20auto=20version=20bump=E2=80=89[bot?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- params/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/version.go b/params/version.go index 2a7eb3c12643..3b6ac95466de 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 5 // Major version component of the current release VersionMinor = 8 // Minor version component of the current release - VersionPatch = 30 // Patch version component of the current release + VersionPatch = 31 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string )