feat: update

common/version/version.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 )
 
-var tag = "v4.1.74"
+var tag = "v4.1.72"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

coordinator/internal/logic/submitproof/proof_receiver.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -233,13 +232,12 @@ func (m *ProofReceiverLogic) validator(ctx context.Context, proverTask *orm.Prov
 	proofTimeSec := uint64(proofTime.Seconds())
 
 	if proofMsg.Status != message.StatusOk {
-		failureMsg := strings.Replace(proofParameter.FailureMsg, "panic", "pa-nic", -1)
 		m.proofRecover(ctx, proofMsg.ID, pk, proofMsg)
 		m.validateFailureProverTaskStatusNotOk.Inc()
 		log.Info("proof generated by prover failed",
 			"taskType", proofMsg.Type, "hash", proofMsg.ID,
 			"proverName", proverTask.ProverName, "proverVersion", proverTask.ProverVersion,
-			"proverPublicKey", pk, "failureType", proofParameter.FailureType, "failureMessage", failureMsg)
+			"proverPublicKey", pk, "failureType", proofParameter.FailureType, "failureMessage", proofParameter.FailureMsg)
 		return ErrValidatorFailureProofMsgStatusNotOk
 	}
 

prover/client/client.go

@@ -176,24 +176,23 @@ func (c *CoordinatorClient) SubmitProof(ctx context.Context, req *SubmitProofReq
 
 	if err != nil {
 		log.Error("submit proof request failed: %v", err)
-		return fmt.Errorf("submit proof request failed: %w", ErrCoordinatorConnect)
+		return fmt.Errorf("submit proof request failed: %w", ConnectErr)
 	}
 
 	if resp.StatusCode() != 200 {
 		log.Error("failed to submit proof, status code: %v", resp.StatusCode())
-		return fmt.Errorf("failed to submit proof, status code not 200: %w", ErrCoordinatorConnect)
+		return fmt.Errorf("failed to submit proof, status code not 200: %w", ConnectErr)
 	}
 
 	if result.ErrCode == types.ErrJWTTokenExpired {
 		log.Info("JWT expired, attempting to re-login")
 		if err := c.Login(ctx); err != nil {
 			log.Error("JWT expired, re-login failed: %v", err)
-			return fmt.Errorf("JWT expired, re-login failed: %w", ErrCoordinatorConnect)
+			return fmt.Errorf("JWT expired, re-login failed: %w", ConnectErr)
 		}
 		log.Info("re-login success")
 		return c.SubmitProof(ctx, req)
 	}
-
 	if result.ErrCode != types.Success {
 		return fmt.Errorf("error code: %v, error message: %v", result.ErrCode, result.ErrMsg)
 	}

prover/client/types.go

@@ -6,8 +6,7 @@ import (
 	"scroll-tech/common/types/message"
 )
 
-// ErrCoordinatorConnect connect to coordinator error
-var ErrCoordinatorConnect = errors.New("connect coordinator error")
+var ConnectErr = errors.New("connect coordinator error")
 
 // ChallengeResponse defines the response structure for random API
 type ChallengeResponse struct {

prover/prover.go

@@ -162,7 +162,7 @@ func (r *Prover) proveAndSubmit() error {
 		proofMsg, err = r.prove(task)
 		if err != nil { // handling error from prove
 			log.Error("failed to prove task", "task_type", task.Task.Type, "task-id", task.Task.ID, "err", err)
-			return r.submitErr(task, message.ProofFailureNoPanic, err)
+			return r.submitErr(task, true, message.ProofFailureNoPanic, err)
 		}
 		return r.submitProof(proofMsg)
 	}
@@ -322,7 +322,7 @@ func (r *Prover) submitProof(msg *message.ProofDetail) error {
 
 	// send the submit request
 	if err := r.coordinatorClient.SubmitProof(r.ctx, req); err != nil {
-		if !errors.Is(errors.Unwrap(err), client.ErrCoordinatorConnect) {
+		if !errors.Is(errors.Unwrap(err), client.ConnectErr) {
 			if deleteErr := r.stack.Delete(msg.ID); deleteErr != nil {
 				log.Error("prover stack pop failed", "task_type", msg.Type, "task_id", msg.ID, "err", deleteErr)
 			}
@@ -330,15 +330,12 @@ func (r *Prover) submitProof(msg *message.ProofDetail) error {
 		return fmt.Errorf("error submitting proof: %v", err)
 	}
 
-	if deleteErr := r.stack.Delete(msg.ID); deleteErr != nil {
-		log.Error("prover stack pop failed", "task_type", msg.Type, "task_id", msg.ID, "err", deleteErr)
-	}
 	log.Info("proof submitted successfully", "task-id", msg.ID, "task-type", msg.Type, "task-status", msg.Status, "err", msg.Error)
 
 	return nil
 }
 
-func (r *Prover) submitErr(task *store.ProvingTask, proofFailureType message.ProofFailureType, err error) error {
+func (r *Prover) submitErr(task *store.ProvingTask, isRetry bool, proofFailureType message.ProofFailureType, err error) error {
 	// prepare the submit request
 	req := &client.SubmitProofRequest{
 		TaskID:      task.Task.ID,
@@ -351,16 +348,13 @@ func (r *Prover) submitErr(task *store.ProvingTask, proofFailureType message.Pro
 
 	// send the submit request
 	if submitErr := r.coordinatorClient.SubmitProof(r.ctx, req); submitErr != nil {
-		if !errors.Is(errors.Unwrap(err), client.ErrCoordinatorConnect) {
+		if !errors.Is(errors.Unwrap(err), client.ConnectErr) {
 			if deleteErr := r.stack.Delete(task.Task.ID); deleteErr != nil {
 				log.Error("prover stack pop failed", "task_type", task.Task.Type, "task_id", task.Task.ID, "err", deleteErr)
 			}
 		}
 		return fmt.Errorf("error submitting proof: %v", submitErr)
 	}
-	if deleteErr := r.stack.Delete(task.Task.ID); deleteErr != nil {
-		log.Error("prover stack pop failed", "task_type", task.Task.Type, "task_id", task.Task.ID, "err", deleteErr)
-	}
 
 	log.Info("proof submitted report failure successfully",
 		"task-id", task.Task.ID, "task-type", task.Task.Type,