status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-02-02 09:46:26 +00:00
Code Issues Projects Releases Wiki Activity

ncli: ssz_snappy support (#3673)

Browse Source 
Tests are snappy-encoded these days.
This commit is contained in:
Jacek Sieka 2022-05-31 09:07:09 +02:00 committed by GitHub
parent 48f01186d6
commit 301331e54e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ncli/ncli.nim
View File

@ -1,7 +1,8 @@
import import
std/[os, strutils, stats], std/[os, strutils, stats],
confutils, chronicles, json_serialization, confutils, chronicles, json_serialization,
stew/byteutils, stew/[byteutils, io2],
snappy,
../research/simutils, ../research/simutils,
../beacon_chain/spec/eth2_apis/eth2_rest_serialization, ../beacon_chain/spec/eth2_apis/eth2_rest_serialization,
../beacon_chain/spec/datatypes/[phase0, altair, bellatrix], ../beacon_chain/spec/datatypes/[phase0, altair, bellatrix],
@ -80,14 +81,30 @@ template saveSSZFile(filename: string, value: ForkedHashedBeaconState) =
of BeaconStateFork.Altair: SSZ.saveFile(filename, value.altairData.data) of BeaconStateFork.Altair: SSZ.saveFile(filename, value.altairData.data)
of BeaconStateFork.Bellatrix: SSZ.saveFile(filename, value.bellatrixData.data) of BeaconStateFork.Bellatrix: SSZ.saveFile(filename, value.bellatrixData.data)
proc loadFile(filename: string, T: type): T =
let
ext = splitFile(filename).ext
bytes = readAllBytes(filename).expect("file exists")
if cmpIgnoreCase(ext, ".ssz") == 0:
SSZ.decode(bytes, T)
elif cmpIgnoreCase(ext, ".ssz_snappy") == 0:
SSZ.decode(snappy.decode(bytes), T)
elif cmpIgnoreCase(ext, ".json") == 0:
# JSON.loadFile(file, t)
echo "TODO needs porting to RestJson"
quit 1
else:
echo "Unknown file type: ", ext
quit 1
proc doTransition(conf: NcliConf) = proc doTransition(conf: NcliConf) =
let let
stateY = (ref ForkedHashedBeaconState)( stateY = (ref ForkedHashedBeaconState)(
phase0Data: phase0.HashedBeaconState( phase0Data: phase0.HashedBeaconState(
data: SSZ.loadFile(conf.preState, phase0.BeaconState)), data: loadFile(conf.preState, phase0.BeaconState)),
kind: BeaconStateFork.Phase0 kind: BeaconStateFork.Phase0
) )
blckX = SSZ.loadFile(conf.blck, phase0.SignedBeaconBlock) blckX = loadFile(conf.blck, phase0.SignedBeaconBlock)
flags = if not conf.verifyStateRoot: {skipStateRootValidation} else: {} flags = if not conf.verifyStateRoot: {skipStateRootValidation} else: {}
setStateRoot(stateY[], hash_tree_root(stateY[].phase0Data.data)) setStateRoot(stateY[], hash_tree_root(stateY[].phase0Data.data))
@ -116,7 +133,7 @@ proc doSlots(conf: NcliConf) =
let let
stateY = withTimerRet(timers[tLoadState]): (ref ForkedHashedBeaconState)( stateY = withTimerRet(timers[tLoadState]): (ref ForkedHashedBeaconState)(
phase0Data: phase0.HashedBeaconState( phase0Data: phase0.HashedBeaconState(
data: SSZ.loadFile(conf.preState2, phase0.BeaconState)), data: loadFile(conf.preState2, phase0.BeaconState)),
kind: BeaconStateFork.Phase0 kind: BeaconStateFork.Phase0
) )
@ -146,17 +163,7 @@ proc doSSZ(conf: NcliConf) =
raiseAssert "doSSZ() only implements hashTreeRoot and pretty commands" raiseAssert "doSSZ() only implements hashTreeRoot and pretty commands"
template printit(t: untyped) {.dirty.} = template printit(t: untyped) {.dirty.} =
let v = newClone( let v = newClone(loadFile(file, t))
if cmpIgnoreCase(ext, ".ssz") == 0:
SSZ.loadFile(file, t)
elif cmpIgnoreCase(ext, ".json") == 0:
# JSON.loadFile(file, t)
echo "TODO needs porting to RestJson"
quit 1
else:
echo "Unknown file type: ", ext
quit 1
)
case conf.cmd: case conf.cmd:
of hashTreeRoot: of hashTreeRoot:
@ -169,7 +176,6 @@ proc doSSZ(conf: NcliConf) =
else: else:
raiseAssert "doSSZ() only implements hashTreeRoot and pretty commands" raiseAssert "doSSZ() only implements hashTreeRoot and pretty commands"
let ext = splitFile(file).ext
case kind case kind
of "attester_slashing": printit(AttesterSlashing) of "attester_slashing": printit(AttesterSlashing)