status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-01-23 18:49:57 +00:00
Code Issues Projects Releases Wiki Activity

hive: update extract_consensus_data tool

Browse Source 
add London HF changes
This commit is contained in:
jangko 2021-06-30 20:43:47 +07:00
parent d47be9047f
commit 0245c8e2c7
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hive_integration/nodocker/consensus/extract_consensus_data.nim
View File

@ -42,6 +42,7 @@ proc processNetWork(network: string): JsonNode =
petersburgBlock = 2000 petersburgBlock = 2000
istanbulBlock = 2000 istanbulBlock = 2000
berlinBlock = 2000 berlinBlock = 2000
londonBlock = 2000
case network case network
of "Frontier": of "Frontier":
@ -90,6 +91,16 @@ proc processNetWork(network: string): JsonNode =
petersburgBlock = 0 petersburgBlock = 0
istanbulBlock = 0 istanbulBlock = 0
berlinBlock = 0 berlinBlock = 0
of "London":
homesteadBlock = 0
eip150Block = 0
eip158Block = 0
byzantiumBlock = 0
constantinopleBlock = 0
petersburgBlock = 0
istanbulBlock = 0
berlinBlock = 0
londonBlock = 0
of "FrontierToHomesteadAt5": of "FrontierToHomesteadAt5":
homesteadBlock = 5 homesteadBlock = 5
of "HomesteadToEIP150At5": of "HomesteadToEIP150At5":
@ -134,6 +145,16 @@ proc processNetWork(network: string): JsonNode =
petersburgBlock = 0 petersburgBlock = 0
istanbulBlock = 0 istanbulBlock = 0
berlinBlock = 5 berlinBlock = 5
of "BerlinToLondonAt5":
homesteadBlock = 0
eip150Block = 0
eip158Block = 0
byzantiumBlock = 0
constantinopleBlock = 0
petersburgBlock = 0
istanbulBlock = 0
berlinBlock = 0
londonBlock = 5
else: else:
doAssert(false, "unsupported network: " & network) doAssert(false, "unsupported network: " & network)
@ -149,14 +170,21 @@ proc processNetWork(network: string): JsonNode =
n["petersburgBlock"] = newJInt(petersburgBlock) n["petersburgBlock"] = newJInt(petersburgBlock)
n["istanbulBlock"] = newJInt(istanbulBlock) n["istanbulBlock"] = newJInt(istanbulBlock)
n["berlinBlock"] = newJInt(berlinBlock) n["berlinBlock"] = newJInt(berlinBlock)
n["londonBlock"] = newJInt(londonBlock)
n["chainId"] = newJInt(1) n["chainId"] = newJInt(1)
result = n result = n
proc optionalField(n: string, genesis, gen: JsonNode) =
if n in gen:
genesis[n] = gen[n]
proc extractChainData(n: JsonNode, chainFile: string): ChainData = proc extractChainData(n: JsonNode, chainFile: string): ChainData =
let gen = n["genesisBlockHeader"] let gen = n["genesisBlockHeader"]
var genesis = newJObject() var genesis = newJObject()
for x in genFields: for x in genFields:
genesis[x] = gen[x] genesis[x] = gen[x]
optionalField("baseFeePerGas", genesis, gen)
genesis["alloc"] = n["pre"] genesis["alloc"] = n["pre"]
var ngen = newJObject() var ngen = newJObject()