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

Revert "finalizing state_transition (#792)"

Browse Source 
This reverts commit 91d75bdfdd239880bc1398547504e4d9043578f8.
This commit is contained in:
tersec 2020-03-10 15:56:08 +00:00
parent cf2dd002f6
commit a327c82820
3 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_chain/block_pool.nim
View File

@ -373,6 +373,7 @@ proc add*(
# TODO if the block is from the future, we should not be resolving it (yet), # TODO if the block is from the future, we should not be resolving it (yet),
# but maybe we should use it as a hint that our clock is wrong? # but maybe we should use it as a hint that our clock is wrong?
updateStateData(pool, pool.tmpState, BlockSlot(blck: parent, slot: blck.slot - 1)) updateStateData(pool, pool.tmpState, BlockSlot(blck: parent, slot: blck.slot - 1))
if not state_transition(pool.tmpState.data, signedBlock, {}): if not state_transition(pool.tmpState.data, signedBlock, {}):
# TODO find a better way to log all this block data # TODO find a better way to log all this block data
notice "Invalid block", notice "Invalid block",
@ -381,6 +382,7 @@ proc add*(
cat = "filtering" cat = "filtering"
return return
# Careful, tmpState.data has been updated but not blck - we need to create # Careful, tmpState.data has been updated but not blck - we need to create
# the BlockRef first! # the BlockRef first!
pool.tmpState.blck = pool.addResolvedBlock( pool.tmpState.blck = pool.addResolvedBlock(

2
beacon_chain/spec/helpers.nim
View File

@ -151,7 +151,7 @@ func compute_signing_root*(ssz_object: auto, domain: Domain): Eth2Digest =
# object-domain tree. # object-domain tree.
let domain_wrapped_object = SigningRoot( let domain_wrapped_object = SigningRoot(
object_root: hash_tree_root(ssz_object), object_root: hash_tree_root(ssz_object),
domain: bytes_to_int(domain) domain: domain
) )
hash_tree_root(domain_wrapped_object) hash_tree_root(domain_wrapped_object)

25
beacon_chain/state_transition.nim
View File

@ -31,9 +31,9 @@
# now. # now.
import import
collections/sets, chronicles, sets, options, collections/sets, chronicles, sets,
./extras, ./ssz, metrics, ./extras, ./ssz, metrics,
./spec/[datatypes, crypto, digest, helpers, validator], ./spec/[datatypes, digest, helpers, validator],
./spec/[state_transition_block, state_transition_epoch], ./spec/[state_transition_block, state_transition_epoch],
../nbench/bench_lab ../nbench/bench_lab
@ -101,19 +101,6 @@ proc process_slots*(state: var BeaconState, slot: Slot) {.nbench.}=
if is_epoch_transition: if is_epoch_transition:
beacon_current_validators.set(get_epoch_validator_count(state)) beacon_current_validators.set(get_epoch_validator_count(state))
#https://github.com/ethereum/eth2.0-specs/blob/v0.10.1/specs/phase0/beacon-chain.md#verify_block_signature
proc verify_block_signature*(state: var BeaconState, signedBlock: SignedBeaconBlock, stateCache: var StateCache): bool {.nbench.} =
let proposer = state.validators[get_beacon_proposer_index(state, stateCache).get]
let domain = get_domain(state, DOMAIN_BEACON_PROPOSER, compute_epoch_at_slot(signedBlock.message.slot))
# TODO This will need to be changed for:
# ```
# let signing_root = compute_signing_root(signedBlock.message,domain)
# return bls_verify(proposer.pubKey, signing_root.data, signedBlock.signature, domain)
# ```
# when https://github.com/status-im/nim-beacon-chain/pull/780 is merged
return bls_verify(proposer.pubKey, hash_tree_root(signedBlock.message).data, signedBlock.signature, domain)
# https://github.com/ethereum/eth2.0-specs/blob/v0.9.4/specs/core/0_beacon-chain.md#beacon-chain-state-transition-function # https://github.com/ethereum/eth2.0-specs/blob/v0.9.4/specs/core/0_beacon-chain.md#beacon-chain-state-transition-function
proc verifyStateRoot(state: BeaconState, blck: BeaconBlock): bool = proc verifyStateRoot(state: BeaconState, blck: BeaconBlock): bool =
# This is inlined in state_transition(...) in spec. # This is inlined in state_transition(...) in spec.
@ -170,10 +157,6 @@ proc state_transition*(
# https://github.com/ethereum/eth2.0-specs/issues/293 # https://github.com/ethereum/eth2.0-specs/issues/293
var per_epoch_cache = get_empty_per_epoch_cache() var per_epoch_cache = get_empty_per_epoch_cache()
if skipBLSValidation notin flags and not verify_block_signature(state, signedBlock, per_epoch_cache):
state = old_state
return false
if processBlock(state, signedBlock.message, flags, per_epoch_cache): if processBlock(state, signedBlock.message, flags, per_epoch_cache):
# This is a bit awkward - at the end of processing we verify that the # This is a bit awkward - at the end of processing we verify that the
# state we arrive at is what the block producer thought it would be - # state we arrive at is what the block producer thought it would be -
@ -241,10 +224,6 @@ proc state_transition*(
process_slots(state, signedBlock.message.slot) process_slots(state, signedBlock.message.slot)
var per_epoch_cache = get_empty_per_epoch_cache() var per_epoch_cache = get_empty_per_epoch_cache()
if skipBLSValidation notin flags and not verify_block_signature(state.data, signedBlock, per_epoch_cache):
state = old_state
return false
if processBlock(state.data, signedBlock.message, flags, per_epoch_cache): if processBlock(state.data, signedBlock.message, flags, per_epoch_cache):
if skipStateRootValidation in flags or verifyStateRoot(state.data, signedBlock.message): if skipStateRootValidation in flags or verifyStateRoot(state.data, signedBlock.message):
# State root is what it should be - we're done! # State root is what it should be - we're done!