status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

change FkGlacierMuir to FkMuirGlacier [skip ci]

This commit is contained in:
andri lim 2020-04-11 16:02:15 +07:00
parent b3a519398e
commit 6591893158
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nimbus/p2p/executor.nim
View File

@ -91,7 +91,7 @@ const
eth2, # FkConstantinople
eth2, # FkPetersburg
eth2, # FkIstanbul
eth2 # FkGlacierMuir
eth2 # FkMuirGlacier
]
proc processBlock*(chainDB: BaseChainDB, header: BlockHeader, body: BlockBody, vmState: BaseVMState): ValidationResult =

4
nimbus/utils/difficulty.nim
View File

@ -145,7 +145,7 @@ template calcDifficultyGlacierMuir*(timeStamp: EthTime, parent: BlockHeader): Di
func calcDifficulty*(timeStamp: EthTime, parent: BlockHeader): DifficultyInt =
let next = parent.blockNumber + bigOne
if next >= forkBlocks[FkGlacierMuir]:
if next >= forkBlocks[FkMuirGlacier]:
result = calcDifficultyGlacierMuir(timeStamp, parent)
elif next >= forkBlocks[FkConstantinople]:
result = calcDifficultyConstantinople(timeStamp, parent)
@ -158,7 +158,7 @@ func calcDifficulty*(timeStamp: EthTime, parent: BlockHeader): DifficultyInt =
func calcDifficulty*(timeStamp: EthTime, parent: BlockHeader, fork: Fork): DifficultyInt =
case fork
of FkGlacierMuir:
of FkMuirGlacier:
result = calcDifficultyGlacierMuir(timeStamp, parent)
of FkConstantinople..FkPetersburg:
result = calcDifficultyConstantinople(timeStamp, parent)

2
nimbus/vm/interpreter/gas_costs.nim
View File

@ -724,7 +724,7 @@ const
FkConstantinople: SpuriousGasFees,
FkPetersburg: SpuriousGasFees,
FkIstanbul: IstanbulGasFees,
FkGlacierMuir: IstanbulGasFees
FkMuirGlacier: IstanbulGasFees
]

10
nimbus/vm/interpreter/vm_forks.nim
View File

@ -19,7 +19,7 @@ type
FkConstantinople,
FkPetersburg,
FkIstanbul,
FkGlacierMuir
FkMuirGlacier
const
forkBlocks*: array[Fork, BlockNumber] = [
@ -33,7 +33,7 @@ const
FkConstantinople: 7_280_000.toBlockNumber, # Never Occured in MainNet
FkPetersburg: 7_280_000.toBlockNumber, # 28/02/2019 07:52:04
FkIstanbul: 9_069_000.toBlockNumber, # 08/12/2019 12:25:09
FkGlacierMuir: 9_200_000.toBlockNumber # 02/01/2020 08:30:49
FkMuirGlacier: 9_200_000.toBlockNumber # 02/01/2020 08:30:49
]
proc toFork*(blockNumber: BlockNumber): Fork =
@ -54,8 +54,8 @@ proc toFork*(blockNumber: BlockNumber): Fork =
elif blockNumber < forkBlocks[FkByzantium]: FkSpurious
elif blockNumber < forkBlocks[FkConstantinople]: FkByzantium
elif blockNumber < forkBlocks[FkIstanbul]: FkPetersburg
elif blockNumber < forkBlocks[FkGlacierMuir]: FkIstanbul
else: FkGlacierMuir
elif blockNumber < forkBlocks[FkMuirGlacier]: FkIstanbul
else: FkMuirGlacier
proc `$`*(fork: Fork): string =
case fork
@ -69,4 +69,4 @@ proc `$`*(fork: Fork): string =
of FkConstantinople: result = "Constantinople"
of FkPetersburg: result = "Petersburg"
of FkIstanbul: result = "Istanbul"
of FkGlacierMuir: result = "Glacier Muir"
of FkMuirGlacier: result = "Glacier Muir"