From b7b9cfac6adbdebbebcdf01b82f802b98db31cb4 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Fri, 16 Feb 2024 10:15:23 +0100 Subject: [PATCH] simulators/ethereum/consensus: add more 'paris' forks --- simulators/ethereum/consensus/forks.go | 42 +++++++++++++++++++++----- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/simulators/ethereum/consensus/forks.go b/simulators/ethereum/consensus/forks.go index fe3a024f9c..ed74c718e3 100644 --- a/simulators/ethereum/consensus/forks.go +++ b/simulators/ethereum/consensus/forks.go @@ -115,7 +115,7 @@ var envForks = map[string]map[string]int{ "HIVE_FORK_LONDON": 2000, }, "HomesteadToEIP150At5": { - "HIVE_FORK_HOMESTEAD": 0, + "HIVE_FORK_HOMESTEAD": 0, "HIVE_FORK_TANGERINE": 5, "HIVE_FORK_SPURIOUS": 2000, "HIVE_FORK_BYZANTIUM": 2000, @@ -138,7 +138,7 @@ var envForks = map[string]map[string]int{ "HIVE_FORK_LONDON": 2000, }, "EIP158ToByzantiumAt5": { - "HIVE_FORK_HOMESTEAD": 0, + "HIVE_FORK_HOMESTEAD": 0, "HIVE_FORK_TANGERINE": 0, "HIVE_FORK_SPURIOUS": 0, "HIVE_FORK_BYZANTIUM": 5, @@ -149,7 +149,7 @@ var envForks = map[string]map[string]int{ "HIVE_FORK_LONDON": 2000, }, "ByzantiumToConstantinopleAt5": { - "HIVE_FORK_HOMESTEAD": 0, + "HIVE_FORK_HOMESTEAD": 0, "HIVE_FORK_TANGERINE": 0, "HIVE_FORK_SPURIOUS": 0, "HIVE_FORK_BYZANTIUM": 0, @@ -160,7 +160,7 @@ var envForks = map[string]map[string]int{ "HIVE_FORK_LONDON": 2000, }, "ByzantiumToConstantinopleFixAt5": { - "HIVE_FORK_HOMESTEAD": 0, + "HIVE_FORK_HOMESTEAD": 0, "HIVE_FORK_TANGERINE": 0, "HIVE_FORK_SPURIOUS": 0, "HIVE_FORK_BYZANTIUM": 0, @@ -171,7 +171,7 @@ var envForks = map[string]map[string]int{ "HIVE_FORK_LONDON": 2000, }, "ConstantinopleFixToIstanbulAt5": { - "HIVE_FORK_HOMESTEAD": 0, + "HIVE_FORK_HOMESTEAD": 0, "HIVE_FORK_TANGERINE": 0, "HIVE_FORK_SPURIOUS": 0, "HIVE_FORK_BYZANTIUM": 0, @@ -182,7 +182,7 @@ var envForks = map[string]map[string]int{ "HIVE_FORK_LONDON": 2000, }, "IstanbulToBerlinAt5": { - "HIVE_FORK_HOMESTEAD": 0, + "HIVE_FORK_HOMESTEAD": 0, "HIVE_FORK_TANGERINE": 0, "HIVE_FORK_SPURIOUS": 0, "HIVE_FORK_BYZANTIUM": 0, @@ -193,7 +193,7 @@ var envForks = map[string]map[string]int{ "HIVE_FORK_LONDON": 2000, }, "BerlinToLondonAt5": { - "HIVE_FORK_HOMESTEAD": 0, + "HIVE_FORK_HOMESTEAD": 0, "HIVE_FORK_TANGERINE": 0, "HIVE_FORK_SPURIOUS": 0, "HIVE_FORK_BYZANTIUM": 0, @@ -226,6 +226,18 @@ var envForks = map[string]map[string]int{ "HIVE_FORK_LONDON": 0, "HIVE_TERMINAL_TOTAL_DIFFICULTY": 786432, }, + "ArrowGlacierToParisAtDiffC0000": { + "HIVE_FORK_HOMESTEAD": 0, + "HIVE_FORK_TANGERINE": 0, + "HIVE_FORK_SPURIOUS": 0, + "HIVE_FORK_BYZANTIUM": 0, + "HIVE_FORK_CONSTANTINOPLE": 0, + "HIVE_FORK_PETERSBURG": 0, + "HIVE_FORK_ISTANBUL": 0, + "HIVE_FORK_BERLIN": 0, + "HIVE_FORK_LONDON": 0, + "HIVE_TERMINAL_TOTAL_DIFFICULTY": 786432, + }, "Merge": { // Remove once Paris replaces Merge "HIVE_FORK_HOMESTEAD": 0, "HIVE_FORK_TANGERINE": 0, @@ -280,6 +292,20 @@ var envForks = map[string]map[string]int{ "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0, "HIVE_SHANGHAI_TIMESTAMP": 15000, }, + "ParisToShanghaiAtTime15k": { + "HIVE_FORK_HOMESTEAD": 0, + "HIVE_FORK_TANGERINE": 0, + "HIVE_FORK_SPURIOUS": 0, + "HIVE_FORK_BYZANTIUM": 0, + "HIVE_FORK_CONSTANTINOPLE": 0, + "HIVE_FORK_PETERSBURG": 0, + "HIVE_FORK_ISTANBUL": 0, + "HIVE_FORK_BERLIN": 0, + "HIVE_FORK_LONDON": 0, + "HIVE_FORK_MERGE": 0, + "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0, + "HIVE_SHANGHAI_TIMESTAMP": 15000, + }, "Cancun": { "HIVE_FORK_HOMESTEAD": 0, "HIVE_FORK_TANGERINE": 0, @@ -310,4 +336,4 @@ var envForks = map[string]map[string]int{ "HIVE_SHANGHAI_TIMESTAMP": 0, "HIVE_CANCUN_TIMESTAMP": 15000, }, -} \ No newline at end of file +}