From 8f431845c3ff00f803c14ebdfd31a207115177ae Mon Sep 17 00:00:00 2001 From: Steven Date: Sun, 6 Aug 2023 20:02:51 +0800 Subject: [PATCH] fix: upgrade libzkp to use scroll-prover `v0.5.3` (#442) Upgrade libzkp to use scroll-prover `v0.5.3`. --- params/version.go | 2 +- .../circuitcapacitychecker/libzkp/Cargo.lock | 30 +++++++++---------- .../circuitcapacitychecker/libzkp/Cargo.toml | 4 +-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/params/version.go b/params/version.go index 7ad6f564928c..f54db44d9680 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 4 // Major version component of the current release VersionMinor = 3 // Minor version component of the current release - VersionPatch = 22 // Patch version component of the current release + VersionPatch = 23 // Patch version component of the current release VersionMeta = "sepolia" // Version metadata to append to the version string ) diff --git a/rollup/circuitcapacitychecker/libzkp/Cargo.lock b/rollup/circuitcapacitychecker/libzkp/Cargo.lock index a0ffec9a948e..14e8d8e01ff3 100644 --- a/rollup/circuitcapacitychecker/libzkp/Cargo.lock +++ b/rollup/circuitcapacitychecker/libzkp/Cargo.lock @@ -23,7 +23,7 @@ dependencies = [ [[package]] name = "aggregator" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "ark-std", "env_logger 0.10.0", @@ -396,7 +396,7 @@ checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" [[package]] name = "bus-mapping" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "eth-types", "ethers-core", @@ -1057,7 +1057,7 @@ dependencies = [ [[package]] name = "eth-types" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "ethers-core", "ethers-signers", @@ -1235,7 +1235,7 @@ dependencies = [ [[package]] name = "external-tracer" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "eth-types", "geth-utils", @@ -1448,7 +1448,7 @@ dependencies = [ [[package]] name = "gadgets" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "digest 0.7.6", "eth-types", @@ -1488,7 +1488,7 @@ dependencies = [ [[package]] name = "geth-utils" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "env_logger 0.9.3", "gobuild 0.1.0-alpha.2 (git+https://github.com/scroll-tech/gobuild.git)", @@ -2085,7 +2085,7 @@ dependencies = [ [[package]] name = "keccak256" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "env_logger 0.9.3", "eth-types", @@ -2285,7 +2285,7 @@ dependencies = [ [[package]] name = "mock" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "eth-types", "ethers-core", @@ -2300,7 +2300,7 @@ dependencies = [ [[package]] name = "mpt-zktrie" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "bus-mapping", "eth-types", @@ -2767,7 +2767,7 @@ dependencies = [ [[package]] name = "prover" version = "0.4.0" -source = "git+https://github.com/scroll-tech/scroll-prover?rev=09f24c5#09f24c523cb77dab76896157ca9a7f34cd2434dd" +source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.3#337089ac40bac756d88b9ae30a3be1f82538b216" dependencies = [ "aggregator", "anyhow", @@ -3177,7 +3177,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d470e29e933dac4101180fd6574971892315c414cf2961a192729089687cc9b" dependencies = [ "derive_more", - "primitive-types 0.12.1", + "primitive-types 0.11.1", "rlp", "ruint-macro", "rustc_version", @@ -3603,7 +3603,7 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "snark-verifier" version = "0.1.0" -source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#514f4573d27c81594d74b62c768f139991b32c64" +source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#12c306ec57849921e690221b10b8a08189868d4a" dependencies = [ "bytes", "ethereum-types 0.14.1", @@ -3627,7 +3627,7 @@ dependencies = [ [[package]] name = "snark-verifier-sdk" version = "0.0.1" -source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#514f4573d27c81594d74b62c768f139991b32c64" +source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#12c306ec57849921e690221b10b8a08189868d4a" dependencies = [ "bincode", "env_logger 0.10.0", @@ -4008,7 +4008,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "types" version = "0.4.0" -source = "git+https://github.com/scroll-tech/scroll-prover?rev=09f24c5#09f24c523cb77dab76896157ca9a7f34cd2434dd" +source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.3#337089ac40bac756d88b9ae30a3be1f82538b216" dependencies = [ "base64 0.13.1", "blake2", @@ -4478,7 +4478,7 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" [[package]] name = "zkevm-circuits" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "array-init", "bus-mapping", diff --git a/rollup/circuitcapacitychecker/libzkp/Cargo.toml b/rollup/circuitcapacitychecker/libzkp/Cargo.toml index 6c8d5b3d0717..a7f34261ffb7 100644 --- a/rollup/circuitcapacitychecker/libzkp/Cargo.toml +++ b/rollup/circuitcapacitychecker/libzkp/Cargo.toml @@ -18,8 +18,8 @@ maingate = { git = "https://github.com/scroll-tech/halo2wrong", branch = "halo2- halo2curves = { git = "https://github.com/scroll-tech/halo2curves.git", branch = "0.3.1-derive-serde" } [dependencies] -prover = { git = "https://github.com/scroll-tech/scroll-prover", rev="09f24c5" } -types = { git = "https://github.com/scroll-tech/scroll-prover", rev="09f24c5" } +prover = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.3" } +types = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.3" } log = "0.4" env_logger = "0.9.0"