Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into fflonk
Browse files Browse the repository at this point in the history
# Conflicts:
#	Cargo.toml
#	crates/fflonk/Cargo.toml
  • Loading branch information
Artemka374 committed Dec 20, 2024
2 parents f69ea05 + 80be249 commit ed9034d
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 21 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.152.7"
".": "0.152.9"
}
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## [0.152.9](https://github.com/matter-labs/zksync-crypto-gpu/compare/v0.152.8...v0.152.9) (2024-12-18)


### Features

* Bump dependencies ([#62](https://github.com/matter-labs/zksync-crypto-gpu/issues/62)) ([f930ea5](https://github.com/matter-labs/zksync-crypto-gpu/commit/f930ea556c37570e7a33a6e71f729194897909ef))

## [0.152.8](https://github.com/matter-labs/zksync-crypto-gpu/compare/v0.152.7...v0.152.8) (2024-11-22)


### Miscellaneous Chores

* release 0.152.8 ([#59](https://github.com/matter-labs/zksync-crypto-gpu/issues/59)) ([4cc3905](https://github.com/matter-labs/zksync-crypto-gpu/commit/4cc3905d914de4335049c0ae5e81dafc0f9885d3))

## [0.152.7](https://github.com/matter-labs/zksync-crypto-gpu/compare/v0.152.6...v0.152.7) (2024-11-20)


Expand Down
38 changes: 19 additions & 19 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,32 @@ keywords = ["blockchain", "zksync"]
categories = ["cryptography"]
repository = "https://github.com/matter-labs/zksync-crypto-gpu"
# All the packages in the workspace should have the same version
version = "0.152.7"
version = "0.152.9"

[workspace.dependencies]
# Local dependencies
boojum-cuda = { version = "=0.152.7", path = "crates/boojum-cuda" }
era_criterion_cuda = { version = "=0.152.7", path = "crates/criterion-cuda" }
era_cudart = { version = "=0.152.7", path = "crates/cudart" }
era_cudart_sys = { version = "=0.152.7", path = "crates/cudart-sys" }
era_cudart_sys_bindings_generator = { version = "=0.152.7", path = "crates/cudart-sys-bindings-generator" }
gpu-ffi = { version = "=0.152.7", path = "crates/gpu-ffi", package = "zksync-gpu-ffi" }
gpu-ffi-bindings-generator = { version = "=0.152.7", path = "crates/gpu-ffi", package = "zksync-gpu-ffi-bindings-generator" }
gpu-prover = { version = "=0.152.7", path = "crates/gpu-prover", package = "zksync-gpu-prover" }
shivini = { version = "=0.152.7", path = "crates/shivini" }
wrapper-prover = { version = "=0.152.7", path = "crates/wrapper-prover", package = "zksync-wrapper-prover" }
fflonk = { version = "=0.152.7", path = "crates/fflonk", package = "fflonk-cuda" }
boojum-cuda = { version = "=0.152.9", path = "crates/boojum-cuda" }
era_criterion_cuda = { version = "=0.152.9", path = "crates/criterion-cuda" }
era_cudart = { version = "=0.152.9", path = "crates/cudart" }
era_cudart_sys = { version = "=0.152.9", path = "crates/cudart-sys" }
era_cudart_sys_bindings_generator = { version = "=0.152.9", path = "crates/cudart-sys-bindings-generator" }
gpu-ffi = { version = "=0.152.9", path = "crates/gpu-ffi", package = "zksync-gpu-ffi" }
gpu-ffi-bindings-generator = { version = "=0.152.9", path = "crates/gpu-ffi", package = "zksync-gpu-ffi-bindings-generator" }
gpu-prover = { version = "=0.152.9", path = "crates/gpu-prover", package = "zksync-gpu-prover" }
shivini = { version = "=0.152.9", path = "crates/shivini" }
wrapper-prover = { version = "=0.152.9", path = "crates/wrapper-prover", package = "zksync-wrapper-prover" }
fflonk = { version = "=0.152.9", path = "crates/fflonk", package = "fflonk-cuda" }

# These dependencies should be shared by all the crates.
# zksync-crypto repository
boojum = { git = "https://github.com/matter-labs/zksync-crypto", branch = "fflonk", package = "boojum" }
fflonk-cpu = {git = "https://github.com/matter-labs/zksync-crypto", branch = "fflonk", package = "fflonk"}
franklin-crypto = { git = "https://github.com/matter-labs/zksync-crypto", branch = "fflonk", package = "franklin-crypto" }
rescue_poseidon = { git = "https://github.com/matter-labs/zksync-crypto", branch = "fflonk", package = "rescue_poseidon" }
snark_wrapper = { git = "https://github.com/matter-labs/zksync-crypto", branch = "fflonk", package = "snark_wrapper" }
boojum = "=0.30.12"
fflonk-cpu = {package = "fflonk", version = "=0.30.12"}
franklin-crypto = "=0.30.12"
rescue_poseidon = "=0.30.12"
snark_wrapper = "=0.30.12"
# zksync-protocol repository
circuit_definitions = { git = "https://github.com/matter-labs/zksync-protocol", branch = "fflonk", package = "circuit_definitions" }
zkevm_test_harness = { git = "https://github.com/matter-labs/zksync-protocol", branch = "fflonk", package = "zkevm_test_harness" }
circuit_definitions = { version = "=0.150.19" }
zkevm_test_harness = { version = "=0.150.19" }

[profile.release]
debug = "line-tables-only"
2 changes: 1 addition & 1 deletion crates/fflonk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ serde_derive = "1"

[features]
default = []
sanity = []
sanity = []

0 comments on commit ed9034d

Please sign in to comment.