bump version

Cargo.lock

@@ -8767,7 +8767,7 @@ dependencies = [
 [[package]]
 name = "scroll-zkvm-prover"
 version = "0.7.1"
-source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.7.1#85dc6bc56728b8eef22281fdb215c136d7b5bbda"
+source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#ba9ff25b55feb9d2ec1eeae49650b43699126a04"
 dependencies = [
  "base64 0.22.1",
  "bincode 1.3.3",
@@ -8794,7 +8794,7 @@ dependencies = [
 [[package]]
 name = "scroll-zkvm-types"
 version = "0.7.1"
-source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.7.1#85dc6bc56728b8eef22281fdb215c136d7b5bbda"
+source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#ba9ff25b55feb9d2ec1eeae49650b43699126a04"
 dependencies = [
  "alloy-primitives",
  "base64 0.22.1",
@@ -8818,7 +8818,7 @@ dependencies = [
 [[package]]
 name = "scroll-zkvm-types-base"
 version = "0.7.1"
-source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.7.1#85dc6bc56728b8eef22281fdb215c136d7b5bbda"
+source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#ba9ff25b55feb9d2ec1eeae49650b43699126a04"
 dependencies = [
  "alloy-primitives",
  "alloy-serde 1.0.41",
@@ -8831,7 +8831,7 @@ dependencies = [
 [[package]]
 name = "scroll-zkvm-types-batch"
 version = "0.7.1"
-source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.7.1#85dc6bc56728b8eef22281fdb215c136d7b5bbda"
+source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#ba9ff25b55feb9d2ec1eeae49650b43699126a04"
 dependencies = [
  "alloy-primitives",
  "c-kzg",
@@ -8853,7 +8853,7 @@ dependencies = [
 [[package]]
 name = "scroll-zkvm-types-bundle"
 version = "0.7.1"
-source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.7.1#85dc6bc56728b8eef22281fdb215c136d7b5bbda"
+source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#ba9ff25b55feb9d2ec1eeae49650b43699126a04"
 dependencies = [
  "rkyv",
  "scroll-zkvm-types-base",
@@ -8863,7 +8863,7 @@ dependencies = [
 [[package]]
 name = "scroll-zkvm-types-chunk"
 version = "0.7.1"
-source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.7.1#85dc6bc56728b8eef22281fdb215c136d7b5bbda"
+source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#ba9ff25b55feb9d2ec1eeae49650b43699126a04"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -8888,7 +8888,7 @@ dependencies = [
 [[package]]
 name = "scroll-zkvm-verifier"
 version = "0.7.1"
-source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.7.1#85dc6bc56728b8eef22281fdb215c136d7b5bbda"
+source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#ba9ff25b55feb9d2ec1eeae49650b43699126a04"
 dependencies = [
  "bincode 1.3.3",
  "eyre",

Cargo.toml

@@ -17,9 +17,9 @@ repository = "https://github.com/scroll-tech/scroll"
 version = "4.7.1"
 
 [workspace.dependencies]
-scroll-zkvm-prover = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.1" }
-scroll-zkvm-verifier = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.1" }
-scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.1" }
+scroll-zkvm-prover = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/galileo-v2" }
+scroll-zkvm-verifier = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/galileo-v2" }
+scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/galileo-v2" }
 
 sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91.2", features = ["scroll", "rkyv"] }
 sbv-utils = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91.2" }

common/version/version.go

@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "v4.7.10"
+var tag = "v4.7.9"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

coordinator/internal/logic/submitproof/proof_receiver.go

@@ -155,7 +155,7 @@ func NewSubmitProofReceiverLogic(cfg *config.ProverManager, chainCfg *params.Cha
 // HandleZkProof handle a ZkProof submitted from a prover.
 // For now only proving/verifying error will lead to setting status as skipped.
 // db/unmarshal errors will not because they are errors on the business logic side.
-func (m *ProofReceiverLogic) HandleZkProof(ctx *gin.Context, proofParameter coordinatorType.SubmitProofParameter) (rerr error) {
+func (m *ProofReceiverLogic) HandleZkProof(ctx *gin.Context, proofParameter coordinatorType.SubmitProofParameter) error {
 	m.proofReceivedTotal.Inc()
 	pk := ctx.GetString(coordinatorType.PublicKey)
 	if len(pk) == 0 {
@@ -172,18 +172,6 @@ func (m *ProofReceiverLogic) HandleZkProof(ctx *gin.Context, proofParameter coor
 		return ErrValidatorFailureProverTaskEmpty
 	}
 
-	defer func() {
-		if rerr != nil && types.ProverProveStatus(proverTask.ProvingStatus) == types.ProverAssigned {
-			// trigger a last-chance closing of current task if some routine had missed it
-			log.Warn("last chance proof recover triggerred",
-				"proofID", proofParameter.TaskID,
-				"err", rerr,
-			)
-			m.proofRecover(ctx.Copy(), proverTask, types.ProverTaskFailureTypeUndefined, proofParameter)
-		}
-
-	}()
-
 	proofTime := time.Since(proverTask.CreatedAt)
 	proofTimeSec := uint64(proofTime.Seconds())
 
@@ -323,20 +311,6 @@ func (m *ProofReceiverLogic) validator(ctx context.Context, proverTask *orm.Prov
 		}
 	}()
 
-	// Internally we overide the timeout failure:
-	// if prover task FailureType is SessionInfoFailureTimeout, the submit proof is timeout, but we still accept it
-	if types.ProverProveStatus(proverTask.ProvingStatus) == types.ProverProofInvalid &&
-		types.ProverTaskFailureType(proverTask.FailureType) == types.ProverTaskFailureTypeTimeout {
-		m.validateFailureProverTaskTimeout.Inc()
-		proverTask.ProvingStatus = int16(types.ProverAssigned)
-
-		proofTime := time.Since(proverTask.CreatedAt)
-		proofTimeSec := uint64(proofTime.Seconds())
-		log.Warn("proof submit proof have timeout", "hash", proofParameter.TaskID, "taskType", proverTask.TaskType,
-			"proverName", proverTask.ProverName, "proverPublicKey", pk, "proofTime", proofTimeSec)
-
-	}
-
 	// Ensure this prover is eligible to participate in the prover task.
 	if types.ProverProveStatus(proverTask.ProvingStatus) == types.ProverProofValid ||
 		types.ProverProveStatus(proverTask.ProvingStatus) == types.ProverProofInvalid {
@@ -354,6 +328,9 @@ func (m *ProofReceiverLogic) validator(ctx context.Context, proverTask *orm.Prov
 		return ErrValidatorFailureProverTaskCannotSubmitTwice
 	}
 
+	proofTime := time.Since(proverTask.CreatedAt)
+	proofTimeSec := uint64(proofTime.Seconds())
+
 	if proofParameter.Status != int(coordinatorType.StatusOk) {
 		// Temporarily replace "panic" with "pa-nic" to prevent triggering the alert based on logs.
 		failureMsg := strings.Replace(proofParameter.FailureMsg, "panic", "pa-nic", -1)
@@ -369,6 +346,14 @@ func (m *ProofReceiverLogic) validator(ctx context.Context, proverTask *orm.Prov
 		return ErrValidatorFailureProofMsgStatusNotOk
 	}
 
+	// if prover task FailureType is SessionInfoFailureTimeout, the submit proof is timeout, need skip it
+	if types.ProverTaskFailureType(proverTask.FailureType) == types.ProverTaskFailureTypeTimeout {
+		m.validateFailureProverTaskTimeout.Inc()
+		log.Info("proof submit proof have timeout, skip this submit proof", "hash", proofParameter.TaskID, "taskType", proverTask.TaskType,
+			"proverName", proverTask.ProverName, "proverPublicKey", pk, "proofTime", proofTimeSec)
+		return ErrValidatorFailureProofTimeout
+	}
+
 	// store the proof to prover task
 	if updateTaskProofErr := m.updateProverTaskProof(ctx, proverTask, proofParameter); updateTaskProofErr != nil {
 		log.Warn("update prover task proof failure", "hash", proofParameter.TaskID, "proverPublicKey", pk,
@@ -383,7 +368,6 @@ func (m *ProofReceiverLogic) validator(ctx context.Context, proverTask *orm.Prov
 			"taskType", proverTask.TaskType, "proverName", proverTask.ProverName, "proverPublicKey", pk)
 		return ErrValidatorFailureTaskHaveVerifiedSuccess
 	}
-
 	return nil
 }
 
@@ -400,7 +384,7 @@ func (m *ProofReceiverLogic) closeProofTask(ctx context.Context, proverTask *orm
 	log.Info("proof close task update proof status", "hash", proverTask.TaskID, "proverPublicKey", proverTask.ProverPublicKey,
 		"taskType", message.ProofType(proverTask.TaskType).String(), "status", types.ProvingTaskVerified.String())
 
-	if err := m.updateProofStatus(ctx, proverTask, proofParameter, types.ProverProofValid, types.ProverTaskFailureType(proverTask.FailureType), proofTimeSec); err != nil {
+	if err := m.updateProofStatus(ctx, proverTask, proofParameter, types.ProverProofValid, types.ProverTaskFailureTypeUndefined, proofTimeSec); err != nil {
 		log.Error("failed to updated proof status ProvingTaskVerified", "hash", proverTask.TaskID, "proverPublicKey", proverTask.ProverPublicKey, "error", err)
 		return err
 	}
@@ -461,9 +445,6 @@ func (m *ProofReceiverLogic) updateProofStatus(ctx context.Context, proverTask *
 	if err != nil {
 		return err
 	}
-	// sync status and failture type into proverTask
-	proverTask.ProvingStatus = int16(status)
-	proverTask.FailureType = int16(failureType)
 
 	if status == types.ProverProofValid && message.ProofType(proofParameter.TaskType) == message.ProofTypeChunk {
 		if checkReadyErr := m.checkAreAllChunkProofsReady(ctx, proverTask.TaskID); checkReadyErr != nil {

crates/libzkp/src/tasks/batch.rs

@@ -29,7 +29,7 @@ pub struct BatchHeaderValidiumWithHash {
 /// Parse header types passed from golang side and adapt to the
 /// definition in zkvm-prover's types
 /// We distinguish the header type in golang side according to the STF
-/// version, i.e. v6, v7-v10 (current), and validium
+/// version, i.e. v6 - v10 (current), and validium
 /// And adapt it to the corresponding batch header type used in zkvm-prover's witness
 /// definition, i.e. v6, v7 (current), and validium
 #[derive(Clone, serde::Deserialize, serde::Serialize)]
@@ -40,7 +40,7 @@ pub enum BatchHeaderV {
     Validium(BatchHeaderValidiumWithHash),
     /// Header for scroll's STF version v6.
     V6(BatchHeaderV6),
-    /// Header for scroll's STF versions v7 - v10.
+    /// Header for scroll's STF versions v7 - V10.
     ///
     /// Since the codec essentially is unchanged for the above STF versions, we do not define new
     /// variants, instead re-using the [`BatchHeaderV7`] variant.
@@ -73,7 +73,7 @@ impl BatchHeaderV {
         }
     }
 
-    pub fn to_zkvm_batch_header_v7_to_v10(&self) -> &BatchHeaderV7 {
+    pub fn to_zkvm_batch_header_v7_to_v9(&self) -> &BatchHeaderV7 {
         match self {
             BatchHeaderV::V7_to_V10(h) => h,
             _ => unreachable!(
@@ -159,7 +159,7 @@ impl BatchProvingTask {
             ),
             BatchHeaderV::V7_to_V10(_) => assert!(
                 matches!(version.fork, ForkName::EuclidV2 | ForkName::Feynman | ForkName::Galileo | ForkName::GalileoV2),
-                "hardfork mismatch for da-codec@v7/8/9/10 header: found={}, expected={:?}",
+                "hardfork mismatch for da-codec@v7/8/9 header: found={}, expected={:?}",
                 version.fork,
                 [ForkName::EuclidV2, ForkName::Feynman, ForkName::Galileo, ForkName::GalileoV2],
             ),
@@ -233,21 +233,20 @@ impl BatchProvingTask {
             (Domain::Scroll, STFVersion::V6) => {
                 ReferenceHeader::V6(*self.batch_header.to_zkvm_batch_header_v6())
             }
-            // The da-codec for STF versions v7, v8, v9, v10 is identical. In zkvm-prover we do not
+            // The da-codec for STF versions v7, v8, v9 is identical. In zkvm-prover we do not
             // create additional variants to indicate the identical behaviour of codec. Instead we
             // add a separate variant for the STF version.
             //
             // We handle the different STF versions here however build the same batch header since
             // that type does not change. The batch header's version byte constructed in the
-            // coordinator actually defines the STF version (v7, v8 or v9, v10) and we can derive
-            // the hard-fork (e.g. feynman or galileo) and the codec from the version
-            // byte.
+            // coordinator actually defines the STF version (v7, v8 or v9) and we can derive the
+            // hard-fork (feynman or galileo) and the codec from the version byte.
             //
             // Refer [`scroll_zkvm_types::public_inputs::Version`].
             (
                 Domain::Scroll,
                 STFVersion::V7 | STFVersion::V8 | STFVersion::V9 | STFVersion::V10,
-            ) => ReferenceHeader::V7_V8_V9(*self.batch_header.to_zkvm_batch_header_v7_to_v10()),
+            ) => ReferenceHeader::V7_V8_V9(*self.batch_header.to_zkvm_batch_header_v7_to_v9()),
             (Domain::Validium, STFVersion::V1) => {
                 ReferenceHeader::Validium(*self.batch_header.to_zkvm_batch_header_validium())
             }

rollup/conf/config.json

@@ -58,8 +58,7 @@
         "min_batches": 1,
         "max_batches": 6,
         "timeout": 7200,
-        "backlog_max": 75,
-        "blob_fee_tolerance": 500000000
+        "backlog_max": 75
       },
       "gas_oracle_config": {
         "min_gas_price": 0,

rollup/internal/config/relayer.go

@@ -48,10 +48,6 @@ type BatchSubmission struct {
 	TimeoutSec int64 `json:"timeout"`
 	// The maximum number of pending batches to keep in the backlog.
 	BacklogMax int64 `json:"backlog_max"`
-	// BlobFeeTolerance is the absolute tolerance (in wei) added to the target blob fee.
-	// If the current fee is below target + tolerance, we proceed with submission.
-	// This prevents skipping submission when the price difference is negligible.
-	BlobFeeTolerance uint64 `json:"blob_fee_tolerance"`
 }
 
 // ChainMonitor this config is used to get batch status from chain_monitor API.

rollup/internal/controller/relayer/l2_relayer.go

@@ -1255,20 +1255,16 @@ func (r *Layer2Relayer) skipSubmitByFee(oldest time.Time, metrics *l2RelayerMetr
 	target := calculateTargetPrice(windowSec, r.batchStrategy, oldest, hist)
 	current := hist[len(hist)-1]
 
-	// apply absolute tolerance offset to target
-	tolerance := new(big.Int).SetUint64(r.cfg.BatchSubmission.BlobFeeTolerance)
-	threshold := new(big.Int).Add(target, tolerance)
-
 	currentFloat, _ := current.Float64()
 	targetFloat, _ := target.Float64()
 	metrics.rollupL2RelayerCurrentBlobPrice.Set(currentFloat)
 	metrics.rollupL2RelayerTargetBlobPrice.Set(targetFloat)
 
-	// if current fee > threshold (target + tolerance) and still inside the timeout window, skip
-	if current.Cmp(threshold) > 0 && time.Since(oldest) < time.Duration(windowSec)*time.Second {
+	// if current fee > target and still inside the timeout window, skip
+	if current.Cmp(target) > 0 && time.Since(oldest) < time.Duration(windowSec)*time.Second {
 		return true, fmt.Errorf(
-			"blob-fee above threshold & window not yet passed; current=%s target=%s threshold=%s tolerance=%s age=%s",
-			current.String(), target.String(), threshold.String(), tolerance.String(), time.Since(oldest),
+			"blob-fee above target & window not yet passed; current=%s target=%s age=%s",
+			current.String(), target.String(), time.Since(oldest),
 		)
 	}