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.

Sign up for GitHub

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: integrate new optional blst backend and verification optimizations from proofs #4630

Merged
merged 7 commits into from
Nov 3, 2020
Merged

feat: integrate new optional blst backend and verification optimizations from proofs #4630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
56980ff
remove extern/fil-blst
dignifiedquire Oct 14, 2020
61fa03b
use supranation/blst@0.2.0 directly
dignifiedquire Oct 14, 2020
398a831
update blst and filecoin-ffi
dignifiedquire Oct 28, 2020
d457b7a
update filecoin-ffi
dignifiedquire Oct 29, 2020
1d17d61
update filecoin-ffi
dignifiedquire Oct 29, 2020
5c30552
update filecoin-ffi to master
dignifiedquire Nov 2, 2020
3c44407
circle: Fix lotus-soup build
magik6k Nov 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ jobs:
- run: cd extern/filecoin-ffi && make
- run:
name: "replace lotus, filecoin-ffi, blst and fil-blst deps"
command: cd extern/oni/lotus-soup && go mod edit -replace github.com/filecoin-project/lotus=../../../ && go mod edit -replace github.com/filecoin-project/filecoin-ffi=../../filecoin-ffi && go mod edit -replace github.com/supranational/blst=../../fil-blst/blst && go mod edit -replace github.com/filecoin-project/fil-blst=../../fil-blst
command: cd extern/oni/lotus-soup && go mod edit -replace github.com/filecoin-project/lotus=../../../ && go mod edit -replace github.com/filecoin-project/filecoin-ffi=../../filecoin-ffi && go mod edit -replace github.com/supranational/blst=../../blst
- run:
name: "build lotus-soup testplan"
command: pushd extern/oni/lotus-soup && go build -tags=testground .
Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
[submodule "extern/test-vectors"]
path = extern/test-vectors
url = https://github.com/filecoin-project/test-vectors.git
[submodule "extern/fil-blst"]
path = extern/fil-blst
url = https://github.com/filecoin-project/fil-blst.git
[submodule "extern/oni"]
path = extern/oni
url = https://github.com/filecoin-project/oni
[submodule "extern/blst"]
path = extern/blst
url = git@github.com:supranational/blst.git
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks the build on machines that don't have github pubkeys setup. You need https here, not git.

1 change: 1 addition & 0 deletions extern/blst
Open in desktop
Submodule blst added at 1cbb16
1 change: 0 additions & 1 deletion extern/fil-blst
Open in desktop
Submodule fil-blst deleted from 5f9348
2 changes: 1 addition & 1 deletion extern/filecoin-ffi
Open in desktop
Submodule filecoin-ffi updated 11 files
+94 −21 .circleci/config.yml
+1 −1 build.sh
+2 −2 filcrypto.yml
+2 −2 generated/cgo_helpers.go
+2 −2 generated/const.go
+2 −2 generated/generated.go
+2 −2 generated/types.go
+15 −25 install-filcrypto
+1 −1 run_tests.sh
+324 −360 rust/Cargo.lock
+8 −4 rust/Cargo.toml
4 changes: 1 addition & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,4 @@ replace github.com/filecoin-project/filecoin-ffi => ./extern/filecoin-ffi

replace github.com/filecoin-project/test-vectors => ./extern/test-vectors

replace github.com/supranational/blst => ./extern/fil-blst/blst

replace github.com/filecoin-project/fil-blst => ./extern/fil-blst
replace github.com/supranational/blst => ./extern/blst