Merge pull request #242 from filswan/upgrade-boost-2.2.0

Upgrade boost 2.2.0
filswan · Apr 7, 2024 · 88cb9be · 88cb9be
2 parents 99be146 + 4e9de30
commit 88cb9be
Show file tree

Hide file tree

Showing 13 changed files with 1,361 additions and 292 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "extern/filecoin-ffi"]
 	path = extern/filecoin-ffi
-	url = https://github.com/filecoin-project/filecoin-ffi.git
+	url = https://github.com/filecoin-project/filecoin-ffi.git
diff --git a/Makefile b/Makefile
@@ -58,7 +58,7 @@ build_win: test
 
 build_boost:
 	git clone https://github.com/filecoin-project/boost.git
-	cd boost && git checkout v2.1.0
+	cd boost && git checkout v2.2.0
 	cd boost && make build && sudo mv boostd /usr/local/bin/
 	rm -rf boost
 .PHONY: build_boost
diff --git a/README-CN.md b/README-CN.md
@@ -53,7 +53,7 @@ export SWAN_PATH="/data/.swan"
 ### 选项:one: **预构建包**: 参照 [release assets](https://github.com/filswan/go-swan-provider/releases)
 ####  构建指南
 ```shell
-wget --no-check-certificate https://github.com/filswan/go-swan-provider/releases/download/v2.3.0/install.sh
+wget --no-check-certificate https://github.com/filswan/go-swan-provider/releases/download/v2.4.0/install.sh
 chmod +x ./install.sh
 ./install.sh
 ```
@@ -64,7 +64,7 @@ chmod +x ./install.sh
 ```
 ulimit -SHn 1048576
 export SWAN_PATH="/data/.swan"
-nohup swan-provider-2.3.0-linux-amd64 daemon >> swan-provider.log 2>&1 & 
+nohup swan-provider-2.4.0-linux-amd64 daemon >> swan-provider.log 2>&1 & 
 ```
 ### 选项:two: 从源代码构建
 构建 `swan-provider` 需要安装以下依赖包:
@@ -93,7 +93,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 ```shell
 git clone https://github.com/filswan/go-swan-provider.git
 cd go-swan-provider
-git checkout release-2.3.0
+git checkout release-2.4.0
 ./build_from_source.sh
 ```
 
@@ -190,6 +190,16 @@ swan-provider daemon
  export SWAN_PATH="/data/.swan"
  swan-provider set-ask --price=0 --verified-price=0 --min-piece-size=1048576 --max-piece-size=34359738368
  ```
+- 重启`swan-provider`和`boostd`服务
+```
+ kill -9 $(ps -ef | grep -E 'swan-provider|boostd' | grep -v grep | awk '{print$2}' )
+ 
+ ulimit -SHn 1048576
+ export SWAN_PATH="/data/.swan"
+ nohup swan-provider daemon >> swan-provider.log 2>&1 & 
+	
+```
+
 - 设置 `[market].publish_wallet` 为控制地址：
  ```
  export OLD_CONTROL_ADDRESS=`lotus-miner actor control list  --verbose | awk '{print $3}' | grep -v key | tr -s '\n'  ' '`

diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ export SWAN_PATH="/data/.swan"
 ### Option:one: **Prebuilt package**: See [release assets](https://github.com/filswan/go-swan-provider/releases)
 ####  Build Instructions
 ```shell
-wget --no-check-certificate https://github.com/filswan/go-swan-provider/releases/download/v2.3.0/install.sh
+wget --no-check-certificate https://github.com/filswan/go-swan-provider/releases/download/v2.4.0/install.sh
 chmod +x ./install.sh
 ./install.sh
 ```
@@ -64,7 +64,7 @@ chmod +x ./install.sh
 ```
 ulimit -SHn 1048576
 export SWAN_PATH="/data/.swan"
-nohup swan-provider-2.2.1-linux-amd64 daemon >> swan-provider.log 2>&1 & 
+nohup swan-provider-2.4.0-linux-amd64 daemon >> swan-provider.log 2>&1 & 
 ```
 ### Option:two: Source Code
 Building the `swan-provider` requires some system dependencies:
@@ -93,7 +93,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 ```shell
 git clone https://github.com/filswan/go-swan-provider.git
 cd go-swan-provider
-git checkout release-2.3.0
+git checkout release-2.4.0
 ./build_from_source.sh
 ```
 
@@ -172,6 +172,9 @@ swan-provider daemon
 	[Libp2p]
   	  ListenAddresses = ["/ip4/0.0.0.0/tcp/24001", "/ip6/::/tcp/24001"]   # Binding address for the libp2p host
       AnnounceAddresses = ["/ip4/209.94.92.3/tcp/24001"]                  # Addresses to explicitly announce to other peers. If not specified, all interface addresses are announced
+
+ 	[localIndexDirectory.Leveldb]
+	 Enabled = true
 	```
 	(3) Run `swan-provider` in the background.
 	```
@@ -193,6 +196,17 @@ swan-provider daemon
  export SWAN_PATH="/data/.swan"
  swan-provider set-ask --price=0 --verified-price=0 --min-piece-size=1048576 --max-piece-size=34359738368
  ```
+
+- Reboot`swan-provider`and`boostd`service
+```
+ kill -9 $(ps -ef | grep -E 'swan-provider|boostd' | grep -v grep | awk '{print$2}' )
+ 
+ ulimit -SHn 1048576
+ export SWAN_PATH="/data/.swan"
+ nohup swan-provider daemon >> swan-provider.log 2>&1 & 
+	
+```
+
  - Set the `[market].publish_wallet` as a control address:
  ```
  export OLD_CONTROL_ADDRESS=`lotus-miner actor control list  --verbose | awk '{print $3}' | grep -v key | tr -s '\n'  ' '`

diff --git a/common/version.go b/common/version.go
@@ -7,7 +7,7 @@ const (
 	MinorVersion = 5
 	FixVersion   = 0
 	CommitHash   = ""
-	VERSION      = "v2.3.0"
+	VERSION      = "v2.4.0"
 )
 
 func GetVersion() string {

diff --git a/extern/filecoin-ffi b/extern/filecoin-ffi
+3 −3		.circleci/config.yml
+0 −5		cgo/proofs.go
+1 −1		cgo/types.go
+2 −2		go.mod
+4 −4		go.sum
+11 −3		install-filcrypto
+0 −4		proofs.go
+65 −33		rust/Cargo.lock
+7 −6		rust/Cargo.toml
+21 −6		rust/src/fvm/engine.rs
+15 −5		rust/src/fvm/machine.rs
+8 −16		rust/src/proofs/api.rs
+2 −2		rust/src/util/api.rs