From fdc6ac9a31ab018720effe41bbf600776391313b Mon Sep 17 00:00:00 2001 From: Zhuo Zhang Date: Sun, 7 Apr 2024 07:30:36 +0000 Subject: [PATCH 1/4] chore(libzkp): upgrade to v0.9.13, support next hard fork --- .../circuitcapacitychecker/libzkp/Cargo.lock | 22 +++++++++---------- .../circuitcapacitychecker/libzkp/Cargo.toml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rollup/circuitcapacitychecker/libzkp/Cargo.lock b/rollup/circuitcapacitychecker/libzkp/Cargo.lock index daa2c88950f5..a924da0826e3 100644 --- a/rollup/circuitcapacitychecker/libzkp/Cargo.lock +++ b/rollup/circuitcapacitychecker/libzkp/Cargo.lock @@ -16,7 +16,7 @@ dependencies = [ [[package]] name = "aggregator" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.10#c625e056ab50582c8c9c662fd2ae1457ef707cc0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.13#3ba956181c48e0031b58d9926e74a5ef974acfc7" dependencies = [ "ark-std", "env_logger 0.10.0", @@ -297,7 +297,7 @@ checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" [[package]] name = "bus-mapping" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.10#c625e056ab50582c8c9c662fd2ae1457ef707cc0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.13#3ba956181c48e0031b58d9926e74a5ef974acfc7" dependencies = [ "eth-types", "ethers-core", @@ -971,7 +971,7 @@ dependencies = [ [[package]] name = "eth-types" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.10#c625e056ab50582c8c9c662fd2ae1457ef707cc0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.13#3ba956181c48e0031b58d9926e74a5ef974acfc7" dependencies = [ "ethers-core", "ethers-signers", @@ -1128,7 +1128,7 @@ dependencies = [ [[package]] name = "external-tracer" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.10#c625e056ab50582c8c9c662fd2ae1457ef707cc0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.13#3ba956181c48e0031b58d9926e74a5ef974acfc7" dependencies = [ "eth-types", "geth-utils", @@ -1308,7 +1308,7 @@ dependencies = [ [[package]] name = "gadgets" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.10#c625e056ab50582c8c9c662fd2ae1457ef707cc0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.13#3ba956181c48e0031b58d9926e74a5ef974acfc7" dependencies = [ "digest 0.7.6", "eth-types", @@ -1340,7 +1340,7 @@ dependencies = [ [[package]] name = "geth-utils" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.10#c625e056ab50582c8c9c662fd2ae1457ef707cc0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.13#3ba956181c48e0031b58d9926e74a5ef974acfc7" dependencies = [ "env_logger 0.9.3", "gobuild 0.1.0-alpha.2 (git+https://github.com/scroll-tech/gobuild.git)", @@ -1949,7 +1949,7 @@ dependencies = [ [[package]] name = "keccak256" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.10#c625e056ab50582c8c9c662fd2ae1457ef707cc0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.13#3ba956181c48e0031b58d9926e74a5ef974acfc7" dependencies = [ "env_logger 0.9.3", "eth-types", @@ -2157,7 +2157,7 @@ dependencies = [ [[package]] name = "mock" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.10#c625e056ab50582c8c9c662fd2ae1457ef707cc0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.13#3ba956181c48e0031b58d9926e74a5ef974acfc7" dependencies = [ "eth-types", "ethers-core", @@ -2173,7 +2173,7 @@ dependencies = [ [[package]] name = "mpt-zktrie" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.10#c625e056ab50582c8c9c662fd2ae1457ef707cc0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.13#3ba956181c48e0031b58d9926e74a5ef974acfc7" dependencies = [ "eth-types", "halo2-mpt-circuits", @@ -2595,7 +2595,7 @@ dependencies = [ [[package]] name = "prover" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.10#c625e056ab50582c8c9c662fd2ae1457ef707cc0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.13#3ba956181c48e0031b58d9926e74a5ef974acfc7" dependencies = [ "aggregator", "anyhow", @@ -4212,7 +4212,7 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" [[package]] name = "zkevm-circuits" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.10#c625e056ab50582c8c9c662fd2ae1457ef707cc0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.13#3ba956181c48e0031b58d9926e74a5ef974acfc7" dependencies = [ "array-init", "bus-mapping", diff --git a/rollup/circuitcapacitychecker/libzkp/Cargo.toml b/rollup/circuitcapacitychecker/libzkp/Cargo.toml index 2783834e27fc..e479b8f7b446 100644 --- a/rollup/circuitcapacitychecker/libzkp/Cargo.toml +++ b/rollup/circuitcapacitychecker/libzkp/Cargo.toml @@ -20,7 +20,7 @@ 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/zkevm-circuits.git", tag = "v0.9.10", default-features = false, features = ["parallel_syn", "scroll", "shanghai", "strict-ccc"] } +prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.9.13", default-features = false, features = ["parallel_syn", "scroll", "shanghai", "strict-ccc"] } anyhow = "1.0" log = "0.4" From c129fe8e3054435c0c8a05ef0b2074f014a882a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Garamv=C3=B6lgyi?= Date: Mon, 8 Apr 2024 10:55:01 +0800 Subject: [PATCH 2/4] bump version --- params/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/version.go b/params/version.go index 498a80425eb9..b673ed574f31 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 5 // Major version component of the current release VersionMinor = 1 // Minor version component of the current release - VersionPatch = 33 // Patch version component of the current release + VersionPatch = 34 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string ) From a7edc5297df82e61e842d3a23b8dc5fb3084a927 Mon Sep 17 00:00:00 2001 From: HAOYUatHZ Date: Mon, 8 Apr 2024 02:56:12 +0000 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20auto=20version=20bump=E2=80=89[bot?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- params/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/version.go b/params/version.go index b673ed574f31..80811cdab523 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 5 // Major version component of the current release VersionMinor = 1 // Minor version component of the current release - VersionPatch = 34 // Patch version component of the current release + VersionPatch = 35 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string ) From e4568b304102d1bfdbaf7de3729296414edcdeec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Garamv=C3=B6lgyi?= Date: Mon, 8 Apr 2024 10:58:02 +0800 Subject: [PATCH 4/4] undo bump version --- params/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/version.go b/params/version.go index 80811cdab523..b673ed574f31 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 5 // Major version component of the current release VersionMinor = 1 // Minor version component of the current release - VersionPatch = 35 // Patch version component of the current release + VersionPatch = 34 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string )