Skip to content

Commit

Permalink
chore: resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
saitima committed Oct 31, 2024
2 parents 3abbc34 + 7ce40a7 commit 0823f14
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/release-please/manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "0.150.8"
".": "0.150.9"
}
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [0.150.9](https://github.com/matter-labs/zksync-protocol/compare/v0.150.8...v0.150.9) (2024-10-29)


### Features

* **circuit_definitions:** naive snark-wrapper circuit for fflonk ([#50](https://github.com/matter-labs/zksync-protocol/issues/50)) ([53481d1](https://github.com/matter-labs/zksync-protocol/commit/53481d18eee028a72979ef32f930d40d1bfa0133))

## [0.150.8](https://github.com/matter-labs/zksync-protocol/compare/v0.150.7...v0.150.8) (2024-10-29)


Expand Down
22 changes: 11 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ resolver = "2"

[workspace.package]
# All the packages in the workspace should have the same version
version = "0.150.8"
version = "0.150.9"
edition = "2021"
authors = ["The Matter Labs Team <[email protected]>"]
homepage = "https://zksync.io/"
Expand All @@ -16,16 +16,16 @@ keywords = ["blockchain", "zksync"]
categories = ["cryptography"]

[workspace.dependencies]
circuit_definitions = { version = "=0.150.8", path = "crates/circuit_definitions" }
circuit_encodings = { version = "=0.150.8", path = "crates/circuit_encodings" }
circuit_sequencer_api = { version = "=0.150.8", path = "crates/circuit_sequencer_api" }
kzg = { version = "=0.150.8", path = "crates/kzg", package = "zksync_kzg" }
zk_evm = { version = "=0.150.8", path = "crates/zk_evm" }
zk_evm_abstractions = { version = "=0.150.8", path = "crates/zk_evm_abstractions" }
zkevm_circuits = { version = "=0.150.8", path = "crates/zkevm_circuits" }
zkevm_opcode_defs = { version = "=0.150.8", path = "crates/zkevm_opcode_defs" }
zkevm_test_harness = { version = "=0.150.8", path = "crates/zkevm_test_harness" }
zkevm-assembly = { version = "=0.150.8", path = "crates/zkEVM-assembly" }
circuit_definitions = { version = "=0.150.9", path = "crates/circuit_definitions" }
circuit_encodings = { version = "=0.150.9", path = "crates/circuit_encodings" }
circuit_sequencer_api = { version = "=0.150.9", path = "crates/circuit_sequencer_api" }
kzg = { version = "=0.150.9", path = "crates/kzg", package = "zksync_kzg" }
zk_evm = { version = "=0.150.9", path = "crates/zk_evm" }
zk_evm_abstractions = { version = "=0.150.9", path = "crates/zk_evm_abstractions" }
zkevm_circuits = { version = "=0.150.9", path = "crates/zkevm_circuits" }
zkevm_opcode_defs = { version = "=0.150.9", path = "crates/zkevm_opcode_defs" }
zkevm_test_harness = { version = "=0.150.9", path = "crates/zkevm_test_harness" }
zkevm-assembly = { version = "=0.150.9", path = "crates/zkEVM-assembly" }

# `zksync-crypto` repository
snark_wrapper = "=0.30.5"
Expand Down

0 comments on commit 0823f14

Please sign in to comment.