Skip to content

Commit

Permalink
ir: Do not vote for the same validators list twice
Browse files Browse the repository at this point in the history
Closes nspcc-dev#2365.

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
  • Loading branch information
carpawell committed Jul 25, 2023
1 parent d6c6c31 commit c51eca8
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Changelog for NeoFS Node
### Fixed
- `neo-go` RPC connection loss handling (#1337)
- Concurrent morph cache misses (#1248)
- Double voting for validators on IR startup (#2365)

### Removed
- Deprecated `morph.rpc_endpoint` SN and `morph.endpoint.client` IR config sections (#2400)
Expand Down
35 changes: 34 additions & 1 deletion pkg/innerring/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"sort"

"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
"github.com/nspcc-dev/neo-go/pkg/util"
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/governance"
auditClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/audit"
Expand Down Expand Up @@ -108,13 +109,21 @@ func (s *Server) voteForSidechainValidator(prm governance.VoteValidatorPrm) erro
return nil
}

voted, err := s.alreadyVoted(validators)
if err != nil {
return fmt.Errorf("could not check validators state: %w", err)
}

if voted {
return nil
}

epoch := s.EpochCounter()

var (
nonce uint32 = 1
vub uint32
vubP *uint32
err error
)

if prm.Hash != nil {
Expand All @@ -138,6 +147,30 @@ func (s *Server) voteForSidechainValidator(prm governance.VoteValidatorPrm) erro
return nil
}

func (s *Server) alreadyVoted(validatorsToVote keys.PublicKeys) (bool, error) {
currentValidators := make(map[keys.PublicKey]struct{}, len(s.contracts.alphabet))
for letter, contract := range s.contracts.alphabet {
validator, err := s.morphClient.VotesFor(contract)
if err != nil {
return false, fmt.Errorf("receiving %s's vote: %w", letter, err)
}

if validator == nil {
continue
}

currentValidators[*validator] = struct{}{}
}

for _, v := range validatorsToVote {
if _, voted := currentValidators[*v]; !voted {
return false, nil
}
}

return true, nil
}

// VoteForSidechainValidator calls vote method on alphabet contracts with
// the provided list of keys.
func (s *Server) VoteForSidechainValidator(prm governance.VoteValidatorPrm) error {
Expand Down
2 changes: 1 addition & 1 deletion pkg/morph/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ func (c *Client) VotesFor(addr util.Uint160) (*keys.PublicKey, error) {
return nil, ErrConnectionLost
}

neoReader := neo.New(c.rpcActor)
neoReader := neo.NewReader(c.rpcActor)

state, err := neoReader.GetAccountState(addr)
if err != nil {
Expand Down

0 comments on commit c51eca8

Please sign in to comment.