From 8c9fce7004eeb9a9a65d875f7843e25f8d8d084b Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Wed, 9 Apr 2025 18:33:37 +0800 Subject: [PATCH 1/5] fix(coordinator): support darwin chunk provers --- coordinator/internal/logic/auth/login.go | 5 +++++ coordinator/internal/logic/provertask/prover_task.go | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/coordinator/internal/logic/auth/login.go b/coordinator/internal/logic/auth/login.go index b8d1bf4775..c0aa645248 100644 --- a/coordinator/internal/logic/auth/login.go +++ b/coordinator/internal/logic/auth/login.go @@ -139,6 +139,11 @@ func (l *LoginLogic) ProverHardForkName(login *types.LoginParameter) (string, er } proverVersion := proverVersionSplits[0] + + if proverVersion == "v4.4.56" { + return "darwin", nil + } + if hardForkNames, ok := l.proverVersionHardForkMap[proverVersion]; ok { return strings.Join(hardForkNames, ","), nil } diff --git a/coordinator/internal/logic/provertask/prover_task.go b/coordinator/internal/logic/provertask/prover_task.go index 1c4f2fd3e6..79aa3e5442 100644 --- a/coordinator/internal/logic/provertask/prover_task.go +++ b/coordinator/internal/logic/provertask/prover_task.go @@ -121,9 +121,15 @@ func (b *BaseProverTask) hardForkSanityCheck(ctx *gin.Context, taskCtx *proverTa return "", getHardForkErr } + // for backward compatibility, darwin chunk prover can still prove darwinV2 chunk tasks + if taskCtx.taskType == message.ProofTypeChunk && hardForkName == "darwin" { + return "darwinV2", nil + } + if _, ok := taskCtx.HardForkNames[hardForkName]; !ok { 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) } + return hardForkName, nil } From af87368036becd3d4cb2101a9ab57b08a82ba4d7 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Wed, 9 Apr 2025 10:34:53 +0000 Subject: [PATCH 2/5] =?UTF-8?q?chore:=20auto=20version=20bump=E2=80=89[bot?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/version/version.go b/common/version/version.go index b3f1ccd72c..95f6e96691 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.5.0" +var tag = "v4.5.1" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok { From a999bec50d9978394c08918635af1fe1a347066f Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Wed, 9 Apr 2025 18:36:15 +0800 Subject: [PATCH 3/5] tweak --- coordinator/internal/logic/auth/login.go | 1 + coordinator/internal/logic/provertask/prover_task.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/coordinator/internal/logic/auth/login.go b/coordinator/internal/logic/auth/login.go index c0aa645248..dfb10c48e7 100644 --- a/coordinator/internal/logic/auth/login.go +++ b/coordinator/internal/logic/auth/login.go @@ -140,6 +140,7 @@ func (l *LoginLogic) ProverHardForkName(login *types.LoginParameter) (string, er proverVersion := proverVersionSplits[0] + // allowing darwin provers to login, because darwin prover can prove darwinV2 chunk tasks if proverVersion == "v4.4.56" { return "darwin", nil } diff --git a/coordinator/internal/logic/provertask/prover_task.go b/coordinator/internal/logic/provertask/prover_task.go index 79aa3e5442..661e8f102f 100644 --- a/coordinator/internal/logic/provertask/prover_task.go +++ b/coordinator/internal/logic/provertask/prover_task.go @@ -129,7 +129,6 @@ func (b *BaseProverTask) hardForkSanityCheck(ctx *gin.Context, taskCtx *proverTa if _, ok := taskCtx.HardForkNames[hardForkName]; !ok { 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) } - return hardForkName, nil } From b8f7515e4ad861102df25a14574db740f7b058a8 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Wed, 9 Apr 2025 18:39:38 +0800 Subject: [PATCH 4/5] tweak --- coordinator/internal/logic/auth/login.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coordinator/internal/logic/auth/login.go b/coordinator/internal/logic/auth/login.go index dfb10c48e7..f5b1e68720 100644 --- a/coordinator/internal/logic/auth/login.go +++ b/coordinator/internal/logic/auth/login.go @@ -140,7 +140,7 @@ func (l *LoginLogic) ProverHardForkName(login *types.LoginParameter) (string, er proverVersion := proverVersionSplits[0] - // allowing darwin provers to login, because darwin prover can prove darwinV2 chunk tasks + // allowing darwin provers to login, because darwin provers can prove darwinV2 chunk tasks if proverVersion == "v4.4.56" { return "darwin", nil } From 2e7827e3554bde6525044b0f0360ac8ca84bd613 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Wed, 9 Apr 2025 18:42:42 +0800 Subject: [PATCH 5/5] fix check --- coordinator/internal/logic/provertask/prover_task.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coordinator/internal/logic/provertask/prover_task.go b/coordinator/internal/logic/provertask/prover_task.go index 661e8f102f..c1815e8a3e 100644 --- a/coordinator/internal/logic/provertask/prover_task.go +++ b/coordinator/internal/logic/provertask/prover_task.go @@ -122,8 +122,8 @@ func (b *BaseProverTask) hardForkSanityCheck(ctx *gin.Context, taskCtx *proverTa } // for backward compatibility, darwin chunk prover can still prove darwinV2 chunk tasks - if taskCtx.taskType == message.ProofTypeChunk && hardForkName == "darwin" { - return "darwinV2", nil + if taskCtx.taskType == message.ProofTypeChunk && hardForkName == "darwinV2" && taskCtx.ProverVersion == "v4.4.56" { + return hardForkName, nil } if _, ok := taskCtx.HardForkNames[hardForkName]; !ok {