lotus 升级
1, lotus 升级
# git show
commit 30b857bc8a7485bf381f788f08f22a45d7e6fcf2 (HEAD -> master, origin/master, origin/HEAD)
Merge: 7c925db7 dafad17a
Author: Whyrusleeping <[email protected]>
Date: Fri Dec 20 20:15:25 2019 -0800
Merge pull request #999 from filecoin-project/fix/sector-set-removal
don't fail execution if the fault set contains an invalid sector ID
# git pull origin master
remote: Enumerating objects: 309, done.
remote: Counting objects: 100% (309/309), done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 529 (delta 306), reused 305 (delta 305), pack-reused 220
Receiving objects: 100% (529/529), 150.70 KiB | 82.00 KiB/s, done.
Resolving deltas: 100% (386/386), completed with 147 local objects.
From https://github.com/filecoin-project/lotus
* branch master -> FETCH_HEAD
30b857bc..716b2a4b master -> origin/master
Updating 30b857bc..716b2a4b
error: Your local changes to the following files would be overwritten by merge:
chain/actors/actor_miner.go
Please commit your changes or stash them before you merge.
Aborting
# git reset --hard
HEAD is now at 30b857bc Merge pull request #999 from filecoin-project/fix/sector-set-removal
# git pull origin master
kill lotus daemon 和 lotus-storage-miner run
# export ALL_PROXY=socks5://127.0.0.1:1080
# export GO111MODULE=on
# export GOPROXY=https://goproxy.io
# make clean all && make install
nohup lotus daemon >> /storage/lotus.log 2>&1 &
# lotus version
0.1.6+git716b2a4b+api0.1.6
lotus version 0.1.6+git716b2a4b
