From 14d2edcb26544e6bc3803070acc7b318c6b00080 Mon Sep 17 00:00:00 2001 From: jangko Date: Thu, 2 Sep 2021 12:24:04 +0700 Subject: [PATCH] chain config preset: add london block number MainNet 12_965_000 RopstenNet 10_499_401 RinkebyNet 8_897_988 GoerliNet 5_062_605 --- nimbus/config.nim | 8 ++++---- tests/test_forkid.nim | 26 +++++++++++++++++--------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/nimbus/config.nim b/nimbus/config.nim index b45da3ea8..530a58d69 100644 --- a/nimbus/config.nim +++ b/nimbus/config.nim @@ -196,7 +196,7 @@ proc chainConfig*(id: NetworkId): ChainConfig = istanbulBlock: 9_069_000.toBlockNumber, # 08/12/2019 12:25:09 muirGlacierBlock: 9_200_000.toBlockNumber, # 02/01/2020 08:30:49 berlinBlock: 12_244_000.toBlockNumber, # 15/04/2021 10:07:03 - londonBlock: high(BlockNumber) + londonBlock: 12_965_000.toBlockNumber, # 05/08/2021 12:33:42 ) of RopstenNet: ChainConfig( @@ -214,7 +214,7 @@ proc chainConfig*(id: NetworkId): ChainConfig = istanbulBlock: 6_485_846.toBlockNumber, muirGlacierBlock: 7_117_117.toBlockNumber, berlinBlock: 9_812_189.toBlockNumber, - londonBlock: high(BlockNumber) + londonBlock: 10_499_401.toBlockNumber # June 24, 2021 ) of RinkebyNet: ChainConfig( @@ -232,7 +232,7 @@ proc chainConfig*(id: NetworkId): ChainConfig = istanbulBlock: 5_435_345.toBlockNumber, muirGlacierBlock: 8_290_928.toBlockNumber, # never occured in rinkeby network berlinBlock: 8_290_928.toBlockNumber, - londonBlock: high(BlockNumber) + londonBlock: 8_897_988.toBlockNumber # July 7, 2021 ) of GoerliNet: ChainConfig( @@ -250,7 +250,7 @@ proc chainConfig*(id: NetworkId): ChainConfig = istanbulBlock: 1_561_651.toBlockNumber, muirGlacierBlock: 4_460_644.toBlockNumber, # never occured in goerli network berlinBlock: 4_460_644.toBlockNumber, - londonBlock: high(BlockNumber) + londonBlock: 5_062_605.toBlockNumber # June 30, 2021 ) else: # everything else will use CustomNet config diff --git a/tests/test_forkid.nim b/tests/test_forkid.nim index 607afed19..eea578c9e 100644 --- a/tests/test_forkid.nim +++ b/tests/test_forkid.nim @@ -24,8 +24,10 @@ const (blockNumber: 9199999'u64, id: (crc: 0x879D6E30'u32, nextFork: 9200000'u64)), # Last Istanbul block (blockNumber: 9200000'u64, id: (crc: 0xE029E991'u32, nextFork: 12244000'u64)), # First MuirGlacier block (blockNumber: 12243999'u64, id: (crc: 0xE029E991'u32, nextFork: 12244000'u64)), # Last MuirGlacier block - (blockNumber: 12244000'u64, id: (crc: 0x0eb440f6'u32, nextFork: 0'u64)), # First Berlin block - (blockNumber: 20000000'u64, id: (crc: 0x0eb440f6'u32, nextFork: 0'u64)), # Future Berlin block + (blockNumber: 12244000'u64, id: (crc: 0x0eb440f6'u32, nextFork: 12965000'u64)), # First Berlin block + (blockNumber: 12964999'u64, id: (crc: 0x0eb440f6'u32, nextFork: 12965000'u64)), # Last Berlin block + (blockNumber: 12965000'u64, id: (crc: 0xb715077d'u32, nextFork: 0'u64)), # First London block + (blockNumber: 20000000'u64, id: (crc: 0xb715077d'u32, nextFork: 0'u64)), # Future London block ] RopstenNetIDs = [ @@ -43,8 +45,10 @@ const (blockNumber: 7117116'u64, id: (crc: 0x4bc66396'u32, nextFork: 7117117'u64)), # Last Istanbul block (blockNumber: 7117117'u64, id: (crc: 0x6727EF90'u32, nextFork: 9812189'u64)), # First MuirGlacier block (blockNumber: 9812188'u64, id: (crc: 0x6727EF90'u32, nextFork: 9812189'u64)), # Last MuirGlacier block - (blockNumber: 9812189'u64, id: (crc: 0xa157d377'u32, nextFork: 0'u64)), # First Berlin block - (blockNumber: 10000000'u64, id: (crc: 0xa157d377'u32, nextFork: 0'u64)), # Future Berlin block + (blockNumber: 9812189'u64, id: (crc: 0xa157d377'u32, nextFork: 10499401'u64)), # First Berlin block + (blockNumber: 10499400'u64, id: (crc: 0xa157d377'u32, nextFork: 10499401'u64)), # Last Berlin block + (blockNumber: 10499401'u64, id: (crc: 0x7119b6b3'u32, nextFork: 0'u64)), # First London block + (blockNumber: 20000000'u64, id: (crc: 0x7119b6b3'u32, nextFork: 0'u64)), # Future London block ] RinkebyNetIDs = [ @@ -61,8 +65,10 @@ const (blockNumber: 5435344'u64, id: (crc: 0xafec6b27'u32, nextFork: 5435345'u64)), # Last Petersburg block (blockNumber: 5435345'u64, id: (crc: 0xcbdb8838'u32, nextFork: 8290928'u64)), # First Istanbul block (blockNumber: 8290927'u64, id: (crc: 0xcbdb8838'u32, nextFork: 8290928'u64)), # Last Istanbul block - (blockNumber: 8290928'u64, id: (crc: 0x6910c8bd'u32, nextFork: 0'u64)), # First Berlin block - (blockNumber: 10000000'u64, id: (crc: 0x6910c8bd'u32, nextFork: 0'u64)), # Future Berlin block + (blockNumber: 8290928'u64, id: (crc: 0x6910c8bd'u32, nextFork: 8897988'u64)), # First Berlin block + (blockNumber: 8897987'u64, id: (crc: 0x6910c8bd'u32, nextFork: 8897988'u64)), # Last Berlin block + (blockNumber: 8897988'u64, id: (crc: 0x8e29f2f3'u32, nextFork: 0'u64)), # First London block + (blockNumber: 10000000'u64, id: (crc: 0x8e29f2f3'u32, nextFork: 0'u64)), # Future London block ] GoerliNetIDs = [ @@ -70,12 +76,14 @@ const (blockNumber: 1561650'u64, id: (crc: 0xa3f5ab08'u32, nextFork: 1561651'u64)), # Last Petersburg block (blockNumber: 1561651'u64, id: (crc: 0xc25efa5c'u32, nextFork: 4460644'u64)), # First Istanbul block (blockNumber: 4460643'u64, id: (crc: 0xc25efa5c'u32, nextFork: 4460644'u64)), # Future Istanbul block - (blockNumber: 4460644'u64, id: (crc: 0x757a1c47'u32, nextFork: 0'u64)), # First Berlin block - (blockNumber: 5000000'u64, id: (crc: 0x757a1c47'u32, nextFork: 0'u64)), # Future Berlin block + (blockNumber: 4460644'u64, id: (crc: 0x757a1c47'u32, nextFork: 5062605'u64)), # First Berlin block + (blockNumber: 5062604'u64, id: (crc: 0x757a1c47'u32, nextFork: 5062605'u64)), # Last Berlin block + (blockNumber: 5062605'u64, id: (crc: 0xb8c6299d'u32, nextFork: 0'u64)), # First London block + (blockNumber: 10000000'u64, id: (crc: 0xb8c6299d'u32, nextFork: 0'u64)), # Future London block ] template runTest(network: untyped) = - test network.astToStr: + test `network`.astToStr: var memDB = newMemoryDB() chainDB = newBaseChainDB(memDB, true, network)