genesis setup improvements

cmd/lotus-seed/seed/seed.go

@@ -1,6 +1,7 @@
 package seed
 
 import (
+	"context"
 	"crypto/sha256"
 	"encoding/json"
 	"fmt"
@@ -12,8 +13,12 @@ import (
 	badger "github.com/ipfs/go-ds-badger"
 	"golang.org/x/xerrors"
 
+	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/build"
+	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/address"
+	"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/lib/sectorbuilder"
 )
@@ -52,7 +57,7 @@ func PreSeal(maddr address.Address, ssize uint64, sectors uint64, sbroot string,
 	r := rand.New(rand.NewSource(101))
 	size := sectorbuilder.UserBytesForSectorSize(ssize)
 
-	var sealedSectors []genesis.PreSeal
+	var sealedSectors []*genesis.PreSeal
 	for i := uint64(1); i <= sectors; i++ {
 		sid, err := sb.AcquireSectorId()
 		if err != nil {
@@ -76,17 +81,35 @@ func PreSeal(maddr address.Address, ssize uint64, sectors uint64, sbroot string,
 			return xerrors.Errorf("commit: %w", err)
 		}
 
-		sealedSectors = append(sealedSectors, genesis.PreSeal{
+		sealedSectors = append(sealedSectors, &genesis.PreSeal{
 			CommR:    pco.CommR,
 			CommD:    pco.CommD,
 			SectorID: sid,
 		})
 	}
 
+	minerAddr, err := wallet.GenerateKey(types.KTBLS)
+	if err != nil {
+		return err
+	}
+
+	miner := &genesis.GenesisMiner{
+		Owner:  minerAddr.Address,
+		Worker: minerAddr.Address,
+
+		SectorSize: ssize,
+
+		Sectors: sealedSectors,
+
+		Key: minerAddr.KeyInfo,
+	}
+
+	if err := createDeals(miner, minerAddr, ssize); err != nil {
+		return xerrors.Errorf("creating deals: %w", err)
+	}
+
 	output := map[string]genesis.GenesisMiner{
-		maddr.String(): genesis.GenesisMiner{
-			Sectors: sealedSectors,
-		},
+		maddr.String(): *miner,
 	}
 
 	out, err := json.MarshalIndent(output, "", "  ")
@@ -104,3 +127,37 @@ func PreSeal(maddr address.Address, ssize uint64, sectors uint64, sbroot string,
 
 	return nil
 }
+
+func createDeals(m *genesis.GenesisMiner, k *wallet.Key, ssize uint64) error {
+	for _, sector := range m.Sectors {
+		proposal := &actors.StorageDealProposal{
+			PieceRef:             sector.CommD[:], // just one deal so this == CommP
+			PieceSize:            ssize,
+			PieceSerialization:   actors.SerializationUnixFSv0,
+			Client:               k.Address,
+			Provider:             k.Address,
+			ProposalExpiration:   9000, // TODO: allow setting
+			Duration:             9000,
+			StoragePricePerEpoch: types.NewInt(0),
+			StorageCollateral:    types.NewInt(0),
+			ProposerSignature:    nil,
+		}
+
+		if err := api.SignWith(context.TODO(), wallet.KeyWallet(k).Sign, k.Address, proposal); err != nil {
+			return err
+		}
+
+		deal := &actors.StorageDeal{
+			Proposal:         *proposal,
+			CounterSignature: nil,
+		}
+
+		if err := api.SignWith(context.TODO(), wallet.KeyWallet(k).Sign, k.Address, deal); err != nil {
+			return err
+		}
+
+		sector.Deal = *deal
+	}
+
+	return nil
+}