From 7f00a6e59c07dd05ad2855baa45443eb775d13dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Fri, 18 Jun 2021 11:17:18 +0200 Subject: [PATCH 1/3] Proofs v8.0.2 with fixed aggregate lengths --- extern/filecoin-ffi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/filecoin-ffi b/extern/filecoin-ffi index d2e3aa7d615..6f11cdffd4f 160000 --- a/extern/filecoin-ffi +++ b/extern/filecoin-ffi @@ -1 +1 @@ -Subproject commit d2e3aa7d61501d69bed6e898de13d1312b021e62 +Subproject commit 6f11cdffd4f6c7ae1b05d0e47f578d4c9b21415f From 5516f3492e4a2ee7f595e46b149fa00b88676680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Fri, 18 Jun 2021 12:02:42 +0200 Subject: [PATCH 2/3] ffiwrapper: Assert aggregate length --- extern/sector-storage/ffiwrapper/sealer_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/extern/sector-storage/ffiwrapper/sealer_test.go b/extern/sector-storage/ffiwrapper/sealer_test.go index df657f097e6..4adec48cfb2 100644 --- a/extern/sector-storage/ffiwrapper/sealer_test.go +++ b/extern/sector-storage/ffiwrapper/sealer_test.go @@ -544,6 +544,7 @@ func TestSealAndVerifyAggregate(t *testing.T) { avi.Proof, err = ProofProver.AggregateSealProofs(avi, toAggregate) require.NoError(t, err) + require.Len(t, avi.Proof, 11188) aggDone := time.Now() From 738ac926d1274c659bf694b06e306d299dc5fdd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Fri, 18 Jun 2021 15:49:59 +0200 Subject: [PATCH 3/3] Update ffi --- Makefile | 2 +- extern/filecoin-ffi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 400788e2e3d..542ace84968 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ BUILD_DEPS+=build/.filecoin-install CLEAN+=build/.filecoin-install ffi-version-check: - @[[ "$$(awk '/const Version/{print $$5}' extern/filecoin-ffi/version.go)" -eq 2 ]] || (echo "FFI version mismatch, update submodules"; exit 1) + @[[ "$$(awk '/const Version/{print $$5}' extern/filecoin-ffi/version.go)" -eq 3 ]] || (echo "FFI version mismatch, update submodules"; exit 1) BUILD_DEPS+=ffi-version-check .PHONY: ffi-version-check diff --git a/extern/filecoin-ffi b/extern/filecoin-ffi index 6f11cdffd4f..d60fc680aa8 160000 --- a/extern/filecoin-ffi +++ b/extern/filecoin-ffi @@ -1 +1 @@ -Subproject commit 6f11cdffd4f6c7ae1b05d0e47f578d4c9b21415f +Subproject commit d60fc680aa8abeafba698f738fed5b94c9bda33d