Handle EIP-3675 (TheMerge) switch block (#1005)

why:
  If configured/activated, this block is advertised as FORK_NEXT in the
  status(0x01) message of the RPLx wire protocol.
This commit is contained in:
Jordan Hrycaj 2022-03-24 08:54:11 +00:00 committed by GitHub
parent bde07054d1
commit 7b9fe94d1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 98 additions and 2 deletions

View File

@ -39,6 +39,12 @@ type
berlinBlock : Option[BlockNumber] berlinBlock : Option[BlockNumber]
londonBlock : Option[BlockNumber] londonBlock : Option[BlockNumber]
arrowGlacierBlock : Option[BlockNumber] arrowGlacierBlock : Option[BlockNumber]
mergeForkBlock : Option[BlockNumber] ##\
## EIP-3675 (TheMerge) switch block: "For the purposes of the EIP-2124\
## fork identifier, nodes implementing this EIP *MUST* set the\
## `FORK_NEXT` parameter to the `FORK_NEXT_VALUE`."
clique : CliqueOptions clique : CliqueOptions
terminalTotalDifficulty*: Option[UInt256] terminalTotalDifficulty*: Option[UInt256]
@ -63,6 +69,7 @@ type
berlinBlock* : BlockNumber berlinBlock* : BlockNumber
londonBlock* : BlockNumber londonBlock* : BlockNumber
arrowGlacierBlock* : BlockNumber arrowGlacierBlock* : BlockNumber
mergeForkBlock* : Option[BlockNumber] # EIP-3675 (TheMerge) switch block
poaEngine* : bool poaEngine* : bool
cliquePeriod* : int cliquePeriod* : int
@ -224,6 +231,14 @@ proc loadNetworkParams*(cc: CustomChain, cg: var NetworkParams):
error "Forks can't be assigned out of order", fork=fork error "Forks can't be assigned out of order", fork=fork
return false return false
# Process optional block numbers in non-increasing order (otherwise error.)
#
# See also the go-lang ref implementation:
# params/config.go:508: func (c *ChainConfig) CheckConfigForkOrder() error {
#
# The difference to the ref implementation is that we have no optional values
# everywhere for the block numbers but rather assign the next larger block.
validateFork(arrowGlacierBlock, high(BlockNumber)) validateFork(arrowGlacierBlock, high(BlockNumber))
validateFork(londonBlock, cg.config.arrowGlacierBlock) validateFork(londonBlock, cg.config.arrowGlacierBlock)
validateFork(berlinBlock, cg.config.londonBlock) validateFork(berlinBlock, cg.config.londonBlock)
@ -238,6 +253,73 @@ proc loadNetworkParams*(cc: CustomChain, cg: var NetworkParams):
validateFork(daoForkBlock, cg.config.eip150Block) validateFork(daoForkBlock, cg.config.eip150Block)
validateFork(homesteadBlock, cg.config.daoForkBlock) validateFork(homesteadBlock, cg.config.daoForkBlock)
# Only this last entry remains optional.
cg.config.mergeForkBlock = cc.config.mergeForkBlock
if cc.config.mergeForkBlock.isSome:
# Must be larger than the largest block
let topBlock = min(cg.config.arrowGlacierBlock, cg.config.londonBlock)
if cg.config.mergeForkBlock.get < topBlock:
error "Forks can't be assigned out of order", fork="mergeForkBlock"
return false
#[
# Process optional block numbers in non-increasing order (otherwise error.)
#
# See also the go-lang ref implementation:
# params/config.go:508: func (c *ChainConfig) CheckConfigForkOrder() error {
#
# The difference to the ref implementation is that we have no optional values
# everywhere for the block numbers but rather assign the next larger block.
var lastFork = ("", BlockNumber.high)
template useForkOption(fork: untyped) =
## For the argument fork, the `BlockNumber` value is optional and assigned
## as such. If it is set at all, the value must not increase compared to
## the last processed `BlockNumber`.
cg.config.fork = cc.config.fork
if cg.config.fork.isSome:
let thisFork = (astToStr(fork), cg.config.fork.get)
if lastFork[1] < thisFork[1]:
error "Forks can't be assigned out of order",
fork = thisFork[0],
predecessor = lastFork[0]
return false
lastFork = thisFork
useForkOption(mergeForkBlock)
useForkOption(arrowGlacierBlock)
template useForkBlockNumber(fork: untyped) =
## For the argument fork, the `BlockNumber` value is optional. If unset,
## then the value of the last processed `BlockNumber` is assigned. If
## it is set at all, the value must not increase compared to the last
## processed `BlockNumber`.
if cc.config.fork.isSome:
cg.config.fork = cc.config.fork.get
else:
cg.config.fork = lastFork[1]
let thisFork = (astToStr(fork), cg.config.fork)
if lastFork[1] < thisFork[1]:
error "Forks can't be assigned out of order",
fork = thisFork[0],
predecessor = lastFork[0]
return false
lastFork = thisFork
useForkBlockNumber(londonBlock)
useForkBlockNumber(berlinBlock)
useForkBlockNumber(muirGlacierBlock)
useForkBlockNumber(istanbulBlock)
useForkBlockNumber(petersburgBlock)
useForkBlockNumber(constantinopleBlock)
useForkBlockNumber(byzantiumBlock)
useForkBlockNumber(eip158Block)
useForkBlockNumber(eip155Block)
useForkBlockNumber(eip150Block)
useForkBlockNumber(daoForkBlock)
useForkBlockNumber(homesteadBlock)
#]#
return true return true
proc loadNetworkParams*(fileName: string, cg: var NetworkParams): proc loadNetworkParams*(fileName: string, cg: var NetworkParams):
@ -322,6 +404,7 @@ proc chainConfigForNetwork(id: NetworkId): ChainConfig =
berlinBlock: 12_244_000.toBlockNumber, # 2021-04-15 10:07:03 UTC berlinBlock: 12_244_000.toBlockNumber, # 2021-04-15 10:07:03 UTC
londonBlock: 12_965_000.toBlockNumber, # 2021-08-05 12:33:42 UTC londonBlock: 12_965_000.toBlockNumber, # 2021-08-05 12:33:42 UTC
arrowGlacierBlock: 13_773_000.toBlockNumber, # 2021-12-09 19:55:23 UTC arrowGlacierBlock: 13_773_000.toBlockNumber, # 2021-12-09 19:55:23 UTC
mergeForkBlock: none(BlockNumber),
) )
of RopstenNet: of RopstenNet:
ChainConfig( ChainConfig(
@ -342,6 +425,7 @@ proc chainConfigForNetwork(id: NetworkId): ChainConfig =
berlinBlock: 9_812_189.toBlockNumber, # 2021-03-10 13:32:08 UTC berlinBlock: 9_812_189.toBlockNumber, # 2021-03-10 13:32:08 UTC
londonBlock: 10_499_401.toBlockNumber, # 2021-06-24 02:03:37 UTC londonBlock: 10_499_401.toBlockNumber, # 2021-06-24 02:03:37 UTC
arrowGlacierBlock: high(BlockNumber), # No current plan arrowGlacierBlock: high(BlockNumber), # No current plan
mergeForkBlock: none(BlockNumber),
) )
of RinkebyNet: of RinkebyNet:
ChainConfig( ChainConfig(
@ -362,6 +446,7 @@ proc chainConfigForNetwork(id: NetworkId): ChainConfig =
berlinBlock: 8_290_928.toBlockNumber, # 2021-03-24 14:48:36 UTC berlinBlock: 8_290_928.toBlockNumber, # 2021-03-24 14:48:36 UTC
londonBlock: 8_897_988.toBlockNumber, # 2021-07-08 01:27:32 UTC londonBlock: 8_897_988.toBlockNumber, # 2021-07-08 01:27:32 UTC
arrowGlacierBlock: high(BlockNumber), # No current plan arrowGlacierBlock: high(BlockNumber), # No current plan
mergeForkBlock: none(BlockNumber),
) )
of GoerliNet: of GoerliNet:
ChainConfig( ChainConfig(
@ -382,6 +467,7 @@ proc chainConfigForNetwork(id: NetworkId): ChainConfig =
berlinBlock: 4_460_644.toBlockNumber, # 2021-03-18 05:29:51 UTC berlinBlock: 4_460_644.toBlockNumber, # 2021-03-18 05:29:51 UTC
londonBlock: 5_062_605.toBlockNumber, # 2021-07-01 03:19:39 UTC londonBlock: 5_062_605.toBlockNumber, # 2021-07-01 03:19:39 UTC
arrowGlacierBlock: high(BlockNumber), # No current plan arrowGlacierBlock: high(BlockNumber), # No current plan
mergeForkBlock: none(BlockNumber),
) )
else: else:
ChainConfig() ChainConfig()

View File

@ -39,7 +39,8 @@ type
MuirGlacier, MuirGlacier,
Berlin, Berlin,
London, London,
ArrowGlacier ArrowGlacier,
MergeFork
Chain* = ref object of AbstractChainDB Chain* = ref object of AbstractChainDB
db: BaseChainDB db: BaseChainDB
@ -75,6 +76,12 @@ func toNextFork(n: BlockNumber): uint64 =
else: else:
result = n.truncate(uint64) result = n.truncate(uint64)
func toNextFork(n: Option[BlockNumber]): uint64 =
if n.isSome:
n.get.truncate(uint64)
else:
0'u64
func isBlockAfterTtd*(c: Chain, blockHeader: BlockHeader): bool = func isBlockAfterTtd*(c: Chain, blockHeader: BlockHeader): bool =
c.db.totalDifficulty + blockHeader.difficulty >= c.db.ttd c.db.totalDifficulty + blockHeader.difficulty >= c.db.ttd
@ -92,7 +99,8 @@ func getNextFork(c: ChainConfig, fork: ChainFork): uint64 =
toNextFork(c.muirGlacierBlock), toNextFork(c.muirGlacierBlock),
toNextFork(c.berlinBlock), toNextFork(c.berlinBlock),
toNextFork(c.londonBlock), toNextFork(c.londonBlock),
toNextFork(c.arrowGlacierBlock) toNextFork(c.arrowGlacierBlock),
toNextFork(c.mergeForkBlock)
] ]
if fork == high(ChainFork): if fork == high(ChainFork):

View File

@ -24,6 +24,8 @@ import
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
func toChainFork(c: ChainConfig, number: BlockNumber): ChainFork = func toChainFork(c: ChainConfig, number: BlockNumber): ChainFork =
if c.mergeForkBlock.isSome and number >= c.mergeForkBlock.get:
return MergeFork
if number >= c.arrowGlacierBlock: ArrowGlacier if number >= c.arrowGlacierBlock: ArrowGlacier
elif number >= c.londonBlock: London elif number >= c.londonBlock: London
elif number >= c.berlinBlock: Berlin elif number >= c.berlinBlock: Berlin