From 7238b9db9a83434eec5905f6bf5cb3f3df235a9a Mon Sep 17 00:00:00 2001 From: Steven Gu Date: Fri, 18 Aug 2023 04:57:47 +0800 Subject: [PATCH] Release `v0.6.0`. --- Cargo.lock | 77 ++++++++++++++++++++++++++++++++++------------- Cargo.toml | 4 +++ prover/Cargo.toml | 12 ++++---- types/Cargo.toml | 2 +- 4 files changed, 67 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 717d8cd37..24dd4e24c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,7 +23,7 @@ dependencies = [ [[package]] name = "aggregator" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.0#a89e567f6c87fa85278e65803b7f40967f2c134c" dependencies = [ "ark-std", "env_logger 0.10.0", @@ -419,7 +419,7 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "bus-mapping" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.0#a89e567f6c87fa85278e65803b7f40967f2c134c" dependencies = [ "eth-types", "ethers-core 0.17.0", @@ -982,9 +982,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" @@ -1122,7 +1122,7 @@ dependencies = [ [[package]] name = "eth-types" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.0#a89e567f6c87fa85278e65803b7f40967f2c134c" dependencies = [ "ethers-core 0.17.0", "ethers-signers", @@ -1387,7 +1387,7 @@ dependencies = [ [[package]] name = "external-tracer" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.0#a89e567f6c87fa85278e65803b7f40967f2c134c" dependencies = [ "eth-types", "geth-utils", @@ -1600,7 +1600,7 @@ dependencies = [ [[package]] name = "gadgets" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.0#a89e567f6c87fa85278e65803b7f40967f2c134c" dependencies = [ "digest 0.7.6", "eth-types", @@ -1640,7 +1640,7 @@ dependencies = [ [[package]] name = "geth-utils" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.0#a89e567f6c87fa85278e65803b7f40967f2c134c" dependencies = [ "env_logger 0.9.3", "gobuild 0.1.0-alpha.2 (git+https://github.com/scroll-tech/gobuild.git)", @@ -1750,6 +1750,21 @@ dependencies = [ "rustc-hash", ] +[[package]] +name = "halo2-base" +version = "0.2.2" +source = "git+https://github.com/scroll-tech/halo2-lib?branch=develop#2c225864227e74b207d9f4b9e08c4d5f1afc69a1" +dependencies = [ + "ff", + "halo2_proofs", + "itertools", + "num-bigint", + "num-integer", + "num-traits", + "rand_chacha", + "rustc-hash", +] + [[package]] name = "halo2-ecc" version = "0.2.2" @@ -1757,7 +1772,26 @@ source = "git+https://github.com/scroll-tech/halo2-lib?tag=v0.1.0#2c225864227e74 dependencies = [ "ff", "group", - "halo2-base", + "halo2-base 0.2.2 (git+https://github.com/scroll-tech/halo2-lib?tag=v0.1.0)", + "itertools", + "num-bigint", + "num-integer", + "num-traits", + "rand", + "rand_chacha", + "rand_core", + "serde", + "serde_json", +] + +[[package]] +name = "halo2-ecc" +version = "0.2.2" +source = "git+https://github.com/scroll-tech/halo2-lib?branch=develop#2c225864227e74b207d9f4b9e08c4d5f1afc69a1" +dependencies = [ + "ff", + "group", + "halo2-base 0.2.2 (git+https://github.com/scroll-tech/halo2-lib?branch=develop)", "itertools", "num-bigint", "num-integer", @@ -1788,7 +1822,7 @@ dependencies = [ [[package]] name = "halo2-mpt-circuits" version = "0.1.0" -source = "git+https://github.com/scroll-tech/mpt-circuit.git?tag=v0.5.0#1c11b6c9b1245073a76c3ce7100b6798060f7cb8" +source = "git+https://github.com/scroll-tech/mpt-circuit.git?branch=v0.5#2163a9c436ed85363c954ecf7e6e1044a1b991dc" dependencies = [ "ethers-core 0.17.0", "halo2_proofs", @@ -2246,7 +2280,7 @@ dependencies = [ [[package]] name = "keccak256" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.0#a89e567f6c87fa85278e65803b7f40967f2c134c" dependencies = [ "env_logger 0.9.3", "eth-types", @@ -2446,7 +2480,7 @@ dependencies = [ [[package]] name = "mock" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.0#a89e567f6c87fa85278e65803b7f40967f2c134c" dependencies = [ "eth-types", "ethers-core 0.17.0", @@ -2461,7 +2495,7 @@ dependencies = [ [[package]] name = "mpt-zktrie" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.0#a89e567f6c87fa85278e65803b7f40967f2c134c" dependencies = [ "bus-mapping", "eth-types", @@ -3820,12 +3854,12 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "snark-verifier" version = "0.1.0" -source = "git+https://github.com/scroll-tech/snark-verifier?tag=v0.1.1#11a09d4a37c31c659b29e2dac0ceb544a776ad7b" +source = "git+https://github.com/scroll-tech//snark-verifier?tag=v0.1.1#11a09d4a37c31c659b29e2dac0ceb544a776ad7b" dependencies = [ "bytes", "ethereum-types 0.14.1", - "halo2-base", - "halo2-ecc", + "halo2-base 0.2.2 (git+https://github.com/scroll-tech/halo2-lib?tag=v0.1.0)", + "halo2-ecc 0.2.2 (git+https://github.com/scroll-tech/halo2-lib?tag=v0.1.0)", "hex", "itertools", "lazy_static", @@ -3844,12 +3878,12 @@ dependencies = [ [[package]] name = "snark-verifier-sdk" version = "0.0.1" -source = "git+https://github.com/scroll-tech/snark-verifier?tag=v0.1.1#11a09d4a37c31c659b29e2dac0ceb544a776ad7b" +source = "git+https://github.com/scroll-tech//snark-verifier?tag=v0.1.1#11a09d4a37c31c659b29e2dac0ceb544a776ad7b" dependencies = [ "bincode", "env_logger 0.10.0", "ethereum-types 0.14.1", - "halo2-base", + "halo2-base 0.2.2 (git+https://github.com/scroll-tech/halo2-lib?tag=v0.1.0)", "hex", "itertools", "lazy_static", @@ -4712,17 +4746,18 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" [[package]] name = "zkevm-circuits" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.21#dec61b750e052d2903313993804cbb143edef911" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.0#a89e567f6c87fa85278e65803b7f40967f2c134c" dependencies = [ "array-init", "bus-mapping", + "either", "env_logger 0.9.3", "eth-types", "ethers-core 0.17.0", "ethers-signers", "gadgets", - "halo2-base", - "halo2-ecc", + "halo2-base 0.2.2 (git+https://github.com/scroll-tech/halo2-lib?branch=develop)", + "halo2-ecc 0.2.2 (git+https://github.com/scroll-tech/halo2-lib?branch=develop)", "halo2_proofs", "hex", "itertools", diff --git a/Cargo.toml b/Cargo.toml index 6fa56ab89..022ffa133 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,6 +17,10 @@ maingate = { git = "https://github.com/scroll-tech/halo2wrong", branch = "halo2- [patch."https://github.com/privacy-scaling-explorations/halo2curves.git"] halo2curves = { git = "https://github.com/scroll-tech/halo2curves.git", branch = "0.3.1-derive-serde" } +[patch."https://github.com/scroll-tech/snark-verifier"] +snark-verifier = { git = "https://github.com/scroll-tech//snark-verifier", tag = "v0.1.1" } +snark-verifier-sdk = { git = "https://github.com/scroll-tech//snark-verifier", tag = "v0.1.1" } + [profile.test] opt-level = 3 #debug-assertions = true diff --git a/prover/Cargo.toml b/prover/Cargo.toml index fea7b5b4c..e551fd17b 100644 --- a/prover/Cargo.toml +++ b/prover/Cargo.toml @@ -8,12 +8,12 @@ edition = "2021" [dependencies] halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_02_02" } -aggregator = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.21" } -bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.21" } -eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.21" } -zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.21", default-features = false, features = ["test","scroll","scroll-trace","shanghai"] } -mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.21" } -mock = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.21" } +aggregator = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.6.0" } +bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.6.0" } +eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.6.0" } +zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.6.0", default-features = false, features = ["test","scroll","scroll-trace","shanghai"] } +mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.6.0" } +mock = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.6.0" } snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.1" } snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.1" } diff --git a/types/Cargo.toml b/types/Cargo.toml index 63ef574e4..87678dc3e 100644 --- a/types/Cargo.toml +++ b/types/Cargo.toml @@ -4,7 +4,7 @@ version = "0.4.0" edition = "2021" [dependencies] -eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.21" } +eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.6.0" } base64 = "0.13.0" blake2 = "0.10.3" ethers-core = "0.17.0"