chore: merge release/v1.6.x dev line into main

Makefile

@@ -200,20 +200,20 @@ docsgen-openrpc-boost: docsgen-openrpc-bin
 
 ## DOCKER IMAGES
 docker_user?=filecoin
-lotus_version?=v1.19.0
+lotus_version?=v1.20.0-rc1
 lotus_src_dir?=
 ffi_from_source?=0
 build_lotus?=0
 ifeq ($(lotus_src_dir),)
 	ifeq ($(build_lotus),1)
-# v1: building lotus image with provided lotus version	
+# v1: building lotus image with provided lotus version
 		lotus_info_msg=!!! building lotus base image from github: tag $(lotus_version) !!!
 		lotus_src_dir=/tmp/lotus-$(lotus_version)
 		lotus_checkout_dir=$(lotus_src_dir)
-		lotus_build_cmd=docker/lotus-all-in-one		
+		lotus_build_cmd=docker/lotus-all-in-one
 		lotus_base_image=$(docker_user)/lotus-all-in-one:dev
 	else
-# v2 (defaut): using lotus image 		
+# v2 (defaut): using lotus image
 		lotus_base_image?=filecoin/lotus-all-in-one:$(lotus_version)-debug
 		lotus_info_msg=using lotus image from dockerhub: $(lotus_base_image)
 		lotus_build_cmd=info/lotus-all-in-one
@@ -237,7 +237,7 @@ docker/lotus-all-in-one: info/lotus-all-in-one | $(lotus_checkout_dir)
 # new lotus Dockerfile does not exist for older lotus versions
 # temporary use the old Dockerfile.lotus
 	cd $(lotus_src_dir) && $(docker_build_cmd) -f Dockerfile.lotus --target lotus-test \
-		-t $(lotus_base_image) .	
+		-t $(lotus_base_image) .
 # code using new lotus Dockerfile
 #	cd $(lotus_src_dir) && $(docker_build_cmd) -f Dockerfile --target lotus-all-in-one \
 #		-t $(lotus_base_image) --build-arg GOFLAGS=-tags=debug .

api/version.go

@@ -27,11 +27,11 @@ func (ve Version) EqMajorMinor(v2 Version) bool {
 
 // semver versions of the rpc api exposed
 var (
-	FullAPIVersion0 = newVer(1, 4, 0)
-	FullAPIVersion1 = newVer(2, 1, 0)
+	FullAPIVersion0 = newVer(1, 5, 0)
+	FullAPIVersion1 = newVer(2, 3, 0)
 
-	MinerAPIVersion0  = newVer(1, 3, 0)
-	WorkerAPIVersion0 = newVer(1, 1, 0)
+	MinerAPIVersion0  = newVer(1, 5, 0)
+	WorkerAPIVersion0 = newVer(1, 7, 0)
 
 	BoostAPIVersion0 = newVer(1, 0, 0)
 )

build/version.go

@@ -2,7 +2,7 @@ package build
 
 var CurrentCommit string
 
-const BuildVersion = "1.5.1"
+const BuildVersion = "1.6.0-rc1"
 
 func UserVersion() string {
 	return BuildVersion + CurrentCommit

cmd/boost/retrieve_cmd.go

@@ -7,6 +7,10 @@ import (
 	"strings"
 	"time"
 
+	flatfs "github.com/ipfs/go-ds-flatfs"
+	levelds "github.com/ipfs/go-ds-leveldb"
+	blockstore "github.com/ipfs/go-ipfs-blockstore"
+
 	"github.com/dustin/go-humanize"
 	clinode "github.com/filecoin-project/boost/cli/node"
 	"github.com/filecoin-project/boost/cmd"
@@ -18,9 +22,6 @@ import (
 	lcli "github.com/filecoin-project/lotus/cli"
 	"github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"
-	flatfs "github.com/ipfs/go-ds-flatfs"
-	levelds "github.com/ipfs/go-ds-leveldb"
-	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	offline "github.com/ipfs/go-ipfs-exchange-offline"
 	files "github.com/ipfs/go-ipfs-files"
 	"github.com/ipfs/go-merkledag"

cmd/boostx/utils_cmd.go

@@ -437,7 +437,7 @@ func signAndPushToMpool(cctx *cli.Context, ctx context.Context, api api.Gateway,
 		msg.GasFeeCap = newGasFeeCap
 	}
 
-	smsg, err := messagesigner.SignMessage(ctx, msg, func(*types.SignedMessage) error { return nil })
+	smsg, err := messagesigner.SignMessage(ctx, msg, nil, func(*types.SignedMessage) error { return nil })
 	if err != nil {
 		return
 	}

cmd/lib/api.go

@@ -16,11 +16,13 @@ import (
 	"github.com/filecoin-project/lotus/api/v0api"
 	"github.com/filecoin-project/lotus/api/v1api"
 	"github.com/filecoin-project/lotus/markets/dagstore"
+	"github.com/filecoin-project/lotus/node/config"
 	lotus_modules "github.com/filecoin-project/lotus/node/modules"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	"github.com/filecoin-project/lotus/node/repo"
 	"github.com/filecoin-project/lotus/storage/paths"
 	"github.com/filecoin-project/lotus/storage/sealer"
+	"github.com/filecoin-project/lotus/storage/sealer/storiface"
 	logging "github.com/ipfs/go-log/v2"
 )
 
@@ -115,8 +117,8 @@ func CreateSectorAccessor(ctx context.Context, storageApiInfo string, fullnodeAp
 	}
 	defer lr.Close()
 
-	if err := lr.SetStorage(func(sc *paths.StorageConfig) {
-		sc.StoragePaths = []paths.LocalPath{}
+	if err := lr.SetStorage(func(sc *storiface.StorageConfig) {
+		sc.StoragePaths = []storiface.LocalPath{}
 	}); err != nil {
 		return nil, nil, fmt.Errorf("set storage config: %w", err)
 	}
@@ -127,7 +129,7 @@ func CreateSectorAccessor(ctx context.Context, storageApiInfo string, fullnodeAp
 	if err != nil {
 		return nil, nil, fmt.Errorf("creating new local store: %w", err)
 	}
-	storage := lotus_modules.RemoteStorage(lstor, storageService, sauth, sealer.Config{
+	storage := lotus_modules.RemoteStorage(lstor, storageService, sauth, config.SealerConfig{
 		// TODO: Not sure if I need this, or any of the other fields in this struct
 		ParallelFetchLimit: 1,
 	})

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/etclabscore/go-openrpc-reflect v0.0.36
 	github.com/fatih/color v1.13.0
 	github.com/filecoin-project/dagstore v0.6.0
-	github.com/filecoin-project/go-address v1.0.0
+	github.com/filecoin-project/go-address v1.1.0
 	github.com/filecoin-project/go-bitfield v0.2.4
 	github.com/filecoin-project/go-cbor-util v0.0.1
 	github.com/filecoin-project/go-commp-utils v0.1.3
@@ -34,9 +34,9 @@ require (
 	github.com/filecoin-project/go-legs v0.4.9
 	github.com/filecoin-project/go-padreader v0.0.1
 	github.com/filecoin-project/go-paramfetch v0.0.4
-	github.com/filecoin-project/go-state-types v0.9.9
+	github.com/filecoin-project/go-state-types v0.10.0-rc3
 	github.com/filecoin-project/go-statestore v0.2.0
-	github.com/filecoin-project/lotus v1.18.3-0.20230110150616-2995a530dcc7
+	github.com/filecoin-project/lotus v1.20.0-rc1-boost
 	github.com/filecoin-project/specs-actors v0.9.15
 	github.com/filecoin-project/specs-storage v0.4.1
 	github.com/gbrlsnchs/jwt/v3 v3.0.1
@@ -82,10 +82,10 @@ require (
 	github.com/libp2p/go-libp2p-gostream v0.5.0
 	github.com/libp2p/go-libp2p-http v0.2.1
 	github.com/libp2p/go-libp2p-kad-dht v0.18.0
-	github.com/libp2p/go-libp2p-pubsub v0.8.1
+	github.com/libp2p/go-libp2p-pubsub v0.8.2
 	github.com/libp2p/go-libp2p-record v0.2.0
 	github.com/libp2p/go-msgio v0.2.0
-	github.com/mattn/go-sqlite3 v1.14.10
+	github.com/mattn/go-sqlite3 v1.14.16
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/multiformats/go-multiaddr v0.7.0
 	github.com/multiformats/go-multibase v0.1.1
@@ -98,7 +98,7 @@ require (
 	github.com/stretchr/testify v1.8.1
 	github.com/urfave/cli/v2 v2.24.4
 	github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc
-	github.com/whyrusleeping/cbor-gen v0.0.0-20220514204315-f29c37e9c44c
+	github.com/whyrusleeping/cbor-gen v0.0.0-20221021053955-c138aae13722
 	go.opencensus.io v0.23.0
 	go.opentelemetry.io/otel v1.13.0
 	go.opentelemetry.io/otel/exporters/jaeger v1.13.0 // indirect
@@ -344,9 +344,21 @@ require (
 
 require (
 	github.com/alexbrainman/goissue34681 v0.0.0-20191006012335-3fc7a47baff5 // indirect
+	github.com/armon/go-metrics v0.3.9 // indirect
+	github.com/boltdb/bolt v1.3.1 // indirect
+	github.com/elastic/go-elasticsearch/v7 v7.14.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
+	github.com/hashicorp/go-hclog v0.16.2 // indirect
+	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
+	github.com/hashicorp/go-msgpack v0.5.5 // indirect
+	github.com/hashicorp/raft v1.1.1 // indirect
+	github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea // indirect
+	github.com/libp2p/go-libp2p-consensus v0.0.1 // indirect
+	github.com/libp2p/go-libp2p-gorpc v0.4.0 // indirect
+	github.com/libp2p/go-libp2p-raft v0.1.8 // indirect
 	github.com/tklauser/go-sysconf v0.3.5 // indirect
 	github.com/tklauser/numcpus v0.2.2 // indirect
+	github.com/ugorji/go/codec v1.2.6 // indirect
 	go.etcd.io/bbolt v1.3.6 // indirect
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
 )