print auth token ; set seal delay ; disable permissioned api proxies …

…; bump balances (#122) * print auth token ; set seal delay * disable permissioned proxy /2 (#123) * bump up balances (#124) * upgrade go.mod to use latest lotus next * make compiler happy due to change in APIs * fix k8s compositions to use natural time mining * add note for balances
filecoin-project · Jul 9, 2020 · 4caecf3 · 4caecf3
1 parent f20b25a
commit 4caecf3
Show file tree

Hide file tree

Showing 21 changed files with 118 additions and 51 deletions.
diff --git a/docker-images/Dockerfile.oni-runtime-debug b/docker-images/Dockerfile.oni-runtime-debug
@@ -0,0 +1,28 @@
+ARG GO_VERSION=1.14.2
+
+FROM golang:${GO_VERSION}-buster as downloader
+
+## Fetch the proof parameters.
+## 1. Install the paramfetch binary first, so it can be cached over builds.
+## 2. Then copy over the parameters (which could change).
+## 3. Trigger the download.
+## Output will be in /var/tmp/filecoin-proof-parameters.
+
+RUN go get github.com/filecoin-project/go-paramfetch/paramfetch
+COPY /proof-parameters.json /
+RUN paramfetch 2048 /proof-parameters.json
+
+## for debug purposes
+RUN apt update && apt install -y mesa-opencl-icd ocl-icd-opencl-dev gcc git bzr jq pkg-config curl && git clone https://github.com/filecoin-project/lotus.git && cd lotus/ && git checkout next && make clean && make all && make install
+
+FROM ubuntu:18.04
+
+RUN apt-get update && apt-get install -y ca-certificates llvm clang mesa-opencl-icd ocl-icd-opencl-dev jq gcc pkg-config net-tools netcat traceroute iputils-ping wget vim curl telnet iproute2 dnsutils
+COPY --from=downloader /var/tmp/filecoin-proof-parameters /var/tmp/filecoin-proof-parameters
+
+## for debug purposes
+COPY --from=downloader /usr/local/bin/lotus /usr/local/bin/lll
+COPY --from=downloader /usr/local/bin/lotus-storage-miner /usr/local/bin/lsm
+
+ENV FULLNODE_API_INFO="dummytoken:/ip4/127.0.0.1/tcp/1234/http"
+ENV STORAGE_API_INFO="dummytoken:/ip4/127.0.0.1/tcp/2345/http"
diff --git a/lotus-soup/compositions/composition-drand-halt.toml b/lotus-soup/compositions/composition-drand-halt.toml
@@ -21,7 +21,7 @@
 [global.run.test_params]
   clients = "1"
   miners = "1"
-  balance = "2000"
+  balance = "20000000" # These balances will work for maximum 100 nodes, as TotalFilecoin is 2B
   sectors = "10"
   random_beacon_type = "local-drand"
   genesis_timestamp_offset = "0"

diff --git a/lotus-soup/compositions/composition-k8s-10-3.toml b/lotus-soup/compositions/composition-k8s-10-3.toml
@@ -24,8 +24,10 @@
 [global.run.test_params]
   clients = "10"
   miners = "3"
-  genesis_timestamp_offset = "100000"
-  balance = "2000"
+  genesis_timestamp_offset = "0"
+  balance = "20000000" # These balances will work for maximum 100 nodes, as TotalFilecoin is 2B
+  random_beacon_type = "mock"
+  mining_mode = "natural"
 
 [[groups]]
   id = "bootstrapper"

diff --git a/lotus-soup/compositions/composition-k8s-3-1.toml b/lotus-soup/compositions/composition-k8s-3-1.toml
@@ -24,9 +24,11 @@
 [global.run.test_params]
   clients = "3"
   miners = "1"
-  genesis_timestamp_offset = "100000"
-  balance = "2000"
+  genesis_timestamp_offset = "0"
+  balance = "20000000" # These balances will work for maximum 100 nodes, as TotalFilecoin is 2B
   sectors = "10"
+  random_beacon_type = "mock"
+  mining_mode = "natural"
 
 [[groups]]
   id = "bootstrapper"

diff --git a/lotus-soup/compositions/composition-k8s-3-2.toml b/lotus-soup/compositions/composition-k8s-3-2.toml
@@ -24,9 +24,11 @@
 [global.run.test_params]
   clients = "3"
   miners = "2"
-  genesis_timestamp_offset = "100000"
-  balance = "2000"
+  genesis_timestamp_offset = "0"
+  balance = "20000000" # These balances will work for maximum 100 nodes, as TotalFilecoin is 2B
   sectors = "10"
+  random_beacon_type = "mock"
+  mining_mode = "natural"
 
 [[groups]]
   id = "bootstrapper"

diff --git a/lotus-soup/compositions/composition-k8s.toml b/lotus-soup/compositions/composition-k8s.toml
@@ -24,9 +24,10 @@
 [global.run.test_params]
   clients = "1"
   miners = "1"
-  genesis_timestamp_offset = "100000"
-  balance = "2000"
+  genesis_timestamp_offset = "0"
+  balance = "20000000" # These balances will work for maximum 100 nodes, as TotalFilecoin is 2B
   sectors = "10"
+  mining_mode = "natural"
 
 [[groups]]
   id = "bootstrapper"

diff --git a/lotus-soup/compositions/composition-local-drand.toml b/lotus-soup/compositions/composition-local-drand.toml
@@ -21,7 +21,7 @@
 [global.run.test_params]
     clients = "1"
     miners = "1"
-    balance = "2000"
+    balance = "20000000" # These balances will work for maximum 100 nodes, as TotalFilecoin is 2B
     sectors = "10"
     random_beacon_type = "local-drand"
     genesis_timestamp_offset = "0"

diff --git a/lotus-soup/compositions/composition-natural.toml b/lotus-soup/compositions/composition-natural.toml
@@ -22,7 +22,7 @@
   clients = "3"
   miners = "2"
   genesis_timestamp_offset = "100000"
-  balance = "2000000000"
+  balance = "20000000" # These balances will work for maximum 100 nodes, as TotalFilecoin is 2B
   sectors = "10"
   random_beacon_type = "mock"
 

diff --git a/lotus-soup/compositions/composition-stress-test-concurrent-natural.toml b/lotus-soup/compositions/composition-stress-test-concurrent-natural.toml
@@ -22,7 +22,7 @@
   clients = "3"
   miners = "2"
   genesis_timestamp_offset = "0"
-  balance = "2000000000"
+  balance = "20000000" # These balances will work for maximum 100 nodes, as TotalFilecoin is 2B
   sectors = "1000"
   random_beacon_type = "mock"
 

diff --git a/lotus-soup/compositions/composition-stress-test-concurrent.toml b/lotus-soup/compositions/composition-stress-test-concurrent.toml
@@ -22,7 +22,7 @@
   clients = "3"
   miners = "2"
   genesis_timestamp_offset = "100000"
-  balance = "2000000000"
+  balance = "20000000" # These balances will work for maximum 100 nodes, as TotalFilecoin is 2B
   sectors = "1000"
   random_beacon_type = "mock"
 

diff --git a/lotus-soup/compositions/composition-stress-test-serial-natural.toml b/lotus-soup/compositions/composition-stress-test-serial-natural.toml
@@ -22,7 +22,7 @@
   clients = "3"
   miners = "2"
   genesis_timestamp_offset = "0"
-  balance = "2000000000"
+  balance = "20000000" # These balances will work for maximum 100 nodes, as TotalFilecoin is 2B
   sectors = "1000"
   random_beacon_type = "mock"
 

diff --git a/lotus-soup/compositions/composition-stress-test-serial.toml b/lotus-soup/compositions/composition-stress-test-serial.toml
@@ -22,7 +22,7 @@
   clients = "3"
   miners = "2"
   genesis_timestamp_offset = "100000"
-  balance = "2000000000"
+  balance = "20000000" # These balances will work for maximum 100 nodes, as TotalFilecoin is 2B
   sectors = "1000"
   random_beacon_type = "mock"
 

diff --git a/lotus-soup/compositions/composition-tracer.toml b/lotus-soup/compositions/composition-tracer.toml
@@ -22,7 +22,7 @@
   clients = "3"
   miners = "2"
   genesis_timestamp_offset = "100000"
-  balance = "2000000000"
+  balance = "20000000" # These balances will work for maximum 100 nodes, as TotalFilecoin is 2B
   sectors = "10"
   random_beacon_type = "mock"
   enable_pubsub_tracer = "true"

diff --git a/lotus-soup/compositions/composition.toml b/lotus-soup/compositions/composition.toml
@@ -22,7 +22,7 @@
   clients = "3"
   miners = "2"
   genesis_timestamp_offset = "0"
-  balance = "20000000.5"
+  balance = "20000000.5" # These balances will work for maximum 100 nodes, as TotalFilecoin is 2B
   sectors = "10"
   random_beacon_type = "mock"
   mining_mode = "natural"

diff --git a/lotus-soup/compositions/stress-test-concurrent-natural-k8s.toml b/lotus-soup/compositions/stress-test-concurrent-natural-k8s.toml
@@ -25,7 +25,7 @@
   clients = "6"
   miners = "2"
   genesis_timestamp_offset = "0"
-  balance = "200000"
+  balance = "20000000" # These balances will work for maximum 100 nodes, as TotalFilecoin is 2B
   sectors = "100"
   random_beacon_type = "mock"
 

diff --git a/lotus-soup/deals_e2e.go b/lotus-soup/deals_e2e.go
@@ -82,7 +82,7 @@ func dealsE2E(t *testkit.TestEnvironment) error {
 
 	// start deal
 	t1 := time.Now()
-	deal := testkit.StartDeal(ctx, minerAddr.MinerActorAddr, client, fcid)
+	deal := testkit.StartDeal(ctx, minerAddr.MinerActorAddr, client, fcid.Root)
 	t.RecordMessage("started deal: %s", deal)
 
 	// TODO: this sleep is only necessary because deals don't immediately get logged in the dealstore, we should fix this
@@ -95,7 +95,7 @@ func dealsE2E(t *testkit.TestEnvironment) error {
 	carExport := true
 
 	t.RecordMessage("trying to retrieve %s", fcid)
-	testkit.RetrieveData(t, ctx, client, fcid, carExport, data)
+	testkit.RetrieveData(t, ctx, client, fcid.Root, carExport, data)
 	t.D().ResettingHistogram("deal.retrieved").Update(int64(time.Since(t1)))
 
 	t.SyncClient.MustSignalEntry(ctx, testkit.StateStopMining)

diff --git a/lotus-soup/deals_stress.go b/lotus-soup/deals_stress.go
@@ -72,7 +72,7 @@ func dealStressTest(t *testkit.TestEnvironment) error {
 
 		data = append(data, dealData)
 		files = append(files, dealFile)
-		cids = append(cids, dealCid)
+		cids = append(cids, dealCid.Root)
 	}
 
 	concurrentDeals := true

diff --git a/lotus-soup/go.mod b/lotus-soup/go.mod
@@ -7,11 +7,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.2-0.20200706104419-7c180fe156d4
+	github.com/filecoin-project/go-fil-markets v0.4.0
 	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.2-0.20200706172415-cf6ac44b6ec5
-	github.com/filecoin-project/specs-actors v0.6.2-0.20200702170846-2cd72643a5cf
+	github.com/filecoin-project/lotus v0.4.2-0.20200708212122-7d841dbfa81c
+	github.com/filecoin-project/specs-actors v0.7.1
 	github.com/gorilla/mux v1.7.4
 	github.com/influxdata/influxdb v1.8.0 // indirect
 	github.com/ipfs/go-cid v0.0.6