Skip to content

Commit

Permalink
Merge branch 'main' into prover_cli_tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ColoCarletti committed Aug 16, 2024
2 parents a48efc9 + 8b8397a commit b6a3807
Show file tree
Hide file tree
Showing 81 changed files with 1,730 additions and 1,424 deletions.
2 changes: 1 addition & 1 deletion .github/release-please/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"core": "24.18.0",
"prover": "16.3.0",
"prover": "16.4.0",
"zk_toolbox": "0.1.1"
}
109 changes: 50 additions & 59 deletions Cargo.lock

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

26 changes: 13 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -207,30 +207,30 @@ 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 = { package = "circuit_sequencer_api", version = "=0.150.2" }
circuit_sequencer_api_1_5_0 = { package = "circuit_sequencer_api", version = "=0.150.4" }
crypto_codegen = { package = "zksync_solidity_vk_codegen", version = "=0.1.0" }
kzg = { package = "zksync_kzg", version = "=0.150.2" }
kzg = { package = "zksync_kzg", version = "=0.150.4" }
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.0" }
zk_evm_1_4_0 = { package = "zk_evm", version = "0.140.0" }
zk_evm_1_4_1 = { package = "zk_evm", version = "0.141.0" }
zk_evm_1_5_0 = { package = "zk_evm", version = "=0.150.0" }
zk_evm_1_5_0 = { package = "zk_evm", version = "=0.150.4" }

# New VM; pinned to a specific commit because of instability
vm2 = { git = "https://github.com/matter-labs/vm2.git", rev = "9a38900d7af9b1d72b47ce3be980e77c1239a61d" }

# Consensus dependencies.
zksync_concurrency = "=0.1.0-rc.10"
zksync_consensus_bft = "=0.1.0-rc.10"
zksync_consensus_crypto = "=0.1.0-rc.10"
zksync_consensus_executor = "=0.1.0-rc.10"
zksync_consensus_network = "=0.1.0-rc.10"
zksync_consensus_roles = "=0.1.0-rc.10"
zksync_consensus_storage = "=0.1.0-rc.10"
zksync_consensus_utils = "=0.1.0-rc.10"
zksync_protobuf = "=0.1.0-rc.10"
zksync_protobuf_build = "=0.1.0-rc.10"
zksync_concurrency = "=0.1.0-rc.11"
zksync_consensus_bft = "=0.1.0-rc.11"
zksync_consensus_crypto = "=0.1.0-rc.11"
zksync_consensus_executor = "=0.1.0-rc.11"
zksync_consensus_network = "=0.1.0-rc.11"
zksync_consensus_roles = "=0.1.0-rc.11"
zksync_consensus_storage = "=0.1.0-rc.11"
zksync_consensus_utils = "=0.1.0-rc.11"
zksync_protobuf = "=0.1.0-rc.11"
zksync_protobuf_build = "=0.1.0-rc.11"

# "Local" dependencies
zksync_multivm = { version = "0.1.0", path = "core/lib/multivm" }
Expand Down
Loading

0 comments on commit b6a3807

Please sign in to comment.