Merge pull request #82 from tendermint/chainid_rebase

Chainid
This commit is contained in:
Jae Kwon
2015-05-30 17:38:39 -07:00
41 changed files with 246 additions and 154 deletions
+1 -1
View File
@@ -232,7 +232,7 @@ FOR_LOOP:
firstPartsHeader := firstParts.Header()
// Finally, verify the first block using the second's validation.
err := bcR.state.BondedValidators.VerifyValidation(
first.Hash(), firstPartsHeader, first.Height, second.Validation)
bcR.state.ChainID, first.Hash(), firstPartsHeader, first.Height, second.Validation)
if err != nil {
log.Debug("error in validation", "error", err)
bcR.pool.RedoRequest(first.Height)