diff --git a/.gitignore b/.gitignore index 82e6ef566..4e008cccc 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ **/*.a **/*.pc build/.* +build/paramfetch.sh /vendor *-fuzz.zip diff --git a/Makefile b/Makefile index ae7b13f64..212f95d8d 100644 --- a/Makefile +++ b/Makefile @@ -56,8 +56,11 @@ bin/ipget: PARAM_SECTOR_SIZES:=1024 16777216 268435456 1073741824 PARAM_SECTOR_SIZES:=$(addprefix build/.params-,$(PARAM_SECTOR_SIZES)) -$(PARAM_SECTOR_SIZES): build/proof-params/parameters.json bin/ipget - ./build/proof-params/paramfetch.sh +./build/paramfetch.sh: build/proof-params/parameters.json + build/proof-params/mkparamfetch.sh + +$(PARAM_SECTOR_SIZES): ./build/paramfetch.sh build/proof-params/parameters.json bin/ipget + ./build/paramfetch.sh touch $@ BUILD_DEPS+=build/.params-1024 diff --git a/build/proof-params/mkparamfetch.sh b/build/proof-params/mkparamfetch.sh new file mode 100755 index 000000000..b503e22ef --- /dev/null +++ b/build/proof-params/mkparamfetch.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -euo pipefail + +sed "s/{{PARAMSJSON}}/$(base64 build/proof-params/parameters.json -w 0)/g" build/proof-params/paramfetch.sh.template > ./build/paramfetch.sh +chmod +x ./build/paramfetch.sh diff --git a/build/proof-params/paramfetch.sh b/build/proof-params/paramfetch.sh.template similarity index 93% rename from build/proof-params/paramfetch.sh rename to build/proof-params/paramfetch.sh.template index 97894ac39..739b8b0e1 100755 --- a/build/proof-params/paramfetch.sh +++ b/build/proof-params/paramfetch.sh.template @@ -2,6 +2,8 @@ set -euo pipefail +PARAMS='{{PARAMSJSON}}' + die() { echo "$@" >&2 exit 1 @@ -73,10 +75,9 @@ fetch_gateway() { } OUT_DIR="/var/tmp/filecoin-proof-parameters" -PARAMS="build/proof-params/parameters.json" mkdir -p $OUT_DIR -jq '. | to_entries | map("'$OUT_DIR'/\(.key) \(.value.cid) \(.value.digest)") | .[]' --raw-output $PARAMS | \ +printf $PARAMS | base64 -d | jq '. | to_entries | map("'$OUT_DIR'/\(.key) \(.value.cid) \(.value.digest)") | .[]' --raw-output | \ while read -r dest cid digest; do if [[ -f "$dest" ]]; then b2=$(b2sum "$dest" | head -c 32)