From 329a8f05bb95b92bca32a07259d93fb183c35180 Mon Sep 17 00:00:00 2001 From: andri lim Date: Fri, 14 Jun 2024 12:29:09 +0700 Subject: [PATCH] Add Cancun timestamp to MainNet preset (#2342) * Add Cancun timestamp to MainNet preset * Fix forkid test: add Cancun forkid --- nimbus/common/chain_config.nim | 3 ++- tests/test_forkid.nim | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nimbus/common/chain_config.nim b/nimbus/common/chain_config.nim index a73a87f95..0abeaa139 100644 --- a/nimbus/common/chain_config.nim +++ b/nimbus/common/chain_config.nim @@ -465,7 +465,8 @@ func chainConfigForNetwork*(id: NetworkId): ChainConfig = arrowGlacierBlock: some(13_773_000.toBlockNumber), # 2021-12-09 19:55:23 UTC grayGlacierBlock: some(15_050_000.toBlockNumber), # 2022-06-30 10:54:04 UTC terminalTotalDifficulty: some(mainNetTTD), - shanghaiTime: some(1_681_338_455.EthTime) + shanghaiTime: some(1_681_338_455.EthTime), # 2023-04-12 10:27:35 UTC + cancunTime: some(1_710_338_135.EthTime) # 2024-03-13 13:55:35 UTC ) of SepoliaNet: const sepoliaTTD = parse("17000000000000000",UInt256) diff --git a/tests/test_forkid.nim b/tests/test_forkid.nim index 132f2990e..22e3228b8 100644 --- a/tests/test_forkid.nim +++ b/tests/test_forkid.nim @@ -42,8 +42,10 @@ const (number: 15049999'u64, time: 0'u64, id: (crc: 0x20c327fc'u32, next: 15050000'u64)), # Last Arrow Glacier block (number: 15050000'u64, time: 0'u64, id: (crc: 0xf0afd0e3'u32, next: 1681338455'u64)), # First Gray Glacier block (number: 20000000'u64, time: 1681338454'u64, id: (crc: 0xf0afd0e3'u32, next: 1681338455'u64)), # Last Gray Glacier block - (number: 20000000'u64, time: 1681338455'u64, id: (crc: 0xdce96c2d'u32, next: 0'u64)), # First Shanghai block - (number: 30000000'u64, time: 2000000000'u64, id: (crc: 0xdce96c2d'u32, next: 0'u64)), # Future Shanghai block + (number: 20000000'u64, time: 1681338455'u64, id: (crc: 0xdce96c2d'u32, next: 1710338135'u64)), # First Shanghai block + (number: 30000000'u64, time: 1710338134'u64, id: (crc: 0xdce96c2d'u32, next: 1710338135'u64)), # Last Shanghai block + (number: 40000000'u64, time: 1710338135'u64, id: (crc: 0x9f3d2254'u32, next: 0'u64)), # First Cancun block + (number: 50000000'u64, time: 2000000000'u64, id: (crc: 0x9f3d2254'u32, next: 0'u64)), # Future Cancun block ] SepoliaNetIDs = [ @@ -54,6 +56,7 @@ const (number: 1735372'u64, time: 1677557088'u64, id: (crc: 0xf7f9bc08'u32, next: 1706655072'u64)), # First Shanghai block (number: 1735372'u64, time: 1706655071'u64, id: (crc: 0xf7f9bc08'u32, next: 1706655072'u64)), # Last Shanghai block (number: 1735372'u64, time: 1706655072'u64, id: (crc: 0x88cf81d9'u32, next: 0'u64)), # First Cancun block + (number: 1735372'u64, time: 2706655072'u64, id: (crc: 0x88cf81d9'u32, next: 0'u64)), # Future Cancun block ] HoleskyNetIDs = [ @@ -62,6 +65,7 @@ const (number: 123'u64, time: 1696000704'u64, id: (crc: 0xfd4f016b'u32, next: 1707305664'u64)), # First Shanghai block (number: 123'u64, time: 1707305663'u64, id: (crc: 0xfd4f016b'u32, next: 1707305664'u64)), # Last Shanghai block (number: 123'u64, time: 1707305664'u64, id: (crc: 0x9b192ad0'u32, next: 0'u64)), # First Cancun block + (number: 123'u64, time: 2707305664'u64, id: (crc: 0x9b192ad0'u32, next: 0'u64)), # Future Cancun block ] template runTest(network: untyped, name: string) =