cerc-io/lotus
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

fix issue 2304: ux improvements

Browse Source
This commit is contained in:
Frank
2020-07-09 10:20:25 +08:00
parent 7d841dbfa8
commit 5b9baba900
40 changed files with 404 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/bash-completion/lotus-storage-miner → scripts/bash-completion/lotus-miner
+1 -1
View File
@@ -7,4 +7,4 @@ _cli_bash_autocomplete() {
COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) );
return 0;
};
complete -F _cli_bash_autocomplete lotus-storage-miner
complete -F _cli_bash_autocomplete lotus-miner
scripts/build-bundle.sh
+1 -1
View File
@@ -20,7 +20,7 @@ pushd bundle
BINARIES=(
"lotus"
"lotus-storage-miner"
"lotus-miner"
"lotus-seal-worker"
)
scripts/deploy-bootstrapper.sh
+2 -2
View File
@@ -10,7 +10,7 @@ log "> Deploying bootstrap node $host"
log "Stopping lotus daemon"
ssh "$host" 'systemctl stop lotus-daemon' &
ssh "$host" 'systemctl stop lotus-storage-miner' &
ssh "$host" 'systemctl stop lotus-miner' &
wait
@@ -18,7 +18,7 @@ ssh "$host" 'rm -rf .lotus' &
ssh "$host" 'rm -rf .lotusstorage' &
scp -C lotus "${host}":/usr/local/bin/lotus &
scp -C lotus-storage-miner "${host}":/usr/local/bin/lotus-storage-miner &
scp -C lotus-miner "${host}":/usr/local/bin/lotus-miner &
wait
scripts/deploy-miner.sh
+2 -2
View File
@@ -14,5 +14,5 @@ echo "SYNC WAIT"
sleep 30
ssh "$HOST" 'lotus sync wait'
ssh "$HOST" 'lotus-storage-miner init --owner=$(cat addr)'
ssh "$HOST" 'systemctl start lotus-storage-miner' &
ssh "$HOST" 'lotus-miner init --owner=$(cat addr)'
ssh "$HOST" 'systemctl start lotus-miner' &
scripts/deploy-node.sh
+4 -4
View File
@@ -11,7 +11,7 @@ HOST=$1
FILES_TO_SEND=(
./lotus
./lotus-storage-miner
./lotus-miner
scripts/lotus-daemon.service
scripts/louts-miner.service
)
@@ -21,14 +21,14 @@ rsync -P "${FILES_TO_SEND[@]}" "$HOST:~/lotus-stage/"
ssh "$HOST" 'bash -s' << 'EOF'
set -euo pipefail
systemctl stop lotus-storage-miner
systemctl stop lotus-miner
systemctl stop lotus-daemon
mkdir -p .lotus .lotusstorage
cd "$HOME/lotus-stage/"
cp -f lotus lotus-storage-miner /usr/local/bin
cp -f lotus lotus-miner /usr/local/bin
cp -f lotus-daemon.service /etc/systemd/system/lotus-daemon.service
cp -f lotus-miner.service /etc/systemd/system/lotus-storage-miner.service
cp -f lotus-miner.service /etc/systemd/system/lotus-miner.service
systemctl daemon-reload
systemctl start lotus-daemon
scripts/dev/sminer-init
+1 -1
View File
@@ -7,4 +7,4 @@ export TRUST_PARAMS=1
tag=${TAG:-debug}
go run -tags=$tag ./cmd/lotus wallet import ~/.genesis-sectors/pre-seal-t01000.key
go run -tags=$tag ./cmd/lotus-storage-miner init --actor=t01000 --genesis-miner --pre-sealed-sectors=~/.genesis-sectors --pre-sealed-metadata=~/.genesis-sectors/pre-seal-t01000.json
go run -tags=$tag ./cmd/lotus-miner init --actor=t01000 --genesis-miner --pre-sealed-sectors=~/.genesis-sectors --pre-sealed-metadata=~/.genesis-sectors/pre-seal-t01000.json
scripts/devnet.bash
+15 -15
View File
@@ -42,8 +42,8 @@ SCRIPTDIR="\$( cd "\$( dirname "\${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
pushd \$SCRIPTDIR/../build
pwd
env RUSTFLAGS="-C target-cpu=native -g" FFI_BUILD_FROM_SOURCE=1 make clean deps lotus lotus-storage-miner lotus-shed
cp lotus lotus-storage-miner lotus-shed ../bin/
env RUSTFLAGS="-C target-cpu=native -g" FFI_BUILD_FROM_SOURCE=1 make clean deps lotus lotus-miner lotus-shed
cp lotus lotus-miner lotus-shed ../bin/
popd
EOF
@@ -51,13 +51,13 @@ EOF
cat > "${BASEDIR}/scripts/env.fish" <<EOF
set -x PATH ${BASEDIR}/bin \$PATH
set -x LOTUS_PATH ${BASEDIR}/.lotus
set -x LOTUS_STORAGE_PATH ${BASEDIR}/.lotusstorage
set -x LOTUS_MINER_PATH ${BASEDIR}/.lotusstorage
EOF
cat > "${BASEDIR}/scripts/env.bash" <<EOF
export PATH=${BASEDIR}/bin:\$PATH
export LOTUS_PATH=${BASEDIR}/.lotus
export LOTUS_STORAGE_PATH=${BASEDIR}/.lotusstorage
export LOTUS_MINER_PATH=${BASEDIR}/.lotusstorage
EOF
cat > "${BASEDIR}/scripts/create_miner.bash" <<EOF
@@ -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=2KiB --pre-sealed-sectors=~/.genesis-sectors --pre-sealed-metadata=~/.genesis-sectors/pre-seal-t01000.json --nosync
lotus-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
@@ -83,16 +83,16 @@ done
sleep 30
sector=\$(lotus-storage-miner sectors list | tail -n1 | awk '{print \$1}' | tr -d ':')
sector=\$(lotus-miner sectors list | tail -n1 | awk '{print \$1}' | tr -d ':')
current="\$sector"
while true; do
if (( \$(lotus-storage-miner sectors list | wc -l) > ${PLEDGE_COUNT} )); then
if (( \$(lotus-miner sectors list | wc -l) > ${PLEDGE_COUNT} )); then
break
fi
while true; do
state=\$(lotus-storage-miner sectors list | tail -n1 | awk '{print \$2}')
state=\$(lotus-miner sectors list | tail -n1 | awk '{print \$2}')
if [ -z "\$state" ]; then
break
@@ -102,15 +102,15 @@ while true; do
PreCommit1 | PreCommit2 | Packing | Unsealed | PreCommitting | Committing | CommitWait | FinalizeSector ) sleep 30 ;;
WaitSeed | Proving ) break ;;
* ) echo "Unknown Sector State: \$state"
lotus-storage-miner sectors status --log \$current
lotus-miner sectors status --log \$current
break ;;
esac
done
lotus-storage-miner sectors pledge
lotus-miner sectors pledge
while [ "\$current" == "\$sector" ]; do
sector=\$(lotus-storage-miner sectors list | tail -n1 | awk '{print \$1}' | tr -d ':')
sector=\$(lotus-miner sectors list | tail -n1 | awk '{print \$1}' | tr -d ':')
sleep 5
done
@@ -128,12 +128,12 @@ while true; do
echo
echo
echo Storage Miner Info
lotus-storage-miner info
lotus-miner info
echo
echo
echo Sector List
lotus-storage-miner sectors list | tail -n4
lotus-miner sectors list | tail -n4
sleep 25
@@ -151,7 +151,7 @@ if [ "$BUILD" == "yes" ]; then
bash "${BASEDIR}/scripts/build.bash"
else
cp ./lotus ${BASEDIR}/bin/
cp ./lotus-storage-miner ${BASEDIR}/bin/
cp ./lotus-miner ${BASEDIR}/bin/
cp ./lotus-seed ${BASEDIR}/bin/
cp ./lotus-shed ${BASEDIR}/bin/
fi
@@ -186,7 +186,7 @@ export LOTUS_PATH="${BASEDIR}/.lotus"
${BASEDIR}/bin/lotus wait-api
tmux send-keys -t $session:$wminer "${BASEDIR}/scripts/create_miner.bash" C-m
tmux send-keys -t $session:$wminer "lotus-storage-miner run --api 48020 --nosync 2>&1 | tee -a ${BASEDIR}/miner.log" C-m
tmux send-keys -t $session:$wminer "lotus-miner run --api 48020 --nosync 2>&1 | tee -a ${BASEDIR}/miner.log" C-m
tmux send-keys -t $session:$wcli "${BASEDIR}/scripts/monitor.bash" C-m
tmux send-keys -t $session:$wpleding "${BASEDIR}/scripts/pledge_sectors.bash" C-m
scripts/init-network.sh
+4 -4
View File
@@ -86,12 +86,12 @@ mdt0111=$(mktemp -d)
mdt0222=$(mktemp -d)
mdt0333=$(mktemp -d)
env LOTUS_PATH="${ldt0111}" LOTUS_STORAGE_PATH="${mdt0111}" ./lotus-storage-miner init --genesis-miner --actor=t0111 --pre-sealed-sectors="${sdt0111}" --pre-sealed-metadata="${sdt0111}/pre-seal-t0111.json" --nosync=true --sector-size="${SECTOR_SIZE}" || true
env LOTUS_PATH="${ldt0111}" LOTUS_STORAGE_PATH="${mdt0111}" ./lotus-storage-miner run --nosync &
env LOTUS_PATH="${ldt0111}" LOTUS_MINER_PATH="${mdt0111}" ./lotus-miner init --genesis-miner --actor=t0111 --pre-sealed-sectors="${sdt0111}" --pre-sealed-metadata="${sdt0111}/pre-seal-t0111.json" --nosync=true --sector-size="${SECTOR_SIZE}" || true
env LOTUS_PATH="${ldt0111}" LOTUS_MINER_PATH="${mdt0111}" ./lotus-miner run --nosync &
mpid=$!
env LOTUS_PATH="${ldt0222}" LOTUS_STORAGE_PATH="${mdt0222}" ./lotus-storage-miner init --actor=t0222 --pre-sealed-sectors="${sdt0222}" --pre-sealed-metadata="${sdt0222}/pre-seal-t0222.json" --nosync=true --sector-size="${SECTOR_SIZE}" || true
env LOTUS_PATH="${ldt0333}" LOTUS_STORAGE_PATH="${mdt0333}" ./lotus-storage-miner init --actor=t0333 --pre-sealed-sectors="${sdt0333}" --pre-sealed-metadata="${sdt0333}/pre-seal-t0333.json" --nosync=true --sector-size="${SECTOR_SIZE}" || true
env LOTUS_PATH="${ldt0222}" LOTUS_MINER_PATH="${mdt0222}" ./lotus-miner init --actor=t0222 --pre-sealed-sectors="${sdt0222}" --pre-sealed-metadata="${sdt0222}/pre-seal-t0222.json" --nosync=true --sector-size="${SECTOR_SIZE}" || true
env LOTUS_PATH="${ldt0333}" LOTUS_MINER_PATH="${mdt0333}" ./lotus-miner init --actor=t0333 --pre-sealed-sectors="${sdt0333}" --pre-sealed-metadata="${sdt0333}/pre-seal-t0333.json" --nosync=true --sector-size="${SECTOR_SIZE}" || true
kill $mpid
wait $mpid
scripts/chainwatch.service → scripts/lotus-chainwatch.service
+1 -1
View File
@@ -9,7 +9,7 @@ Environment=GOLOG_LOG_FMT="json"
Environment=LOTUS_DB=""
Environment=LOTUS_PATH="%h/.lotus"
EnvironmentFile=-/etc/lotus/chainwatch.env
ExecStart=/usr/local/bin/chainwatch run
ExecStart=/usr/local/bin/lotus-chainwatch run
[Install]
WantedBy=multi-user.target
scripts/lotus-miner.service
+1 -1
View File
@@ -5,7 +5,7 @@ After=lotus-daemon.service
Requires=lotus-daemon.service
[Service]
ExecStart=/usr/local/bin/lotus-storage-miner run
ExecStart=/usr/local/bin/lotus-miner run
Environment=GOLOG_FILE="/var/log/lotus/miner.log"
Environment=GOLOG_LOG_FMT="json"
scripts/miner-mon.sh
+3 -3
View File
@@ -9,15 +9,15 @@ tmux new-window -t $SESSION:1 -n 'Storage Miner'
tmux split-window -h
tmux select-pane -t 0
tmux send-keys "watch -n1 './lotus-storage-miner info'" C-m
tmux send-keys "watch -n1 './lotus-miner info'" C-m
tmux split-window -v
tmux select-pane -t 1
tmux send-keys "watch -n1 './lotus-storage-miner workers list'" C-m
tmux send-keys "watch -n1 './lotus-miner workers list'" C-m
tmux select-pane -t 2
tmux send-keys "watch -n1 './lotus-storage-miner storage list'" C-m
tmux send-keys "watch -n1 './lotus-miner storage list'" C-m
tmux -2 attach-session -t $SESSION
scripts/quick-network-join.bash
+14 -14
View File
@@ -25,8 +25,8 @@ SCRIPTDIR="\$( cd "\$( dirname "\${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
pushd \$SCRIPTDIR/../build
pwd
env RUSTFLAGS="-C target-cpu=native -g" FFI_BUILD_FROM_SOURCE=1 make clean deps lotus lotus-storage-miner lotus-shed
cp lotus lotus-storage-miner lotus-shed ../bin/
env RUSTFLAGS="-C target-cpu=native -g" FFI_BUILD_FROM_SOURCE=1 make clean deps lotus lotus-miner lotus-shed
cp lotus lotus-miner lotus-shed ../bin/
popd
EOF
@@ -34,13 +34,13 @@ EOF
cat > "${BASEDIR}/scripts/env.fish" <<EOF
set -x PATH ${BASEDIR}/bin \$PATH
set -x LOTUS_PATH ${BASEDIR}/.lotus
set -x LOTUS_STORAGE_PATH ${BASEDIR}/.lotusstorage
set -x LOTUS_MINER_PATH ${BASEDIR}/.lotusstorage
EOF
cat > "${BASEDIR}/scripts/env.bash" <<EOF
export PATH=${BASEDIR}/bin:\$PATH
export LOTUS_PATH=${BASEDIR}/.lotus
export LOTUS_STORAGE_PATH=${BASEDIR}/.lotusstorage
export LOTUS_MINER_PATH=${BASEDIR}/.lotusstorage
EOF
cat > "${BASEDIR}/scripts/create_miner.bash" <<EOF
@@ -60,7 +60,7 @@ lotus state wait-msg "\${param[f]}"
maddr=\$(curl "$faucet/msgwaitaddr?cid=\${param[f]}" | jq -r '.addr')
lotus-storage-miner init --actor=\$maddr --owner=\$owner
lotus-miner init --actor=\$maddr --owner=\$owner
EOF
cat > "${BASEDIR}/scripts/pledge_sectors.bash" <<EOF
@@ -78,16 +78,16 @@ done
sleep 30
sector=\$(lotus-storage-miner sectors list | tail -n1 | awk '{print \$1}' | tr -d ':')
sector=\$(lotus-miner sectors list | tail -n1 | awk '{print \$1}' | tr -d ':')
current="\$sector"
while true; do
if (( \$(lotus-storage-miner sectors list | wc -l) > ${PLEDGE_COUNT} )); then
if (( \$(lotus-miner sectors list | wc -l) > ${PLEDGE_COUNT} )); then
break
fi
while true; do
state=\$(lotus-storage-miner sectors list | tail -n1 | awk '{print \$2}')
state=\$(lotus-miner sectors list | tail -n1 | awk '{print \$2}')
if [ -z "\$state" ]; then
break
@@ -97,15 +97,15 @@ while true; do
PreCommit1 | PreCommit2 | Packing | Unsealed | PreCommitting | Committing | CommitWait | FinalizeSector ) sleep 30 ;;
WaitSeed | Proving ) break ;;
* ) echo "Unknown Sector State: \$state"
lotus-storage-miner sectors status --log \$current
lotus-miner sectors status --log \$current
break ;;
esac
done
lotus-storage-miner sectors pledge
lotus-miner sectors pledge
while [ "\$current" == "\$sector" ]; do
sector=\$(lotus-storage-miner sectors list | tail -n1 | awk '{print \$1}' | tr -d ':')
sector=\$(lotus-miner sectors list | tail -n1 | awk '{print \$1}' | tr -d ':')
sleep 5
done
@@ -123,12 +123,12 @@ while true; do
echo
echo
echo Storage Miner Info
lotus-storage-miner info
lotus-miner info
echo
echo
echo Sector List
lotus-storage-miner sectors list | tail -n4
lotus-miner sectors list | tail -n4
sleep 25
@@ -170,7 +170,7 @@ tmux send-keys -t $session:$wdaemon "lotus daemon --api 48010 daemon 2>&1 | tee
sleep 30
tmux send-keys -t $session:$wminer "${BASEDIR}/scripts/create_miner.bash" C-m
tmux send-keys -t $session:$wminer "lotus-storage-miner run --api 48020 2>&1 | tee -a ${BASEDIR}/miner.log" C-m
tmux send-keys -t $session:$wminer "lotus-miner run --api 48020 2>&1 | tee -a ${BASEDIR}/miner.log" C-m
tmux send-keys -t $session:$wcli "${BASEDIR}/scripts/monitor.bash" C-m
tmux send-keys -t $session:$wpleding "${BASEDIR}/scripts/pledge_sectors.bash" C-m
scripts/setup-host.sh
+1 -1
View File
@@ -3,4 +3,4 @@
HOST=$1
scp scripts/lotus-daemon.service "${HOST}:/etc/systemd/system/lotus-daemon.service"
scp scripts/lotus-miner.service "${HOST}:/etc/systemd/system/lotus-storage-miner.service"
scp scripts/lotus-miner.service "${HOST}:/etc/systemd/system/lotus-miner.service"
scripts/zsh-completion/lotus-storage-miner → scripts/zsh-completion/lotus-miner
+1 -1
View File
@@ -9,4 +9,4 @@ _cli_bash_autocomplete() {
COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) );
return 0;
};
complete -F _cli_bash_autocomplete lotus-storage-miner
complete -F _cli_bash_autocomplete lotus-miner