feat: lite-mode - check that gateway API implements required chain, mpool, state methods

cmd/lotus-gateway/api.go

@@ -8,6 +8,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/lotus/node/impl/full"
 	"github.com/ipfs/go-cid"
 )
 
@@ -93,3 +94,6 @@ func (a *GatewayAPI) StateLookupID(ctx context.Context, addr address.Address, ts
 }
 
 var _ api.GatewayAPI = &GatewayAPI{}
+var _ full.ChainModuleAPI = (*GatewayAPI)(nil)
+var _ full.MpoolModuleAPI = (*GatewayAPI)(nil)
+var _ full.StateModuleAPI = (*GatewayAPI)(nil)

cmd/lotus/daemon.go

@@ -15,10 +15,6 @@ import (
 	"runtime/pprof"
 	"strings"
 
-	"github.com/filecoin-project/lotus/node/impl/full"
-
-	"github.com/filecoin-project/lotus/chain/types"
-
 	paramfetch "github.com/filecoin-project/go-paramfetch"
 	"github.com/mitchellh/go-homedir"
 	"github.com/multiformats/go-multiaddr"
@@ -34,6 +30,7 @@ import (
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/stmgr"
 	"github.com/filecoin-project/lotus/chain/store"
+	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/chain/vm"
 	lcli "github.com/filecoin-project/lotus/cli"
 	"github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
@@ -42,6 +39,7 @@ import (
 	"github.com/filecoin-project/lotus/lib/ulimit"
 	"github.com/filecoin-project/lotus/metrics"
 	"github.com/filecoin-project/lotus/node"
+	"github.com/filecoin-project/lotus/node/impl/full"
 	"github.com/filecoin-project/lotus/node/modules"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	"github.com/filecoin-project/lotus/node/modules/testing"

node/builder.go

@@ -6,8 +6,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/filecoin-project/lotus/node/impl/full"
-
 	logging "github.com/ipfs/go-log"
 	ci "github.com/libp2p/go-libp2p-core/crypto"
 	"github.com/libp2p/go-libp2p-core/host"
@@ -61,6 +59,7 @@ import (
 	"github.com/filecoin-project/lotus/node/hello"
 	"github.com/filecoin-project/lotus/node/impl"
 	"github.com/filecoin-project/lotus/node/impl/common"
+	"github.com/filecoin-project/lotus/node/impl/full"
 	"github.com/filecoin-project/lotus/node/modules"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	"github.com/filecoin-project/lotus/node/modules/helpers"
@@ -270,6 +269,7 @@ func Online() Option {
 			Override(new(full.ChainModuleAPI), From(new(full.ChainModule))),
 			Override(new(full.StateModuleAPI), From(new(full.StateModule))),
 			Override(new(full.MpoolModuleAPI), From(new(full.MpoolModule))),
+			Override(new(stmgr.StateManagerAPI), From(new(*stmgr.StateManager))),
 
 			Override(new(dtypes.ChainGCLocker), blockstore.NewGCLocker),
 			Override(new(dtypes.ChainGCBlockstore), modules.ChainGCBlockstore),

node/impl/full/chain.go

@@ -68,7 +68,7 @@ func (a *ChainAPI) ChainNotify(ctx context.Context) (<-chan []*api.HeadChange, e
 	return a.Chain.SubHeadChanges(ctx), nil
 }
 
-func (m *ChainModule) ChainHead(ctx context.Context) (*types.TipSet, error) {
+func (m *ChainModule) ChainHead(context.Context) (*types.TipSet, error) {
 	return m.Chain.GetHeaviestTipSet(), nil
 }
 

node/impl/full/mpool.go

@@ -4,19 +4,16 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/filecoin-project/lotus/chain/messagepool"
-
-	"github.com/filecoin-project/lotus/chain/messagesigner"
-
-	"github.com/filecoin-project/lotus/node/modules/dtypes"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/ipfs/go-cid"
 	"go.uber.org/fx"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/api"
+	"github.com/filecoin-project/lotus/chain/messagepool"
+	"github.com/filecoin-project/lotus/chain/messagesigner"
 	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/lotus/node/modules/dtypes"
 )
 
 type MpoolModuleAPI interface {

node/impl/full/multisig.go

@@ -3,8 +3,6 @@ package full
 import (
 	"context"
 
-	"github.com/filecoin-project/lotus/chain/stmgr"
-
 	"github.com/filecoin-project/go-state-types/big"
 
 	"github.com/filecoin-project/go-address"
@@ -25,8 +23,8 @@ import (
 type MsigAPI struct {
 	fx.In
 
-	StateManagerAPI stmgr.StateManagerAPI
+	StateAPI StateAPI
-	MpoolAPI        MpoolAPI
+	MpoolAPI MpoolAPI
 }
 
 func (a *MsigAPI) messageBuilder(ctx context.Context, from address.Address) (multisig.MessageBuilder, error) {
@@ -153,7 +151,7 @@ func (a *MsigAPI) msigApproveOrCancel(ctx context.Context, operation api.MsigPro
 	}
 
 	if proposer.Protocol() != address.ID {
-		proposerID, err := a.StateManagerAPI.LookupID(ctx, proposer, nil)
+		proposerID, err := a.StateAPI.StateLookupID(ctx, proposer, types.EmptyTSK)
 		if err != nil {
 			return cid.Undef, err
 		}

node/impl/full/wallet.go

@@ -19,8 +19,8 @@ import (
 type WalletAPI struct {
 	fx.In
 
-	stmgr.StateManagerAPI
+	StateManagerAPI stmgr.StateManagerAPI
-	Wallet *wallet.Wallet
+	Wallet          *wallet.Wallet
 }
 
 func (a *WalletAPI) WalletNew(ctx context.Context, typ crypto.SigType) (address.Address, error) {