From 6393de9ce53a31063dcce2dfd024d205868b2260 Mon Sep 17 00:00:00 2001 From: Morty <70688412+yiweichi@users.noreply.github.com> Date: Tue, 11 Mar 2025 15:00:30 +0800 Subject: [PATCH] fix(coordinator): fix not-compatible-prover errors counting towards number of attempts --- common/version/version.go | 2 +- coordinator/internal/logic/provertask/batch_prover_task.go | 7 +++---- .../internal/logic/provertask/bundle_prover_task.go | 7 +++---- coordinator/internal/logic/provertask/chunk_prover_task.go | 7 +++---- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/common/version/version.go b/common/version/version.go index 1c6a1469dd..96a807e8d9 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.4.94" +var tag = "v4.4.95" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok { diff --git a/coordinator/internal/logic/provertask/batch_prover_task.go b/coordinator/internal/logic/provertask/batch_prover_task.go index e251b31d5d..e11128eed8 100644 --- a/coordinator/internal/logic/provertask/batch_prover_task.go +++ b/coordinator/internal/logic/provertask/batch_prover_task.go @@ -135,8 +135,6 @@ func (bp *BatchProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato return nil, nil } - log.Info("start batch proof generation session", "task_id", batchTask.Hash, "public key", taskCtx.PublicKey, "prover name", taskCtx.ProverName) - hardForkName, getHardForkErr := bp.hardForkName(ctx, batchTask) if getHardForkErr != nil { bp.recoverActiveAttempts(ctx, batchTask) @@ -146,13 +144,14 @@ func (bp *BatchProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato if _, ok := taskCtx.HardForkNames[hardForkName]; !ok { bp.recoverActiveAttempts(ctx, batchTask) - log.Error("incompatible prover version", + log.Debug("incompatible prover version", "requisite hard fork name", hardForkName, "prover hard fork name", taskCtx.HardForkNames, "task_id", batchTask.Hash) - return nil, ErrCoordinatorInternalFailure + return nil, nil } + log.Info("start batch proof generation session", "task_id", batchTask.Hash, "public key", taskCtx.PublicKey, "prover name", taskCtx.ProverName) proverTask := orm.ProverTask{ TaskID: batchTask.Hash, ProverPublicKey: taskCtx.PublicKey, diff --git a/coordinator/internal/logic/provertask/bundle_prover_task.go b/coordinator/internal/logic/provertask/bundle_prover_task.go index 50d01295d1..4dc14264d8 100644 --- a/coordinator/internal/logic/provertask/bundle_prover_task.go +++ b/coordinator/internal/logic/provertask/bundle_prover_task.go @@ -135,8 +135,6 @@ func (bp *BundleProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinat return nil, nil } - log.Info("start bundle proof generation session", "task index", bundleTask.Index, "public key", taskCtx.PublicKey, "prover name", taskCtx.ProverName) - hardForkName, getHardForkErr := bp.hardForkName(ctx, bundleTask) if getHardForkErr != nil { bp.recoverActiveAttempts(ctx, bundleTask) @@ -146,13 +144,14 @@ func (bp *BundleProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinat if _, ok := taskCtx.HardForkNames[hardForkName]; !ok { bp.recoverActiveAttempts(ctx, bundleTask) - log.Error("incompatible prover version", + log.Debug("incompatible prover version", "requisite hard fork name", hardForkName, "prover hard fork name", taskCtx.HardForkNames, "task_id", bundleTask.Hash) - return nil, ErrCoordinatorInternalFailure + return nil, nil } + log.Info("start bundle proof generation session", "task index", bundleTask.Index, "public key", taskCtx.PublicKey, "prover name", taskCtx.ProverName) proverTask := orm.ProverTask{ TaskID: bundleTask.Hash, ProverPublicKey: taskCtx.PublicKey, diff --git a/coordinator/internal/logic/provertask/chunk_prover_task.go b/coordinator/internal/logic/provertask/chunk_prover_task.go index 19cd103b3d..674f478912 100644 --- a/coordinator/internal/logic/provertask/chunk_prover_task.go +++ b/coordinator/internal/logic/provertask/chunk_prover_task.go @@ -133,8 +133,6 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato return nil, nil } - log.Info("start chunk generation session", "task_id", chunkTask.Hash, "public key", taskCtx.PublicKey, "prover name", taskCtx.ProverName) - hardForkName, getHardForkErr := cp.hardForkName(ctx, chunkTask) if getHardForkErr != nil { cp.recoverActiveAttempts(ctx, chunkTask) @@ -144,13 +142,14 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato if _, ok := taskCtx.HardForkNames[hardForkName]; !ok { cp.recoverActiveAttempts(ctx, chunkTask) - log.Error("incompatible prover version", + log.Debug("incompatible prover version", "requisite hard fork name", hardForkName, "prover hard fork name", taskCtx.HardForkNames, "task_id", chunkTask.Hash) - return nil, ErrCoordinatorInternalFailure + return nil, nil } + log.Info("start chunk generation session", "task_id", chunkTask.Hash, "public key", taskCtx.PublicKey, "prover name", taskCtx.ProverName) proverTask := orm.ProverTask{ TaskID: chunkTask.Hash, ProverPublicKey: taskCtx.PublicKey,