feat: make the upgrade epoch input from the client (#252)

Author: arajasek

builtin/v13/migration/market.go

@@ -21,12 +21,14 @@ import (
 
 type marketMigrator struct {
 	providerSectors *providerSectors
+	upgradeEpoch    abi.ChainEpoch
 	OutCodeCID      cid.Cid
 }
 
-func newMarketMigrator(ctx context.Context, store cbor.IpldStore, outCode cid.Cid, ps *providerSectors) (*marketMigrator, error) {
+func newMarketMigrator(ctx context.Context, store cbor.IpldStore, outCode cid.Cid, ps *providerSectors, upgradeEpoch abi.ChainEpoch) (*marketMigrator, error) {
 	return &marketMigrator{
 		providerSectors: ps,
+		upgradeEpoch:    upgradeEpoch,
 		OutCodeCID:      outCode,
 	}, nil
 }
@@ -329,7 +331,7 @@ func (m *marketMigrator) migrateProviderSectorsAndStatesFromScratch(ctx context.
 		}
 
 		// FIP: For each unexpired deal state object in the market actor state that has a terminated epoch set to -1:
-		if oldState.SlashEpoch == -1 && proposal.EndEpoch >= UpgradeHeight {
+		if oldState.SlashEpoch == -1 && proposal.EndEpoch >= m.upgradeEpoch {
 			// FIP: find the corresponding deal proposal object and extract the provider's actor ID;
 			// - we do this by collecting all dealIDs in providerSectors in miner migration
 

builtin/v13/migration/miner.go

@@ -33,15 +33,15 @@ type providerSectors struct {
 // minerMigration is technically a no-op, but it collects a cache for market migration
 type minerMigrator struct {
 	providerSectors *providerSectors
-
-	OutCodeCID cid.Cid
+	upgradeEpoch    abi.ChainEpoch
+	OutCodeCID      cid.Cid
 }
 
-func newMinerMigrator(ctx context.Context, store cbor.IpldStore, outCode cid.Cid, ps *providerSectors) (*minerMigrator, error) {
+func newMinerMigrator(ctx context.Context, store cbor.IpldStore, outCode cid.Cid, ps *providerSectors, upgradeEpoch abi.ChainEpoch) (*minerMigrator, error) {
 	return &minerMigrator{
 		providerSectors: ps,
-
-		OutCodeCID: outCode,
+		upgradeEpoch:    upgradeEpoch,
+		OutCodeCID:      outCode,
 	}, nil
 }
 
@@ -73,7 +73,7 @@ func (m *minerMigrator) MigrateState(ctx context.Context, store cbor.IpldStore,
 		// no cached migration, so we simply iterate all sectors and collect deal IDs
 
 		err = inSectors.ForEach(&sector, func(i int64) error {
-			if len(sector.DealIDs) == 0 || sector.Expiration < UpgradeHeight {
+			if len(sector.DealIDs) == 0 || sector.Expiration < m.upgradeEpoch {
 				return nil
 			}
 

builtin/v13/migration/top.go

@@ -17,9 +17,6 @@ import (
 	"golang.org/x/xerrors"
 )
 
-// TODO: Make input to migration
-const UpgradeHeight = abi.ChainEpoch(3654004)
-
 // MigrateStateTree Migrates the filecoin state tree starting from the global state tree and upgrading all actor state.
 // The store must support concurrent writes (even if the configured worker count is 1).
 func MigrateStateTree(ctx context.Context, store cbor.IpldStore, newManifestCID cid.Cid, actorsRootIn cid.Cid, priorEpoch abi.ChainEpoch, cfg migration.Config, log migration.Logger, cache migration.MigrationCache) (cid.Cid, error) {
@@ -119,7 +116,7 @@ func MigrateStateTree(ctx context.Context, store cbor.IpldStore, newManifestCID
 		updatesToMinerToSectorToDeals: map[abi.ActorID]map[abi.SectorNumber][]abi.DealID{},
 	}
 
-	minerMig, err := newMinerMigrator(ctx, store, miner13Cid, ps)
+	minerMig, err := newMinerMigrator(ctx, store, miner13Cid, ps, cfg.UpgradeEpoch)
 	if err != nil {
 		return cid.Undef, xerrors.Errorf("failed to create miner migrator: %w", err)
 	}
@@ -132,7 +129,7 @@ func MigrateStateTree(ctx context.Context, store cbor.IpldStore, newManifestCID
 		return cid.Undef, xerrors.Errorf("code cid for market actor not found in new manifest")
 	}
 
-	marketMig, err := newMarketMigrator(ctx, store, market13Cid, ps)
+	marketMig, err := newMarketMigrator(ctx, store, market13Cid, ps, cfg.UpgradeEpoch)
 	if err != nil {
 		return cid.Undef, xerrors.Errorf("failed to create market migrator: %w", err)
 	}

migration/util.go

@@ -5,6 +5,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/filecoin-project/go-state-types/abi"
+
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/rt"
 	cbor "github.com/ipfs/go-ipld-cbor"
@@ -83,6 +85,8 @@ type Config struct {
 	// Time between progress logs to emit.
 	// Zero (the default) results in no progress logs.
 	ProgressLogPeriod time.Duration
+	// The epoch at which the upgrade will run.
+	UpgradeEpoch abi.ChainEpoch
 }
 
 type Logger interface {