-
Notifications
You must be signed in to change notification settings - Fork 314
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: use upstream group, ff and pairing dependencies #1488
Conversation
c16831c
to
1d7a0c0
Compare
Nice, thanks @DrPeterVanNostrand! Will start reviewing next week. |
Note that this PR removes all ci jobs starting with the string |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cargo.toml's should be updated before merging.
fil-proofs-param/Cargo.toml
Outdated
blake2b_simd = "0.5" | ||
bellperson = { version = "0.16", default-features = false } | ||
bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "halo" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be changed before merging.
fil-proofs-tooling/Cargo.toml
Outdated
@@ -25,8 +25,8 @@ regex = "1.3.7" | |||
commandspec = "0.12.2" | |||
chrono = { version = "0.4.7", features = ["serde"] } | |||
memmap = "0.7.0" | |||
bellperson = { version = "0.16", default-features = false } | |||
rand = "0.7" | |||
bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "halo" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be changed before merging.
filecoin-hashers/Cargo.toml
Outdated
@@ -9,33 +9,30 @@ repository = "https://github.com/filecoin-project/rust-fil-proofs" | |||
readme = "README.md" | |||
|
|||
[dependencies] | |||
bellperson = { version = "0.16", default-features = false } | |||
bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "halo" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be changed before merging.
filecoin-hashers/Cargo.toml
Outdated
|
||
neptune = { version = "^4.0", default-features = false, optional = true } | ||
neptune = { git = "https://github.com/filecoin-project/neptune", branch = "halo", optional = true } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be changed before merging.
filecoin-proofs/Cargo.toml
Outdated
blake2b_simd = "0.5" | ||
bellperson = { version = "0.16", default-features = false } | ||
bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "halo" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be changed before merging.
storage-proofs-core/Cargo.toml
Outdated
hex = "0.4.0" | ||
generic-array = "0.14.4" | ||
anyhow = "1.0.23" | ||
thiserror = "1.0.6" | ||
neptune = { version = "^4.0", default-features = false } | ||
neptune = { git = "https://github.com/filecoin-project/neptune", branch = "halo" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be changed before merging.
storage-proofs-porep/Cargo.toml
Outdated
ff = { version = "0.3.1", package = "fff" } | ||
bellperson = { version = "0.16", default-features = false } | ||
ff = "0.10.0" | ||
bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "halo" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be changed before merging.
storage-proofs-porep/Cargo.toml
Outdated
log = "0.4.7" | ||
pretty_assertions = "0.6.1" | ||
generic-array = "0.14.4" | ||
anyhow = "1.0.23" | ||
neptune = { version = "^4.0", default-features = false } | ||
neptune = { git = "https://github.com/filecoin-project/neptune", branch = "halo" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be changed before merging.
storage-proofs-post/Cargo.toml
Outdated
ff = { version = "0.3.1", package = "fff" } | ||
bellperson = { version = "0.16", default-features = false } | ||
ff = "0.10.0" | ||
bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "halo" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be changed before merging.
storage-proofs-post/Cargo.toml
Outdated
log = "0.4.7" | ||
hex = "0.4.0" | ||
generic-array = "0.14.4" | ||
anyhow = "1.0.23" | ||
neptune = { version = "^4.0", default-features = false } | ||
neptune = { git = "https://github.com/filecoin-project/neptune", branch = "halo" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be changed before merging.
1d7a0c0
to
098341b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Needs a rebase, but looks good!
890a777
to
e694f49
Compare
e694f49
to
871d8ae
Compare
filecoin-hashers
fr32
storage-proofs-core
storage-proofs-porep
storage-proofs-post
filecoin-proofs
Note that this PR removes the
pairing
andblst
features and drops support forpaired
's BLS12-381 implementation.