Skip to content

Commit

Permalink
Merge branch 'main' into incremental_qc
Browse files Browse the repository at this point in the history
  • Loading branch information
moshababo authored Dec 22, 2023
2 parents 36661aa + 84cdd9e commit a214868
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
12 changes: 9 additions & 3 deletions node/Cargo.lock

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

4 changes: 2 additions & 2 deletions node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ zksync_protobuf_build = { path = "libs/protobuf_build" }

# Crates from Matter Labs.
pairing = { package = "pairing_ce", git = "https://github.com/matter-labs/pairing.git", rev = "f55393fd366596eac792d78525d26e9c4d6ed1ca" }
vise = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "dd05139b76ab0843443ab3ff730174942c825dae" }
vise-exporter = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "dd05139b76ab0843443ab3ff730174942c825dae" }
vise = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "1c9cc500e92cf9ea052b230e114a6f9cce4fb2c1" }
vise-exporter = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "1c9cc500e92cf9ea052b230e114a6f9cce4fb2c1" }

# Crates from third-parties.
anyhow = "1"
Expand Down
2 changes: 1 addition & 1 deletion node/deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ skip = [
[sources]
unknown-registry = "deny"
unknown-git = "deny"
allow-org = { github = ["matter-labs"] }
allow-org = { github = ["matter-labs", "slowli"] } # TODO: remove once `vise` is published

0 comments on commit a214868

Please sign in to comment.