From 1beb8faa26962d00cd4f55ee7d3f3a521ae6f0d1 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 3 Jul 2020 20:11:14 +0200 Subject: [PATCH 1/3] upgrade buildbase to v4 --- docker-images/Dockerfile.oni-buildbase | 2 +- docker-images/HISTORY.md | 1 + docker-images/{build.sh => build-buildbase.sh} | 1 - docker-images/{push.sh => build-runtime.sh} | 7 ++++--- 4 files changed, 6 insertions(+), 5 deletions(-) rename docker-images/{build.sh => build-buildbase.sh} (82%) rename docker-images/{push.sh => build-runtime.sh} (52%) diff --git a/docker-images/Dockerfile.oni-buildbase b/docker-images/Dockerfile.oni-buildbase index f9383b2d0..dae3b6dd3 100644 --- a/docker-images/Dockerfile.oni-buildbase +++ b/docker-images/Dockerfile.oni-buildbase @@ -4,7 +4,7 @@ FROM golang:${GO_VERSION}-buster RUN apt-get update && apt-get install -y ca-certificates llvm clang mesa-opencl-icd ocl-icd-opencl-dev jq gcc git pkg-config bzr -ARG FILECOIN_FFI_COMMIT=5342c7c97d1a1df4650629d14f2823d52889edd9 +ARG FILECOIN_FFI_COMMIT=6a143e06f923f3a4f544c7a652e8b4df420a3d28 ARG FFI_DIR=/extra/filecoin-ffi RUN mkdir -p ${FFI_DIR} \ diff --git a/docker-images/HISTORY.md b/docker-images/HISTORY.md index 7560da9e9..a5fce90cd 100644 --- a/docker-images/HISTORY.md +++ b/docker-images/HISTORY.md @@ -5,6 +5,7 @@ * `v1` => initial image locking in FFI commit ca281af0b6c00314382a75ae869e5cb22c83655b. * `v2` => no changes; released only for aligning both images to aesthetically please @nonsense :D * `v3` => locking in FFI commit 5342c7c97d1a1df4650629d14f2823d52889edd9. +* `v4` => locking in FFI commit 6a143e06f923f3a4f544c7a652e8b4df420a3d28. ## oni-runtime diff --git a/docker-images/build.sh b/docker-images/build-buildbase.sh similarity index 82% rename from docker-images/build.sh rename to docker-images/build-buildbase.sh index c9c6946b0..1ad66b228 100755 --- a/docker-images/build.sh +++ b/docker-images/build-buildbase.sh @@ -24,4 +24,3 @@ fi dir="$(dirname "$0")" docker build -t "iptestground/oni-buildbase:$TAG" -f "$dir/Dockerfile.oni-buildbase" "$dir" -docker build -t "iptestground/oni-runtime:$TAG" -f "$dir/Dockerfile.oni-runtime" "$dir" diff --git a/docker-images/push.sh b/docker-images/build-runtime.sh similarity index 52% rename from docker-images/push.sh rename to docker-images/build-runtime.sh index ff2c4fcdc..8b0b2cc29 100755 --- a/docker-images/push.sh +++ b/docker-images/build-runtime.sh @@ -17,9 +17,10 @@ TAG=$1 # Validate required arguments if [ -z "$TAG" ] then - echo -e "Please provide a tag for the push. For example: \`./push.sh v3\`" + echo -e "Please provide a tag for the build. For example: \`./build.sh v3\`" exit 2 fi -docker push "iptestground/oni-buildbase:$TAG" -docker push "iptestground/oni-runtime:$TAG" +dir="$(dirname "$0")" + +docker build -t "iptestground/oni-runtime:$TAG" -f "$dir/Dockerfile.oni-runtime" "$dir" From aa90a8a9891b75112efeb312e5a1f40af7d05f22 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 3 Jul 2020 20:57:57 +0200 Subject: [PATCH 2/3] upgrade lotus --- lotus-soup/go.mod | 6 +++--- lotus-soup/go.sum | 4 ++++ lotus-soup/manifest.toml | 2 +- lotus-soup/testkit/role_miner.go | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lotus-soup/go.mod b/lotus-soup/go.mod index 5fbdd9cd9..b4b73a073 100644 --- a/lotus-soup/go.mod +++ b/lotus-soup/go.mod @@ -6,11 +6,11 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/drand/drand v0.9.2-0.20200616080806-a94e9c1636a4 github.com/filecoin-project/go-address v0.0.2-0.20200504173055-8b6f2fb2b3ef - github.com/filecoin-project/go-fil-markets v0.3.1 + github.com/filecoin-project/go-fil-markets v0.3.2-0.20200702145639-4034a18364e4 github.com/filecoin-project/go-jsonrpc v0.1.1-0.20200602181149-522144ab4e24 github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b - github.com/filecoin-project/lotus v0.4.1-0.20200701153027-70d83784046b - github.com/filecoin-project/specs-actors v0.6.2-0.20200617175406-de392ca14121 + github.com/filecoin-project/lotus v0.4.2-0.20200703133307-d3a1261f1e81 + github.com/filecoin-project/specs-actors v0.6.2-0.20200702170846-2cd72643a5cf github.com/gorilla/mux v1.7.4 github.com/influxdata/influxdb v1.8.0 // indirect github.com/ipfs/go-cid v0.0.6 diff --git a/lotus-soup/go.sum b/lotus-soup/go.sum index 5a58be51d..ce7a15ece 100644 --- a/lotus-soup/go.sum +++ b/lotus-soup/go.sum @@ -242,6 +242,7 @@ github.com/filecoin-project/go-fil-commcid v0.0.0-20200208005934-2b8bd03caca5 h1 github.com/filecoin-project/go-fil-commcid v0.0.0-20200208005934-2b8bd03caca5/go.mod h1:JbkIgFF/Z9BDlvrJO1FuKkaWsH673/UdFaiVS6uIHlA= github.com/filecoin-project/go-fil-markets v0.3.1 h1:YLH4ck4hQrKBpQ3fo0VcA2SXqiAosizxBJ/QHYgR9aE= github.com/filecoin-project/go-fil-markets v0.3.1/go.mod h1:UY+/zwNXHN73HcrN6HxNDpv6KKM6ehqfCuE9vK9khF8= +github.com/filecoin-project/go-fil-markets v0.3.2-0.20200702145639-4034a18364e4/go.mod h1:UY+/zwNXHN73HcrN6HxNDpv6KKM6ehqfCuE9vK9khF8= github.com/filecoin-project/go-jsonrpc v0.1.1-0.20200602181149-522144ab4e24 h1:Jc7vkplmZYVuaEcSXGHDwefvZIdoyyaoGDLqSr8Svms= github.com/filecoin-project/go-jsonrpc v0.1.1-0.20200602181149-522144ab4e24/go.mod h1:j6zV//WXIIY5kky873Q3iIKt/ViOE8rcijovmpxrXzM= github.com/filecoin-project/go-padreader v0.0.0-20200210211231-548257017ca6 h1:92PET+sx1Hb4W/8CgFwGuxaKbttwY+UNspYZTvXY0vs= @@ -259,6 +260,8 @@ github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b/go.mod h1:Q0GQOBtKf1oE10eSXSlhN45kDBdGvEcVOqMiffqX+N8= github.com/filecoin-project/lotus v0.4.1-0.20200701153027-70d83784046b h1:5B4Sabzrk8lH+AD/yTUrL9yJT4AemAEtRJMHrciA7bk= github.com/filecoin-project/lotus v0.4.1-0.20200701153027-70d83784046b/go.mod h1:hqGdmSDzUWfhss1qBHot1Yi35AHFFJ6NVuFVZJLKW1M= +github.com/filecoin-project/lotus v0.4.2-0.20200703133307-d3a1261f1e81 h1:5z7zvH58rVG7jRdKYNif9SoBTiXHeDyKwKLOr0pnA1o= +github.com/filecoin-project/lotus v0.4.2-0.20200703133307-d3a1261f1e81/go.mod h1:uo3yDPhPlpHwdCKr0k41/a205WwlSclQamx+sQDKRMI= github.com/filecoin-project/sector-storage v0.0.0-20200615154852-728a47ab99d6/go.mod h1:M59QnAeA/oV+Z8oHFLoNpGMv0LZ8Rll+vHVXX7GirPM= github.com/filecoin-project/sector-storage v0.0.0-20200625154333-98ef8e4ef246/go.mod h1:8f0hWDzzIi1hKs4IVKH9RnDsO4LEHVz8BNat0okDOuY= github.com/filecoin-project/sector-storage v0.0.0-20200630180318-4c1968f62a8f h1:EHKqNJNIcYggqfrd5nu7SV1KR93ReZygfdSV0w/jefQ= @@ -269,6 +272,7 @@ github.com/filecoin-project/specs-actors v0.6.0/go.mod h1:dRdy3cURykh2R8O/DKqy8o github.com/filecoin-project/specs-actors v0.6.1/go.mod h1:dRdy3cURykh2R8O/DKqy8olScl70rmIS7GrB4hB1IDY= github.com/filecoin-project/specs-actors v0.6.2-0.20200617175406-de392ca14121 h1:oRA+b4iN4H86xXDXbU3TOyvmBZp7//c5VqTc0oJ6nLg= github.com/filecoin-project/specs-actors v0.6.2-0.20200617175406-de392ca14121/go.mod h1:dRdy3cURykh2R8O/DKqy8olScl70rmIS7GrB4hB1IDY= +github.com/filecoin-project/specs-actors v0.6.2-0.20200702170846-2cd72643a5cf/go.mod h1:dRdy3cURykh2R8O/DKqy8olScl70rmIS7GrB4hB1IDY= github.com/filecoin-project/specs-storage v0.1.0/go.mod h1:Pr5ntAaxsh+sLG/LYiL4tKzvA83Vk5vLODYhfNwOg7k= github.com/filecoin-project/specs-storage v0.1.1-0.20200622113353-88a9704877ea h1:iixjULRQFPn7Q9KlIqfwLJnlAXO10bbkI+xy5GKGdLY= github.com/filecoin-project/specs-storage v0.1.1-0.20200622113353-88a9704877ea/go.mod h1:Pr5ntAaxsh+sLG/LYiL4tKzvA83Vk5vLODYhfNwOg7k= diff --git a/lotus-soup/manifest.toml b/lotus-soup/manifest.toml index d43c42627..e48faf2f7 100644 --- a/lotus-soup/manifest.toml +++ b/lotus-soup/manifest.toml @@ -7,7 +7,7 @@ runner = "local:docker" [builders."docker:go"] enabled = true -build_base_image = "iptestground/oni-buildbase:v3" +build_base_image = "iptestground/oni-buildbase:v4" runtime_image = "iptestground/oni-runtime:v2" [runners."local:docker"] diff --git a/lotus-soup/testkit/role_miner.go b/lotus-soup/testkit/role_miner.go index 5313b0fd9..088162810 100644 --- a/lotus-soup/testkit/role_miner.go +++ b/lotus-soup/testkit/role_miner.go @@ -91,7 +91,7 @@ func PrepareMiner(t *TestEnvironment) (*LotusMiner, error) { } sectors := t.IntParam("sectors") - genMiner, _, err := seed.PreSeal(minerAddr, abi.RegisteredSealProof_StackedDrg2KiBV1, 0, sectors, presealDir, []byte("TODO: randomize this"), &walletKey.KeyInfo) + genMiner, _, err := seed.PreSeal(minerAddr, abi.RegisteredSealProof_StackedDrg2KiBV1, 0, sectors, presealDir, []byte("TODO: randomize this"), &walletKey.KeyInfo, false) if err != nil { return nil, err } From f7715ab1ba8b45f56e805c0b4add2cc448e803d6 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 3 Jul 2020 21:36:57 +0200 Subject: [PATCH 3/3] bump filecoin-ffi to 6a143 --- extra/filecoin-ffi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/filecoin-ffi b/extra/filecoin-ffi index 5342c7c97..6a143e06f 160000 --- a/extra/filecoin-ffi +++ b/extra/filecoin-ffi @@ -1 +1 @@ -Subproject commit 5342c7c97d1a1df4650629d14f2823d52889edd9 +Subproject commit 6a143e06f923f3a4f544c7a652e8b4df420a3d28