fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-24 02:01:43 +00:00
Code Issues Projects Releases Wiki Activity

prettyprint block, unified state hash, test block mutation.

Browse Source
This commit is contained in:
Jae Kwon
2014-10-13 20:07:26 -07:00
parent 810aeb7bcb
commit c8f996f345
9 changed files with 316 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
state/state.go
View File

@ -314,9 +314,12 @@ func (s *State) releaseValidator(accountId uint64) {
}
}
// "checkStateHash": If false, instead of checking the resulting
// state.Hash() against block.StateHash, it *sets* the block.StateHash.
// (used for constructing a new proposal)
// NOTE: If an error occurs during block execution, state will be left
// at an invalid state. Copy the state before calling AppendBlock!
func (s *State) AppendBlock(b *Block) error {
func (s *State) AppendBlock(b *Block, checkStateHash bool) error {
// Basic block validation.
err := b.ValidateBasic(s.Height, s.BlockHash)
if err != nil {
@ -373,15 +376,20 @@ func (s *State) AppendBlock(b *Block) error {
// Increment validator AccumPowers
s.BondedValidators.IncrementAccum()
// State hashes should match
// XXX include UnbondingValidators.Hash().
if !bytes.Equal(s.BondedValidators.Hash(), b.ValidationStateHash) {
return Errorf("Invalid ValidationStateHash. Got %X, block says %X",
s.BondedValidators.Hash(), b.ValidationStateHash)
}
if !bytes.Equal(s.AccountDetails.Hash(), b.AccountStateHash) {
return Errorf("Invalid AccountStateHash. Got %X, block says %X",
s.AccountDetails.Hash(), b.AccountStateHash)
// Check or set block.StateHash
stateHash := s.Hash()
if checkStateHash {
// State hash should match
if !bytes.Equal(stateHash, b.StateHash) {
return Errorf("Invalid state hash. Got %X, block says %X",
stateHash, b.StateHash)
}
} else {
// Set the state hash.
if b.StateHash != nil {
panic("Cannot overwrite block.StateHash")
}
b.StateHash = stateHash
}
s.Height = b.Height
@ -401,3 +409,14 @@ func (s *State) GetAccountDetail(accountId uint64) *AccountDetail {
func (s *State) SetAccountDetail(accDet *AccountDetail) (updated bool) {
return s.AccountDetails.Set(accDet.Id, accDet)
}
// Returns a hash that represents the state data,
// excluding Height, BlockHash, and CommitTime.
func (s *State) Hash() []byte {
hashables := []merkle.Hashable{
s.AccountDetails,
s.BondedValidators,
s.UnbondingValidators,
}
return merkle.HashFromHashables(hashables)
}