msf11 deprecated, msf13 added, adjust deployment phases (#4056)

Removes deprecated msf11 and adds msf13 to devnets,
and extends devnet check for public testnets.
This commit is contained in:
Etan Kissling 2022-09-03 00:49:32 +02:00 committed by GitHub
parent f33a241ba1
commit b7e4d1518b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -117,10 +117,10 @@ func deploymentPhase*(genesisData: string): DeploymentPhase =
"60F4596000000000043DB0D9A83813551EE2F33450D23797757D430911A9320530AD8A0EABC43EFB", "60F4596000000000043DB0D9A83813551EE2F33450D23797757D430911A9320530AD8A0EABC43EFB",
] ]
devnets = [ devnets = [
# Mainnet Shadow Fork 11
"FC95FB6200000000422F215805E0007A693FCA223DC4E42D392485698D45AFAFB962F50A8235789F",
# Mainnet Shadow Fork 12 # Mainnet Shadow Fork 12
"6CAB0C630000000096BBD4D72A6B5901B3E9402FF565C80D3A067D3C81A97BF65DE07129ADA6A821", "6CAB0C630000000096BBD4D72A6B5901B3E9402FF565C80D3A067D3C81A97BF65DE07129ADA6A821",
# Mainnet Shadow Fork 13
"6C37176300000000061F583BEA1E10B0D77648E8186E05C07AD8A80892DF83B7F7D64AED43801C64",
] ]
let data = (genesisData[0 ..< 40].toHex()) let data = (genesisData[0 ..< 40].toHex())

View File

@ -625,7 +625,7 @@ proc init*(T: type BeaconNode,
dag = loadChainDag( dag = loadChainDag(
config, cfg, db, eventBus, config, cfg, db, eventBus,
validatorMonitor, networkGenesisValidatorsRoot, validatorMonitor, networkGenesisValidatorsRoot,
genesisStateContents.deploymentPhase <= DeploymentPhase.Devnet) genesisStateContents.deploymentPhase <= DeploymentPhase.Testnet)
genesisTime = getStateField(dag.headState, genesis_time) genesisTime = getStateField(dag.headState, genesis_time)
beaconClock = BeaconClock.init(genesisTime) beaconClock = BeaconClock.init(genesisTime)
getBeaconTime = beaconClock.getBeaconTimeFn() getBeaconTime = beaconClock.getBeaconTimeFn()