update lotus v1.33.1

LexLuthr · LexLuthr · commit f6d59874f418 · 2025-09-03T14:47:29.000+04:00
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ $(warning Your Golang version is go$(shell expr $(GOVERSION) / 1000000).$(shell
 $(error Update Golang to version to at least 1.20.0)
 endif
 
-ALLOWED_NODE_VERSIONS := 16 18 20
+ALLOWED_NODE_VERSIONS := 16 18 20 22 24
 validate-node-version:
 ifeq ($(filter $(shell node -v | cut -c2-3),$(ALLOWED_NODE_VERSIONS)),)
 	@echo "Unsupported Node.js version. Please install one of the following versions: $(ALLOWED_NODE_VERSIONS)"
diff --git a/car/car_offset_writer_test.go b/car/car_offset_writer_test.go
@@ -22,6 +22,7 @@ import (
 	"github.com/ipld/go-car"
 	mh "github.com/multiformats/go-multihash"
 	"github.com/stretchr/testify/require"
+	"google.golang.org/protobuf/proto"
 )
 
 func TestCarOffsetWriterDagOrder(t *testing.T) {
@@ -46,7 +47,7 @@ func TestCarOffsetWriterDagOrder(t *testing.T) {
 			{Hash: aaaaBlk.Cid().Bytes(), Name: &aaaa},
 		},
 	}
-	rootByts, err := pbn.Marshal()
+	rootByts, err := proto.Marshal(pbn)
 	require.NoError(t, err)
 	rootBlk := blocks.NewBlock(rootByts)
 	require.NoError(t, bserv.AddBlock(ctx, rootBlk))
diff --git a/cmd/boost/deal_cmd.go b/cmd/boost/deal_cmd.go
@@ -135,7 +135,7 @@ func dealCmdAction(cctx *cli.Context, isOnline bool) error {
 		return err
 	}
 
-	api, closer, err := lcli.GetGatewayAPI(cctx)
+	api, closer, err := lcli.GetGatewayAPIV1(cctx)
 	if err != nil {
 		return fmt.Errorf("cant setup gateway connection: %w", err)
 	}
diff --git a/cmd/boost/deal_status_cmd.go b/cmd/boost/deal_status_cmd.go
@@ -50,7 +50,7 @@ var dealStatusCmd = &cli.Command{
 			return err
 		}
 
-		api, closer, err := lcli.GetGatewayAPI(cctx)
+		api, closer, err := lcli.GetGatewayAPIV1(cctx)
 		if err != nil {
 			return fmt.Errorf("cant setup gateway connection: %w", err)
 		}
diff --git a/cmd/boost/direct_deal.go b/cmd/boost/direct_deal.go
@@ -247,7 +247,7 @@ var directDealAllocate = &cli.Command{
 			return err
 		}
 
-		gapi, closer, err := lcli.GetGatewayAPI(cctx)
+		gapi, closer, err := lcli.GetGatewayAPIV1(cctx)
 		if err != nil {
 			return fmt.Errorf("can't setup gateway connection: %w", err)
 		}
@@ -381,7 +381,7 @@ var directDealGetAllocations = &cli.Command{
 			return err
 		}
 
-		gapi, closer, err := lcli.GetGatewayAPI(cctx)
+		gapi, closer, err := lcli.GetGatewayAPIV1(cctx)
 		if err != nil {
 			return fmt.Errorf("cant setup gateway connection: %w", err)
 		}
@@ -591,7 +591,7 @@ If the client id different then claim can be extended up to maximum 5 years from
 			return fmt.Errorf("specified term-max %d is larger than %d maximum allowed by verified regirty actor policy", tmax, verifreg13types.MaximumVerifiedAllocationTerm)
 		}
 
-		gapi, closer, err := lcli.GetGatewayAPI(cctx)
+		gapi, closer, err := lcli.GetGatewayAPIV1(cctx)
 		if err != nil {
 			return fmt.Errorf("can't setup gateway connection: %w", err)
 		}
@@ -725,7 +725,7 @@ var listClaimsCmd = &cli.Command{
 			return fmt.Errorf("must provide a miner ID")
 		}
 
-		gapi, closer, err := lcli.GetGatewayAPI(cctx)
+		gapi, closer, err := lcli.GetGatewayAPIV1(cctx)
 		if err != nil {
 			return fmt.Errorf("can't setup gateway connection: %w", err)
 		}
diff --git a/cmd/boost/init_cmd.go b/cmd/boost/init_cmd.go
@@ -32,7 +32,7 @@ var initCmd = &cli.Command{
 			return err
 		}
 
-		api, closer, err := lcli.GetGatewayAPI(cctx)
+		api, closer, err := lcli.GetGatewayAPIV1(cctx)
 		if err != nil {
 			return fmt.Errorf("cant setup gateway connection: %w", err)
 		}
diff --git a/cmd/boost/provider_cmd.go b/cmd/boost/provider_cmd.go
@@ -53,7 +53,7 @@ var libp2pInfoCmd = &cli.Command{
 			return fmt.Errorf("setting up CLI node: %w", err)
 		}
 
-		api, closer, err := lcli.GetGatewayAPI(cctx)
+		api, closer, err := lcli.GetGatewayAPIV1(cctx)
 		if err != nil {
 			return fmt.Errorf("setting up gateway connection: %w", err)
 		}
@@ -144,7 +144,7 @@ var storageAskCmd = &cli.Command{
 			return err
 		}
 
-		api, closer, err := lcli.GetGatewayAPI(cctx)
+		api, closer, err := lcli.GetGatewayAPIV1(cctx)
 		if err != nil {
 			return fmt.Errorf("cant setup gateway connection: %w", err)
 		}
@@ -225,7 +225,7 @@ var retrievalTransportsCmd = &cli.Command{
 			return err
 		}
 
-		api, closer, err := lcli.GetGatewayAPI(cctx)
+		api, closer, err := lcli.GetGatewayAPIV1(cctx)
 		if err != nil {
 			return fmt.Errorf("cant setup gateway connection: %w", err)
 		}
diff --git a/cmd/boost/retrieve_cmd.go b/cmd/boost/retrieve_cmd.go
@@ -149,7 +149,7 @@ var retrieveCmd = &cli.Command{
 			selNode = selspec.Node()
 		}
 
-		api, closer, err := lcli.GetGatewayAPI(cctx)
+		api, closer, err := lcli.GetGatewayAPIV1(cctx)
 		if err != nil {
 			return fmt.Errorf("setting up gateway connection: %w", err)
 		}
diff --git a/cmd/boost/wallet_cmd.go b/cmd/boost/wallet_cmd.go
@@ -97,7 +97,7 @@ var walletList = &cli.Command{
 			return err
 		}
 
-		api, closer, err := lcli.GetGatewayAPI(cctx)
+		api, closer, err := lcli.GetGatewayAPIV1(cctx)
 		if err != nil {
 			return fmt.Errorf("cant setup gateway connection: %w", err)
 		}
@@ -271,7 +271,7 @@ var walletBalance = &cli.Command{
 			return err
 		}
 
-		api, closer, err := lcli.GetGatewayAPI(cctx)
+		api, closer, err := lcli.GetGatewayAPIV1(cctx)
 		if err != nil {
 			return fmt.Errorf("cant setup gateway connection: %w", err)
 		}
diff --git a/cmd/boostd/run.go b/cmd/boostd/run.go
@@ -62,7 +62,7 @@ var runCmd = &cli.Command{
 		}
 
 		subCh := gateway.NewEthSubHandler()
-		fullnodeApi, ncloser, err := lcli.GetFullNodeAPIV1(cctx, lcliutil.FullNodeWithEthSubscribtionHandler(subCh))
+		fullnodeApi, ncloser, err := lcli.GetFullNodeAPIV1(cctx, lcliutil.FullNodeWithEthSubscriptionHandler(subCh))
 		if err != nil {
 			return fmt.Errorf("getting full node api: %w", err)
 		}
diff --git a/cmd/booster-bitswap/bitswap/bitswap.go b/cmd/booster-bitswap/bitswap/bitswap.go
@@ -1,15 +1,15 @@
 package bitswap
 
 import (
-	"github.com/ipfs/boxo/bitswap/network"
+	"github.com/ipfs/boxo/bitswap/network/bsnet"
 	"github.com/libp2p/go-libp2p/core/protocol"
 )
 
 var Protocols = []protocol.ID{
-	network.ProtocolBitswap,
-	network.ProtocolBitswapNoVers,
-	network.ProtocolBitswapOneOne,
-	network.ProtocolBitswapOneZero,
+	bsnet.ProtocolBitswap,
+	bsnet.ProtocolBitswapNoVers,
+	bsnet.ProtocolBitswapOneOne,
+	bsnet.ProtocolBitswapOneZero,
 }
 
 var ProtocolStrings = []string{}
diff --git a/cmd/booster-bitswap/client.go b/cmd/booster-bitswap/client.go
@@ -20,13 +20,13 @@ import (
 	lotus_blockstore "github.com/filecoin-project/lotus/blockstore"
 	lcli "github.com/filecoin-project/lotus/cli"
 	"github.com/ipfs/boxo/bitswap/client"
-	bsnetwork "github.com/ipfs/boxo/bitswap/network"
-	nilrouting "github.com/ipfs/boxo/routing/none"
+	bsnetwork "github.com/ipfs/boxo/bitswap/network/bsnet"
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	ipldlegacy "github.com/ipfs/go-ipld-legacy"
 	"github.com/ipld/go-car/v2/blockstore"
 	"github.com/libp2p/go-libp2p"
+	nilrouting "github.com/libp2p/go-libp2p-routing-helpers"
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
@@ -96,11 +96,8 @@ var fetchCmd = &cli.Command{
 		}
 
 		// Create a bitswap client
-		nilRouter, err := nilrouting.ConstructNilRouting(ctx, nil, nil, nil)
-		if err != nil {
-			return err
-		}
-		net := bsnetwork.NewFromIpfsHost(host, nilRouter)
+		nilRouter := nilrouting.Null{}
+		net := bsnetwork.NewFromIpfsHost(host)
 		bs, err := blockstore.OpenReadWrite(outputCarPath, []cid.Cid{rootCid}, blockstore.UseWholeCIDs(true))
 		if err != nil {
 			return fmt.Errorf("creating blockstore at %s: %w", outputCarPath, err)
@@ -110,7 +107,7 @@ var fetchCmd = &cli.Command{
 		defer cancel()
 		idbs := lotus_blockstore.WrapIDStore(bs)
 		brn := &blockReceiver{bs: idbs, ctx: ctx, cancel: cancel}
-		bsClient := client.New(ctx, net, bs, client.WithBlockReceivedNotifier(brn))
+		bsClient := client.New(ctx, net, nilRouter, idbs, client.WithBlockReceivedNotifier(brn))
 		defer bsClient.Close()
 		net.Start(bsClient)
 
diff --git a/cmd/booster-bitswap/server.go b/cmd/booster-bitswap/server.go
@@ -6,10 +6,9 @@ import (
 	"time"
 
 	"github.com/filecoin-project/boost/protocolproxy"
-	bsnetwork "github.com/ipfs/boxo/bitswap/network"
+	bsnetwork "github.com/ipfs/boxo/bitswap/network/bsnet"
 	"github.com/ipfs/boxo/bitswap/server"
-	blockstore "github.com/ipfs/boxo/blockstore"
-	nilrouting "github.com/ipfs/boxo/routing/none"
+	"github.com/ipfs/boxo/blockstore"
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/peer"
@@ -66,10 +65,6 @@ func (s *BitswapServer) Start(ctx context.Context, proxy *peer.AddrInfo, opts *B
 	}
 
 	// Start a bitswap server on the provider
-	nilRouter, err := nilrouting.ConstructNilRouting(s.ctx, nil, nil, nil)
-	if err != nil {
-		return err
-	}
 	bsopts := []server.Option{
 		server.EngineBlockstoreWorkerCount(opts.EngineBlockstoreWorkerCount),
 		server.EngineTaskWorkerCount(opts.EngineTaskWorkerCount),
@@ -87,7 +82,7 @@ func (s *BitswapServer) Start(ctx context.Context, proxy *peer.AddrInfo, opts *B
 			return fulfill
 		}),
 	}
-	net := bsnetwork.NewFromIpfsHost(host, nilRouter)
+	net := bsnetwork.NewFromIpfsHost(host)
 	s.server = server.New(s.ctx, net, s.remoteStore, bsopts...)
 	net.Start(s.server)
 
@@ -105,7 +100,8 @@ func (s *BitswapServer) Stop() error {
 		s.host.ConnManager().Unprotect(s.proxy.ID, protectTag)
 	}
 	s.cancel()
-	return s.server.Close()
+	s.server.Close()
+	return nil
 }
 
 func (s *BitswapServer) keepProxyConnectionAlive(ctx context.Context, proxy peer.AddrInfo) {
diff --git a/cmd/boostx/stats_cmd.go b/cmd/boostx/stats_cmd.go
@@ -47,7 +47,7 @@ var statsCmd = &cli.Command{
 			return fmt.Errorf("setting up CLI node: %w", err)
 		}
 
-		api, closer, err := lcli.GetGatewayAPI(cctx)
+		api, closer, err := lcli.GetGatewayAPIV1(cctx)
 		if err != nil {
 			return fmt.Errorf("setting up gateway connection: %w", err)
 		}
diff --git a/cmd/boostx/utils_cmd.go b/cmd/boostx/utils_cmd.go
@@ -65,7 +65,7 @@ var marketAddCmd = &cli.Command{
 			return err
 		}
 
-		api, closer, err := lcli.GetGatewayAPI(cctx)
+		api, closer, err := lcli.GetGatewayAPIV1(cctx)
 		if err != nil {
 			return fmt.Errorf("cant setup gateway connection: %w", err)
 		}
@@ -137,7 +137,7 @@ var marketWithdrawCmd = &cli.Command{
 			return err
 		}
 
-		api, closer, err := lcli.GetGatewayAPI(cctx)
+		api, closer, err := lcli.GetGatewayAPIV1(cctx)
 		if err != nil {
 			return fmt.Errorf("cant setup gateway connection: %w", err)
 		}
diff --git a/extern/filecoin-ffi b/extern/filecoin-ffi
@@ -1 +1 @@
-Subproject commit 7315a33ed47f27ef8b224c752268ee73e12cdb19
+Subproject commit 552ab5c27e6bd909f7fbf5c079d0f58b789c3e6f
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/go.work b/go.work
diff --git a/go.work.sum b/go.work.sum
diff --git a/node/builder.go b/node/builder.go

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ func dealCmdAction(cctx *cli.Context, isOnline bool) error {`
`135`	`135`	`return err`
`136`	`136`	`}`
`137`	`137`
`138`		`- api, closer, err := lcli.GetGatewayAPI(cctx)`
	`138`	`+ api, closer, err := lcli.GetGatewayAPIV1(cctx)`
`139`	`139`	`if err != nil {`
`140`	`140`	`return fmt.Errorf("cant setup gateway connection: %w", err)`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ var dealStatusCmd = &cli.Command{`
`50`	`50`	`return err`
`51`	`51`	`}`
`52`	`52`
`53`		`- api, closer, err := lcli.GetGatewayAPI(cctx)`
	`53`	`+ api, closer, err := lcli.GetGatewayAPIV1(cctx)`
`54`	`54`	`if err != nil {`
`55`	`55`	`return fmt.Errorf("cant setup gateway connection: %w", err)`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ var directDealAllocate = &cli.Command{`
`247`	`247`	`return err`
`248`	`248`	`}`
`249`	`249`
`250`		`- gapi, closer, err := lcli.GetGatewayAPI(cctx)`
	`250`	`+ gapi, closer, err := lcli.GetGatewayAPIV1(cctx)`
`251`	`251`	`if err != nil {`
`252`	`252`	`return fmt.Errorf("can't setup gateway connection: %w", err)`
`253`	`253`	`}`
`@@ -381,7 +381,7 @@ var directDealGetAllocations = &cli.Command{`
`381`	`381`	`return err`
`382`	`382`	`}`
`383`	`383`
`384`		`- gapi, closer, err := lcli.GetGatewayAPI(cctx)`
	`384`	`+ gapi, closer, err := lcli.GetGatewayAPIV1(cctx)`
`385`	`385`	`if err != nil {`
`386`	`386`	`return fmt.Errorf("cant setup gateway connection: %w", err)`
`387`	`387`	`}`
`@@ -591,7 +591,7 @@ If the client id different then claim can be extended up to maximum 5 years from`
`591`	`591`	`return fmt.Errorf("specified term-max %d is larger than %d maximum allowed by verified regirty actor policy", tmax, verifreg13types.MaximumVerifiedAllocationTerm)`
`592`	`592`	`}`
`593`	`593`
`594`		`- gapi, closer, err := lcli.GetGatewayAPI(cctx)`
	`594`	`+ gapi, closer, err := lcli.GetGatewayAPIV1(cctx)`
`595`	`595`	`if err != nil {`
`596`	`596`	`return fmt.Errorf("can't setup gateway connection: %w", err)`
`597`	`597`	`}`
`@@ -725,7 +725,7 @@ var listClaimsCmd = &cli.Command{`
`725`	`725`	`return fmt.Errorf("must provide a miner ID")`
`726`	`726`	`}`
`727`	`727`
`728`		`- gapi, closer, err := lcli.GetGatewayAPI(cctx)`
	`728`	`+ gapi, closer, err := lcli.GetGatewayAPIV1(cctx)`
`729`	`729`	`if err != nil {`
`730`	`730`	`return fmt.Errorf("can't setup gateway connection: %w", err)`
`731`	`731`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ var initCmd = &cli.Command{`
`32`	`32`	`return err`
`33`	`33`	`}`
`34`	`34`
`35`		`- api, closer, err := lcli.GetGatewayAPI(cctx)`
	`35`	`+ api, closer, err := lcli.GetGatewayAPIV1(cctx)`
`36`	`36`	`if err != nil {`
`37`	`37`	`return fmt.Errorf("cant setup gateway connection: %w", err)`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ var libp2pInfoCmd = &cli.Command{`
`53`	`53`	`return fmt.Errorf("setting up CLI node: %w", err)`
`54`	`54`	`}`
`55`	`55`
`56`		`- api, closer, err := lcli.GetGatewayAPI(cctx)`
	`56`	`+ api, closer, err := lcli.GetGatewayAPIV1(cctx)`
`57`	`57`	`if err != nil {`
`58`	`58`	`return fmt.Errorf("setting up gateway connection: %w", err)`
`59`	`59`	`}`
`@@ -144,7 +144,7 @@ var storageAskCmd = &cli.Command{`
`144`	`144`	`return err`
`145`	`145`	`}`
`146`	`146`
`147`		`- api, closer, err := lcli.GetGatewayAPI(cctx)`
	`147`	`+ api, closer, err := lcli.GetGatewayAPIV1(cctx)`
`148`	`148`	`if err != nil {`
`149`	`149`	`return fmt.Errorf("cant setup gateway connection: %w", err)`
`150`	`150`	`}`
`@@ -225,7 +225,7 @@ var retrievalTransportsCmd = &cli.Command{`
`225`	`225`	`return err`
`226`	`226`	`}`
`227`	`227`
`228`		`- api, closer, err := lcli.GetGatewayAPI(cctx)`
	`228`	`+ api, closer, err := lcli.GetGatewayAPIV1(cctx)`
`229`	`229`	`if err != nil {`
`230`	`230`	`return fmt.Errorf("cant setup gateway connection: %w", err)`
`231`	`231`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ var retrieveCmd = &cli.Command{`
`149`	`149`	`selNode = selspec.Node()`
`150`	`150`	`}`
`151`	`151`
`152`		`- api, closer, err := lcli.GetGatewayAPI(cctx)`
	`152`	`+ api, closer, err := lcli.GetGatewayAPIV1(cctx)`
`153`	`153`	`if err != nil {`
`154`	`154`	`return fmt.Errorf("setting up gateway connection: %w", err)`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ var walletList = &cli.Command{`
`97`	`97`	`return err`
`98`	`98`	`}`
`99`	`99`
`100`		`- api, closer, err := lcli.GetGatewayAPI(cctx)`
	`100`	`+ api, closer, err := lcli.GetGatewayAPIV1(cctx)`
`101`	`101`	`if err != nil {`
`102`	`102`	`return fmt.Errorf("cant setup gateway connection: %w", err)`
`103`	`103`	`}`
`@@ -271,7 +271,7 @@ var walletBalance = &cli.Command{`
`271`	`271`	`return err`
`272`	`272`	`}`
`273`	`273`
`274`		`- api, closer, err := lcli.GetGatewayAPI(cctx)`
	`274`	`+ api, closer, err := lcli.GetGatewayAPIV1(cctx)`
`275`	`275`	`if err != nil {`
`276`	`276`	`return fmt.Errorf("cant setup gateway connection: %w", err)`
`277`	`277`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ var runCmd = &cli.Command{`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`subCh := gateway.NewEthSubHandler()`
`65`		`- fullnodeApi, ncloser, err := lcli.GetFullNodeAPIV1(cctx, lcliutil.FullNodeWithEthSubscribtionHandler(subCh))`
	`65`	`+ fullnodeApi, ncloser, err := lcli.GetFullNodeAPIV1(cctx, lcliutil.FullNodeWithEthSubscriptionHandler(subCh))`
`66`	`66`	`if err != nil {`
`67`	`67`	`return fmt.Errorf("getting full node api: %w", err)`
`68`	`68`	`}`