Implement 'storage miner' module, wire up a few bits it needs to start

node/builder.go

@@ -37,6 +37,7 @@ import (
 	"github.com/filecoin-project/go-lotus/node/modules/lp2p"
 	"github.com/filecoin-project/go-lotus/node/modules/testing"
 	"github.com/filecoin-project/go-lotus/node/repo"
+	"github.com/filecoin-project/go-lotus/storage"
 )
 
 // special is a type used to give keys to modules which
@@ -180,6 +181,9 @@ func Online() Option {
 
 		libp2p(),
 
+		// common
+		Override(new(*wallet.Wallet), wallet.NewWallet),
+
 		// Full node
 
 		ApplyIf(func(s *Settings) bool { return s.nodeType == nodeFull },
@@ -198,7 +202,6 @@ func Online() Option {
 			// Filecoin services
 			Override(new(*chain.Syncer), chain.NewSyncer),
 			Override(new(*chain.BlockSync), chain.NewBlockSyncClient),
-			Override(new(*wallet.Wallet), wallet.NewWallet),
 			Override(new(*chain.MessagePool), chain.NewMessagePool),
 
 			Override(new(modules.Genesis), modules.ErrorGenesis),
@@ -214,6 +217,7 @@ func Online() Option {
 		// Storage miner
 		ApplyIf(func(s *Settings) bool { return s.nodeType == nodeStorageMiner },
 			Override(new(*sectorbuilder.SectorBuilder), sectorbuilder.New),
+			Override(new(*storage.Miner), modules.StorageMiner),
 		),
 	)
 }

node/impl/full.go

@@ -11,6 +11,7 @@ import (
 	"github.com/filecoin-project/go-lotus/chain/gen"
 	"github.com/filecoin-project/go-lotus/chain/store"
 	"github.com/filecoin-project/go-lotus/chain/types"
+	"github.com/filecoin-project/go-lotus/chain/vm"
 	"github.com/filecoin-project/go-lotus/chain/wallet"
 	"github.com/filecoin-project/go-lotus/miner"
 	"github.com/filecoin-project/go-lotus/node/client"
@@ -85,6 +86,32 @@ func (a *FullNodeAPI) ChainGetBlockMessages(ctx context.Context, msg cid.Cid) ([
 	return a.Chain.MessagesForBlock(b)
 }
 
+func (a *FullNodeAPI) ChainCall(ctx context.Context, msg *types.Message) (*types.MessageReceipt, error) {
+	hts := a.Chain.GetHeaviestTipSet()
+	state, err := a.Chain.TipSetState(hts.Cids())
+	if err != nil {
+		return nil, err
+	}
+
+	vmi, err := vm.NewVM(state, hts.Height(), hts.Blocks()[0].Miner, a.Chain)
+	if err != nil {
+		return nil, xerrors.Errorf("failed to set up vm: %w", err)
+	}
+
+	if msg.GasLimit == types.EmptyInt {
+		msg.GasLimit = types.NewInt(10000000000)
+	}
+	if msg.GasPrice == types.EmptyInt {
+		msg.GasPrice = types.NewInt(0)
+	}
+	if msg.Value == types.EmptyInt {
+		msg.Value = types.NewInt(0)
+	}
+
+	// TODO: maybe just use the invoker directly?
+	return vmi.ApplyMessage(ctx, msg)
+}
+
 func (a *FullNodeAPI) MpoolPending(ctx context.Context, ts *types.TipSet) ([]*types.SignedMessage, error) {
 	// TODO: need to make sure we don't return messages that were already included in the referenced chain
 	// also need to accept ts == nil just fine, assume nil == chain.Head()

node/impl/storminer.go

@@ -8,12 +8,15 @@ import (
 
 	"github.com/filecoin-project/go-lotus/api"
 	"github.com/filecoin-project/go-lotus/lib/sectorbuilder"
+	"github.com/filecoin-project/go-lotus/storage"
 )
 
 type StorageMinerAPI struct {
 	CommonAPI
 
 	SectorBuilder *sectorbuilder.SectorBuilder
+
+	Miner *storage.Miner
 }
 
 func (sm *StorageMinerAPI) StoreGarbageData(ctx context.Context) (uint64, error) {

node/modules/core.go

@@ -34,9 +34,11 @@ import (
 	"github.com/filecoin-project/go-lotus/chain/address"
 	"github.com/filecoin-project/go-lotus/chain/store"
 	"github.com/filecoin-project/go-lotus/chain/types"
+	"github.com/filecoin-project/go-lotus/chain/wallet"
 	"github.com/filecoin-project/go-lotus/lib/sectorbuilder"
 	"github.com/filecoin-project/go-lotus/node/modules/helpers"
 	"github.com/filecoin-project/go-lotus/node/repo"
+	"github.com/filecoin-project/go-lotus/storage"
 )
 
 var log = logging.Logger("modules")
@@ -237,12 +239,55 @@ func SectorBuilderConfig(storagePath string) func() (*sectorbuilder.SectorBuilde
 			return nil, err
 		}
 
-		return &sectorbuilder.SectorBuilderConfig{
+		sb := &sectorbuilder.SectorBuilderConfig{
 			Miner:       minerAddr,
 			SectorSize:  1024,
 			MetadataDir: metadata,
 			SealedDir:   sealed,
 			StagedDir:   staging,
-		}, nil
+		}
+
+		return sb, nil
 	}
 }
+
+func SectorBuilder(lc fx.Lifecycle, sbc *sectorbuilder.SectorBuilderConfig) (*sectorbuilder.SectorBuilder, error) {
+	sb, err := sectorbuilder.New(sbc)
+	if err != nil {
+		return nil, err
+	}
+
+	lc.Append(fx.Hook{
+		OnStart: func(ctx context.Context) error {
+			sb.Run(ctx)
+			return nil
+		},
+	})
+
+	return sb, nil
+}
+
+func StorageMiner(lc fx.Lifecycle, api api.FullNode, h host.Host, ds datastore.Batching, sb *sectorbuilder.SectorBuilder, w *wallet.Wallet) (*storage.Miner, error) {
+	maddrb, err := ds.Get(datastore.NewKey("miner-address"))
+	if err != nil {
+		return nil, err
+	}
+
+	maddr, err := address.NewFromBytes(maddrb)
+	if err != nil {
+		return nil, err
+	}
+
+	sm, err := storage.NewMiner(api, maddr, h, ds, sb, w)
+	if err != nil {
+		return nil, err
+	}
+
+	lc.Append(fx.Hook{
+		OnStart: func(ctx context.Context) error {
+			return sm.Run(ctx)
+		},
+	})
+
+	return sm, nil
+}