Skip to content

Commit

Permalink
Update zk_evm Dependency (matter-labs#89)
Browse files Browse the repository at this point in the history 
### What

This PR modifies all direct and indirect clients of zk_evm branch v1.3.3
which are dependencies of zksync-era to use it at the v1.3.3-rc0 tag.
  • Loading branch information
@shahar4
shahar4 authored Sep 19, 2023
1 parent 7f1d44d commit efc69f9
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions core/lib/types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ zksync_contracts = { path = "../contracts", version = "1.0" }
zksync_mini_merkle_tree = { path = "../mini_merkle_tree", version = "1.0" }
# We need this import because we wanat DAL to be responsible for (de)serialization
codegen = { git = "https://github.com/matter-labs/solidity_plonk_verifier.git", branch = "dev" }
zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3" }
zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" }
zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", tag = "v1.3.3-rc1" }
zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", tag = "v1.3.3-rc0" }

chrono = { version = "0.4", features = ["serde", "rustc-serialize"] }
metrics = "0.20"
Expand Down
2 changes: 1 addition & 1 deletion core/lib/utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ categories = ["cryptography"]
[dependencies]
zksync_basic_types = { path = "../../lib/basic_types", version = "1.0" }
vlog = { path = "../../lib/vlog", version = "1.0" }
zk_evm = {git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3"}
zk_evm = {git = "https://github.com/matter-labs/era-zk_evm.git", tag = "v1.3.3-rc0"}

num = { version = "0.3.1", features = ["serde"] }
bigdecimal = { version = "0.2.2", features = ["serde"]}
Expand Down
2 changes: 1 addition & 1 deletion core/lib/vm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ categories = ["cryptography"]

[dependencies]
zkevm-assembly = { git = "https://github.com/matter-labs/era-zkEVM-assembly.git", branch = "v1.3.2" }
zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" }
zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", tag = "v1.3.3-rc0" }

zksync_config = { path = "../config", version = "1.0" }
zksync_types = { path = "../types", version = "1.0" }
Expand Down
2 changes: 1 addition & 1 deletion core/tests/vm-benchmark/harness/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ zksync_state = { path = "../../../lib/state" }
zksync_utils = { path = "../../../lib/utils" }
zksync_config = { path = "../../../lib/config" }
zksync_contracts = { path = "../../../lib/contracts" }
zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" }
zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", tag = "v1.3.3-rc0" }
once_cell = "1.17"
ouroboros = "0.15.6"
2 changes: 1 addition & 1 deletion prover/circuit_synthesizer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ prometheus_exporter = { path = "../../core/lib/prometheus_exporter", version = "
zksync_prover_utils = { path = "../../core/lib/prover_utils", version = "1.0" }
zksync_verification_key_generator_and_server = { path = "../../core/bin/verification_key_generator_and_server", version = "1.0" }

zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3"}
zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", tag = "v1.3.3-rc1"}

prover-service = { git = "https://github.com/matter-labs/era-heavy-ops-service.git", branch = "v1.3.2", features=["legacy"], default-features=false}

Expand Down
2 changes: 1 addition & 1 deletion prover/prover/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ setup_key_generator_and_server = { path = "../setup_key_generator_and_server", v
api = { git = "https://github.com/matter-labs/era-heavy-ops-service.git", branch = "v1.3.3", features=["gpu"], default-features=false}
prover-service = { git = "https://github.com/matter-labs/era-heavy-ops-service.git", branch = "v1.3.3", features=["gpu"], default-features=false}

zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3"}
zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", tag = "v1.3.3-rc1"}


tokio = { version = "1", features = ["time"] }
Expand Down
2 changes: 1 addition & 1 deletion prover/setup_key_generator_and_server/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ zksync_config = { path = "../../core/lib/config", version = "1.0" }
circuit_testing = {git = "https://github.com/matter-labs/era-circuit_testing.git", branch = "main"}
api = { git = "https://github.com/matter-labs/era-heavy-ops-service.git", branch = "v1.3.3", features=["gpu"], default-features=false}
prover-service = { git = "https://github.com/matter-labs/era-heavy-ops-service.git", branch = "v1.3.3", features=["gpu"], default-features=false}
zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3"}
zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", tag = "v1.3.3-rc1"}


structopt = "0.3.26"
Expand Down

0 comments on commit efc69f9

Please sign in to comment.