Merge pull request #766 from filecoin-project/feat/holes

Pre-sealing holes

cmd/lotus-seed/main.go

@@ -66,6 +66,11 @@ var preSealCmd = &cli.Command{
 			Value: 1,
 			Usage: "select number of sectors to pre-seal",
 		},
+		&cli.Uint64Flag{
+			Name:  "sector-offset",
+			Value: 0,
+			Usage: "how many sector ids to skip when starting to seal",
+		},
 	},
 	Action: func(c *cli.Context) error {
 		sdir := c.String("sectorbuilder-dir")
@@ -79,7 +84,7 @@ var preSealCmd = &cli.Command{
 			return err
 		}
 
-		gm, err := seed.PreSeal(maddr, c.Uint64("sector-size"), c.Int("num-sectors"), sbroot, []byte(c.String("ticket-preimage")))
+		gm, err := seed.PreSeal(maddr, c.Uint64("sector-size"), c.Uint64("sector-offset"), c.Int("num-sectors"), sbroot, []byte(c.String("ticket-preimage")))
 		if err != nil {
 			return err
 		}

cmd/lotus-seed/seed/seed.go

@@ -26,15 +26,16 @@ import (
 
 var log = logging.Logger("preseal")
 
-func PreSeal(maddr address.Address, ssize uint64, sectors int, sbroot string, preimage []byte) (*genesis.GenesisMiner, error) {
+func PreSeal(maddr address.Address, ssize uint64, offset uint64, sectors int, sbroot string, preimage []byte) (*genesis.GenesisMiner, error) {
 	cfg := &sectorbuilder.Config{
-		Miner:         maddr,
-		SectorSize:    ssize,
-		CacheDir:      filepath.Join(sbroot, "cache"),
-		SealedDir:     filepath.Join(sbroot, "sealed"),
-		StagedDir:     filepath.Join(sbroot, "staging"),
-		UnsealedDir:   filepath.Join(sbroot, "unsealed"),
-		WorkerThreads: 2,
+		Miner:          maddr,
+		SectorSize:     ssize,
+		FallbackLastID: offset,
+		CacheDir:       filepath.Join(sbroot, "cache"),
+		SealedDir:      filepath.Join(sbroot, "sealed"),
+		StagedDir:      filepath.Join(sbroot, "staging"),
+		UnsealedDir:    filepath.Join(sbroot, "unsealed"),
+		WorkerThreads:  2,
 	}
 
 	for _, d := range []string{cfg.CacheDir, cfg.SealedDir, cfg.StagedDir, cfg.UnsealedDir} {
@@ -77,7 +78,7 @@ func PreSeal(maddr address.Address, ssize uint64, sectors int, sbroot string, pr
 			TicketBytes: trand,
 		}
 
-		fmt.Println("Piece info: ", pi)
+		fmt.Printf("sector-id: %d, piece info: %v", sid, pi)
 
 		pco, err := sb.SealPreCommit(sid, ticket, []sectorbuilder.PublicPieceInfo{pi})
 		if err != nil {