Skip to content

Commit ebca98b

Browse files
spencer-tbEikix
spencer-tb
authored and
Eikix
committed
simulators/ethereum/consensus: add Paris as additional merge fork (ethereum#997)
1 parent 8c46de7 commit ebca98b

File tree

2 files changed

+317
-312
lines changed

2 files changed

+317
-312
lines changed

‎simulators/ethereum/consensus/forks.go‎

Lines changed: 313 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,313 @@
1+
package main
2+
3+
var envForks = map[string]map[string]int{
4+
"Frontier": {
5+
"HIVE_FORK_HOMESTEAD": 2000,
6+
"HIVE_FORK_DAO_BLOCK": 2000,
7+
"HIVE_FORK_TANGERINE": 2000,
8+
"HIVE_FORK_SPURIOUS": 2000,
9+
"HIVE_FORK_BYZANTIUM": 2000,
10+
"HIVE_FORK_CONSTANTINOPLE": 2000,
11+
"HIVE_FORK_PETERSBURG": 2000,
12+
"HIVE_FORK_ISTANBUL": 2000,
13+
"HIVE_FORK_BERLIN": 2000,
14+
"HIVE_FORK_LONDON": 2000,
15+
},
16+
"Homestead": {
17+
"HIVE_FORK_HOMESTEAD": 0,
18+
"HIVE_FORK_DAO_BLOCK": 2000,
19+
"HIVE_FORK_TANGERINE": 2000,
20+
"HIVE_FORK_SPURIOUS": 2000,
21+
"HIVE_FORK_BYZANTIUM": 2000,
22+
"HIVE_FORK_CONSTANTINOPLE": 2000,
23+
"HIVE_FORK_PETERSBURG": 2000,
24+
"HIVE_FORK_ISTANBUL": 2000,
25+
"HIVE_FORK_BERLIN": 2000,
26+
"HIVE_FORK_LONDON": 2000,
27+
},
28+
"EIP150": {
29+
"HIVE_FORK_HOMESTEAD": 0,
30+
"HIVE_FORK_TANGERINE": 0,
31+
"HIVE_FORK_SPURIOUS": 2000,
32+
"HIVE_FORK_BYZANTIUM": 2000,
33+
"HIVE_FORK_CONSTANTINOPLE": 2000,
34+
"HIVE_FORK_PETERSBURG": 2000,
35+
"HIVE_FORK_ISTANBUL": 2000,
36+
"HIVE_FORK_BERLIN": 2000,
37+
"HIVE_FORK_LONDON": 2000,
38+
},
39+
"EIP158": {
40+
"HIVE_FORK_HOMESTEAD": 0,
41+
"HIVE_FORK_TANGERINE": 0,
42+
"HIVE_FORK_SPURIOUS": 0,
43+
"HIVE_FORK_BYZANTIUM": 2000,
44+
"HIVE_FORK_CONSTANTINOPLE": 2000,
45+
"HIVE_FORK_PETERSBURG": 2000,
46+
"HIVE_FORK_ISTANBUL": 2000,
47+
"HIVE_FORK_BERLIN": 2000,
48+
"HIVE_FORK_LONDON": 2000,
49+
},
50+
"Byzantium": {
51+
"HIVE_FORK_HOMESTEAD": 0,
52+
"HIVE_FORK_TANGERINE": 0,
53+
"HIVE_FORK_SPURIOUS": 0,
54+
"HIVE_FORK_BYZANTIUM": 0,
55+
"HIVE_FORK_CONSTANTINOPLE": 2000,
56+
"HIVE_FORK_PETERSBURG": 2000,
57+
"HIVE_FORK_ISTANBUL": 2000,
58+
"HIVE_FORK_BERLIN": 2000,
59+
"HIVE_FORK_LONDON": 2000,
60+
},
61+
"Constantinople": {
62+
"HIVE_FORK_HOMESTEAD": 0,
63+
"HIVE_FORK_TANGERINE": 0,
64+
"HIVE_FORK_SPURIOUS": 0,
65+
"HIVE_FORK_BYZANTIUM": 0,
66+
"HIVE_FORK_CONSTANTINOPLE": 0,
67+
"HIVE_FORK_PETERSBURG": 2000,
68+
"HIVE_FORK_ISTANBUL": 2000,
69+
"HIVE_FORK_BERLIN": 2000,
70+
"HIVE_FORK_LONDON": 2000,
71+
},
72+
"ConstantinopleFix": {
73+
"HIVE_FORK_HOMESTEAD": 0,
74+
"HIVE_FORK_TANGERINE": 0,
75+
"HIVE_FORK_SPURIOUS": 0,
76+
"HIVE_FORK_BYZANTIUM": 0,
77+
"HIVE_FORK_CONSTANTINOPLE": 0,
78+
"HIVE_FORK_PETERSBURG": 0,
79+
"HIVE_FORK_ISTANBUL": 2000,
80+
"HIVE_FORK_BERLIN": 2000,
81+
"HIVE_FORK_LONDON": 2000,
82+
},
83+
"Istanbul": {
84+
"HIVE_FORK_HOMESTEAD": 0,
85+
"HIVE_FORK_TANGERINE": 0,
86+
"HIVE_FORK_SPURIOUS": 0,
87+
"HIVE_FORK_BYZANTIUM": 0,
88+
"HIVE_FORK_CONSTANTINOPLE": 0,
89+
"HIVE_FORK_PETERSBURG": 0,
90+
"HIVE_FORK_ISTANBUL": 0,
91+
"HIVE_FORK_BERLIN": 2000,
92+
"HIVE_FORK_LONDON": 2000,
93+
},
94+
"Berlin": {
95+
"HIVE_FORK_HOMESTEAD": 0,
96+
"HIVE_FORK_TANGERINE": 0,
97+
"HIVE_FORK_SPURIOUS": 0,
98+
"HIVE_FORK_BYZANTIUM": 0,
99+
"HIVE_FORK_CONSTANTINOPLE": 0,
100+
"HIVE_FORK_PETERSBURG": 0,
101+
"HIVE_FORK_ISTANBUL": 0,
102+
"HIVE_FORK_BERLIN": 0,
103+
"HIVE_FORK_LONDON": 2000,
104+
},
105+
"FrontierToHomesteadAt5": {
106+
"HIVE_FORK_HOMESTEAD": 5,
107+
"HIVE_FORK_DAO_BLOCK": 2000,
108+
"HIVE_FORK_TANGERINE": 2000,
109+
"HIVE_FORK_SPURIOUS": 2000,
110+
"HIVE_FORK_BYZANTIUM": 2000,
111+
"HIVE_FORK_CONSTANTINOPLE": 2000,
112+
"HIVE_FORK_PETERSBURG": 2000,
113+
"HIVE_FORK_ISTANBUL": 2000,
114+
"HIVE_FORK_BERLIN": 2000,
115+
"HIVE_FORK_LONDON": 2000,
116+
},
117+
"HomesteadToEIP150At5": {
118+
"HIVE_FORK_HOMESTEAD": 0,
119+
"HIVE_FORK_TANGERINE": 5,
120+
"HIVE_FORK_SPURIOUS": 2000,
121+
"HIVE_FORK_BYZANTIUM": 2000,
122+
"HIVE_FORK_CONSTANTINOPLE": 2000,
123+
"HIVE_FORK_PETERSBURG": 2000,
124+
"HIVE_FORK_ISTANBUL": 2000,
125+
"HIVE_FORK_BERLIN": 2000,
126+
"HIVE_FORK_LONDON": 2000,
127+
},
128+
"HomesteadToDaoAt5": {
129+
"HIVE_FORK_HOMESTEAD": 0,
130+
"HIVE_FORK_DAO_BLOCK": 5,
131+
"HIVE_FORK_TANGERINE": 2000,
132+
"HIVE_FORK_SPURIOUS": 2000,
133+
"HIVE_FORK_BYZANTIUM": 2000,
134+
"HIVE_FORK_CONSTANTINOPLE": 2000,
135+
"HIVE_FORK_PETERSBURG": 2000,
136+
"HIVE_FORK_ISTANBUL": 2000,
137+
"HIVE_FORK_BERLIN": 2000,
138+
"HIVE_FORK_LONDON": 2000,
139+
},
140+
"EIP158ToByzantiumAt5": {
141+
"HIVE_FORK_HOMESTEAD": 0,
142+
"HIVE_FORK_TANGERINE": 0,
143+
"HIVE_FORK_SPURIOUS": 0,
144+
"HIVE_FORK_BYZANTIUM": 5,
145+
"HIVE_FORK_CONSTANTINOPLE": 2000,
146+
"HIVE_FORK_PETERSBURG": 2000,
147+
"HIVE_FORK_ISTANBUL": 2000,
148+
"HIVE_FORK_BERLIN": 2000,
149+
"HIVE_FORK_LONDON": 2000,
150+
},
151+
"ByzantiumToConstantinopleAt5": {
152+
"HIVE_FORK_HOMESTEAD": 0,
153+
"HIVE_FORK_TANGERINE": 0,
154+
"HIVE_FORK_SPURIOUS": 0,
155+
"HIVE_FORK_BYZANTIUM": 0,
156+
"HIVE_FORK_CONSTANTINOPLE": 5,
157+
"HIVE_FORK_PETERSBURG": 2000,
158+
"HIVE_FORK_ISTANBUL": 2000,
159+
"HIVE_FORK_BERLIN": 2000,
160+
"HIVE_FORK_LONDON": 2000,
161+
},
162+
"ByzantiumToConstantinopleFixAt5": {
163+
"HIVE_FORK_HOMESTEAD": 0,
164+
"HIVE_FORK_TANGERINE": 0,
165+
"HIVE_FORK_SPURIOUS": 0,
166+
"HIVE_FORK_BYZANTIUM": 0,
167+
"HIVE_FORK_CONSTANTINOPLE": 5,
168+
"HIVE_FORK_PETERSBURG": 5,
169+
"HIVE_FORK_ISTANBUL": 2000,
170+
"HIVE_FORK_BERLIN": 2000,
171+
"HIVE_FORK_LONDON": 2000,
172+
},
173+
"ConstantinopleFixToIstanbulAt5": {
174+
"HIVE_FORK_HOMESTEAD": 0,
175+
"HIVE_FORK_TANGERINE": 0,
176+
"HIVE_FORK_SPURIOUS": 0,
177+
"HIVE_FORK_BYZANTIUM": 0,
178+
"HIVE_FORK_CONSTANTINOPLE": 0,
179+
"HIVE_FORK_PETERSBURG": 0,
180+
"HIVE_FORK_ISTANBUL": 5,
181+
"HIVE_FORK_BERLIN": 2000,
182+
"HIVE_FORK_LONDON": 2000,
183+
},
184+
"IstanbulToBerlinAt5": {
185+
"HIVE_FORK_HOMESTEAD": 0,
186+
"HIVE_FORK_TANGERINE": 0,
187+
"HIVE_FORK_SPURIOUS": 0,
188+
"HIVE_FORK_BYZANTIUM": 0,
189+
"HIVE_FORK_CONSTANTINOPLE": 0,
190+
"HIVE_FORK_PETERSBURG": 0,
191+
"HIVE_FORK_ISTANBUL": 0,
192+
"HIVE_FORK_BERLIN": 5,
193+
"HIVE_FORK_LONDON": 2000,
194+
},
195+
"BerlinToLondonAt5": {
196+
"HIVE_FORK_HOMESTEAD": 0,
197+
"HIVE_FORK_TANGERINE": 0,
198+
"HIVE_FORK_SPURIOUS": 0,
199+
"HIVE_FORK_BYZANTIUM": 0,
200+
"HIVE_FORK_CONSTANTINOPLE": 0,
201+
"HIVE_FORK_PETERSBURG": 0,
202+
"HIVE_FORK_ISTANBUL": 0,
203+
"HIVE_FORK_BERLIN": 0,
204+
"HIVE_FORK_LONDON": 5,
205+
},
206+
"London": {
207+
"HIVE_FORK_HOMESTEAD": 0,
208+
"HIVE_FORK_TANGERINE": 0,
209+
"HIVE_FORK_SPURIOUS": 0,
210+
"HIVE_FORK_BYZANTIUM": 0,
211+
"HIVE_FORK_CONSTANTINOPLE": 0,
212+
"HIVE_FORK_PETERSBURG": 0,
213+
"HIVE_FORK_ISTANBUL": 0,
214+
"HIVE_FORK_BERLIN": 0,
215+
"HIVE_FORK_LONDON": 0,
216+
},
217+
"ArrowGlacierToMergeAtDiffC0000": {
218+
"HIVE_FORK_HOMESTEAD": 0,
219+
"HIVE_FORK_TANGERINE": 0,
220+
"HIVE_FORK_SPURIOUS": 0,
221+
"HIVE_FORK_BYZANTIUM": 0,
222+
"HIVE_FORK_CONSTANTINOPLE": 0,
223+
"HIVE_FORK_PETERSBURG": 0,
224+
"HIVE_FORK_ISTANBUL": 0,
225+
"HIVE_FORK_BERLIN": 0,
226+
"HIVE_FORK_LONDON": 0,
227+
"HIVE_TERMINAL_TOTAL_DIFFICULTY": 786432,
228+
},
229+
"Merge": { // Remove once Paris replaces Merge
230+
"HIVE_FORK_HOMESTEAD": 0,
231+
"HIVE_FORK_TANGERINE": 0,
232+
"HIVE_FORK_SPURIOUS": 0,
233+
"HIVE_FORK_BYZANTIUM": 0,
234+
"HIVE_FORK_CONSTANTINOPLE": 0,
235+
"HIVE_FORK_PETERSBURG": 0,
236+
"HIVE_FORK_ISTANBUL": 0,
237+
"HIVE_FORK_BERLIN": 0,
238+
"HIVE_FORK_LONDON": 0,
239+
"HIVE_FORK_MERGE": 0,
240+
"HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
241+
},
242+
"Paris": {
243+
"HIVE_FORK_HOMESTEAD": 0,
244+
"HIVE_FORK_TANGERINE": 0,
245+
"HIVE_FORK_SPURIOUS": 0,
246+
"HIVE_FORK_BYZANTIUM": 0,
247+
"HIVE_FORK_CONSTANTINOPLE": 0,
248+
"HIVE_FORK_PETERSBURG": 0,
249+
"HIVE_FORK_ISTANBUL": 0,
250+
"HIVE_FORK_BERLIN": 0,
251+
"HIVE_FORK_LONDON": 0,
252+
"HIVE_FORK_MERGE": 0,
253+
"HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
254+
},
255+
"Shanghai": {
256+
"HIVE_FORK_HOMESTEAD": 0,
257+
"HIVE_FORK_TANGERINE": 0,
258+
"HIVE_FORK_SPURIOUS": 0,
259+
"HIVE_FORK_BYZANTIUM": 0,
260+
"HIVE_FORK_CONSTANTINOPLE": 0,
261+
"HIVE_FORK_PETERSBURG": 0,
262+
"HIVE_FORK_ISTANBUL": 0,
263+
"HIVE_FORK_BERLIN": 0,
264+
"HIVE_FORK_LONDON": 0,
265+
"HIVE_FORK_MERGE": 0,
266+
"HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
267+
"HIVE_SHANGHAI_TIMESTAMP": 0,
268+
},
269+
"MergeToShanghaiAtTime15k": {
270+
"HIVE_FORK_HOMESTEAD": 0,
271+
"HIVE_FORK_TANGERINE": 0,
272+
"HIVE_FORK_SPURIOUS": 0,
273+
"HIVE_FORK_BYZANTIUM": 0,
274+
"HIVE_FORK_CONSTANTINOPLE": 0,
275+
"HIVE_FORK_PETERSBURG": 0,
276+
"HIVE_FORK_ISTANBUL": 0,
277+
"HIVE_FORK_BERLIN": 0,
278+
"HIVE_FORK_LONDON": 0,
279+
"HIVE_FORK_MERGE": 0,
280+
"HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
281+
"HIVE_SHANGHAI_TIMESTAMP": 15000,
282+
},
283+
"Cancun": {
284+
"HIVE_FORK_HOMESTEAD": 0,
285+
"HIVE_FORK_TANGERINE": 0,
286+
"HIVE_FORK_SPURIOUS": 0,
287+
"HIVE_FORK_BYZANTIUM": 0,
288+
"HIVE_FORK_CONSTANTINOPLE": 0,
289+
"HIVE_FORK_PETERSBURG": 0,
290+
"HIVE_FORK_ISTANBUL": 0,
291+
"HIVE_FORK_BERLIN": 0,
292+
"HIVE_FORK_LONDON": 0,
293+
"HIVE_FORK_MERGE": 0,
294+
"HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
295+
"HIVE_SHANGHAI_TIMESTAMP": 0,
296+
"HIVE_CANCUN_TIMESTAMP": 0,
297+
},
298+
"ShanghaiToCancunAtTime15k": {
299+
"HIVE_FORK_HOMESTEAD": 0,
300+
"HIVE_FORK_TANGERINE": 0,
301+
"HIVE_FORK_SPURIOUS": 0,
302+
"HIVE_FORK_BYZANTIUM": 0,
303+
"HIVE_FORK_CONSTANTINOPLE": 0,
304+
"HIVE_FORK_PETERSBURG": 0,
305+
"HIVE_FORK_ISTANBUL": 0,
306+
"HIVE_FORK_BERLIN": 0,
307+
"HIVE_FORK_LONDON": 0,
308+
"HIVE_FORK_MERGE": 0,
309+
"HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
310+
"HIVE_SHANGHAI_TIMESTAMP": 0,
311+
"HIVE_CANCUN_TIMESTAMP": 15000,
312+
},
313+
}

0 commit comments

Comments
 (0)