give miners the ability to select different sector sizes

node/impl/full/state.go

@@ -69,6 +69,10 @@ func (a *StateAPI) StateMinerProvingPeriodEnd(ctx context.Context, actor address
 	return stmgr.GetMinerProvingPeriodEnd(ctx, a.StateManager, ts, actor)
 }
 
+func (a *StateAPI) StateMinerSectorSize(ctx context.Context, actor address.Address, ts *types.TipSet) (uint64, error) {
+	return stmgr.GetMinerSectorSize(ctx, a.StateManager, ts, actor)
+}
+
 func (a *StateAPI) StatePledgeCollateral(ctx context.Context, ts *types.TipSet) (types.BigInt, error) {
 	param, err := actors.SerializeParams(&actors.PledgeCollateralParams{Size: types.NewInt(0)})
 	if err != nil {

node/impl/storminer.go

@@ -7,12 +7,13 @@ import (
 	"math/rand"
 
 	"github.com/filecoin-project/lotus/api"
-	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/address"
 	"github.com/filecoin-project/lotus/lib/sectorbuilder"
 	"github.com/filecoin-project/lotus/storage"
 	"github.com/filecoin-project/lotus/storage/sector"
 	"github.com/filecoin-project/lotus/storage/sectorblocks"
+
+	"golang.org/x/xerrors"
 )
 
 type StorageMinerAPI struct {
@@ -31,7 +32,11 @@ func (sm *StorageMinerAPI) ActorAddress(context.Context) (address.Address, error
 }
 
 func (sm *StorageMinerAPI) StoreGarbageData(ctx context.Context) (uint64, error) {
-	size := sectorbuilder.UserBytesForSectorSize(build.SectorSize)
+	ssize, err := sm.Miner.SectorSize(ctx)
+	if err != nil {
+		return 0, xerrors.Errorf("failed to get miner sector size: %w", err)
+	}
+	size := sectorbuilder.UserBytesForSectorSize(ssize)
 
 	// TODO: create a deal
 	name := fmt.Sprintf("fake-file-%d", rand.Intn(100000000))

node/modules/storageminer.go

@@ -16,7 +16,6 @@ import (
 	"go.uber.org/fx"
 
 	"github.com/filecoin-project/lotus/api"
-	"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/lib/sectorbuilder"
@@ -38,13 +37,18 @@ func minerAddrFromDS(ds dtypes.MetadataDS) (address.Address, error) {
 	return address.NewFromBytes(maddrb)
 }
 
-func SectorBuilderConfig(storagePath string) func(dtypes.MetadataDS) (*sectorbuilder.SectorBuilderConfig, error) {
-	return func(ds dtypes.MetadataDS) (*sectorbuilder.SectorBuilderConfig, error) {
+func SectorBuilderConfig(storagePath string) func(dtypes.MetadataDS, api.FullNode) (*sectorbuilder.SectorBuilderConfig, error) {
+	return func(ds dtypes.MetadataDS, api api.FullNode) (*sectorbuilder.SectorBuilderConfig, error) {
 		minerAddr, err := minerAddrFromDS(ds)
 		if err != nil {
 			return nil, err
 		}
 
+		ssize, err := api.StateMinerSectorSize(context.TODO(), minerAddr, nil)
+		if err != nil {
+			return nil, err
+		}
+
 		sp, err := homedir.Expand(storagePath)
 		if err != nil {
 			return nil, err
@@ -56,7 +60,7 @@ func SectorBuilderConfig(storagePath string) func(dtypes.MetadataDS) (*sectorbui
 
 		sb := &sectorbuilder.SectorBuilderConfig{
 			Miner:       minerAddr,
-			SectorSize:  build.SectorSize,
+			SectorSize:  ssize,
 			MetadataDir: metadata,
 			SealedDir:   sealed,
 			StagedDir:   staging,