certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ibc: check commit is for header

This commit is contained in:
Ethan Buchman 2017-02-13 21:29:11 -05:00
parent bc6c79ef04
commit 6e6a5892c5
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/ibc/ibc.go
View File

@ -329,6 +329,7 @@ func (sm *IBCStateMachine) runPacketPostTx(tx IBCPacketPostTx) {
save(sm.store, packetKeyIngress, packet) save(sm.store, packetKeyIngress, packet)
// Load Header and make sure it exists // Load Header and make sure it exists
// If it exists, we already checked a valid commit for it in UpdateChainTx
var header tm.Header var header tm.Header
exists, err := load(sm.store, headerKey, &header) exists, err := load(sm.store, headerKey, &header)
if err != nil { if err != nil {
@ -341,16 +342,6 @@ func (sm *IBCStateMachine) runPacketPostTx(tx IBCPacketPostTx) {
return return
} }
/*
// Read Proof
var proof *merkle.IAVLProof
err = wire.ReadBinaryBytes(tx.Proof, &proof)
if err != nil {
sm.res.Code = IBCEncodingError
sm.res.Log = cmn.Fmt("Reading Proof: %v", err.Error())
return
}
*/
proof := tx.Proof proof := tx.Proof
if proof == nil { if proof == nil {
sm.res.Code = IBCCodeInvalidProof sm.res.Code = IBCCodeInvalidProof
@ -368,7 +359,6 @@ func (sm *IBCStateMachine) runPacketPostTx(tx IBCPacketPostTx) {
} }
return return
} }
func (ibc *IBCPlugin) InitChain(store types.KVStore, vals []*abci.Validator) { func (ibc *IBCPlugin) InitChain(store types.KVStore, vals []*abci.Validator) {
@ -432,6 +422,7 @@ func verifyCommit(chainState BlockchainState, header *tm.Header, commit *tm.Comm
if chainState.ChainID != header.ChainID { if chainState.ChainID != header.ChainID {
return errors.New(cmn.Fmt("Expected header.ChainID %v, got %v", chainState.ChainID, header.ChainID)) return errors.New(cmn.Fmt("Expected header.ChainID %v, got %v", chainState.ChainID, header.ChainID))
} }
// Ensure things aren't empty
if len(chainState.Validators) == 0 { if len(chainState.Validators) == 0 {
return errors.New(cmn.Fmt("Blockchain has no validators")) // NOTE: Why would this happen? return errors.New(cmn.Fmt("Blockchain has no validators")) // NOTE: Why would this happen?
} }
@ -443,6 +434,11 @@ func verifyCommit(chainState BlockchainState, header *tm.Header, commit *tm.Comm
vals := chainState.Validators vals := chainState.Validators
valSet := tm.NewValidatorSet(vals) valSet := tm.NewValidatorSet(vals)
// Ensure the commit is for the header
if !bytes.Equal(header.Hash(), vote0.BlockID.Hash) {
return errors.New(cmn.Fmt("Commit.BlockID.Hash (%X) does not match header.Hash (%X)", vote0.BlockID.Hash, header.Hash()))
}
// NOTE: Currently this only works with the exact same validator set. // NOTE: Currently this only works with the exact same validator set.
// Not this, but perhaps "ValidatorSet.VerifyCommitAny" should expose // Not this, but perhaps "ValidatorSet.VerifyCommitAny" should expose
// the functionality to verify commits even after validator changes. // the functionality to verify commits even after validator changes.