status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-01-11 21:04:11 +00:00
Code Issues Projects Releases Wiki Activity

engine fix

Browse Source
This commit is contained in:
Jacek Sieka 2024-12-20 15:43:13 +01:00
parent fe6bee532c
commit f0678f139a
No known key found for this signature in database
GPG Key ID: A1B09461ABB656B8
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hive_integration/nodocker/engine/node.nim
View File

@ -59,7 +59,7 @@ proc processBlock(
vmState.stateDB.addBalance(withdrawal.address, withdrawal.weiAmount) vmState.stateDB.addBalance(withdrawal.address, withdrawal.weiAmount)
if header.ommersHash != EMPTY_UNCLE_HASH: if header.ommersHash != EMPTY_UNCLE_HASH:
discard com.db.persistUncles(blk.uncles) discard vmState.stateDB.txFrame.persistUncles(blk.uncles)
# EIP-3675: no reward for miner in POA/POS # EIP-3675: no reward for miner in POA/POS
if com.proofOfStake(header, vmState.stateDB.txFrame): if com.proofOfStake(header, vmState.stateDB.txFrame):
@ -69,7 +69,7 @@ proc processBlock(
let clearEmptyAccount = com.isSpuriousOrLater(header.number) let clearEmptyAccount = com.isSpuriousOrLater(header.number)
db.persist(clearEmptyAccount) db.persist(clearEmptyAccount)
dbTx.commit() vmState.stateDB.txFrame.commit()
ok() ok()
@ -87,8 +87,8 @@ proc getVmState(c: ChainRef, header: Header, txFrame: CoreDbTxRef):
# intended to accepts invalid block # intended to accepts invalid block
proc setBlock*(c: ChainRef; blk: Block): Result[void, string] = proc setBlock*(c: ChainRef; blk: Block): Result[void, string] =
template header: Header = blk.header template header: Header = blk.header
let dbTx = c.db.ctx.txFrameBegin() let txFrame = c.db.ctx.txFrameBegin(nil)
defer: dbTx.dispose() defer: txFrame.dispose()
# Needed for figuring out whether KVT cleanup is due (see at the end) # Needed for figuring out whether KVT cleanup is due (see at the end)
let let
@ -109,11 +109,8 @@ proc setBlock*(c: ChainRef; blk: Block): Result[void, string] =
# between eth_blockNumber and eth_syncing # between eth_blockNumber and eth_syncing
c.com.syncCurrent = header.number c.com.syncCurrent = header.number
dbTx.commit() txFrame.commit()
# The `c.db.persistent()` call is ignored by the legacy DB which
# automatically saves persistently when reaching the zero level transaction.
#
# For the `Aristo` database, this code position is only reached if the # For the `Aristo` database, this code position is only reached if the
# the parent state of the first block (as registered in `headers[0]`) was # the parent state of the first block (as registered in `headers[0]`) was
# the canonical state before updating. So this state will be saved with # the canonical state before updating. So this state will be saved with