fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-08-01 04:31:57 +00:00
Code Issues Projects Releases Wiki Activity

Fix comments about AppHash, rollbacks, etc

Browse Source
This commit is contained in:
Jae Kwon
2016-01-09 12:09:31 -08:00
parent 3e3c0083c7
commit 5d06bb964b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
consensus/state.go
View File

@@ -807,7 +807,7 @@ func (cs *ConsensusState) createProposalBlock() (block *types.Block, blockParts
LastBlockHash: cs.state.LastBlockHash, LastBlockHash: cs.state.LastBlockHash,
LastBlockParts: cs.state.LastBlockParts, LastBlockParts: cs.state.LastBlockParts,
ValidatorsHash: cs.state.Validators.Hash(), ValidatorsHash: cs.state.Validators.Hash(),
AppHash: cs.state.AppHash, AppHash: cs.state.AppHash, // state merkle root of txs from the previous block.
}, },
LastValidation: validation, LastValidation: validation,
Data: &types.Data{ Data: &types.Data{
@@ -1134,6 +1134,7 @@ func (cs *ConsensusState) finalizeCommit(height int) {
log.Info(Fmt("%v", block)) log.Info(Fmt("%v", block))
// Fire off event for new block. // Fire off event for new block.
// TODO: Handle app failure. See #177
cs.evsw.FireEvent(types.EventStringNewBlock(), types.EventDataNewBlock{block}) cs.evsw.FireEvent(types.EventStringNewBlock(), types.EventDataNewBlock{block})
// Create a copy of the state for staging // Create a copy of the state for staging
@@ -1141,7 +1142,6 @@ func (cs *ConsensusState) finalizeCommit(height int) {
// Run the block on the State: // Run the block on the State:
// + update validator sets // + update validator sets
// + first rolls back proxyAppConn
// + run txs on the proxyAppConn // + run txs on the proxyAppConn
err := stateCopy.ExecBlock(cs.evsw, cs.proxyAppConn, block, blockParts.Header()) err := stateCopy.ExecBlock(cs.evsw, cs.proxyAppConn, block, blockParts.Header())
if err != nil { if err != nil {

2
types/block.go
View File

@@ -140,7 +140,7 @@ type Header struct {
LastValidationHash []byte `json:"last_validation_hash"` LastValidationHash []byte `json:"last_validation_hash"`
DataHash []byte `json:"data_hash"` DataHash []byte `json:"data_hash"`
ValidatorsHash []byte `json:"validators_hash"` ValidatorsHash []byte `json:"validators_hash"`
AppHash []byte `json:"app_hash"` AppHash []byte `json:"app_hash"` // state merkle root of txs from the previous block
} }
// NOTE: hash is nil if required fields are missing. // NOTE: hash is nil if required fields are missing.