Add lotus-gen, rewire genesis mining

node/modules/storageminer.go

@@ -2,7 +2,6 @@ package modules
 
 import (
 	"context"
-	"fmt"
 	"math"
 	"path/filepath"
 	"reflect"
@@ -24,9 +23,11 @@ import (
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/address"
 	"github.com/filecoin-project/lotus/chain/deals"
+	"github.com/filecoin-project/lotus/chain/gen"
 	"github.com/filecoin-project/lotus/datatransfer"
 	"github.com/filecoin-project/lotus/lib/sectorbuilder"
 	"github.com/filecoin-project/lotus/lib/statestore"
+	"github.com/filecoin-project/lotus/miner"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	"github.com/filecoin-project/lotus/node/modules/helpers"
 	"github.com/filecoin-project/lotus/node/repo"
@@ -176,26 +177,27 @@ func StagingDAG(mctx helpers.MetricsCtx, lc fx.Lifecycle, r repo.LockedRepo, rt
 	return dag, nil
 }
 
-func RegisterMiner(lc fx.Lifecycle, ds dtypes.MetadataDS, api api.FullNode) error {
+func SetupBlockProducer(lc fx.Lifecycle, ds dtypes.MetadataDS, api api.FullNode, epp gen.ElectionPoStProver) (*miner.Miner, error) {
 	minerAddr, err := minerAddrFromDS(ds)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
+	m := miner.NewMiner(api, epp)
+
 	lc.Append(fx.Hook{
 		OnStart: func(ctx context.Context) error {
-			log.Infof("Registering miner '%s' with full node", minerAddr)
-			if err := api.MinerRegister(ctx, minerAddr); err != nil {
-				return fmt.Errorf("Failed to register miner: %s\nIf you are certain no other storage miner instance is running, try running 'lotus unregister-miner %s' and restarting the storage miner", err, minerAddr)
+			if err := m.Register(minerAddr); err != nil {
+				return err
 			}
 			return nil
 		},
 		OnStop: func(ctx context.Context) error {
-			log.Infof("Unregistering miner '%s' from full node", minerAddr)
-			return api.MinerUnregister(ctx, minerAddr)
+			return m.Unregister(ctx, minerAddr)
 		},
 	})
-	return nil
+
+	return m, nil
 }
 
 func SectorBuilder(lc fx.Lifecycle, cfg *sectorbuilder.Config, ds dtypes.MetadataDS) (*sectorbuilder.SectorBuilder, error) {

node/modules/testing/genesis.go

@@ -2,8 +2,10 @@ package testing
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
 	"time"
 
@@ -19,6 +21,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/gen"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/chain/wallet"
+	"github.com/filecoin-project/lotus/genesis"
 	"github.com/filecoin-project/lotus/node/modules"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 )
@@ -61,19 +64,30 @@ func MakeGenesisMem(out io.Writer, minerPid peer.ID) func(bs dtypes.ChainBlockst
 	}
 }
 
-func MakeGenesis(outFile string) func(bs dtypes.ChainBlockstore, w *wallet.Wallet) modules.Genesis {
+func MakeGenesis(outFile, preseal string) func(bs dtypes.ChainBlockstore, w *wallet.Wallet) modules.Genesis {
 	return func(bs dtypes.ChainBlockstore, w *wallet.Wallet) modules.Genesis {
 		return func() (*types.BlockHeader, error) {
 			glog.Warn("Generating new random genesis block, note that this SHOULD NOT happen unless you are setting up new network")
+			fdata, err := ioutil.ReadFile(preseal)
+			if err != nil {
+				return nil, err
+			}
+
+			var preseal map[string]genesis.GenesisMiner
+			if err := json.Unmarshal(fdata, &preseal); err != nil {
+				return nil, err
+			}
+
 			minerAddr, err := w.GenerateKey(types.KTBLS)
 			if err != nil {
 				return nil, err
 			}
 
 			gmc := &gen.GenMinerCfg{
-				Owners:  []address.Address{minerAddr},
-				Workers: []address.Address{minerAddr},
-				PeerIDs: []peer.ID{"peer ID 1"},
+				Owners:   []address.Address{minerAddr},
+				Workers:  []address.Address{minerAddr},
+				PeerIDs:  []peer.ID{"peer ID 1"},
+				PreSeals: preseal,
 			}
 
 			addrs := map[address.Address]types.BigInt{