diff --git a/params/version.go b/params/version.go index 03a257259d..a65d5c9c02 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 = 7 // Patch version component of the current release + VersionPatch = 8 // 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 43b1736549..a0ffec9a94 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#82fc8ae1176d092227bdc946702b86ed2ca545e4" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" 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#82fc8ae1176d092227bdc946702b86ed2ca545e4" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" 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#82fc8ae1176d092227bdc946702b86ed2ca545e4" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" 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#82fc8ae1176d092227bdc946702b86ed2ca545e4" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" 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#82fc8ae1176d092227bdc946702b86ed2ca545e4" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" 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#82fc8ae1176d092227bdc946702b86ed2ca545e4" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" dependencies = [ "env_logger 0.9.3", "gobuild 0.1.0-alpha.2 (git+https://github.com/scroll-tech/gobuild.git)", @@ -1617,10 +1617,26 @@ dependencies = [ "serde_json", ] +[[package]] +name = "halo2-gate-generator" +version = "0.1.0" +source = "git+https://github.com/scroll-tech/halo2gategen.git#35b137de2f71c37dfbd236842b868013c46739d1" +dependencies = [ + "halo2_proofs", + "lazy_static", + "num-bigint", + "rand", + "serde", + "serde_json", + "strum", + "strum_macros", + "subtle", +] + [[package]] name = "halo2-mpt-circuits" version = "0.1.0" -source = "git+https://github.com/scroll-tech/mpt-circuit.git?branch=v0.4#9d129125bd792e906c30e56386424bc3ab5920ba" +source = "git+https://github.com/scroll-tech/mpt-circuit.git?branch=v0.5#1c11b6c9b1245073a76c3ce7100b6798060f7cb8" dependencies = [ "ethers-core", "halo2_proofs", @@ -1666,7 +1682,7 @@ dependencies = [ [[package]] name = "halo2curves" version = "0.3.1" -source = "git+https://github.com/scroll-tech/halo2curves.git?branch=0.3.1-derive-serde#c0ac1935e5da2a620204b5b011be2c924b1e0155" +source = "git+https://github.com/scroll-tech/halo2curves.git?branch=0.3.1-derive-serde#969f1e44d9713ee4cd552563bd0c762c5d53b56e" dependencies = [ "ff", "group", @@ -2069,7 +2085,7 @@ dependencies = [ [[package]] name = "keccak256" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#82fc8ae1176d092227bdc946702b86ed2ca545e4" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" dependencies = [ "env_logger 0.9.3", "eth-types", @@ -2269,7 +2285,7 @@ dependencies = [ [[package]] name = "mock" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#82fc8ae1176d092227bdc946702b86ed2ca545e4" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" dependencies = [ "eth-types", "ethers-core", @@ -2284,7 +2300,7 @@ dependencies = [ [[package]] name = "mpt-zktrie" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#82fc8ae1176d092227bdc946702b86ed2ca545e4" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" dependencies = [ "bus-mapping", "eth-types", @@ -2633,11 +2649,14 @@ dependencies = [ [[package]] name = "poseidon-circuit" version = "0.1.0" -source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=scroll-dev-0619#50015b7cfbd5fe3263ec683cb291396c1b99cd1f" +source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=scroll-dev-0723#1652d54bf7ca9d8f286b53fe077d9efefdcf6d5f" dependencies = [ "bitvec 1.0.1", "halo2_proofs", "lazy_static", + "log", + "rand", + "rand_xorshift", "thiserror", ] @@ -2748,7 +2767,7 @@ dependencies = [ [[package]] name = "prover" version = "0.4.0" -source = "git+https://github.com/scroll-tech/scroll-prover?rev=26e9cf7#26e9cf7a0bc76f5559bbbab5ac28a3e850ddce92" +source = "git+https://github.com/scroll-tech/scroll-prover?rev=09f24c5#09f24c523cb77dab76896157ca9a7f34cd2434dd" dependencies = [ "aggregator", "anyhow", @@ -3134,6 +3153,23 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "rmd160-circuits" +version = "0.1.0" +source = "git+https://github.com/scroll-tech/misc-precompiled-circuit.git?branch=integration#31c41ca4365dcf2b6ed4f2cdcd3dc8d2e8f080df" +dependencies = [ + "halo2-gate-generator", + "halo2_proofs", + "lazy_static", + "num-bigint", + "rand", + "serde", + "serde_json", + "strum", + "strum_macros", + "subtle", +] + [[package]] name = "ruint" version = "1.8.0" @@ -3567,7 +3603,7 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "snark-verifier" version = "0.1.0" -source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#a530941eb9a6151c46d5546ca818d04bbd286c02" +source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#514f4573d27c81594d74b62c768f139991b32c64" dependencies = [ "bytes", "ethereum-types 0.14.1", @@ -3591,7 +3627,7 @@ dependencies = [ [[package]] name = "snark-verifier-sdk" version = "0.0.1" -source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#a530941eb9a6151c46d5546ca818d04bbd286c02" +source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#514f4573d27c81594d74b62c768f139991b32c64" dependencies = [ "bincode", "env_logger 0.10.0", @@ -3972,7 +4008,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "types" version = "0.4.0" -source = "git+https://github.com/scroll-tech/scroll-prover?rev=26e9cf7#26e9cf7a0bc76f5559bbbab5ac28a3e850ddce92" +source = "git+https://github.com/scroll-tech/scroll-prover?rev=09f24c5#09f24c523cb77dab76896157ca9a7f34cd2434dd" dependencies = [ "base64 0.13.1", "blake2", @@ -4442,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#82fc8ae1176d092227bdc946702b86ed2ca545e4" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#5ae54f4b9c38951a12fbaf5a18a7ae1ef72df14a" dependencies = [ "array-init", "bus-mapping", @@ -4471,6 +4507,8 @@ dependencies = [ "rand_chacha", "rand_xorshift", "rayon", + "rmd160-circuits", + "serde", "serde_json", "sha3 0.10.8", "snark-verifier", @@ -4497,8 +4535,8 @@ dependencies = [ [[package]] name = "zktrie" -version = "0.1.2" -source = "git+https://github.com/scroll-tech/zktrie.git?branch=scroll-dev-0226#1a5562f663a81ff903383db69dc6c9404b63e69d" +version = "0.2.0" +source = "git+https://github.com/scroll-tech/zktrie.git?branch=v0.6#83318659773604fa565e2ebeb810a6d3746f0af4" dependencies = [ "gobuild 0.1.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/rollup/circuitcapacitychecker/libzkp/Cargo.toml b/rollup/circuitcapacitychecker/libzkp/Cargo.toml index 12587ec4ba..a844b3c423 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="26e9cf7" } -types = { git = "https://github.com/scroll-tech/scroll-prover", rev="26e9cf7" } +prover = { git = "https://github.com/scroll-tech/scroll-prover", rev="09f24c5" } +types = { git = "https://github.com/scroll-tech/scroll-prover", rev="09f24c5" } log = "0.4" env_logger = "0.9.0"