Skip to content

Hotfix: #110

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

Merged
kaleofduty merged 1 commit into from
Apr 8, 2025
Merged

Hotfix: #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.23.0
toolchain go1.23.6

require (
github.com/ethereum/go-ethereum v1.15.6
github.com/ethereum/go-ethereum v1.15.3
github.com/leanovate/gopter v0.2.11
github.com/mr-tron/base58 v1.2.0
github.com/pkg/errors v0.9.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRk
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/ethereum/c-kzg-4844 v1.0.3 h1:IEnbOHwjixW2cTvKRUlAAUOeleV7nNM/umJR+qy4WDs=
github.com/ethereum/c-kzg-4844 v1.0.3/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
github.com/ethereum/go-ethereum v1.15.6 h1:jgLoUM6/pNjp0uEnXyWcWikDwa4j1wZlcqkX8Pm8A+I=
github.com/ethereum/go-ethereum v1.15.6/go.mod h1:+S9k+jFzlyVTNcYGvqFhzN/SFhI6vA+aOY4T5tLSPL0=
github.com/ethereum/go-ethereum v1.15.3 h1:OeTWAq6r8iR89bfJDjmmOemE74ywArl9DUViFsVj3Y8=
github.com/ethereum/go-ethereum v1.15.3/go.mod h1:jMXlpZXfSar1mGs/5sB0aEpEnPsiE1Jn6/3anlueqz8=
github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8=
github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
github.com/ferranbt/fastssz v0.1.2 h1:Dky6dXlngF6Qjc+EfDipAkE83N5I5DE68bY6O0VLNPk=
Expand Down
12 changes: 10 additions & 2 deletions offchainreporting2plus/internal/ocr3/protocol/outcome_generation_leader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func (outgen *outcomeGenerationState[RI]) messageEpochStartRequest(msg MessageEp
return
}

notBadCount := 0 // Note: just because a request is not bad does not mean it's good. Tertium datur!
notBadCount := 0 // Note: just because a request is not marked bad does not mean it's good. Tertium datur!
for _, epochStartRequest := range outgen.leaderState.epochStartRequests {
if epochStartRequest.bad {
continue
Expand All @@ -91,18 +91,26 @@ func (outgen *outcomeGenerationState[RI]) messageEpochStartRequest(msg MessageEp
return
}

// The not-bad entries in epochStartRequests here are guaranteed to be
// nonempty due to definition of ByzQuorumSize.
var maxSender *commontypes.OracleID
for sender, epochStartRequest := range outgen.leaderState.epochStartRequests {
if epochStartRequest.bad {
continue
}
if maxSender != nil {
maxTimestamp := outgen.leaderState.epochStartRequests[*maxSender].message.HighestCertified.Timestamp()
if !maxTimestamp.Less31(epochStartRequest.message.HighestCertified.Timestamp()) {
continue
}
}

maxSender = &sender
}

if maxSender == nil {
return
}

maxRequest := outgen.leaderState.epochStartRequests[*maxSender]

if !maxRequest.message.HighestCertified.Timestamp().Equal(maxRequest.message.SignedHighestCertifiedTimestamp.HighestCertifiedTimestamp) {
Expand Down