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

catch wrong-fork-blocks earlier (#3444)

Browse Source 
Can't apply a phase0 block to a later phase state and vice versa.

Since instantiation has been a topic, pre/post c file size:

```
424K	@mspec@sstate_transition.nim.c
892K	@mspec@sstate_transition_block.nim.c
```

```
288K	@mspec@sstate_transition.nim.c
880K	@mspec@sstate_transition_block.nim.c
```
This commit is contained in:
Jacek Sieka 2022-02-28 13:58:34 +01:00 committed by GitHub
parent 961c02fcba
commit 12ed537f75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_chain/consensus_object_pools/block_clearance.nim
View File

@ -94,7 +94,7 @@ proc addResolvedHeadBlock(
blockRef blockRef
proc checkStateTransition( proc checkStateTransition(
dag: ChainDAGRef, signedBlock: SomeForkySignedBeaconBlock, dag: ChainDAGRef, signedBlock: ForkySigVerifiedSignedBeaconBlock,
cache: var StateCache): Result[void, BlockError] = cache: var StateCache): Result[void, BlockError] =
## Ensure block can be applied on a state ## Ensure block can be applied on a state
func restore(v: var ForkedHashedBeaconState) = func restore(v: var ForkedHashedBeaconState) =

15
beacon_chain/spec/forks.nim
View File

@ -226,13 +226,22 @@ template init*(T: type ForkedTrustedSignedBeaconBlock, blck: altair.TrustedSigne
template init*(T: type ForkedTrustedSignedBeaconBlock, blck: bellatrix.TrustedSignedBeaconBlock): T = template init*(T: type ForkedTrustedSignedBeaconBlock, blck: bellatrix.TrustedSignedBeaconBlock): T =
T(kind: BeaconBlockFork.Bellatrix, bellatrixData: blck) T(kind: BeaconBlockFork.Bellatrix, bellatrixData: blck)
template toFork*[T: phase0.TrustedSignedBeaconBlock]( template toFork*[T:
phase0.SignedBeaconBlock |
phase0.SigVerifiedSignedBeaconBlock |
phase0.TrustedSignedBeaconBlock](
t: type T): BeaconBlockFork = t: type T): BeaconBlockFork =
BeaconBlockFork.Phase0 BeaconBlockFork.Phase0
template toFork*[T: altair.TrustedSignedBeaconBlock]( template toFork*[T:
altair.SignedBeaconBlock |
altair.SigVerifiedSignedBeaconBlock |
altair.TrustedSignedBeaconBlock](
t: type T): BeaconBlockFork = t: type T): BeaconBlockFork =
BeaconBlockFork.Altair BeaconBlockFork.Altair
template toFork*[T: bellatrix.TrustedSignedBeaconBlock]( template toFork*[T:
bellatrix.SignedBeaconBlock |
bellatrix.SigVerifiedSignedBeaconBlock |
bellatrix.TrustedSignedBeaconBlock](
t: type T): BeaconBlockFork = t: type T): BeaconBlockFork =
BeaconBlockFork.Bellatrix BeaconBlockFork.Bellatrix

6
beacon_chain/spec/state_transition.nim
View File

@ -250,11 +250,11 @@ proc state_transition_block*(
## before the state has been updated, `rollback` will not be called. ## before the state has been updated, `rollback` will not be called.
doAssert not rollback.isNil, "use noRollback if it's ok to mess up state" doAssert not rollback.isNil, "use noRollback if it's ok to mess up state"
# Ensure state_transition_block()-only callers trigger this
maybeUpgradeStateToAltair(cfg, state)
let res = withState(state): let res = withState(state):
when stateFork.toBeaconBlockFork() == type(signedBlock).toFork:
state_transition_block_aux(cfg, state, signedBlock, cache, flags) state_transition_block_aux(cfg, state, signedBlock, cache, flags)
else:
err("State/block fork mismatch")
if res.isErr(): if res.isErr():
rollback(state) rollback(state)