diff --git a/Cargo.lock b/Cargo.lock index bbe21e2e6e38..26929be71957 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1313,13 +1313,14 @@ dependencies = [ [[package]] name = "circuit_encodings" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" +version = "0.150.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5128d4b8fbb27ac453f573a95601058e74487bdafd22a3168cded66bf340c28" dependencies = [ "derivative", "serde", - "zk_evm 0.150.5", - "zkevm_circuits 0.150.5", + "zk_evm 0.150.6", + "zkevm_circuits 0.150.6", ] [[package]] @@ -1379,10 +1380,11 @@ dependencies = [ [[package]] name = "circuit_sequencer_api" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" +version = "0.150.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093d0c2c0b39144ddb4e1e88d73d95067ce34ec7750808b2eed01edbb510b88e" dependencies = [ - "circuit_encodings 0.150.5", + "circuit_encodings 0.150.6", "derivative", "rayon", "serde", @@ -9340,8 +9342,9 @@ dependencies = [ [[package]] name = "zk_evm" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" +version = "0.150.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c14bda6c101389145cd01fac900f1392876bc0284d98faf7f376237baa2cb19d" dependencies = [ "anyhow", "lazy_static", @@ -9349,7 +9352,7 @@ dependencies = [ "serde", "serde_json", "static_assertions", - "zk_evm_abstractions 0.150.5 (git+https://github.com/matter-labs/zksync-protocol.git)", + "zk_evm_abstractions 0.150.6", ] [[package]] @@ -9380,27 +9383,15 @@ dependencies = [ [[package]] name = "zk_evm_abstractions" -version = "0.150.5" +version = "0.150.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6b0720261ab55490fe3a96e96de30d5d7b277940b52ea7f52dbf564eb1748" -dependencies = [ - "anyhow", - "num_enum 0.6.1", - "serde", - "static_assertions", - "zkevm_opcode_defs 0.150.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "zk_evm_abstractions" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" +checksum = "a008f2442fc6a508bdd1f902380242cb6ff11b8b27acdac2677c6d9f75cbb004" dependencies = [ "anyhow", "num_enum 0.6.1", "serde", "static_assertions", - "zkevm_opcode_defs 0.150.5 (git+https://github.com/matter-labs/zksync-protocol.git)", + "zkevm_opcode_defs 0.150.6", ] [[package]] @@ -9449,8 +9440,9 @@ dependencies = [ [[package]] name = "zkevm_circuits" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" +version = "0.150.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f68518aedd5358b17224771bb78bacd912cf66011aeda98b1f887cfb9e0972f" dependencies = [ "arrayvec 0.7.6", "boojum", @@ -9462,7 +9454,7 @@ dependencies = [ "seq-macro", "serde", "smallvec", - "zkevm_opcode_defs 0.150.5 (git+https://github.com/matter-labs/zksync-protocol.git)", + "zkevm_opcode_defs 0.150.6", "zksync_cs_derive", ] @@ -9510,25 +9502,9 @@ dependencies = [ [[package]] name = "zkevm_opcode_defs" -version = "0.150.5" +version = "0.150.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79055eae1b6c1ab80793ed9d77d2964c9c896afa4b5dfed278cf58cd10acfe8f" -dependencies = [ - "bitflags 2.6.0", - "blake2 0.10.6", - "ethereum-types", - "k256 0.13.4", - "lazy_static", - "p256", - "serde", - "sha2 0.10.8", - "sha3 0.10.8", -] - -[[package]] -name = "zkevm_opcode_defs" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" +checksum = "762b5f1c1b283c5388995a85d40a05aef1c14f50eb904998b7e9364739f5b899" dependencies = [ "bitflags 2.6.0", "blake2 0.10.6", @@ -9652,7 +9628,7 @@ dependencies = [ "anyhow", "circuit_sequencer_api 0.140.3", "circuit_sequencer_api 0.141.2", - "circuit_sequencer_api 0.150.5", + "circuit_sequencer_api 0.150.6", "futures 0.3.30", "itertools 0.10.5", "num_cpus", @@ -9664,7 +9640,7 @@ dependencies = [ "vise", "zk_evm 0.133.0", "zk_evm 0.141.0", - "zk_evm 0.150.5", + "zk_evm 0.150.6", "zksync_contracts", "zksync_dal", "zksync_eth_client", @@ -10379,8 +10355,9 @@ dependencies = [ [[package]] name = "zksync_kzg" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" +version = "0.150.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c006b6b7a27cc50ff0c515b6d0b197dbb907bbf65d1d2ea42fc3ed21b315642" dependencies = [ "boojum", "derivative", @@ -10390,7 +10367,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "zkevm_circuits 0.150.5", + "zkevm_circuits 0.150.6", ] [[package]] @@ -10517,7 +10494,7 @@ dependencies = [ "circuit_sequencer_api 0.140.3", "circuit_sequencer_api 0.141.2", "circuit_sequencer_api 0.142.2", - "circuit_sequencer_api 0.150.5", + "circuit_sequencer_api 0.150.6", "ethabi", "hex", "itertools 0.10.5", @@ -10531,7 +10508,7 @@ dependencies = [ "zk_evm 0.133.0", "zk_evm 0.140.0", "zk_evm 0.141.0", - "zk_evm 0.150.5", + "zk_evm 0.150.6", "zksync_contracts", "zksync_eth_signer", "zksync_system_constants", @@ -10572,7 +10549,7 @@ dependencies = [ "tower-http", "tracing", "vise", - "zk_evm 0.150.5", + "zk_evm 0.150.6", "zksync_config", "zksync_consensus_roles", "zksync_contracts", @@ -10967,7 +10944,7 @@ version = "0.1.0" dependencies = [ "bincode", "chrono", - "circuit_sequencer_api 0.150.5", + "circuit_sequencer_api 0.150.6", "serde", "serde_json", "serde_with", @@ -11349,8 +11326,8 @@ source = "git+https://github.com/matter-labs/vm2.git?rev=a233d44bbe61dc6a758a754 dependencies = [ "enum_dispatch", "primitive-types", - "zk_evm_abstractions 0.150.5 (registry+https://github.com/rust-lang/crates.io-index)", - "zkevm_opcode_defs 0.150.5 (registry+https://github.com/rust-lang/crates.io-index)", + "zk_evm_abstractions 0.150.6", + "zkevm_opcode_defs 0.150.6", "zksync_vm2_interface", ] diff --git a/Cargo.toml b/Cargo.toml index 52c2c18c8c03..e86d67a435ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -219,15 +219,15 @@ circuit_sequencer_api_1_3_3 = { package = "circuit_sequencer_api", version = "0. circuit_sequencer_api_1_4_0 = { package = "circuit_sequencer_api", version = "0.140" } circuit_sequencer_api_1_4_1 = { package = "circuit_sequencer_api", version = "0.141" } circuit_sequencer_api_1_4_2 = { package = "circuit_sequencer_api", version = "0.142" } -circuit_sequencer_api_1_5_0 = { git = "https://github.com/matter-labs/zksync-protocol.git", package = "circuit_sequencer_api" } +circuit_sequencer_api_1_5_0 = { package = "circuit_sequencer_api", version = "=0.150.6" } crypto_codegen = { package = "zksync_solidity_vk_codegen", version = "=0.30.1" } -kzg = { git = "https://github.com/matter-labs/zksync-protocol.git", package = "zksync_kzg" } +kzg = { package = "zksync_kzg", version = "=0.150.6" } zk_evm = { version = "=0.133.0" } zk_evm_1_3_1 = { package = "zk_evm", version = "0.131.0-rc.2" } zk_evm_1_3_3 = { package = "zk_evm", version = "0.133" } zk_evm_1_4_0 = { package = "zk_evm", version = "0.140" } zk_evm_1_4_1 = { package = "zk_evm", version = "0.141" } -zk_evm_1_5_0 = { git = "https://github.com/matter-labs/zksync-protocol.git", package = "zk_evm" } +zk_evm_1_5_0 = { package = "zk_evm", version = "=0.150.6" } # New VM; pinned to a specific commit because of instability zksync_vm2 = { git = "https://github.com/matter-labs/vm2.git", rev = "a233d44bbe61dc6a758a754c3b78fe4f83e56699" } diff --git a/prover/Cargo.lock b/prover/Cargo.lock index 2bd2cf0c4d42..6f2bf2575f00 100644 --- a/prover/Cargo.lock +++ b/prover/Cargo.lock @@ -652,7 +652,7 @@ dependencies = [ [[package]] name = "boojum-cuda" version = "0.150.9" -source = "git+https://github.com/matter-labs/zksync-crypto-gpu.git?branch=vv-temp-harness-pin#5777d2934bf05cf80401aae33cc8acb1a14d2b49" +source = "git+https://github.com/matter-labs/zksync-crypto-gpu.git?branch=vv-temp-harness-pin#1fa6d8b1c1ba6fc18bbfb09f91a71dc7a4572e23" dependencies = [ "boojum", "cmake", @@ -660,7 +660,6 @@ dependencies = [ "era_cudart_sys", "itertools 0.13.0", "lazy_static", - "snark_wrapper", ] [[package]] @@ -799,10 +798,11 @@ dependencies = [ [[package]] name = "circuit_definitions" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" +version = "0.150.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "492404ea63c934d8e894325f0a741723bf91cd035cb34a92fddd8617c4a00fd3" dependencies = [ - "circuit_encodings 0.150.5", + "circuit_encodings 0.150.6", "crossbeam", "derivative", "seq-macro", @@ -848,13 +848,14 @@ dependencies = [ [[package]] name = "circuit_encodings" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" +version = "0.150.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5128d4b8fbb27ac453f573a95601058e74487bdafd22a3168cded66bf340c28" dependencies = [ "derivative", "serde", - "zk_evm 0.150.5", - "zkevm_circuits 0.150.5", + "zk_evm 0.150.6", + "zkevm_circuits 0.150.6", ] [[package]] @@ -914,10 +915,11 @@ dependencies = [ [[package]] name = "circuit_sequencer_api" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" +version = "0.150.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093d0c2c0b39144ddb4e1e88d73d95067ce34ec7750808b2eed01edbb510b88e" dependencies = [ - "circuit_encodings 0.150.5", + "circuit_encodings 0.150.6", "derivative", "rayon", "serde", @@ -1739,7 +1741,7 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "era_cudart" version = "0.150.9" -source = "git+https://github.com/matter-labs/zksync-crypto-gpu.git?branch=vv-temp-harness-pin#5777d2934bf05cf80401aae33cc8acb1a14d2b49" +source = "git+https://github.com/matter-labs/zksync-crypto-gpu.git?branch=vv-temp-harness-pin#1fa6d8b1c1ba6fc18bbfb09f91a71dc7a4572e23" dependencies = [ "bitflags 2.6.0", "era_cudart_sys", @@ -1749,7 +1751,7 @@ dependencies = [ [[package]] name = "era_cudart_sys" version = "0.150.9" -source = "git+https://github.com/matter-labs/zksync-crypto-gpu.git?branch=vv-temp-harness-pin#5777d2934bf05cf80401aae33cc8acb1a14d2b49" +source = "git+https://github.com/matter-labs/zksync-crypto-gpu.git?branch=vv-temp-harness-pin#1fa6d8b1c1ba6fc18bbfb09f91a71dc7a4572e23" dependencies = [ "serde_json", ] @@ -5678,7 +5680,7 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "shivini" version = "0.150.9" -source = "git+https://github.com/matter-labs/zksync-crypto-gpu.git?branch=vv-temp-harness-pin#5777d2934bf05cf80401aae33cc8acb1a14d2b49" +source = "git+https://github.com/matter-labs/zksync-crypto-gpu.git?branch=vv-temp-harness-pin#1fa6d8b1c1ba6fc18bbfb09f91a71dc7a4572e23" dependencies = [ "bincode", "blake2 0.10.6", @@ -5689,7 +5691,6 @@ dependencies = [ "era_cudart", "era_cudart_sys", "hex", - "itertools 0.13.0", "rand 0.8.5", "serde", "sha2 0.10.8", @@ -7445,8 +7446,9 @@ dependencies = [ [[package]] name = "zk_evm" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" +version = "0.150.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c14bda6c101389145cd01fac900f1392876bc0284d98faf7f376237baa2cb19d" dependencies = [ "anyhow", "lazy_static", @@ -7454,7 +7456,7 @@ dependencies = [ "serde", "serde_json", "static_assertions", - "zk_evm_abstractions 0.150.5 (git+https://github.com/matter-labs/zksync-protocol.git)", + "zk_evm_abstractions 0.150.6", ] [[package]] @@ -7485,33 +7487,22 @@ dependencies = [ [[package]] name = "zk_evm_abstractions" -version = "0.150.5" +version = "0.150.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6b0720261ab55490fe3a96e96de30d5d7b277940b52ea7f52dbf564eb1748" +checksum = "a008f2442fc6a508bdd1f902380242cb6ff11b8b27acdac2677c6d9f75cbb004" dependencies = [ "anyhow", "num_enum 0.6.1", "serde", "static_assertions", - "zkevm_opcode_defs 0.150.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "zk_evm_abstractions" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" -dependencies = [ - "anyhow", - "num_enum 0.6.1", - "serde", - "static_assertions", - "zkevm_opcode_defs 0.150.5 (git+https://github.com/matter-labs/zksync-protocol.git)", + "zkevm_opcode_defs 0.150.6", ] [[package]] name = "zkevm-assembly" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" +version = "0.150.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dc743ac7b0d618536dc3ace798fd4b8af78b057884afda5785c7970e15d62d0" dependencies = [ "env_logger 0.9.3", "hex", @@ -7524,7 +7515,7 @@ dependencies = [ "smallvec", "structopt", "thiserror", - "zkevm_opcode_defs 0.150.5 (git+https://github.com/matter-labs/zksync-protocol.git)", + "zkevm_opcode_defs 0.150.6", ] [[package]] @@ -7573,8 +7564,9 @@ dependencies = [ [[package]] name = "zkevm_circuits" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" +version = "0.150.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f68518aedd5358b17224771bb78bacd912cf66011aeda98b1f887cfb9e0972f" dependencies = [ "arrayvec 0.7.4", "boojum", @@ -7586,7 +7578,7 @@ dependencies = [ "seq-macro", "serde", "smallvec", - "zkevm_opcode_defs 0.150.5 (git+https://github.com/matter-labs/zksync-protocol.git)", + "zkevm_opcode_defs 0.150.6", "zksync_cs_derive", ] @@ -7634,25 +7626,9 @@ dependencies = [ [[package]] name = "zkevm_opcode_defs" -version = "0.150.5" +version = "0.150.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79055eae1b6c1ab80793ed9d77d2964c9c896afa4b5dfed278cf58cd10acfe8f" -dependencies = [ - "bitflags 2.6.0", - "blake2 0.10.6", - "ethereum-types", - "k256 0.13.3", - "lazy_static", - "p256", - "serde", - "sha2 0.10.8", - "sha3 0.10.8", -] - -[[package]] -name = "zkevm_opcode_defs" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" +checksum = "762b5f1c1b283c5388995a85d40a05aef1c14f50eb904998b7e9364739f5b899" dependencies = [ "bitflags 2.6.0", "blake2 0.10.6", @@ -7667,12 +7643,13 @@ dependencies = [ [[package]] name = "zkevm_test_harness" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" +version = "0.150.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ad3e73d290a38a35dd245fd68cb6f498a8a8da4a52f846e88da3d3c31a34fd" dependencies = [ "bincode", "circuit_definitions", - "circuit_sequencer_api 0.150.5", + "circuit_sequencer_api 0.150.6", "codegen", "crossbeam", "derivative", @@ -7694,7 +7671,7 @@ dependencies = [ [[package]] name = "zksync-gpu-ffi" version = "0.150.9" -source = "git+https://github.com/matter-labs/zksync-crypto-gpu.git?branch=vv-temp-harness-pin#5777d2934bf05cf80401aae33cc8acb1a14d2b49" +source = "git+https://github.com/matter-labs/zksync-crypto-gpu.git?branch=vv-temp-harness-pin#1fa6d8b1c1ba6fc18bbfb09f91a71dc7a4572e23" dependencies = [ "cmake", "crossbeam", @@ -7708,7 +7685,7 @@ dependencies = [ [[package]] name = "zksync-gpu-prover" version = "0.150.9" -source = "git+https://github.com/matter-labs/zksync-crypto-gpu.git?branch=vv-temp-harness-pin#5777d2934bf05cf80401aae33cc8acb1a14d2b49" +source = "git+https://github.com/matter-labs/zksync-crypto-gpu.git?branch=vv-temp-harness-pin#1fa6d8b1c1ba6fc18bbfb09f91a71dc7a4572e23" dependencies = [ "bit-vec", "cfg-if", @@ -7724,7 +7701,7 @@ dependencies = [ [[package]] name = "zksync-wrapper-prover" version = "0.150.9" -source = "git+https://github.com/matter-labs/zksync-crypto-gpu.git?branch=vv-temp-harness-pin#5777d2934bf05cf80401aae33cc8acb1a14d2b49" +source = "git+https://github.com/matter-labs/zksync-crypto-gpu.git?branch=vv-temp-harness-pin#1fa6d8b1c1ba6fc18bbfb09f91a71dc7a4572e23" dependencies = [ "circuit_definitions", "zkevm_test_harness", @@ -8092,8 +8069,9 @@ dependencies = [ [[package]] name = "zksync_kzg" -version = "0.150.5" -source = "git+https://github.com/matter-labs/zksync-protocol.git#9bf5cf839f76a19f7c21981d8c56a7f8bbe03d7e" +version = "0.150.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c006b6b7a27cc50ff0c515b6d0b197dbb907bbf65d1d2ea42fc3ed21b315642" dependencies = [ "boojum", "derivative", @@ -8103,7 +8081,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "zkevm_circuits 0.150.5", + "zkevm_circuits 0.150.6", ] [[package]] @@ -8139,7 +8117,7 @@ dependencies = [ "circuit_sequencer_api 0.140.3", "circuit_sequencer_api 0.141.2", "circuit_sequencer_api 0.142.2", - "circuit_sequencer_api 0.150.5", + "circuit_sequencer_api 0.150.6", "ethabi", "hex", "itertools 0.10.5", @@ -8151,7 +8129,7 @@ dependencies = [ "zk_evm 0.133.0", "zk_evm 0.140.0", "zk_evm 0.141.0", - "zk_evm 0.150.5", + "zk_evm 0.150.6", "zksync_contracts", "zksync_system_constants", "zksync_types", @@ -8203,7 +8181,7 @@ dependencies = [ "anyhow", "async-trait", "bincode", - "circuit_sequencer_api 0.150.5", + "circuit_sequencer_api 0.150.6", "clap 4.5.4", "ctrlc", "futures 0.3.30", @@ -8429,7 +8407,7 @@ name = "zksync_prover_interface" version = "0.1.0" dependencies = [ "chrono", - "circuit_sequencer_api 0.150.5", + "circuit_sequencer_api 0.150.6", "serde", "serde_with", "strum", @@ -8628,8 +8606,8 @@ source = "git+https://github.com/matter-labs/vm2.git?rev=a233d44bbe61dc6a758a754 dependencies = [ "enum_dispatch", "primitive-types", - "zk_evm_abstractions 0.150.5 (registry+https://github.com/rust-lang/crates.io-index)", - "zkevm_opcode_defs 0.150.5 (registry+https://github.com/rust-lang/crates.io-index)", + "zk_evm_abstractions 0.150.6", + "zkevm_opcode_defs 0.150.6", "zksync_vm2_interface", ] diff --git a/prover/Cargo.toml b/prover/Cargo.toml index 8c338db86d44..659b912b72ec 100644 --- a/prover/Cargo.toml +++ b/prover/Cargo.toml @@ -62,9 +62,9 @@ url = "2.5.2" vise = "0.2.0" # Proving dependencies -circuit_definitions = { git = "https://github.com/matter-labs/zksync-protocol.git", package = "circuit_definitions" } -circuit_sequencer_api = { git = "https://github.com/matter-labs/zksync-protocol.git", package = "circuit_sequencer_api" } -zkevm_test_harness = { git = "https://github.com/matter-labs/zksync-protocol.git", package = "zkevm_test_harness" } +circuit_definitions = "=0.150.6" +circuit_sequencer_api = "=0.150.6" +zkevm_test_harness = "=0.150.6" # GPU proving dependencies wrapper_prover = { git = "https://github.com/matter-labs/zksync-crypto-gpu.git", branch="vv-temp-harness-pin", package = "zksync-wrapper-prover" } diff --git a/prover/crates/lib/keystore/Cargo.toml b/prover/crates/lib/keystore/Cargo.toml index d81e800b3036..4d9addc26bc0 100644 --- a/prover/crates/lib/keystore/Cargo.toml +++ b/prover/crates/lib/keystore/Cargo.toml @@ -15,7 +15,7 @@ zksync_basic_types.workspace = true zksync_utils.workspace = true zksync_prover_fri_types.workspace = true zkevm_test_harness.workspace = true -circuit_definitions = { git = "https://github.com/matter-labs/zksync-protocol.git", package = "circuit_definitions", features = [ "log_tracing" ] } +circuit_definitions = { workspace = true, features = ["log_tracing"] } shivini = { workspace = true, optional = true } anyhow.workspace = true diff --git a/prover/crates/lib/prover_fri_types/Cargo.toml b/prover/crates/lib/prover_fri_types/Cargo.toml index 30046aa0badf..3b228b42ec40 100644 --- a/prover/crates/lib/prover_fri_types/Cargo.toml +++ b/prover/crates/lib/prover_fri_types/Cargo.toml @@ -13,5 +13,5 @@ categories.workspace = true [dependencies] zksync_object_store.workspace = true zksync_types.workspace = true -circuit_definitions = { git = "https://github.com/matter-labs/zksync-protocol.git", package = "circuit_definitions", features = [ "log_tracing" ] } +circuit_definitions = { workspace = true, features = [ "log_tracing" ] } serde = { workspace = true, features = ["derive"] }