feat: add challenger address to validators (#10)

bnb-chain · Mar 14, 2023 · 337f92c · 337f92c
1 parent b3f4927
commit 337f92c
Show file tree

Hide file tree

Showing 9 changed files with 469 additions and 258 deletions.
diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go
diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto
@@ -347,10 +347,11 @@ message Validator {
 
 // ValidatorUpdate
 message ValidatorUpdate {
-  tendermint.crypto.PublicKey pub_key         = 1 [(gogoproto.nullable) = false];
-  int64                       power           = 2;
-  bytes                       relayer_bls_key = 3;
-  bytes                       relayer_address = 4;
+  tendermint.crypto.PublicKey pub_key            = 1 [(gogoproto.nullable) = false];
+  int64                       power              = 2;
+  bytes                       relayer_bls_key    = 3;
+  bytes                       relayer_address    = 4;
+  bytes                       challenger_address = 5;
 }
 
 // VoteInfo

diff --git a/proto/tendermint/types/validator.pb.go b/proto/tendermint/types/validator.pb.go
diff --git a/proto/tendermint/types/validator.proto b/proto/tendermint/types/validator.proto
@@ -13,17 +13,19 @@ message ValidatorSet {
 }
 
 message Validator {
-  bytes                       address           = 1;
-  tendermint.crypto.PublicKey pub_key           = 2 [(gogoproto.nullable) = false];
-  int64                       voting_power      = 3;
-  int64                       proposer_priority = 4;
-  bytes                       relayer_bls_key   = 5;
-  bytes                       relayer_address   = 6;
+  bytes                       address            = 1;
+  tendermint.crypto.PublicKey pub_key            = 2 [(gogoproto.nullable) = false];
+  int64                       voting_power       = 3;
+  int64                       proposer_priority  = 4;
+  bytes                       relayer_bls_key    = 5;
+  bytes                       relayer_address    = 6;
+  bytes                       challenger_address = 7;
 }
 
 message SimpleValidator {
-  tendermint.crypto.PublicKey pub_key          = 1;
-  int64                       voting_power     = 2;
-  bytes                       relayer_bls_key  = 3;
-  bytes                       relayer_address  = 4;
+  tendermint.crypto.PublicKey pub_key             = 1;
+  int64                       voting_power        = 2;
+  bytes                       relayer_bls_key     = 3;
+  bytes                       relayer_address     = 4;
+  bytes                       challenger_address  = 5;
 }
diff --git a/state/execution_test.go b/state/execution_test.go
@@ -257,6 +257,12 @@ func TestValidateValidatorUpdates(t *testing.T) {
 			defaultValidatorParams,
 			false,
 		},
+		{
+			"updating a validator with challenger address is OK",
+			[]abci.ValidatorUpdate{{PubKey: pk1, Power: 20, ChallengerAddress: ([]byte)("relayer")}},
+			defaultValidatorParams,
+			false,
+		},
 		{
 			"removing a validator is OK",
 			[]abci.ValidatorUpdate{{PubKey: pk2, Power: 0}},
@@ -298,9 +304,11 @@ func TestUpdateValidators(t *testing.T) {
 	// updated validator with mock relayer bls public key and relayer address
 	updated := types.NewValidator(pubkey1, 20)
 	blsPubKey := ed25519.GenPrivKey().PubKey().Bytes()
-	relayer := ed25519.GenPrivKey().PubKey().Address().Bytes()
 	updated.SetRelayerBlsKey(blsPubKey)
+	relayer := ed25519.GenPrivKey().PubKey().Address().Bytes()
 	updated.SetRelayerAddress(relayer)
+	challenger := ed25519.GenPrivKey().PubKey().Address().Bytes()
+	updated.SetChallengerAddress(challenger)
 
 	testCases := []struct {
 		name string
@@ -340,9 +348,10 @@ func TestUpdateValidators(t *testing.T) {
 			true,
 		},
 		{
-			"updating a validator with relayer bls public key and address is OK",
+			"updating a validator with relayer bls public key, relayer and challenger address is OK",
 			types.NewValidatorSet([]*types.Validator{val1}),
-			[]abci.ValidatorUpdate{{PubKey: pk, Power: 20, RelayerBlsKey: blsPubKey, RelayerAddress: relayer}},
+			[]abci.ValidatorUpdate{{PubKey: pk, Power: 20,
+				RelayerBlsKey: blsPubKey, RelayerAddress: relayer, ChallengerAddress: challenger}},
 			types.NewValidatorSet([]*types.Validator{updated}),
 			false,
 		},
@@ -364,11 +373,13 @@ func TestUpdateValidators(t *testing.T) {
 				assert.Equal(t, tc.resultingSet.Validators[0].Address, tc.currentSet.Validators[0].Address)
 				assert.Equal(t, tc.resultingSet.Validators[0].RelayerBlsKey, tc.currentSet.Validators[0].RelayerBlsKey)
 				assert.Equal(t, tc.resultingSet.Validators[0].RelayerAddress, tc.currentSet.Validators[0].RelayerAddress)
+				assert.Equal(t, tc.resultingSet.Validators[0].ChallengerAddress, tc.currentSet.Validators[0].ChallengerAddress)
 
 				if tc.resultingSet.Size() > 1 {
 					assert.Equal(t, tc.resultingSet.Validators[1].Address, tc.currentSet.Validators[1].Address)
 					assert.Equal(t, tc.resultingSet.Validators[1].RelayerBlsKey, tc.currentSet.Validators[1].RelayerBlsKey)
 					assert.Equal(t, tc.resultingSet.Validators[1].RelayerAddress, tc.currentSet.Validators[1].RelayerAddress)
+					assert.Equal(t, tc.resultingSet.Validators[1].ChallengerAddress, tc.currentSet.Validators[1].ChallengerAddress)
 				}
 
 			}
@@ -425,10 +436,12 @@ func TestEndBlockValidatorUpdates(t *testing.T) {
 	currentValPower := currentVal.VotingPower
 	blsPubKey := ed25519.GenPrivKey().PubKey().Bytes()
 	relayer := ed25519.GenPrivKey().PubKey().Address().Bytes()
+	challenger := ed25519.GenPrivKey().PubKey().Address().Bytes()
 
 	app.ValidatorUpdates = []abci.ValidatorUpdate{
 		{PubKey: pk, Power: 10}, // add a new validator
-		{PubKey: currentValPk, Power: currentValPower, RelayerBlsKey: blsPubKey, RelayerAddress: relayer}, // updating a validator's relayer pub key and address
+		{PubKey: currentValPk, Power: currentValPower,
+			RelayerBlsKey: blsPubKey, RelayerAddress: relayer, ChallengerAddress: challenger}, // updating a validator's relayer pub key and address
 	}
 
 	state, _, err = blockExec.ApplyBlock(state, blockID, block)
@@ -448,6 +461,7 @@ func TestEndBlockValidatorUpdates(t *testing.T) {
 		}
 		assert.Equal(t, blsPubKey, val.RelayerBlsKey)
 		assert.Equal(t, relayer, val.RelayerAddress)
+		assert.Equal(t, challenger, val.ChallengerAddress)
 	}
 
 	// test we threw an event
@@ -461,6 +475,7 @@ func TestEndBlockValidatorUpdates(t *testing.T) {
 
 			assert.Equal(t, blsPubKey, event.ValidatorUpdates[1].RelayerBlsKey)
 			assert.EqualValues(t, relayer, event.ValidatorUpdates[1].RelayerAddress)
+			assert.EqualValues(t, challenger, event.ValidatorUpdates[1].ChallengerAddress)
 		}
 	case <-updatesSub.Cancelled():
 		t.Fatalf("updatesSub was cancelled (reason: %v)", updatesSub.Err())

diff --git a/types/protobuf.go b/types/protobuf.go
@@ -140,6 +140,7 @@ func (pb2tm) ValidatorUpdates(vals []abci.ValidatorUpdate) ([]*Validator, error)
 		updated := NewValidator(pub, v.Power)
 		updated.SetRelayerBlsKey(v.RelayerBlsKey)
 		updated.SetRelayerAddress(v.RelayerAddress)
+		updated.SetChallengerAddress(v.ChallengerAddress)
 		tmVals[i] = updated
 	}
 	return tmVals, nil