From e35f5f94524da47477123fd3502c52198c199dcf Mon Sep 17 00:00:00 2001 From: gajinder Date: Wed, 17 Aug 2022 17:43:33 +0530 Subject: [PATCH 1/2] Configure mainnet merge --- packages/config/src/chainConfig/presets/mainnet.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/config/src/chainConfig/presets/mainnet.ts b/packages/config/src/chainConfig/presets/mainnet.ts index 46c278679e9c..991dc4b8d764 100644 --- a/packages/config/src/chainConfig/presets/mainnet.ts +++ b/packages/config/src/chainConfig/presets/mainnet.ts @@ -7,8 +7,8 @@ export const chainConfig: IChainConfig = { PRESET_BASE: PresetName.mainnet, // Transition - // TBD, 2**256-1 is a placeholder - TERMINAL_TOTAL_DIFFICULTY: BigInt("115792089237316195423570985008687907853269984665640564039457584007913129639935"), + // Estimated: Sept 15, 2022 + TERMINAL_TOTAL_DIFFICULTY: BigInt("58750000000000000000000"), TERMINAL_BLOCK_HASH: b("0x0000000000000000000000000000000000000000000000000000000000000000"), TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: Infinity, @@ -34,7 +34,7 @@ export const chainConfig: IChainConfig = { ALTAIR_FORK_EPOCH: 74240, // Oct 27, 2021, 10:56:23am UTC // Bellatrix BELLATRIX_FORK_VERSION: b("0x02000000"), - BELLATRIX_FORK_EPOCH: Infinity, + BELLATRIX_FORK_EPOCH: 144896, // Sept 6, 2022, 11:34:47am UTC // Sharding SHARDING_FORK_VERSION: b("0x03000000"), SHARDING_FORK_EPOCH: Infinity, From fbc33c4133e03a5f5725b8ebd99713a240e154c2 Mon Sep 17 00:00:00 2001 From: gajinder Date: Wed, 17 Aug 2022 17:45:38 +0530 Subject: [PATCH 2/2] change minimal ttd comment --- packages/config/src/chainConfig/presets/minimal.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/config/src/chainConfig/presets/minimal.ts b/packages/config/src/chainConfig/presets/minimal.ts index 684f77f446ac..b67ddab1f009 100644 --- a/packages/config/src/chainConfig/presets/minimal.ts +++ b/packages/config/src/chainConfig/presets/minimal.ts @@ -8,7 +8,7 @@ export const chainConfig: IChainConfig = { PRESET_BASE: PresetName.minimal, // Transition - // TBD, 2**256-1 is a placeholder + // 2**256-2**10 for testing minimal network TERMINAL_TOTAL_DIFFICULTY: BigInt("115792089237316195423570985008687907853269984665640564039457584007913129639935"), TERMINAL_BLOCK_HASH: b("0x0000000000000000000000000000000000000000000000000000000000000000"), TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: Infinity,