add VotingPower to abci.Evidence

Finschia · Aug 26, 2021 · d07066e · d07066e
1 parent 92e2b95
commit d07066e
Show file tree

Hide file tree

Showing 7 changed files with 303 additions and 212 deletions.
diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go
diff --git a/evidence/pool_test.go b/evidence/pool_test.go
@@ -98,11 +98,11 @@ func TestEvidencePoolBasic(t *testing.T) {
 	var evidenceBytes int64
 	switch keyType := voterSet.Voters[0].PubKey.(type) {
 	case ed25519.PubKey:
-		evidenceBytes = 372
+		evidenceBytes = 375
 	case bls.PubKey:
-		evidenceBytes = 436
+		evidenceBytes = 439
 	case composite.PubKey:
-		evidenceBytes = 436
+		evidenceBytes = 439
 	default:
 		assert.Fail(t, fmt.Sprintf("unknown public key: %s", keyType))
 	}

diff --git a/proto/ostracon/abci/types.proto b/proto/ostracon/abci/types.proto
@@ -375,6 +375,9 @@ message Evidence {
   // not store historical validators.
   // https://github.com/tendermint/tendermint/issues/4581
   int64 total_voting_power = 5;
+
+  // *** Ostracon Extended Fields ***
+  int64 voting_power = 1000;
 }
 
 //----------------------------------------

diff --git a/proto/ostracon/types/evidence.pb.go b/proto/ostracon/types/evidence.pb.go
diff --git a/proto/ostracon/types/evidence.proto b/proto/ostracon/types/evidence.proto
@@ -22,6 +22,9 @@ message DuplicateVoteEvidence {
   int64                     total_voting_power = 3;
   int64                     validator_power    = 4;
   google.protobuf.Timestamp timestamp          = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
+
+  // *** Ostracon Extended Fields ***
+  int64 voting_power = 1000;
 }
 
 // LightClientAttackEvidence contains evidence of a set of validators attempting to mislead a light client.

diff --git a/state/execution_test.go b/state/execution_test.go
@@ -189,13 +189,15 @@ func TestBeginBlockByzantineValidators(t *testing.T) {
 			Time:             defaultEvidenceTime,
 			Validator:        types.TM2PB.Validator(state.Validators.Validators[0]),
 			TotalVotingPower: 10,
+			VotingPower:      10,
 		},
 		{
 			Type:             abci.EvidenceType_LIGHT_CLIENT_ATTACK,
 			Height:           8,
 			Time:             defaultEvidenceTime,
 			Validator:        types.TM2PB.Validator(state.Validators.Validators[0]),
 			TotalVotingPower: 12,
+			VotingPower:      0,
 		},
 	}
 

diff --git a/types/evidence.go b/types/evidence.go
@@ -54,6 +54,7 @@ type DuplicateVoteEvidence struct {
 
 	// abci specific information
 	TotalVotingPower int64
+	VotingPower      int64
 	ValidatorPower   int64
 	Timestamp        time.Time
 }
@@ -83,6 +84,7 @@ func NewDuplicateVoteEvidence(vote1, vote2 *Vote, blockTime time.Time, voterSet
 		VoteA:            voteA,
 		VoteB:            voteB,
 		TotalVotingPower: voterSet.TotalVotingPower(),
+		VotingPower:      val.VotingPower,
 		ValidatorPower:   val.StakingPower,
 		Timestamp:        blockTime,
 	}
@@ -99,6 +101,7 @@ func (dve *DuplicateVoteEvidence) ABCI() []abci.Evidence {
 		Height:           dve.VoteA.Height,
 		Time:             dve.Timestamp,
 		TotalVotingPower: dve.TotalVotingPower,
+		VotingPower:      dve.VotingPower,
 	}}
 }
 
@@ -163,6 +166,7 @@ func (dve *DuplicateVoteEvidence) ToProto() *tmproto.DuplicateVoteEvidence {
 		VoteA:            voteA,
 		VoteB:            voteB,
 		TotalVotingPower: dve.TotalVotingPower,
+		VotingPower:      dve.VotingPower,
 		ValidatorPower:   dve.ValidatorPower,
 		Timestamp:        dve.Timestamp,
 	}
@@ -189,6 +193,7 @@ func DuplicateVoteEvidenceFromProto(pb *tmproto.DuplicateVoteEvidence) (*Duplica
 		VoteA:            vA,
 		VoteB:            vB,
 		TotalVotingPower: pb.TotalVotingPower,
+		VotingPower:      pb.VotingPower,
 		ValidatorPower:   pb.ValidatorPower,
 		Timestamp:        pb.Timestamp,
 	}
@@ -229,6 +234,7 @@ func (l *LightClientAttackEvidence) ABCI() []abci.Evidence {
 			Height:           l.Height(),
 			Time:             l.Timestamp,
 			TotalVotingPower: l.TotalVotingPower,
+			VotingPower:      0,
 		}
 	}
 	return abciEv