Skip to content

feat: use upstream group, ff and pairing dependencies#1488

Merged
dignifiedquire merged 1 commit into
masterfrom
halo
Sep 18, 2021
Merged

feat: use upstream group, ff and pairing dependencies#1488
dignifiedquire merged 1 commit into
masterfrom
halo

Conversation

@DrPeterVanNostrand

@DrPeterVanNostrand DrPeterVanNostrand commented Aug 6, 2021

Copy link
Copy Markdown
Contributor
  • 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
Copy Markdown
Contributor

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

@DrPeterVanNostrand

Copy link
Copy Markdown
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.

@DrPeterVanNostrand DrPeterVanNostrand left a comment

Copy link
Copy Markdown
Contributor Author

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.

Comment thread fil-proofs-param/Cargo.toml Outdated
ff = "0.10.0"
blake2b_simd = "0.5"
bellperson = { version = "0.16", default-features = false }
bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "halo" }

Copy link
Copy Markdown
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.

Comment thread fil-proofs-tooling/Cargo.toml Outdated
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
Copy Markdown
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.

Comment thread filecoin-hashers/Cargo.toml Outdated

[dependencies]
bellperson = { version = "0.16", default-features = false }
bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "halo" }

Copy link
Copy Markdown
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.

Comment thread filecoin-hashers/Cargo.toml Outdated
rand = "0.8.0"

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

Copy link
Copy Markdown
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.

Comment thread filecoin-proofs/Cargo.toml Outdated
ff = "0.10.0"
blake2b_simd = "0.5"
bellperson = { version = "0.16", default-features = false }
bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "halo" }

Copy link
Copy Markdown
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.

Comment thread storage-proofs-core/Cargo.toml Outdated
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
Copy Markdown
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.

Comment thread 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" }

Copy link
Copy Markdown
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.

Comment thread storage-proofs-porep/Cargo.toml Outdated
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
Copy Markdown
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.

Comment thread 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" }

Copy link
Copy Markdown
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.

Comment thread storage-proofs-post/Cargo.toml Outdated
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
Copy Markdown
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.

@cryptonemo cryptonemo left a comment

Copy link
Copy Markdown
Contributor

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
@dignifiedquire dignifiedquire deleted the halo branch September 18, 2021 12:03
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