Merge remote-tracking branch 'origin/master' into next

scripts/dev/gen-daemon

@@ -5,7 +5,7 @@ set -o xtrace
 export TRUST_PARAMS=1
 tag=${TAG:-debug}
 
-go run -tags=$tag ./cmd/lotus-seed pre-seal --sector-size 2048 --num-sectors 2
+go run -tags=$tag ./cmd/lotus-seed pre-seal --sector-size 2KiB --num-sectors 2
 go run -tags=$tag ./cmd/lotus-seed genesis new localnet.json
 go run -tags=$tag ./cmd/lotus-seed genesis add-miner localnet.json ~/.genesis-sectors/pre-seal-t01000.json
 go run -tags=$tag ./cmd/lotus daemon --lotus-make-genesis=devel.gen --genesis-template=localnet.json --bootstrap=false

scripts/devnet.bash

@@ -12,11 +12,11 @@ faucet="http://t01000.miner.interopnet.kittyhawk.wtf"
 
 PLEDGE_COUNT="${1:-20}"
 
-if [ -z "$BRANCH" ]; then 
+if [ -z "$BRANCH" ]; then
   BRANCH="interopnet"
 fi
 
-if [ -z "$BUILD" ]; then 
+if [ -z "$BUILD" ]; then
   BUILD="no"
 fi
 
@@ -65,7 +65,7 @@ cat > "${BASEDIR}/scripts/create_miner.bash" <<EOF
 set -x
 
 lotus wallet import ~/.genesis-sectors/pre-seal-t01000.key
-lotus-storage-miner init --genesis-miner --actor=t01000 --sector-size=2048 --pre-sealed-sectors=~/.genesis-sectors --pre-sealed-metadata=~/.genesis-sectors/pre-seal-t01000.json --nosync
+lotus-storage-miner init --genesis-miner --actor=t01000 --sector-size=2KiB --pre-sealed-sectors=~/.genesis-sectors --pre-sealed-metadata=~/.genesis-sectors/pre-seal-t01000.json --nosync
 EOF
 
 cat > "${BASEDIR}/scripts/pledge_sectors.bash" <<EOF

scripts/init-network.sh

@@ -3,7 +3,7 @@
 set -xeo
 
 NUM_SECTORS=2
-SECTOR_SIZE=2048
+SECTOR_SIZE=2KiB
 
 
 sdt0111=$(mktemp -d)

scripts/lotus-daemon.service

@@ -1,11 +1,15 @@
 [Unit]
 Description=Lotus Daemon
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
-ExecStart=/usr/local/bin/lotus daemon
 Environment=GOLOG_FILE="/var/log/lotus-daemon"
 Environment=GOLOG_LOG_FMT="json"
+ExecStart=/usr/local/bin/lotus daemon
+Restart=always
+RestartSec=30
+
 MemoryAccounting=true
 MemoryHigh=8G
 MemoryMax=10G