Skip to content

Commit

Permalink
Merge pull request #248 from filswan/update-2.6
Browse files Browse the repository at this point in the history 
Support lotus v1.30.0
  • Loading branch information
@Normalnoise
Normalnoise authored Nov 19, 2024
2 parents 6471bfd + f494f96 commit a246f56
Show file tree
Hide file tree
Showing 9 changed files with 183 additions and 131 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ build_win: test

build_boost:
git clone https://github.com/filecoin-project/boost.git
cd boost && git checkout v2.3.0
cd boost && git checkout v2.4.0
cd boost && make build && sudo mv boostd /usr/local/bin/
rm -rf boost
.PHONY: build_boost
8 changes: 4 additions & 4 deletions README-CN.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Swan Provider 接收来自 Swan Platform 的离线订单。提供以下功能：
#### 启动 Lotus-miner
在启动 `swan-provider`之前，请确保 `Lotus-miner` 正常运行。您需要使用 `Lotus-miner` 令牌导入订单。
```shell
lotus-miner auth create-token --perm write
lotus-miner auth create-token --perm admin
```
注意，请保持 `Lotus-miner` 在后台运行!
生成的令牌位于 `$LOTUS_MINER_PATH/token`
Expand All @@ -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.5.0/install.sh
wget --no-check-certificate https://github.com/filswan/go-swan-provider/releases/download/v2.6.0/install.sh
chmod +x ./install.sh
./install.sh
```
Expand All @@ -64,7 +64,7 @@ chmod +x ./install.sh
```
ulimit -SHn 1048576
export SWAN_PATH="/data/.swan"
nohup swan-provider-2.4.0-linux-amd64 daemon >> swan-provider.log 2>&1 &
nohup swan-provider-2.6.0-linux-amd64 daemon >> swan-provider.log 2>&1 &
```
### 选项:two: 从源代码构建
构建 `swan-provider` 需要安装以下依赖包:
Expand Down Expand Up @@ -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.4.0
git checkout release-2.6.0
./build_from_source.sh
```

Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Swan Provider listens to offline deals that come from the Swan platform. It prov
#### Start Lotus-miner
Before launching the `swan-provider`, you must ensure that `Lotus-miner` is running normally. and `Lotus-miner` token is necessary for importing deals.
```shell
lotus-miner auth create-token --perm write
lotus-miner auth create-token --perm admin
```
Note that the `Lotus-miner` needs to be running in the background!
The created token is located at `$LOTUS_MINER_PATH/token`
Expand All @@ -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.5.0/install.sh
wget --no-check-certificate https://github.com/filswan/go-swan-provider/releases/download/v2.6.0/install.sh
chmod +x ./install.sh
./install.sh
```
Expand All @@ -64,7 +64,7 @@ chmod +x ./install.sh
```
ulimit -SHn 1048576
export SWAN_PATH="/data/.swan"
nohup swan-provider-2.5.0-linux-amd64 daemon >> swan-provider.log 2>&1 &
nohup swan-provider-2.6.0-linux-amd64 daemon >> swan-provider.log 2>&1 &
```
### Option:two: Source Code
Building the `swan-provider` requires some system dependencies:
Expand Down Expand Up @@ -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.5.0
git checkout release-2.6.0
./build_from_source.sh
```

Expand Down
2 changes: 1 addition & 1 deletion common/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const (
MinorVersion = 5
FixVersion = 0
CommitHash = ""
VERSION = "v2.5.0"
VERSION = "v2.6.0"
)

func GetVersion() string {
Expand Down
2 changes: 1 addition & 1 deletion extern/filecoin-ffi
Submodule filecoin-ffi updated 19 files
+0 −372 .circleci/config.yml
+61 −0 .github/actions/configure-environment/action.yml
+147 −0 .github/workflows/ci.yml
+84 −0 .github/workflows/release-check.yml
+21 −0 .github/workflows/releaser.yml
+27 −19 README.md
+28 −0 RELEASE.md
+1 −5 bls_test.go
+27 −27 go.mod
+71 −68 go.sum
+17 −4 install-filcrypto
+2 −2 proofs_test.go
+11 −11 rust/Cargo.lock
+2 −2 rust/Cargo.toml
+25 −25 rust/scripts/publish-release.sh
+1 −1 rust/src/fvm/engine.rs
+0 −18 sector_update.go
+3 −0 version.json
+5 −6 workflows.go
85 changes: 48 additions & 37 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ go 1.22.3
require (
github.com/BurntSushi/toml v1.3.2
github.com/Khan/genqlient v0.5.0
github.com/fatih/color v1.15.0
github.com/fatih/color v1.16.0
github.com/filswan/go-swan-lib v0.3.4
github.com/filswan/swan-boost-lib v0.0.4
github.com/filswan/swan-boost-lib v0.0.5
github.com/gin-gonic/gin v1.9.1
github.com/google/uuid v1.6.0
github.com/itsjamie/gin-cors v0.0.0-20160420130702-97b4a9da7933
Expand All @@ -17,29 +17,34 @@ require (

require (
github.com/Gurpartap/async v0.0.0-20180927173644-4f7f499dd9ee // indirect
github.com/Kubuxu/go-broadcast v0.0.0-20240621161059-1a8c90734cd6 // indirect
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
github.com/bahlo/generic-list-go v0.2.0 // indirect
github.com/bits-and-blooms/bitset v1.13.0 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/chzyer/readline v1.5.1 // indirect
github.com/cilium/ebpf v0.9.1 // indirect
github.com/consensys/bavard v0.1.13 // indirect
github.com/consensys/gnark-crypto v0.12.1 // indirect
github.com/cskr/pubsub v1.0.2 // indirect
github.com/detailyang/go-fallocate v0.0.0-20180908115635-432fa640bd2e // indirect
github.com/drand/drand v1.5.11 // indirect
github.com/drand/kyber v1.3.1 // indirect
github.com/drand/kyber-bls12381 v0.3.1 // indirect
github.com/elastic/go-sysinfo v1.11.0 // indirect
github.com/elastic/go-windows v1.0.1 // indirect
github.com/ethereum/go-ethereum v1.13.15 // indirect
github.com/filecoin-project/boost/extern/boostd-data v0.0.0-20240626173351-5dcdc1cdd1ef // indirect
github.com/filecoin-project/dagstore v0.7.0 // indirect
github.com/filecoin-project/filecoin-ffi v1.28.0-rc2 // indirect
github.com/filecoin-project/filecoin-ffi v1.30.0 // indirect
github.com/filecoin-project/go-clock v0.1.0 // indirect
github.com/filecoin-project/go-commp-utils v0.1.4 // indirect
github.com/filecoin-project/go-commp-utils/nonffi v0.0.0-20220905160352-62059082a837 // indirect
github.com/filecoin-project/go-commp-utils/v2 v2.1.0 // indirect
github.com/filecoin-project/go-data-segment v0.0.1 // indirect
github.com/filecoin-project/go-ds-versioning v0.1.2 // indirect
github.com/filecoin-project/go-f3 v0.0.7 // indirect
github.com/filecoin-project/go-fil-commcid v0.1.0 // indirect
github.com/filecoin-project/go-f3 v0.7.2 // indirect
github.com/filecoin-project/go-fil-commcid v0.2.0 // indirect
github.com/filecoin-project/go-fil-commp-hashhash v0.2.0 // indirect
github.com/filecoin-project/go-paramfetch v0.0.4 // indirect
github.com/filecoin-project/go-storedcounter v0.1.0 // indirect
github.com/filecoin-project/pubsub v1.0.0 // indirect
Expand All @@ -52,6 +57,7 @@ require (
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026 // indirect
github.com/hashicorp/golang-lru/arc/v2 v2.0.7 // indirect
github.com/holiman/uint256 v1.3.1 // indirect
github.com/invopop/jsonschema v0.12.0 // indirect
github.com/ipfs/go-bitfield v1.1.0 // indirect
github.com/ipfs/go-cidutil v0.1.0 // indirect
Expand Down Expand Up @@ -81,6 +87,7 @@ require (
github.com/manifoldco/promptui v0.9.0 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/mattn/go-sqlite3 v1.14.16 // indirect
github.com/mmcloughlin/addchain v0.4.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nikkolasg/hexjson v0.1.0 // indirect
github.com/petar/GoLLRB v0.0.0-20210522233825-ae3b015fd3e9 // indirect
Expand All @@ -104,7 +111,7 @@ require (
github.com/puzpuzpuz/xsync/v2 v2.4.0 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/samber/lo v1.39.0 // indirect
github.com/triplewz/poseidon v0.0.0-20230828015038-79d8165c88ed // indirect
github.com/triplewz/poseidon v0.0.2-0.20240407130934-5265fab9d889 // indirect
github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc // indirect
github.com/whyrusleeping/cbor v0.0.0-20171005072247-63513f603b11 // indirect
github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f // indirect
Expand All @@ -116,16 +123,21 @@ require (
github.com/zondax/ledger-filecoin-go v0.11.1 // indirect
github.com/zondax/ledger-go v0.14.3 // indirect
github.com/zyedidia/generic v1.2.1 // indirect
gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b // indirect
gitlab.com/yawning/tuplehash v0.0.0-20230713102510-df83abbf9a02 // indirect
go.dedis.ch/kyber/v4 v4.0.0-pre2.0.20240924132404-4de33740016e // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.14.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
go.uber.org/mock v0.4.0 // indirect
golang.org/x/term v0.25.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
google.golang.org/grpc v1.64.0 // indirect
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
howett.net/plist v1.0.0 // indirect
rsc.io/tmplfunc v0.0.3 // indirect
)

require (
Expand Down Expand Up @@ -157,23 +169,23 @@ require (
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/elastic/go-elasticsearch/v7 v7.14.0 // indirect
github.com/elastic/gosigar v0.14.2 // indirect
github.com/filecoin-project/boost v1.7.5-0.20240729131301-15f5241b3aa7 // indirect
github.com/filecoin-project/go-address v1.1.0 // indirect
github.com/filecoin-project/boost v1.7.5-0.20241110105354-3965a2cf64d6 // indirect
github.com/filecoin-project/go-address v1.2.0 // indirect
github.com/filecoin-project/go-amt-ipld/v2 v2.1.0 // indirect
github.com/filecoin-project/go-amt-ipld/v3 v3.1.0 // indirect
github.com/filecoin-project/go-amt-ipld/v4 v4.3.0 // indirect
github.com/filecoin-project/go-amt-ipld/v4 v4.4.0 // indirect
github.com/filecoin-project/go-bitfield v0.2.4 // indirect
github.com/filecoin-project/go-cbor-util v0.0.1 // indirect
github.com/filecoin-project/go-crypto v0.0.1 // indirect
github.com/filecoin-project/go-crypto v0.1.0 // indirect
github.com/filecoin-project/go-hamt-ipld v0.1.5 // indirect; indirectgit
github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0 // indirect
github.com/filecoin-project/go-hamt-ipld/v3 v3.1.0 // indirect
github.com/filecoin-project/go-jsonrpc v0.3.2 // indirect
github.com/filecoin-project/go-hamt-ipld/v3 v3.4.0 // indirect
github.com/filecoin-project/go-jsonrpc v0.6.0 // indirect
github.com/filecoin-project/go-padreader v0.0.1 // indirect
github.com/filecoin-project/go-state-types v0.14.0 // indirect
github.com/filecoin-project/go-state-types v0.15.0 // indirect
github.com/filecoin-project/go-statemachine v1.0.3 // indirect
github.com/filecoin-project/go-statestore v0.2.0 // indirect
github.com/filecoin-project/lotus v1.28.1 // indirect
github.com/filecoin-project/lotus v1.30.0 // indirect
github.com/filecoin-project/specs-actors v0.9.15 // indirect
github.com/filecoin-project/specs-actors/v2 v2.3.6 // indirect
github.com/filecoin-project/specs-actors/v3 v3.1.2 // indirect
Expand All @@ -190,7 +202,7 @@ require (
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.5 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.14.0 // indirect
Expand All @@ -201,7 +213,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/gopacket v1.1.19 // indirect
github.com/google/pprof v0.0.0-20240509144519-723abb6459b7 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
Expand All @@ -226,7 +238,7 @@ require (
github.com/ipfs/go-ipfs-ds-help v1.1.1 // indirect
github.com/ipfs/go-ipfs-exchange-interface v0.2.1 // indirect
github.com/ipfs/go-ipfs-util v0.0.3 // indirect
github.com/ipfs/go-ipld-cbor v0.1.0 // indirect
github.com/ipfs/go-ipld-cbor v0.2.0 // indirect
github.com/ipfs/go-ipld-format v0.6.0 // indirect
github.com/ipfs/go-ipld-legacy v0.2.1 // indirect
github.com/ipfs/go-log v1.0.5 // indirect
Expand All @@ -238,22 +250,21 @@ require (
github.com/ipld/go-codec-dagpb v1.6.0 // indirect
github.com/ipld/go-ipld-prime v0.21.0 // indirect
github.com/ipni/go-libipni v0.5.2 // indirect
github.com/ipsn/go-secp256k1 v0.0.0-20180726113642-9d62b9f0bc52 // indirect
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
github.com/jbenet/goprocess v0.1.4 // indirect
github.com/jessevdk/go-flags v1.4.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kelseyhightower/envconfig v1.4.0 // indirect
github.com/klauspost/compress v1.17.8 // indirect
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/koron/go-ssdp v0.0.4 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/libp2p/go-cidranger v1.1.0 // indirect
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
github.com/libp2p/go-libp2p v0.35.4 // indirect
github.com/libp2p/go-libp2p v0.35.5 // indirect
github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
github.com/libp2p/go-libp2p-kad-dht v0.25.2 // indirect
github.com/libp2p/go-libp2p-kbucket v0.6.3 // indirect
Expand Down Expand Up @@ -281,8 +292,8 @@ require (
github.com/mr-tron/base58 v1.2.0 // indirect
github.com/multiformats/go-base32 v0.1.0 // indirect
github.com/multiformats/go-base36 v0.2.0 // indirect
github.com/multiformats/go-multiaddr v0.12.4 // indirect
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
github.com/multiformats/go-multiaddr v0.13.0 // indirect
github.com/multiformats/go-multiaddr-dns v0.4.0 // indirect
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
github.com/multiformats/go-multibase v0.2.0 // indirect
github.com/multiformats/go-multicodec v0.9.0 // indirect
Expand Down Expand Up @@ -315,16 +326,16 @@ require (
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/stretchr/testify v1.9.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
github.com/tklauser/go-sysconf v0.3.5 // indirect
github.com/tklauser/numcpus v0.2.2 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
github.com/urfave/cli/v2 v2.25.7 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.1 // indirect
github.com/vektah/gqlparser/v2 v2.4.5 // indirect
github.com/whyrusleeping/bencher v0.0.0-20190829221104-bb6607aa8bba // indirect
github.com/whyrusleeping/cbor-gen v0.1.1 // indirect
github.com/whyrusleeping/cbor-gen v0.2.0 // indirect
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 // indirect
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
Expand All @@ -339,15 +350,15 @@ require (
go.uber.org/zap v1.27.0 // indirect
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/tools v0.24.0 // indirect
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
gonum.org/v1/gonum v0.15.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading

0 comments on commit a246f56

Please sign in to comment.