Merge branch 'feat/upgrade4' of github.com:scroll-tech/scroll into fe…

…at/upgrade4_mock

common/libzkp/impl/Cargo.toml

@@ -29,7 +29,7 @@ snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", br
 # curie
 prover_v3 = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.11.4", package = "prover", default-features = false, features = ["parallel_syn", "scroll"] }
 # darwin
-prover_v4 = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "feat/agg_recursion", package = "prover", default-features = false, features = ["parallel_syn", "scroll"] }
+prover_v4 = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.12.0-rc.2", package = "prover", default-features = false, features = ["parallel_syn", "scroll"] }
 
 base64 = "0.13.0"
 env_logger = "0.9.0"

rollup/internal/controller/relayer/l2_relayer.go

@@ -460,10 +460,14 @@ func (r *Layer2Relayer) ProcessPendingBundles() {
 	r.metrics.rollupL2RelayerProcessPendingBundlesTotal.Inc()
 
 	bundle, err := r.bundleOrm.GetFirstPendingBundle(r.ctx)
+	if bundle == nil && err == nil {
+		return
+	}
 	if err != nil {
 		log.Error("Failed to fetch first pending L2 bundle", "err", err)
 		return
 	}
+
 	status := types.ProvingStatus(bundle.ProvingStatus)
 	switch status {
 	case types.ProvingTaskUnassigned, types.ProvingTaskAssigned:

rollup/internal/orm/bundle.go

@@ -126,6 +126,9 @@ func (o *Bundle) GetFirstPendingBundle(ctx context.Context) (*Bundle, error) {
 
 	var pendingBundle Bundle
 	if err := db.First(&pendingBundle).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, nil
+		}
 		return nil, fmt.Errorf("Bundle.GetFirstPendingBundle error: %w", err)
 	}
 	return &pendingBundle, nil