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/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