Merge branch 'develop' into fix-do-not-bump-gas-price-for-nonce-gappe…

…d-transactions

common/types/db.go

@@ -109,6 +109,10 @@ const (
  ProverTaskFailureTypeVerifiedFailed
  // ProverTaskFailureTypeServerError collect occur error
  ProverTaskFailureTypeServerError
+ // ProverTaskFailureTypeObjectAlreadyVerified object(batch/chunk) already verified, may exists in test env when ENABLE_TEST_ENV_BYPASS_FEATURES is true
+ ProverTaskFailureTypeObjectAlreadyVerified
+ // ProverTaskFailureTypeReassignedByAdmin reassigned by admin, this value is used in admin-system and defined here for clarity
+ ProverTaskFailureTypeReassignedByAdmin
 )
 
 func (r ProverTaskFailureType) String() string {
@@ -123,6 +127,10 @@ func (r ProverTaskFailureType) String() string {
  return "prover task failure verified failed"
  case ProverTaskFailureTypeServerError:
  return "prover task failure server exception"
+ case ProverTaskFailureTypeObjectAlreadyVerified:
+ return "prover task failure object already verified"
+ case ProverTaskFailureTypeReassignedByAdmin:
+ return "prover task failure reassigned by admin"
  default:
  return fmt.Sprintf("illegal prover task failure type (%d)", int32(r))
  }

coordinator/internal/logic/submitproof/proof_receiver.go

@@ -284,6 +284,8 @@ func (m *ProofReceiverLogic) validator(ctx context.Context, proverTask *orm.Prov
 
  // if the batch/chunk have proved and verifier success, need skip this submit proof
  if m.checkIsTaskSuccess(ctx, proofMsg.ID, proofMsg.Type) {
+ m.proofRecover(ctx, proverTask, types.ProverTaskFailureTypeObjectAlreadyVerified, proofMsg)
+
  m.validateFailureProverTaskHaveVerifier.Inc()
  log.Info("the prove task have proved and verifier success, skip this submit proof", "hash", proofMsg.ID,
  "taskType", proverTask.TaskType, "proverName", proverTask.ProverName, "proverPublicKey", pk, "forkName", forkName)