Fix the bug of Ostracon's changes of #194

state/execution.go

@@ -146,7 +146,11 @@ func (blockExec *BlockExecutor) CreateProposalBlock(
 // Validation does not mutate state, but does require historical information from the stateDB,
 // ie. to verify evidence from a validator at an old height.
 func (blockExec *BlockExecutor) ValidateBlock(state State, round int32, block *types.Block) error {
-	return validateBlock(state, round, block)
+	err := validateBlock(state, round, block)
+	if err != nil {
+		return err
+	}
+	return blockExec.evpool.CheckEvidence(block.Evidence.Evidence)
 }
 
 // ApplyBlock validates the block against the state, executes it against the app,

types/protobuf.go

@@ -50,14 +50,19 @@ func (oc2pb) Header(header *Header) tmproto.Header {
 		LastCommitHash: header.LastCommitHash,
 		DataHash:       header.DataHash,
 
-		VotersHash:         header.VotersHash,
+		ValidatorsHash:     header.ValidatorsHash,
 		NextValidatorsHash: header.NextValidatorsHash,
 		ConsensusHash:      header.ConsensusHash,
 		AppHash:            header.AppHash,
 		LastResultsHash:    header.LastResultsHash,
 
 		EvidenceHash:    header.EvidenceHash,
 		ProposerAddress: header.ProposerAddress,
+
+		// Ostracon fields
+		Round:      header.Round,
+		Proof:      header.Proof,
+		VotersHash: header.VotersHash,
 	}
 }
 

types/validator.go

@@ -99,10 +99,11 @@ func (v *Validator) String() string {
 	if v == nil {
 		return "nil-Validator"
 	}
-	return fmt.Sprintf("Validator{%v %v VP:%v A:%v}",
+	return fmt.Sprintf("Validator{%v %v VP:%v VW:%v A:%v}",
 		v.Address,
 		v.PubKey,
 		v.VotingPower,
+		v.VotingWeight,
 		v.ProposerPriority)
 }