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

work around long pyrmont startup time (#2060) 

* also fixes unnecessary copy/memory alloc when loading DbSeq entries
This commit is contained in:
Jacek Sieka 2020-11-21 18:53:40 +01:00 committed by GitHub
parent 8c9540350e
commit 672915e170
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
beacon_chain/beacon_chain_db.nim
View File

@ -5,6 +5,7 @@ import
stew/[results, objects, endians2, io2], stew/[results, objects, endians2, io2],
serialization, chronicles, snappy, serialization, chronicles, snappy,
eth/db/[kvstore, kvstore_sqlite3], eth/db/[kvstore, kvstore_sqlite3],
./network_metadata,
./spec/[datatypes, digest, crypto, state_transition, signatures], ./spec/[datatypes, digest, crypto, state_transition, signatures],
./ssz/[ssz_serialization, merkleization], ./ssz/[ssz_serialization, merkleization],
merkle_minimal, filepath merkle_minimal, filepath
@ -12,7 +13,7 @@ import
type type
DbSeq*[T] = object DbSeq*[T] = object
insertStmt: SqliteStmt[openArray[byte], void] insertStmt: SqliteStmt[openArray[byte], void]
selectStmt: SqliteStmt[int64, seq[byte]] selectStmt: SqliteStmt[int64, openArray[byte]]
recordCount: int64 recordCount: int64
DbMap*[K, V] = object DbMap*[K, V] = object
@ -152,7 +153,7 @@ proc init*[T](Seq: type DbSeq[T], db: SqStoreRef, name: string): Seq =
selectStmt = db.prepareStmt( selectStmt = db.prepareStmt(
"SELECT value FROM " & name & " WHERE id = ?;", "SELECT value FROM " & name & " WHERE id = ?;",
int64, seq[byte]).expect("this is a valid statement") int64, openArray[byte]).expect("this is a valid statement")
countStmt = db.prepareStmt( countStmt = db.prepareStmt(
"SELECT COUNT(*) FROM " & name & ";", "SELECT COUNT(*) FROM " & name & ";",
@ -181,7 +182,7 @@ proc get*[T](s: DbSeq[T], idx: uint64): T =
# This is used only locally # This is used only locally
let resultAddr = addr result let resultAddr = addr result
let queryRes = s.selectStmt.exec(int64(idx) + 1) do (recordBytes: seq[byte]): let queryRes = s.selectStmt.exec(int64(idx) + 1) do (recordBytes: openArray[byte]):
try: try:
resultAddr[] = decode(SSZ, recordBytes, T) resultAddr[] = decode(SSZ, recordBytes, T)
except SerializationError: except SerializationError:
@ -207,11 +208,12 @@ proc produceDerivedData(deposit: DepositData,
preset: RuntimePreset, preset: RuntimePreset,
validators: var ImmutableValidatorDataSeq, validators: var ImmutableValidatorDataSeq,
validatorKeyToIndex: var ValidatorKeyToIndexMap, validatorKeyToIndex: var ValidatorKeyToIndexMap,
finalizedEth1DepositsMerkleizer: var DepositsMerkleizer) = finalizedEth1DepositsMerkleizer: var DepositsMerkleizer,
skipBlsCheck = false) =
let htr = hash_tree_root(deposit) let htr = hash_tree_root(deposit)
finalizedEth1DepositsMerkleizer.addChunk htr.data finalizedEth1DepositsMerkleizer.addChunk htr.data
if verify_deposit_signature(preset, deposit): if skipBlsCheck or verify_deposit_signature(preset, deposit):
let pubkey = deposit.pubkey let pubkey = deposit.pubkey
if pubkey notin validatorKeyToIndex: if pubkey notin validatorKeyToIndex:
let idx = ValidatorIndex validators.len let idx = ValidatorIndex validators.len
@ -257,13 +259,22 @@ proc init*(T: type BeaconChainDB,
finalizedEth1DepositsMerkleizer = init DepositsMerkleizer finalizedEth1DepositsMerkleizer = init DepositsMerkleizer
finalizedEth2DepositsMerkleizer = init DepositsMerkleizer finalizedEth2DepositsMerkleizer = init DepositsMerkleizer
let isPyrmont =
not pyrmontMetadata.incompatible and preset == pyrmontMetadata.runtimePreset
for i in 0 ..< depositsSeq.len: for i in 0 ..< depositsSeq.len:
# TODO this is a hack to avoid long startup times on pyrmont - it should
# be removed when the storage of deposits is fixed. It works because
# we know that he first 100k deposits on pyrmont have a valid
# signature
let skipBlsCheck = isPyrmont and i < 100010
produceDerivedData( produceDerivedData(
depositsSeq.get(i), depositsSeq.get(i),
preset, preset,
immutableValidatorData, immutableValidatorData,
validatorKeyToIndex, validatorKeyToIndex,
finalizedEth1DepositsMerkleizer) finalizedEth1DepositsMerkleizer, skipBlsCheck)
T(backend: kvStore sqliteStore, T(backend: kvStore sqliteStore,
preset: preset, preset: preset,