Skip to content
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

Merged
merged 1 commit into from
Sep 18, 2021
Merged

Conversation

DrPeterVanNostrand
Copy link
Contributor

@DrPeterVanNostrand DrPeterVanNostrand commented Aug 6, 2021

  • filecoin-hashers
  • fr32
  • storage-proofs-core
  • storage-proofs-porep
  • storage-proofs-post
  • filecoin-proofs
  • everything else

Note that this PR removes the pairing and blst features and drops support for paired's BLS12-381 implementation.

@cryptonemo
Copy link
Collaborator

Nice, thanks @DrPeterVanNostrand! Will start reviewing next week.

@DrPeterVanNostrand
Copy link
Contributor Author

Note that this PR removes all ci jobs starting with the string test_blst_* and those github checks will never pass. I'm not sure how to remove those github checks and/or I may not have permission in CircleCI.

Copy link
Contributor Author

@DrPeterVanNostrand DrPeterVanNostrand left a 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.

blake2b_simd = "0.5"
bellperson = { version = "0.16", default-features = false }
bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "halo" }
Copy link
Contributor Author

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.

@@ -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" }
Copy link
Contributor Author

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.

@@ -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" }
Copy link
Contributor Author

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.


neptune = { version = "^4.0", default-features = false, optional = true }
neptune = { git = "https://github.com/filecoin-project/neptune", branch = "halo", optional = true }
Copy link
Contributor Author

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.

blake2b_simd = "0.5"
bellperson = { version = "0.16", default-features = false }
bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "halo" }
Copy link
Contributor Author

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.

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" }
Copy link
Contributor Author

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.

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" }
Copy link
Contributor Author

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.

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" }
Copy link
Contributor Author

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.

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" }
Copy link
Contributor Author

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.

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" }
Copy link
Contributor Author

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.

Copy link
Collaborator

@cryptonemo cryptonemo left a 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!

@dignifiedquire dignifiedquire changed the title feat: use Halo2 compatible dependencies feat: use upstream group, ff and pairing dependencies Sep 18, 2021
@dignifiedquire dignifiedquire merged commit bd2e158 into master Sep 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants