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

Update rules for short session flips when identity has 1 or 2 flips #1129

Merged
merged 1 commit into from
Jun 1, 2023
Merged

Update rules for short session flips when identity has 1 or 2 flips #1129

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
57 changes: 35 additions & 22 deletions core/ceremony/ceremony.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@ func (vc *ValidationCeremony) ApplyNewEpoch(height uint64, appState *appstate.Ap

identity := appState.State.GetIdentity(addr)
newIdentityState := determineNewIdentityState(identity, shortScore, longScore, totalScore,
totalFlips, missed, noQualShort, noQualLong, vc.epoch >= 93, vc.config.Consensus.EnableUpgrade10)
totalFlips, missed, noQualShort, noQualLong, vc.epoch >= 93, vc.config.Consensus.EnableUpgrade10, shortQualifiedFlipsCount, vc.config.Consensus.EnableUpgrade12)
identityBirthday := determineIdentityBirthday(vc.epoch, identity, newIdentityState)

incSuccessfulInvites(shardValidationResults, god, addr, identity, identityBirthday, newIdentityState, vc.epoch, allGoodInviters)
Expand Down Expand Up @@ -1221,7 +1221,7 @@ func (vc *ValidationCeremony) ApplyNewEpoch(height uint64, appState *appstate.Ap
for _, shard := range vc.shardCandidates {
for _, addr := range shard.nonCandidates {
identity := appState.State.GetIdentity(addr)
newIdentityState := determineNewIdentityState(identity, 0, 0, 0, 0, true, false, false, vc.epoch >= 93, vc.config.Consensus.EnableUpgrade10)
newIdentityState := determineNewIdentityState(identity, 0, 0, 0, 0, true, false, false, vc.epoch >= 93, vc.config.Consensus.EnableUpgrade10, 0, vc.config.Consensus.EnableUpgrade12)
identityBirthday := determineIdentityBirthday(vc.epoch, identity, newIdentityState)

value := cacheValue{
Expand Down Expand Up @@ -1477,7 +1477,20 @@ func determineIdentityBirthday(currentEpoch uint16, identity state.Identity, new
return 0
}

func determineNewIdentityState(identity state.Identity, shortScore, longScore, totalScore float32, totalQualifiedFlips uint32, missed, noQualShort, nonQualLong bool, candidateToNewbieFixEnabled, enableUpgrade10 bool) state.IdentityState {
func determineNewIdentityState(identity state.Identity, shortScore, longScore, totalScore float32, totalQualifiedFlips uint32, missed, noQualShort, nonQualLong, candidateToNewbieFixEnabled, enableUpgrade10 bool, shortQualifiedFlipsCount uint32, enableUpgrade12 bool) state.IdentityState {

shortSessionScoreCheck := func() bool {
if !enableUpgrade12 {
return shortScore >= common.MinShortScore
}
switch shortQualifiedFlipsCount {
case 1:
return true
case 2:
return shortScore > 0
}
return shortScore >= common.MinShortScore
}

if !identity.HasDoneAllRequiredFlips() {
switch identity.State {
Expand All @@ -1499,13 +1512,13 @@ func determineNewIdentityState(identity state.Identity, shortScore, longScore, t
if missed {
return state.Killed
}
if noQualShort || nonQualLong && shortScore >= common.MinShortScore {
if noQualShort || nonQualLong && shortSessionScoreCheck() {
if enableUpgrade10 || candidateToNewbieFixEnabled {
return state.Newbie
}
return state.Candidate
}
if shortScore < common.MinShortScore || longScore < common.MinLongScore {
if !shortSessionScoreCheck() || longScore < common.MinLongScore {
return state.Killed
}
return state.Newbie
Expand All @@ -1514,28 +1527,28 @@ func determineNewIdentityState(identity state.Identity, shortScore, longScore, t
return state.Killed
}
if noQualShort ||
nonQualLong && totalQualifiedFlips >= common.MinFlipsForVerified && totalScore >= common.MinTotalScore && shortScore >= common.MinShortScore ||
nonQualLong && totalQualifiedFlips < common.MinFlipsForVerified && shortScore >= common.MinShortScore {
nonQualLong && totalQualifiedFlips >= common.MinFlipsForVerified && totalScore >= common.MinTotalScore && shortSessionScoreCheck() ||
nonQualLong && totalQualifiedFlips < common.MinFlipsForVerified && shortSessionScoreCheck() {
return state.Newbie
}
if totalQualifiedFlips >= common.MinFlipsForVerified && totalScore >= common.MinTotalScore && shortScore >= common.MinShortScore && longScore >= common.MinLongScore {
if totalQualifiedFlips >= common.MinFlipsForVerified && totalScore >= common.MinTotalScore && shortSessionScoreCheck() && longScore >= common.MinLongScore {
return state.Verified
}
if totalQualifiedFlips < common.MinFlipsForVerified && shortScore >= common.MinShortScore && longScore >= common.MinLongScore {
if totalQualifiedFlips < common.MinFlipsForVerified && shortSessionScoreCheck() && longScore >= common.MinLongScore {
return state.Newbie
}
return state.Killed
case state.Verified:
if missed {
return state.Suspended
}
if noQualShort || nonQualLong && totalScore >= common.MinTotalScore && shortScore >= common.MinShortScore {
if noQualShort || nonQualLong && totalScore >= common.MinTotalScore && shortSessionScoreCheck() {
return state.Verified
}
if totalQualifiedFlips >= common.MinFlipsForHuman && totalScore >= common.MinHumanTotalScore && shortScore >= common.MinShortScore && longScore >= common.MinLongScore {
if totalQualifiedFlips >= common.MinFlipsForHuman && totalScore >= common.MinHumanTotalScore && shortSessionScoreCheck() && longScore >= common.MinLongScore {
return state.Human
}
if totalQualifiedFlips >= common.MinFlipsForVerified && totalScore >= common.MinTotalScore && shortScore >= common.MinShortScore && longScore >= common.MinLongScore {
if totalQualifiedFlips >= common.MinFlipsForVerified && totalScore >= common.MinTotalScore && shortSessionScoreCheck() && longScore >= common.MinLongScore {
return state.Verified
}
return state.Killed
Expand All @@ -1544,20 +1557,20 @@ func determineNewIdentityState(identity state.Identity, shortScore, longScore, t
return state.Zombie
}
if !enableUpgrade10 {
if noQualShort || nonQualLong && totalScore >= common.MinTotalScore && shortScore >= common.MinShortScore {
if noQualShort || nonQualLong && totalScore >= common.MinTotalScore && shortSessionScoreCheck() {
return state.Suspended
}
}
if totalQualifiedFlips >= common.MinFlipsForHuman && totalScore >= common.MinHumanTotalScore &&
(shortScore >= common.MinShortScore || enableUpgrade10 && noQualShort) &&
(shortSessionScoreCheck() || enableUpgrade10 && noQualShort) &&
(longScore >= common.MinLongScore || enableUpgrade10 && nonQualLong) {
return state.Human
}
if totalScore >= common.MinTotalScore && shortScore >= common.MinShortScore && longScore >= common.MinLongScore {
if totalScore >= common.MinTotalScore && shortSessionScoreCheck() && longScore >= common.MinLongScore {
return state.Verified
}
if enableUpgrade10 {
if noQualShort || nonQualLong && totalScore >= common.MinTotalScore && shortScore >= common.MinShortScore {
if noQualShort || nonQualLong && totalScore >= common.MinTotalScore && shortSessionScoreCheck() {
return state.Verified
}
}
Expand All @@ -1567,16 +1580,16 @@ func determineNewIdentityState(identity state.Identity, shortScore, longScore, t
return state.Killed
}
if !enableUpgrade10 {
if noQualShort || nonQualLong && totalScore >= common.MinTotalScore && shortScore >= common.MinShortScore {
if noQualShort || nonQualLong && totalScore >= common.MinTotalScore && shortSessionScoreCheck() {
return state.Zombie
}
}
if totalQualifiedFlips >= common.MinFlipsForHuman && totalScore >= common.MinHumanTotalScore &&
(shortScore >= common.MinShortScore || enableUpgrade10 && noQualShort) &&
(shortSessionScoreCheck() || enableUpgrade10 && noQualShort) &&
(longScore >= common.MinLongScore || enableUpgrade10 && nonQualLong) {
return state.Human
}
if totalScore >= common.MinTotalScore && shortScore >= common.MinShortScore {
if totalScore >= common.MinTotalScore && shortSessionScoreCheck() {
return state.Verified
}
if enableUpgrade10 {
Expand All @@ -1589,16 +1602,16 @@ func determineNewIdentityState(identity state.Identity, shortScore, longScore, t
if missed {
return state.Suspended
}
if noQualShort || nonQualLong && totalScore >= common.MinHumanTotalScore && shortScore >= common.MinShortScore {
if noQualShort || nonQualLong && totalScore >= common.MinHumanTotalScore && shortSessionScoreCheck() {
return state.Human
}
if nonQualLong {
return state.Suspended
}
if totalScore >= common.MinHumanTotalScore && shortScore >= common.MinShortScore && longScore >= common.MinLongScore {
if totalScore >= common.MinHumanTotalScore && shortSessionScoreCheck() && longScore >= common.MinLongScore {
return state.Human
}
if totalScore >= common.MinTotalScore && shortScore >= common.MinShortScore && longScore >= common.MinLongScore {
if totalScore >= common.MinTotalScore && shortSessionScoreCheck() && longScore >= common.MinLongScore {
return state.Verified
}
return state.Suspended
Expand Down
Loading