diff --git a/common/libzkp/impl/Cargo.lock b/common/libzkp/impl/Cargo.lock index db679f291..772cff4e2 100644 --- a/common/libzkp/impl/Cargo.lock +++ b/common/libzkp/impl/Cargo.lock @@ -32,13 +32,14 @@ dependencies = [ [[package]] name = "aggregator" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.12#554bdcf00334bab45670b8daa72d687a7ff2b919" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0" dependencies = [ "ark-std", "env_logger 0.10.0", "eth-types", "ethers-core", "halo2_proofs", + "hex", "itertools", "log", "rand", @@ -432,7 +433,7 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bus-mapping" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.12#554bdcf00334bab45670b8daa72d687a7ff2b919" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0" dependencies = [ "eth-types", "ethers-core", @@ -1048,7 +1049,7 @@ dependencies = [ [[package]] name = "eth-types" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.12#554bdcf00334bab45670b8daa72d687a7ff2b919" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0" dependencies = [ "ethers-core", "ethers-signers", @@ -1225,7 +1226,7 @@ dependencies = [ [[package]] name = "external-tracer" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.12#554bdcf00334bab45670b8daa72d687a7ff2b919" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0" dependencies = [ "eth-types", "geth-utils", @@ -1438,7 +1439,7 @@ dependencies = [ [[package]] name = "gadgets" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.12#554bdcf00334bab45670b8daa72d687a7ff2b919" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0" dependencies = [ "digest 0.7.6", "eth-types", @@ -1478,7 +1479,7 @@ dependencies = [ [[package]] name = "geth-utils" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.12#554bdcf00334bab45670b8daa72d687a7ff2b919" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0" dependencies = [ "env_logger 0.9.3", "gobuild 0.1.0-alpha.2 (git+https://github.com/scroll-tech/gobuild.git)", @@ -2076,7 +2077,7 @@ dependencies = [ [[package]] name = "keccak256" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.12#554bdcf00334bab45670b8daa72d687a7ff2b919" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0" dependencies = [ "env_logger 0.9.3", "eth-types", @@ -2263,7 +2264,7 @@ dependencies = [ [[package]] name = "mock" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.12#554bdcf00334bab45670b8daa72d687a7ff2b919" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0" dependencies = [ "eth-types", "ethers-core", @@ -2278,7 +2279,7 @@ dependencies = [ [[package]] name = "mpt-zktrie" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.12#554bdcf00334bab45670b8daa72d687a7ff2b919" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0" dependencies = [ "bus-mapping", "eth-types", @@ -2754,7 +2755,7 @@ dependencies = [ [[package]] name = "prover" version = "0.4.0" -source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.12#ef945901bee26c4b79be8af60e259443392368fa" +source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.13#0756ac68ee2f41c51f09a748cd28220290fe49ae" dependencies = [ "aggregator", "anyhow", @@ -4039,7 +4040,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "types" version = "0.4.0" -source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.12#ef945901bee26c4b79be8af60e259443392368fa" +source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.13#0756ac68ee2f41c51f09a748cd28220290fe49ae" dependencies = [ "base64 0.13.1", "blake2", @@ -4490,7 +4491,7 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" [[package]] name = "zkevm-circuits" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.12#554bdcf00334bab45670b8daa72d687a7ff2b919" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0" dependencies = [ "array-init", "bus-mapping", diff --git a/common/libzkp/impl/Cargo.toml b/common/libzkp/impl/Cargo.toml index c9c716b04..f3e2d5e0b 100644 --- a/common/libzkp/impl/Cargo.toml +++ b/common/libzkp/impl/Cargo.toml @@ -20,8 +20,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", tag = "v0.5.12" } -types = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.12" } +prover = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.13" } +types = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.13" } halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "develop" } log = "0.4" diff --git a/common/types/message/message.go b/common/types/message/message.go index bdb022bde..04ff0e548 100644 --- a/common/types/message/message.go +++ b/common/types/message/message.go @@ -250,11 +250,12 @@ type ChunkInfo struct { // ChunkProof includes the proof info that are required for chunk verification and rollup. type ChunkProof struct { - StorageTrace []byte `json:"storage_trace"` - Protocol []byte `json:"protocol"` - Proof []byte `json:"proof"` - Instances []byte `json:"instances"` - Vk []byte `json:"vk"` + StorageTrace []byte `json:"storage_trace"` + Protocol []byte `json:"protocol"` + Proof []byte `json:"proof"` + Instances []byte `json:"instances"` + Vk []byte `json:"vk"` + ChunkInfo *ChunkInfo `json:"chunk_info,omitempty"` // cross-reference between cooridinator computation and prover compution } // BatchProof includes the proof info that are required for batch verification and rollup. diff --git a/common/types/message/message_test.go b/common/types/message/message_test.go index df4ef5283..21e7b16e4 100644 --- a/common/types/message/message_test.go +++ b/common/types/message/message_test.go @@ -73,6 +73,7 @@ func TestProofMessageSignVerifyPublicKey(t *testing.T) { Proof: []byte("testProof"), Instances: []byte("testInstance"), Vk: []byte("testVk"), + ChunkInfo: nil, }, Error: "testError", }, @@ -101,12 +102,13 @@ func TestProofDetailHash(t *testing.T) { Proof: []byte("testProof"), Instances: []byte("testInstance"), Vk: []byte("testVk"), + ChunkInfo: nil, }, Error: "testError", } hash, err := proofDetail.Hash() assert.NoError(t, err) - expectedHash := "4165f5ab3399001002a5b8e4062914249a2deb72f6133d647b586f53e236802d" + expectedHash := "72a00232c1fcb100b1b67e6d12cd449e5d2d890e3a66e50f4c23499d4990766f" assert.Equal(t, expectedHash, hex.EncodeToString(hash)) } @@ -136,6 +138,7 @@ func TestProofMsgPublicKey(t *testing.T) { Proof: []byte("testProof"), Instances: []byte("testInstance"), Vk: []byte("testVk"), + ChunkInfo: nil, }, Error: "testError", }, diff --git a/common/version/version.go b/common/version/version.go index 6efd634fc..a79b343ea 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -6,7 +6,7 @@ import ( "strings" ) -var tag = "v4.1.35" +var tag = "v4.1.36" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok {