From 790fc44b405809f321f502e31596e192be269903 Mon Sep 17 00:00:00 2001 From: Zhang Zhuo Date: Wed, 3 Apr 2024 10:54:46 +0800 Subject: [PATCH] chore(libzkp): upgrade to v0.10.0l, fix keccak overflow (#1231) Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> Co-authored-by: HAOYUatHZ --- common/libzkp/impl/Cargo.lock | 22 +++++++++++----------- common/libzkp/impl/Cargo.toml | 2 +- common/version/version.go | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/common/libzkp/impl/Cargo.lock b/common/libzkp/impl/Cargo.lock index 1489d2ef9..fbcda0fcf 100644 --- a/common/libzkp/impl/Cargo.lock +++ b/common/libzkp/impl/Cargo.lock @@ -31,7 +31,7 @@ dependencies = [ [[package]] name = "aggregator" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0k#15cfd66323d45747b093a188569f6a93e6e981a0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0l#837544fb393aa10e6954840494538b1511652bd3" dependencies = [ "ark-std 0.3.0", "c-kzg", @@ -521,7 +521,7 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bus-mapping" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0k#15cfd66323d45747b093a188569f6a93e6e981a0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0l#837544fb393aa10e6954840494538b1511652bd3" dependencies = [ "eth-types", "ethers-core", @@ -1139,7 +1139,7 @@ dependencies = [ [[package]] name = "eth-types" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0k#15cfd66323d45747b093a188569f6a93e6e981a0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0l#837544fb393aa10e6954840494538b1511652bd3" dependencies = [ "base64 0.13.1", "ethers-core", @@ -1293,7 +1293,7 @@ dependencies = [ [[package]] name = "external-tracer" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0k#15cfd66323d45747b093a188569f6a93e6e981a0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0l#837544fb393aa10e6954840494538b1511652bd3" dependencies = [ "eth-types", "geth-utils", @@ -1485,7 +1485,7 @@ dependencies = [ [[package]] name = "gadgets" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0k#15cfd66323d45747b093a188569f6a93e6e981a0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0l#837544fb393aa10e6954840494538b1511652bd3" dependencies = [ "eth-types", "halo2_proofs", @@ -1507,7 +1507,7 @@ dependencies = [ [[package]] name = "geth-utils" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0k#15cfd66323d45747b093a188569f6a93e6e981a0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0l#837544fb393aa10e6954840494538b1511652bd3" dependencies = [ "env_logger 0.10.0", "gobuild", @@ -2142,7 +2142,7 @@ dependencies = [ [[package]] name = "keccak256" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0k#15cfd66323d45747b093a188569f6a93e6e981a0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0l#837544fb393aa10e6954840494538b1511652bd3" dependencies = [ "env_logger 0.10.0", "eth-types", @@ -2292,7 +2292,7 @@ dependencies = [ [[package]] name = "mock" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0k#15cfd66323d45747b093a188569f6a93e6e981a0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0l#837544fb393aa10e6954840494538b1511652bd3" dependencies = [ "eth-types", "ethers-core", @@ -2307,7 +2307,7 @@ dependencies = [ [[package]] name = "mpt-zktrie" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0k#15cfd66323d45747b093a188569f6a93e6e981a0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0l#837544fb393aa10e6954840494538b1511652bd3" dependencies = [ "eth-types", "halo2-mpt-circuits", @@ -2754,7 +2754,7 @@ dependencies = [ [[package]] name = "prover" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0k#15cfd66323d45747b093a188569f6a93e6e981a0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0l#837544fb393aa10e6954840494538b1511652bd3" dependencies = [ "aggregator", "anyhow", @@ -4441,7 +4441,7 @@ dependencies = [ [[package]] name = "zkevm-circuits" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0k#15cfd66323d45747b093a188569f6a93e6e981a0" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.10.0l#837544fb393aa10e6954840494538b1511652bd3" dependencies = [ "array-init", "bus-mapping", diff --git a/common/libzkp/impl/Cargo.toml b/common/libzkp/impl/Cargo.toml index c52dd0902..979202041 100644 --- a/common/libzkp/impl/Cargo.toml +++ b/common/libzkp/impl/Cargo.toml @@ -24,7 +24,7 @@ bls12_381 = { git = "https://github.com/scroll-tech/bls12_381", branch = "feat/i [dependencies] halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.1" } -prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.10.0k", default-features = false, features = ["parallel_syn", "scroll", "shanghai"] } +prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.10.0l", default-features = false, features = ["parallel_syn", "scroll", "shanghai"] } base64 = "0.13.0" env_logger = "0.9.0" diff --git a/common/version/version.go b/common/version/version.go index f333d631b..7f5e397ab 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.3.81" +var tag = "v4.3.82" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok {