install paramfetch from rfsb

.circleci/config.yml

@@ -23,7 +23,6 @@ jobs:
       - update_submodules
       - build_project
       - lint_project
-      - install_filecoin_proofs
       - restore_parameter_cache
       - fetch_filecoin_parameters
       - save_parameter_cache
@@ -58,7 +57,6 @@ jobs:
       - update_submodules
       - build_project
       - lint_project
-      - install_filecoin_proofs
       - restore_parameter_cache
       - fetch_filecoin_parameters
       - save_parameter_cache
@@ -83,18 +81,12 @@ commands:
             echo 'export GOPATH="${HOME}/go"' >> $BASH_ENV
             echo 'export FILECOIN_PARAMETER_CACHE="${HOME}/filecoin-proof-parameters/"' >> $BASH_ENV
             echo 'export GO111MODULE=on' >> $BASH_ENV
-  install_filecoin_proofs:
-    steps:
-      - run:
-          name: Install filecoin-proofs binaries
-          command: |
-            cargo install filecoin-proofs
   fetch_filecoin_parameters:
     steps:
       - run:
           name: Fetch filecoin groth parameters
           command: |
-            ./scripts/retry.sh 1 10 1000 ./scripts/with-dots.sh paramfetch --params-for-sector-sizes=1024 --verbose
+            ./scripts/retry.sh 1 10 1000 ./scripts/with-dots.sh ./bin/paramfetch --params-for-sector-sizes=1024 --verbose
   update_submodules:
     steps:
       - run:
@@ -119,10 +111,10 @@ commands:
     steps:
       - restore_cache:
           keys:
-            - v1-proof-params-{{ checksum "~/.cargo/bin/paramfetch" }}
+            - v1-proof-params-{{ checksum "./bin/paramfetch" }}
   save_parameter_cache:
     steps:
       - save_cache:
-          key: v1-proof-params-{{ checksum "~/.cargo/bin/paramfetch" }}
+          key: v1-proof-params-{{ checksum "./bin/paramfetch" }}
           paths:
             - "~/filecoin-proof-parameters/"

.gitignore

@@ -2,3 +2,4 @@
 **/*.a
 **/*.pc
 .install-rust-fil-sector-builder
+bin/

install-rust-fil-sector-builder

@@ -16,6 +16,9 @@ if download_release_tarball tarball_path "${subm_dir}"; then
     cp "${tmp_dir}/include/sector_builder_ffi.h" .
     cp "${tmp_dir}/lib/libsector_builder_ffi.a" .
     cp "${tmp_dir}/lib/pkgconfig/sector_builder_ffi.pc" .
+
+    mkdir -p bin
+    cp "${tmp_dir}/bin/paramfetch" bin
 else
     echo "failed to find or obtain precompiled assets for ${subm_dir}, falling back to local build"
     build_from_source "${subm_dir}"
@@ -26,4 +29,13 @@ else
     find "${subm_dir}" -type f -name sector_builder_ffi.h -exec cp -- "{}" . \;
     find "${subm_dir}" -type f -name libsector_builder_ffi.a -exec cp -- "{}" . \;
     find "${subm_dir}" -type f -name sector_builder_ffi.pc -exec cp -- "{}" . \;
+
+    pushd $subm_dir
+
+    # TODO https://github.com/filecoin-project/rust-fil-sector-builder/issues/39
+    FP_VERSION=$(cat "Cargo.lock" | grep 'name = "filecoin-proofs"' -A1 | tail -n1 | cut -d' ' -f3 | tr -d '"')
+
+    cargo install --version $FP_VERSION filecoin-proofs --root '..' --bin paramfetch
+
+    popd
 fi