Skip to content
This repository has been archived by the owner on Jul 16, 2024. It is now read-only.

Commit

Permalink
feat: rename validator's bls key field (#18)
Browse files Browse the repository at this point in the history
  • Loading branch information
forcodedancing authored Mar 17, 2023
1 parent 36c7dc8 commit c3fa7af
Show file tree
Hide file tree
Showing 13 changed files with 299 additions and 294 deletions.
382 changes: 191 additions & 191 deletions abci/types/types.pb.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion proto/tendermint/abci/types.proto
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ message Validator {
message ValidatorUpdate {
tendermint.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false];
int64 power = 2;
bytes relayer_bls_key = 3;
bytes bls_key = 3;
bytes relayer_address = 4;
bytes challenger_address = 5;
}
Expand Down
106 changes: 53 additions & 53 deletions proto/tendermint/types/validator.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions proto/tendermint/types/validator.proto
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ message Validator {
tendermint.crypto.PublicKey pub_key = 2 [(gogoproto.nullable) = false];
int64 voting_power = 3;
int64 proposer_priority = 4;
bytes relayer_bls_key = 5;
bytes 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 bls_key = 3;
bytes relayer_address = 4;
bytes challenger_address = 5;
}
26 changes: 16 additions & 10 deletions state/execution_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,20 @@ func TestValidateValidatorUpdates(t *testing.T) {
false,
},
{
"updating a validator with relayer public key and relayer address is OK",
[]abci.ValidatorUpdate{{PubKey: pk1, Power: 20, RelayerBlsKey: ([]byte)("blspukkey"), RelayerAddress: ([]byte)("relayer")}},
"updating a validator with bls public key is OK",
[]abci.ValidatorUpdate{{PubKey: pk1, Power: 20, BlsKey: ([]byte)("blspukkey")}},
defaultValidatorParams,
false,
},
{
"updating a validator with relayer address is OK",
[]abci.ValidatorUpdate{{PubKey: pk1, Power: 20, RelayerAddress: ([]byte)("relayer")}},
defaultValidatorParams,
false,
},
{
"updating a validator with challenger address is OK",
[]abci.ValidatorUpdate{{PubKey: pk1, Power: 20, ChallengerAddress: ([]byte)("relayer")}},
[]abci.ValidatorUpdate{{PubKey: pk1, Power: 20, ChallengerAddress: ([]byte)("challenger")}},
defaultValidatorParams,
false,
},
Expand Down Expand Up @@ -304,7 +310,7 @@ 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()
updated.SetRelayerBlsKey(blsPubKey)
updated.SetBlsKey(blsPubKey)
relayer := ed25519.GenPrivKey().PubKey().Address().Bytes()
updated.SetRelayerAddress(relayer)
challenger := ed25519.GenPrivKey().PubKey().Address().Bytes()
Expand Down Expand Up @@ -351,7 +357,7 @@ func TestUpdateValidators(t *testing.T) {
"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, ChallengerAddress: challenger}},
BlsKey: blsPubKey, RelayerAddress: relayer, ChallengerAddress: challenger}},
types.NewValidatorSet([]*types.Validator{updated}),
false,
},
Expand All @@ -371,13 +377,13 @@ func TestUpdateValidators(t *testing.T) {
assert.Equal(t, tc.resultingSet.TotalVotingPower(), tc.currentSet.TotalVotingPower())

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].BlsKey, tc.currentSet.Validators[0].BlsKey)
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].BlsKey, tc.currentSet.Validators[1].BlsKey)
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)
}
Expand Down Expand Up @@ -441,7 +447,7 @@ func TestEndBlockValidatorUpdates(t *testing.T) {
app.ValidatorUpdates = []abci.ValidatorUpdate{
{PubKey: pk, Power: 10}, // add a new validator
{PubKey: currentValPk, Power: currentValPower,
RelayerBlsKey: blsPubKey, RelayerAddress: relayer, ChallengerAddress: challenger}, // updating a validator's relayer pub key and address
BlsKey: blsPubKey, RelayerAddress: relayer, ChallengerAddress: challenger}, // updating a validator's bls pub key and addresses
}

state, _, err = blockExec.ApplyBlock(state, blockID, block)
Expand All @@ -459,7 +465,7 @@ func TestEndBlockValidatorUpdates(t *testing.T) {
if idx < 0 {
t.Fatalf("can't find address %v in the set %v", currentVal.Address, state.NextValidators)
}
assert.Equal(t, blsPubKey, val.RelayerBlsKey)
assert.Equal(t, blsPubKey, val.BlsKey)
assert.Equal(t, relayer, val.RelayerAddress)
assert.Equal(t, challenger, val.ChallengerAddress)
}
Expand All @@ -473,7 +479,7 @@ func TestEndBlockValidatorUpdates(t *testing.T) {
assert.Equal(t, pubkey, event.ValidatorUpdates[0].PubKey)
assert.EqualValues(t, 10, event.ValidatorUpdates[0].VotingPower)

assert.Equal(t, blsPubKey, event.ValidatorUpdates[1].RelayerBlsKey)
assert.Equal(t, blsPubKey, event.ValidatorUpdates[1].BlsKey)
assert.EqualValues(t, relayer, event.ValidatorUpdates[1].RelayerAddress)
assert.EqualValues(t, challenger, event.ValidatorUpdates[1].ChallengerAddress)
}
Expand Down
2 changes: 1 addition & 1 deletion types/protobuf.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func (pb2tm) ValidatorUpdates(vals []abci.ValidatorUpdate) ([]*Validator, error)
return nil, err
}
updated := NewValidator(pub, v.Power)
updated.SetRelayerBlsKey(v.RelayerBlsKey)
updated.SetBlsKey(v.BlsKey)
updated.SetRelayerAddress(v.RelayerAddress)
updated.SetChallengerAddress(v.ChallengerAddress)
tmVals[i] = updated
Expand Down
21 changes: 10 additions & 11 deletions types/validator.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ type Validator struct {

ProposerPriority int64 `json:"proposer_priority"`

RelayerBlsKey []byte `json:"relayer_bls_key"` // bls public key of authorized relayer/operator
RelayerAddress []byte `json:"relayer_address"` // address of authorized relayer/operator

BlsKey []byte `json:"bls_key"` // bls public key
RelayerAddress []byte `json:"relayer_address"` // address of authorized relayer/operator
ChallengerAddress []byte `json:"challenger_address"` // address of authorized challenger/operator
}

Expand Down Expand Up @@ -63,8 +62,8 @@ func (v *Validator) ValidateBasic() error {
return fmt.Errorf("validator address is the wrong size: %v", v.Address)
}

if len(v.RelayerBlsKey) != 0 && len(v.RelayerBlsKey) != BlsPubKeySize {
return fmt.Errorf("validator relayer bls key is the wrong size: %v", v.RelayerBlsKey)
if len(v.BlsKey) != 0 && len(v.BlsKey) != BlsPubKeySize {
return fmt.Errorf("validator relayer bls key is the wrong size: %v", v.BlsKey)
}
if len(v.RelayerAddress) != 0 && len(v.RelayerAddress) != AddressSize {
return fmt.Errorf("validator relayer address is the wrong size: %v", v.RelayerAddress)
Expand Down Expand Up @@ -150,7 +149,7 @@ func (v *Validator) Bytes() []byte {
pbv := tmproto.SimpleValidator{
PubKey: &pk,
VotingPower: v.VotingPower,
RelayerBlsKey: v.RelayerBlsKey,
BlsKey: v.BlsKey,
RelayerAddress: v.RelayerAddress,
ChallengerAddress: v.ChallengerAddress,
}
Expand All @@ -162,9 +161,9 @@ func (v *Validator) Bytes() []byte {
return bz
}

// SetRelayerBlsKey will update the bls public key of relayer.
func (v *Validator) SetRelayerBlsKey(blsKey []byte) {
v.RelayerBlsKey = blsKey
// SetBlsKey will update the bls public key of relayer.
func (v *Validator) SetBlsKey(blsKey []byte) {
v.BlsKey = blsKey
}

// SetRelayerAddress will update the relayer address of validator.
Expand Down Expand Up @@ -193,7 +192,7 @@ func (v *Validator) ToProto() (*tmproto.Validator, error) {
PubKey: pk,
VotingPower: v.VotingPower,
ProposerPriority: v.ProposerPriority,
RelayerBlsKey: v.RelayerBlsKey,
BlsKey: v.BlsKey,
RelayerAddress: v.RelayerAddress,
ChallengerAddress: v.ChallengerAddress,
}
Expand All @@ -217,7 +216,7 @@ func ValidatorFromProto(vp *tmproto.Validator) (*Validator, error) {
v.PubKey = pk
v.VotingPower = vp.GetVotingPower()
v.ProposerPriority = vp.GetProposerPriority()
v.RelayerBlsKey = vp.GetRelayerBlsKey()
v.BlsKey = vp.GetBlsKey()
v.RelayerAddress = vp.GetRelayerAddress()
v.ChallengerAddress = vp.GetChallengerAddress()
return v, nil
Expand Down
2 changes: 1 addition & 1 deletion types/validator_set_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1661,7 +1661,7 @@ func TestValidatorSetHash(t *testing.T) {

//mock relayer bls public key & address
blsPubKey := ed25519.GenPrivKey().PubKey().Bytes()
val.SetRelayerBlsKey(blsPubKey)
val.SetBlsKey(blsPubKey)
relayer := ed25519.GenPrivKey().PubKey().Address().Bytes()
val.SetRelayerAddress(relayer)
challenger := ed25519.GenPrivKey().PubKey().Address().Bytes()
Expand Down
Loading

0 comments on commit c3fa7af

Please sign in to comment.