Skip to content

Commit

Permalink
Merge pull request #76 from hyperledger-labs/tm-total-voting-power
Browse files Browse the repository at this point in the history
tendermint: set value to `TotalVotingPower`

Signed-off-by: Jun Kimura <[email protected]>
  • Loading branch information
bluele authored Sep 13, 2022
2 parents 3963445 + 2e4e17e commit e51bc1f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
4 changes: 3 additions & 1 deletion chains/tendermint/light.go
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,12 @@ func (pr *Prover) GetLightSignedHeaderAtHeight(height int64) (*tmclient.Header,
return nil, err
}

protoVal, err := tmtypes.NewValidatorSet(sh.ValidatorSet.Validators).ToProto()
valSet := tmtypes.NewValidatorSet(sh.ValidatorSet.Validators)
protoVal, err := valSet.ToProto()
if err != nil {
return nil, err
}
protoVal.TotalVotingPower = valSet.TotalVotingPower()

return &tmclient.Header{SignedHeader: sh.SignedHeader.ToProto(), ValidatorSet: protoVal}, nil
}
Expand Down
8 changes: 6 additions & 2 deletions chains/tendermint/prover.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,12 @@ func (pr *Prover) UpdateLightWithHeader() (header core.HeaderI, provableHeight i
}
}

protoVal, err := tmtypes.NewValidatorSet(sh.ValidatorSet.Validators).ToProto()
valSet := tmtypes.NewValidatorSet(sh.ValidatorSet.Validators)
protoVal, err := valSet.ToProto()
if err != nil {
return nil, 0, 0, err
}
protoVal.TotalVotingPower = valSet.TotalVotingPower()

h := &tmclient.Header{
SignedHeader: sh.SignedHeader.ToProto(),
Expand Down Expand Up @@ -237,10 +239,12 @@ func (c *Prover) queryHeaderAtHeight(height int64) (*tmclient.Header, error) {
return nil, err
}

protoVal, err := tmtypes.NewValidatorSet(val.Validators).ToProto()
valSet := tmtypes.NewValidatorSet(val.Validators)
protoVal, err := valSet.ToProto()
if err != nil {
return nil, err
}
protoVal.TotalVotingPower = valSet.TotalVotingPower()

return &tmclient.Header{
// NOTE: This is not a SignedHeader
Expand Down
7 changes: 6 additions & 1 deletion chains/tendermint/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,12 @@ func (c *Chain) QueryValsetAtHeight(height clienttypes.Height) (*tmproto.Validat
}
tmValSet.GetProposer()

return tmValSet.ToProto()
protoValSet, err := tmValSet.ToProto()
if err != nil {
return nil, err
}
protoValSet.TotalVotingPower = tmValSet.TotalVotingPower()
return protoValSet, err
}

func (c *Chain) toTmValidators(vals stakingtypes.Validators) ([]*tmtypes.Validator, error) {
Expand Down

0 comments on commit e51bc1f

Please sign in to comment.