Skip to content

Commit a34c01d

Browse files
authored
fix(coordinator): support darwin chunk provers (#1640)
Co-authored-by: colinlyguo <colinlyguo@users.noreply.github.com>
1 parent 0578aab commit a34c01d

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

common/version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"runtime/debug"
66
)
77

8-
var tag = "v4.5.0"
8+
var tag = "v4.5.1"
99

1010
var commit = func() string {
1111
if info, ok := debug.ReadBuildInfo(); ok {

coordinator/internal/logic/auth/login.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,12 @@ func (l *LoginLogic) ProverHardForkName(login *types.LoginParameter) (string, er
139139
}
140140

141141
proverVersion := proverVersionSplits[0]
142+
143+
// allowing darwin provers to login, because darwin provers can prove darwinV2 chunk tasks
144+
if proverVersion == "v4.4.56" {
145+
return "darwin", nil
146+
}
147+
142148
if hardForkNames, ok := l.proverVersionHardForkMap[proverVersion]; ok {
143149
return strings.Join(hardForkNames, ","), nil
144150
}

coordinator/internal/logic/provertask/prover_task.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@ func (b *BaseProverTask) hardForkSanityCheck(ctx *gin.Context, taskCtx *proverTa
121121
return "", getHardForkErr
122122
}
123123

124+
// for backward compatibility, darwin chunk prover can still prove darwinV2 chunk tasks
125+
if taskCtx.taskType == message.ProofTypeChunk && hardForkName == "darwinV2" && taskCtx.ProverVersion == "v4.4.56" {
126+
return hardForkName, nil
127+
}
128+
124129
if _, ok := taskCtx.HardForkNames[hardForkName]; !ok {
125130
return "", fmt.Errorf("to be assigned prover task's hard-fork name is not the same as prover, proverName: %s, proverVersion: %s, proverSupportHardForkNames: %s, taskHardForkName: %v", taskCtx.ProverName, taskCtx.ProverVersion, taskCtx.HardForkNames, hardForkName)
126131
}

0 commit comments

Comments
 (0)