more ncli_db Deneb support (#5336)

This commit is contained in:
tersec 2023-08-23 16:37:25 +00:00 committed by GitHub
parent d28facf4c4
commit d0314f0942
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions

View File

@ -12,7 +12,6 @@ import
../beacon_chain/networking/network_metadata, ../beacon_chain/networking/network_metadata,
../beacon_chain/[beacon_chain_db, era_db], ../beacon_chain/[beacon_chain_db, era_db],
../beacon_chain/consensus_object_pools/[blockchain_dag], ../beacon_chain/consensus_object_pools/[blockchain_dag],
../beacon_chain/spec/datatypes/[phase0, altair, bellatrix],
../beacon_chain/spec/[ ../beacon_chain/spec/[
beaconstate, state_transition, state_transition_epoch, validator, beaconstate, state_transition, state_transition_epoch, validator,
ssz_codec], ssz_codec],
@ -210,9 +209,6 @@ func getSlotRange(dag: ChainDAGRef, startSlot: int64, count: uint64): (Slot, Slo
else: start + count else: start + count
(start, ends) (start, ends)
from ../beacon_chain/spec/datatypes/capella import
HashedBeaconState, TrustedSignedBeaconBlock
proc cmdBench(conf: DbConf, cfg: RuntimeConfig) = proc cmdBench(conf: DbConf, cfg: RuntimeConfig) =
var timers: array[Timers, RunningStat] var timers: array[Timers, RunningStat]
@ -353,6 +349,7 @@ proc cmdBench(conf: DbConf, cfg: RuntimeConfig) =
processBlocks(blocks[1]) processBlocks(blocks[1])
processBlocks(blocks[2]) processBlocks(blocks[2])
processBlocks(blocks[3]) processBlocks(blocks[3])
processBlocks(blocks[4])
printTimers(false, timers) printTimers(false, timers)
@ -365,6 +362,7 @@ proc cmdDumpState(conf: DbConf) =
altairState = (ref altair.HashedBeaconState)() altairState = (ref altair.HashedBeaconState)()
bellatrixState = (ref bellatrix.HashedBeaconState)() bellatrixState = (ref bellatrix.HashedBeaconState)()
capellaState = (ref capella.HashedBeaconState)() capellaState = (ref capella.HashedBeaconState)()
denebState = (ref deneb.HashedBeaconState)()
for stateRoot in conf.stateRoot: for stateRoot in conf.stateRoot:
if shouldShutDown: quit QuitSuccess if shouldShutDown: quit QuitSuccess
@ -382,6 +380,7 @@ proc cmdDumpState(conf: DbConf) =
doit(altairState[]) doit(altairState[])
doit(bellatrixState[]) doit(bellatrixState[])
doit(capellaState[]) doit(capellaState[])
doit(denebState[])
echo "Couldn't load ", stateRoot echo "Couldn't load ", stateRoot
@ -414,6 +413,8 @@ proc cmdDumpBlock(conf: DbConf) =
dump("./", blck.get()) dump("./", blck.get())
elif (let blck = db.getBlock(root, capella.TrustedSignedBeaconBlock); blck.isSome): elif (let blck = db.getBlock(root, capella.TrustedSignedBeaconBlock); blck.isSome):
dump("./", blck.get()) dump("./", blck.get())
elif (let blck = db.getBlock(root, deneb.TrustedSignedBeaconBlock); blck.isSome):
dump("./", blck.get())
else: else:
echo "Couldn't load ", blockRoot echo "Couldn't load ", blockRoot
except CatchableError as e: except CatchableError as e: