From 3716c5a4364560d241d37dc08cc40b60d1a6a449 Mon Sep 17 00:00:00 2001 From: Rohit Narurkar Date: Thu, 18 Jul 2024 03:19:31 +0100 Subject: [PATCH 1/2] bump prover (upgrade #4) (#1437) --- common/libzkp/impl/Cargo.lock | 20 ++++++++++---------- common/libzkp/impl/Cargo.toml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/common/libzkp/impl/Cargo.lock b/common/libzkp/impl/Cargo.lock index 9a2d711bdb..08d67ca9f6 100644 --- a/common/libzkp/impl/Cargo.lock +++ b/common/libzkp/impl/Cargo.lock @@ -65,7 +65,7 @@ dependencies = [ [[package]] name = "aggregator" version = "0.12.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#86158b58907aac1c4c8f43ce9d5b29170d309401" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0-rc.2#86158b58907aac1c4c8f43ce9d5b29170d309401" dependencies = [ "ark-std 0.3.0", "bitstream-io", @@ -598,7 +598,7 @@ dependencies = [ [[package]] name = "bus-mapping" version = "0.12.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#86158b58907aac1c4c8f43ce9d5b29170d309401" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0-rc.2#86158b58907aac1c4c8f43ce9d5b29170d309401" dependencies = [ "eth-types 0.12.0", "ethers-core", @@ -1214,7 +1214,7 @@ dependencies = [ [[package]] name = "eth-types" version = "0.12.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#86158b58907aac1c4c8f43ce9d5b29170d309401" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0-rc.2#86158b58907aac1c4c8f43ce9d5b29170d309401" dependencies = [ "base64 0.13.1", "ethers-core", @@ -1383,7 +1383,7 @@ dependencies = [ [[package]] name = "external-tracer" version = "0.12.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#86158b58907aac1c4c8f43ce9d5b29170d309401" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0-rc.2#86158b58907aac1c4c8f43ce9d5b29170d309401" dependencies = [ "eth-types 0.12.0", "geth-utils 0.12.0", @@ -1577,7 +1577,7 @@ dependencies = [ [[package]] name = "gadgets" version = "0.12.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#86158b58907aac1c4c8f43ce9d5b29170d309401" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0-rc.2#86158b58907aac1c4c8f43ce9d5b29170d309401" dependencies = [ "eth-types 0.12.0", "halo2_proofs", @@ -1610,7 +1610,7 @@ dependencies = [ [[package]] name = "geth-utils" version = "0.12.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#86158b58907aac1c4c8f43ce9d5b29170d309401" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0-rc.2#86158b58907aac1c4c8f43ce9d5b29170d309401" dependencies = [ "env_logger 0.10.0", "gobuild", @@ -2374,7 +2374,7 @@ dependencies = [ [[package]] name = "mock" version = "0.12.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#86158b58907aac1c4c8f43ce9d5b29170d309401" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0-rc.2#86158b58907aac1c4c8f43ce9d5b29170d309401" dependencies = [ "eth-types 0.12.0", "ethers-core", @@ -2403,7 +2403,7 @@ dependencies = [ [[package]] name = "mpt-zktrie" version = "0.12.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#86158b58907aac1c4c8f43ce9d5b29170d309401" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0-rc.2#86158b58907aac1c4c8f43ce9d5b29170d309401" dependencies = [ "eth-types 0.12.0", "halo2curves", @@ -2909,7 +2909,7 @@ dependencies = [ [[package]] name = "prover" version = "0.12.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#86158b58907aac1c4c8f43ce9d5b29170d309401" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0-rc.2#86158b58907aac1c4c8f43ce9d5b29170d309401" dependencies = [ "aggregator 0.12.0", "anyhow", @@ -4588,7 +4588,7 @@ dependencies = [ [[package]] name = "zkevm-circuits" version = "0.12.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#86158b58907aac1c4c8f43ce9d5b29170d309401" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0-rc.2#86158b58907aac1c4c8f43ce9d5b29170d309401" dependencies = [ "array-init", "bus-mapping 0.12.0", diff --git a/common/libzkp/impl/Cargo.toml b/common/libzkp/impl/Cargo.toml index 80e88ec817..ccac9f37db 100644 --- a/common/libzkp/impl/Cargo.toml +++ b/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" From d516949f390c5a0617a45e50ca58d0872a1f164a Mon Sep 17 00:00:00 2001 From: georgehao Date: Thu, 18 Jul 2024 11:38:14 +0800 Subject: [PATCH 2/2] fix ProcessPendingBundles record not found (#1444) --- rollup/internal/controller/relayer/l2_relayer.go | 4 ++++ rollup/internal/orm/bundle.go | 3 +++ 2 files changed, 7 insertions(+) diff --git a/rollup/internal/controller/relayer/l2_relayer.go b/rollup/internal/controller/relayer/l2_relayer.go index 13c7234dc5..5be2aec345 100644 --- a/rollup/internal/controller/relayer/l2_relayer.go +++ b/rollup/internal/controller/relayer/l2_relayer.go @@ -505,10 +505,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: diff --git a/rollup/internal/orm/bundle.go b/rollup/internal/orm/bundle.go index afd861729d..28ed3209bd 100644 --- a/rollup/internal/orm/bundle.go +++ b/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