fix

scroll-tech · Aug 23, 2023 · 0df4136 · 0df4136
1 parent 4bd9efb
commit 0df4136
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/coordinator/internal/logic/provertask/batch_prover_task.go b/coordinator/internal/logic/provertask/batch_prover_task.go
@@ -71,17 +71,15 @@ func (bp *BatchProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato
 		return nil, fmt.Errorf("get prover version from context failed")
 	}
 	if getTaskParameter.VK == "" { // allow vk being empty, because for the first time the prover may not know its vk
-		if version.CheckScrollProverVersionTag(proverVersion.(string)) { // but reject too-old provers
+		if !version.CheckScrollProverVersionTag(proverVersion.(string)) { // but reject too-old provers
 			return nil, fmt.Errorf("incompatible prover version. please upgrade your prover, expect version: %s, actual version: %s", version.Version, proverVersion.(string))
 		}
-	} else {
-		if getTaskParameter.VK != bp.vk {
-			if version.CheckScrollProverVersion(proverVersion.(string)) { // same prover version but different vks
-				return nil, fmt.Errorf("incompatible vk. please check your params files or config files")
-			}
-			// different prover versions and different vks
-			return nil, fmt.Errorf("incompatible prover version. please upgrade your prover, expect version: %s, actual version: %s", version.Version, proverVersion.(string))
+	} else if getTaskParameter.VK != bp.vk { // non-empty vk but different
+		if !version.CheckScrollProverVersion(proverVersion.(string)) { // same prover version but different vks
+			return nil, fmt.Errorf("incompatible vk. please check your params files or config files")
 		}
+		// different prover versions and different vks
+		return nil, fmt.Errorf("incompatible prover version. please upgrade your prover, expect version: %s, actual version: %s", version.Version, proverVersion.(string))
 	}
 
 	isAssigned, err := bp.proverTaskOrm.IsProverAssigned(ctx, publicKey.(string))

diff --git a/coordinator/internal/logic/provertask/chunk_prover_task.go b/coordinator/internal/logic/provertask/chunk_prover_task.go
@@ -71,17 +71,15 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato
 		return nil, fmt.Errorf("get prover version from context failed")
 	}
 	if getTaskParameter.VK == "" { // allow vk being empty, because for the first time the prover may not know its vk
-		if version.CheckScrollProverVersionTag(proverVersion.(string)) { // but reject too-old provers
+		if !version.CheckScrollProverVersionTag(proverVersion.(string)) { // but reject too-old provers
 			return nil, fmt.Errorf("incompatible prover version. please upgrade your prover, expect version: %s, actual version: %s", version.Version, proverVersion.(string))
 		}
-	} else {
-		if getTaskParameter.VK != cp.vk {
-			if version.CheckScrollProverVersion(proverVersion.(string)) { // same prover version but different vks
-				return nil, fmt.Errorf("incompatible vk. please check your params files or config files")
-			}
-			// different prover versions and different vks
-			return nil, fmt.Errorf("incompatible prover version. please upgrade your prover, expect version: %s, actual version: %s", version.Version, proverVersion.(string))
+	} else if getTaskParameter.VK != cp.vk { // non-empty vk but different
+		if !version.CheckScrollProverVersion(proverVersion.(string)) { // same prover version but different vks
+			return nil, fmt.Errorf("incompatible vk. please check your params files or config files")
 		}
+		// different prover versions and different vks
+		return nil, fmt.Errorf("incompatible prover version. please upgrade your prover, expect version: %s, actual version: %s", version.Version, proverVersion.(string))
 	}
 
 	isAssigned, err := cp.proverTaskOrm.IsProverAssigned(ctx, publicKey.(string))