Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: return error if 2/3 votes have not been achieved #32

Merged
merged 14 commits into from
Mar 23, 2023
Merged

fix: return error if 2/3 votes have not been achieved #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fcdc9b8
fix hashing method
randyahx Mar 21, 2023
eb38276
Update hash_verifier.go
randyahx Mar 21, 2023
acd190b
Update data_provider.go
randyahx Mar 22, 2023
0dd7ad9
Update app.go
randyahx Mar 22, 2023
ac22d48
set event status to "skipped" if object cannot be queried
randyahx Mar 22, 2023
033b1d6
include only error with "no such object"
randyahx Mar 22, 2023
b2e45d5
Update vote_processor.go
randyahx Mar 23, 2023
998e732
fix hashing method
randyahx Mar 21, 2023
52ad832
Update hash_verifier.go
randyahx Mar 21, 2023
2d3829b
set event status to "skipped" if object cannot be queried
randyahx Mar 22, 2023
2cb4bf0
include only error with "no such object"
randyahx Mar 22, 2023
ea4a8f5
Update vote_processor.go
randyahx Mar 23, 2023
50484e7
Merge branch 'fix/hash-verifier' of github.com:bnb-chain/greenfield-c…
randyahx Mar 23, 2023
415414f
Update hash_verifier.go
randyahx Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions verifier/hash_verifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"context"
"encoding/hex"
"io"
"strings"
"sync"
"time"

Expand Down Expand Up @@ -83,6 +84,12 @@ func (v *Verifier) verifyForSingleEvent(event *model.Event) error {
// Call blockchain for object info to get original hash
checksums, err := v.executor.GetObjectInfoChecksums(event.ObjectId)
if err != nil {
if strings.Contains(err.Error(), "No such object") {
err := v.daoManager.EventDao.UpdateEventStatusVerifyResultByChallengeId(event.ChallengeId, model.Skipped, model.Unknown)
if err != nil {
return err
}
}
return err
}
chainRootHash := checksums[event.RedundancyIndex+1]
Expand Down
11 changes: 5 additions & 6 deletions vote/vote_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,11 @@ func (p *VoteProcessor) queryMoreThanTwoThirdVotesForEvent(event *model.Event, v
// skip current tx if reach the max retry.
if triedTimes > QueryVotepoolMaxRetry {
alert.SendTelegramMessage(p.config.AlertConfig.Identity, p.config.AlertConfig.TelegramChatId, p.config.AlertConfig.TelegramBotId, fmt.Sprintf("failed to collect votes for challenge after retry, id: %d", event.ChallengeId))
logging.Logger.Infof("failed to collect votes for challenge after retry, id: %d", event.ChallengeId)
return p.UpdateEventStatus(event.ChallengeId, model.NoEnoughVotesCollected)
err := p.UpdateEventStatus(event.ChallengeId, model.NoEnoughVotesCollected)
if err != nil {
return err
}
return fmt.Errorf("failed to collect votes for challenge after retry, id: %d", event.ChallengeId)
}

queriedVotes, err := p.executor.QueryVotes(localVote.EventHash, votepool.DataAvailabilityChallengeEvent)
Expand All @@ -203,10 +206,6 @@ func (p *VoteProcessor) queryMoreThanTwoThirdVotesForEvent(event *model.Event, v
return err
}
validVotesCountPerReq := len(queriedVotes)
if validVotesCountPerReq == 0 {
continue
}

isLocalVoteIncluded := false

for _, v := range queriedVotes {
Expand Down