From 8c3d0e1a4a06932c2fc553a423dcd4ac5cbb835c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Wed, 4 Sep 2019 11:49:22 +0200 Subject: [PATCH] Simpler paramfetch --- .circleci/config.yml | 7 ++++- .gitmodules | 3 -- Makefile | 44 ++++++++++-------------------- build/proof-params/parameters.json | 42 ++++++++++++++++++++++++++++ build/proof-params/paramfetch.sh | 8 ++++++ extern/go-fil-proofs | 1 - 6 files changed, 70 insertions(+), 35 deletions(-) create mode 100644 build/proof-params/parameters.json create mode 100755 build/proof-params/paramfetch.sh delete mode 160000 extern/go-fil-proofs diff --git a/.circleci/config.yml b/.circleci/config.yml index 4062f665b..2cefa9d37 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,6 @@ commands: steps: - go/install-ssh - go/install: {package: git} - - run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y prepare: steps: - checkout @@ -63,6 +62,9 @@ jobs: - install-deps - prepare - go/mod-download + - run: + command: GO111MODULE=on go get github.com/ipfs/ipget@c0cbd7d9d1925965a5aa0895d5ff32dbdb4a009e + working_directory: "~" - run: echo 'export PATH=$HOME/.cargo/bin:$PATH' >> $BASH_ENV - run: command: make deps @@ -118,6 +120,9 @@ jobs: - install-deps - prepare - go/mod-download + - run: + command: GO111MODULE=on go get github.com/ipfs/ipget@c0cbd7d9d1925965a5aa0895d5ff32dbdb4a009e + working_directory: "~" - run: command: make deps no_output_timeout: 30m diff --git a/.gitmodules b/.gitmodules index c05da4f38..d8e0ccfa6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "extern/go-sectorbuilder"] path = extern/go-sectorbuilder url = https://github.com/filecoin-project/go-sectorbuilder -[submodule "extern/go-fil-proofs"] - path = extern/go-fil-proofs - url = git@github.com:filecoin-project/go-fil-proofs.git diff --git a/Makefile b/Makefile index fd7b66f35..fceffab10 100644 --- a/Makefile +++ b/Makefile @@ -39,36 +39,6 @@ MODULES+=$(SECTOR_BUILDER_PATH) BUILD_DEPS+=build/.sector-builder-install CLEAN+=build/.sector-builder-install -## PROOFS - -PROOFS_PATH:=extern/go-fil-proofs/ -PROOFS_DEPS:=bin/paramcache bin/paramfetch misc/parameters.json -PROOFS_DEPS:=$(addprefix $(PROOFS_PATH),$(PROOFS_DEPS)) - -$(PROOFS_DEPS): build/.proofs-install ; - -build/.proofs-install: $(PROOFS_PATH) - $(MAKE) -C $(PROOFS_PATH) $(PROOFS_DEPS:$(PROOFS_PATH)%=%) - @touch $@ - -MODULES+=$(PROOFS_PATH) -BUILD_DEPS+=build/.proofs-install -CLEAN+=build/.proofs-install - -PARAM_SECTOR_SIZES:=1024 268435456 -PARAM_SECTOR_SIZES:=$(addprefix params-,$(PARAM_SECTOR_SIZES)) - -$(PARAM_SECTOR_SIZES): extern/go-fil-proofs/bin/paramfetch extern/go-fil-proofs/misc/parameters.json - IPFS_LOGGING=info ./extern/go-fil-proofs/bin/paramfetch -z $(subst params-,,$@) --verbose --json=./extern/go-fil-proofs/misc/parameters.json --ipget-args="--node spawn -p /ip4/138.201.67.219/tcp/4002/ws/ipfs/QmUd6zHcbkbcs7SMxwLs48qZVX3vpcM8errYS7xEczwRMA -p /ip4/138.201.67.218/tcp/4002/ws/ipfs/QmbVWZQhCGrS7DhgLqWbgvdmKN7JueKCREVanfnVpgyq8x -p /ip4/94.130.135.167/tcp/4002/ws/ipfs/QmUEMvxS2e7iDrereVYc5SWPauXPyNwxcy9BXZrC1QTcHE -p /ip4/138.201.68.74/tcp/4001/ipfs/QmdnXwLrC8p1ueiq2Qya8joNvk3TVVDAut7PrikmZwubtR -p /ip4/138.201.67.220/tcp/4001/ipfs/QmNSYxZAiJHeLdkBg38roksAR9So7Y5eojks1yjEcUtZ7i" --ipget-version=v0.4.0 -.PHONY: $(PARAM_SECTOR_SIZES) - -BUILD_DEPS+=params-1024 - -paramcache: extern/go-fil-proofs/bin/paramcache - RUST_LOG=info ./extern/go-fil-proofs/bin/paramcache - -# end git modules - $(MODULES): build/.update-modules ; # dummy file that marks the last time modules were updated @@ -76,6 +46,20 @@ build/.update-modules: git submodule update --init --recursive touch $@ +# end git modules + +## PROOFS + +PARAM_SECTOR_SIZES:=1024 268435456 +PARAM_SECTOR_SIZES:=$(addprefix build/.params-,$(PARAM_SECTOR_SIZES)) + +$(PARAM_SECTOR_SIZES): build/proof-params/parameters.json + ./build/proof-params/paramfetch.sh + touch $@ + +BUILD_DEPS+=build/.params-1024 +CLEAN+=build/.params-1024 + CLEAN+=build/.update-modules deps: $(BUILD_DEPS) diff --git a/build/proof-params/parameters.json b/build/proof-params/parameters.json new file mode 100644 index 000000000..01d4b4dd7 --- /dev/null +++ b/build/proof-params/parameters.json @@ -0,0 +1,42 @@ +{ + "v11-vdf-post-6142c5095dcab8adf8698aaea24eac78035e3fefe6503b3e2f80758e4c948639.params": { + "cid": "QmYS9NmkfVtZCtQPF18uQBeWfajF5YRKKkDPXpVR6pzzP4", + "digest": "43008a8c945076a08aa2e7c4785241de", + "sector_size": 1024 + }, + "v11-vdf-post-6142c5095dcab8adf8698aaea24eac78035e3fefe6503b3e2f80758e4c948639.vk": { + "cid": "QmTXenYSVvEz2yEJ1deCobfQBVgykkigBuvWJCzTM5tmC2", + "digest": "73b49d9cf0ba983b3e861da0e0ee2e2a", + "sector_size": 1024 + }, + "v11-vdf-post-71ca99ebb6212e45b2affa16eb6e1f671c37986e84ee8b9edbf924ab45b5fdfe.params": { + "cid": "Qmc3R5xmapcSGKGR9zRC2fyPo3QuAuChtsKwswE6NZ6QMQ", + "digest": "8091b735d254982b0b62e712bab82139", + "sector_size": 268435456 + }, + "v11-vdf-post-71ca99ebb6212e45b2affa16eb6e1f671c37986e84ee8b9edbf924ab45b5fdfe.vk": { + "cid": "QmeD4mdJFPjsWouBPPwvm6iVFYG8bpqNYetd2Ux7PoZawz", + "digest": "32784464acc85a662ea16ecf5aba931d", + "sector_size": 268435456 + }, + "v11-zigzag-proof-of-replication-5efcf852a15bd74808bc65d6f2df146de817baea96c96e3b752e6a3349957644.params": { + "cid": "QmNSuxq15JPFCTehxVpgJydNZ79rpLoNwnLzQMGA9EziXg", + "digest": "818cd9cc2e0e47210a05bd073847ab5a", + "sector_size": 268435456 + }, + "v11-zigzag-proof-of-replication-5efcf852a15bd74808bc65d6f2df146de817baea96c96e3b752e6a3349957644.vk": { + "cid": "Qmbc8LcydZXsVqQrkNMeLEu31Vxi1VigQGJ2ehytxWPALH", + "digest": "a6636e2ee1a176161e022296bc045e79", + "sector_size": 268435456 + }, + "v11-zigzag-proof-of-replication-a09b5cf44f640589b1b02cf823fa28269850342bcefa4878189b9b5c9ec4d2bb.params": { + "cid": "QmTfhTnkFvbpFfw8UydFdnPCDfxgAxEcw4fRdGsELpcFnh", + "digest": "906b6c0c9dc5bb581d9641c11b54e197", + "sector_size": 1024 + }, + "v11-zigzag-proof-of-replication-a09b5cf44f640589b1b02cf823fa28269850342bcefa4878189b9b5c9ec4d2bb.vk": { + "cid": "QmRDcUxfpPY9a1vR3T4vRgxHtWHyy9m3xuMQtj8P749r4e", + "digest": "3632776cd23e376694c625390b9a73ea", + "sector_size": 1024 + } +} diff --git a/build/proof-params/paramfetch.sh b/build/proof-params/paramfetch.sh new file mode 100755 index 000000000..6b28a90ed --- /dev/null +++ b/build/proof-params/paramfetch.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +IPGET_PARAMS="--node=spawn -p=/ip4/138.201.67.219/tcp/4002/ws/ipfs/QmUd6zHcbkbcs7SMxwLs48qZVX3vpcM8errYS7xEczwRMA -p=/ip4/138.201.67.218/tcp/4002/ws/ipfs/QmbVWZQhCGrS7DhgLqWbgvdmKN7JueKCREVanfnVpgyq8x -p=/ip4/94.130.135.167/tcp/4002/ws/ipfs/QmUEMvxS2e7iDrereVYc5SWPauXPyNwxcy9BXZrC1QTcHE -p=/ip4/138.201.68.74/tcp/4001/ipfs/QmdnXwLrC8p1ueiq2Qya8joNvk3TVVDAut7PrikmZwubtR -p=/ip4/138.201.67.220/tcp/4001/ipfs/QmNSYxZAiJHeLdkBg38roksAR9So7Y5eojks1yjEcUtZ7i" +OUT_DIR="/var/tmp/filecoin-proof-parameters" +PARAMS="build/proof-params/parameters.json" + +mkdir -p $OUT_DIR +jq '. | to_entries | map("-o '$OUT_DIR'/\(.key) \(.value.cid)") | .[]' --raw-output $PARAMS | xargs -t -L1 ipget --progress $IPGET_PARAMS diff --git a/extern/go-fil-proofs b/extern/go-fil-proofs deleted file mode 160000 index 5201fa9a4..000000000 --- a/extern/go-fil-proofs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5201fa9a47494a673da4322dffdf20b7bc335acb