Skip to content

Commit

Permalink
Merge branch 'master' into tf/refactor-euclidean-division
Browse files Browse the repository at this point in the history
  • Loading branch information
TomAFrench authored Feb 5, 2024
2 parents 5460e68 + bdf64ed commit c620d50
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 19 deletions.
25 changes: 13 additions & 12 deletions Cargo.lock

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

5 changes: 3 additions & 2 deletions acvm-repo/bn254_blackbox_solver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ rust-embed = { version = "6.6.0", features = [
"include-exclude",
] }

# BN254 fixed base scalar multiplication solver
grumpkin = { git = "https://github.com/noir-lang/grumpkin", rev = "56d99799381f79e42148aaef0de2b0cf9a4b9a5d", features = ["std"] }
grumpkin = { package = "noir_grumpkin", features = [
"std",
] } # BN254 fixed base scalar multiplication solver
ark-ec = { version = "^0.4.0", default-features = false }
ark-ff = { version = "^0.4.0", default-features = false }
num-bigint.workspace = true
Expand Down
12 changes: 7 additions & 5 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ allow = [
# bitmaps 2.1.0, generational-arena 0.2.9,im 15.1.0
"MPL-2.0",
# Boost Software License
"BSL-1.0"
"BSL-1.0",
]

# Allow 1 or more licenses on a per-crate basis, so that particular licenses
Expand Down Expand Up @@ -93,7 +93,9 @@ unknown-registry = "warn"
# Lint level for what to happen when a crate from a git repository that is not
# in the allow list is encountered
unknown-git = "deny"
allow-git = [
"https://github.com/noir-lang/grumpkin",
"https://github.com/jfecher/chumsky"
]

# DON'T YOU DARE ADD ANYTHING TO THIS IF YOU WANT TO PUBLISH ANYTHING NOIR RELATED TO CRATES.IO
#
# crates.io rejects git dependencies so anything depending on these is unpublishable and you'll ruin my day
# when I find out.
allow-git = ["https://github.com/jfecher/chumsky"]

0 comments on commit c620d50

Please sign in to comment.