Skip to content

Commit

Permalink
simulators/ethereum/consensus: add more 'paris' forks
Browse files Browse the repository at this point in the history
  • Loading branch information
fjl committed Feb 16, 2024
1 parent 2e26029 commit 37723c2
Showing 1 changed file with 34 additions and 8 deletions.
42 changes: 34 additions & 8 deletions simulators/ethereum/consensus/forks.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -310,4 +336,4 @@ var envForks = map[string]map[string]int{
"HIVE_SHANGHAI_TIMESTAMP": 0,
"HIVE_CANCUN_TIMESTAMP": 15000,
},
}
}

0 comments on commit 37723c2

Please sign in to comment.