wire in nv16 migration signature and manifests

chain/consensus/filcns/upgrades.go

@@ -45,132 +45,189 @@ import (
 	"github.com/filecoin-project/lotus/chain/vm"
 )
 
+type LegacyMigrationFunc = func(
+	ctx context.Context,
+	sm *stmgr.StateManager, cache stmgr.MigrationCache,
+	cb stmgr.ExecMonitor,
+	oldState cid.Cid,
+	height abi.ChainEpoch, ts *types.TipSet,
+) (newState cid.Cid, err error)
+
+type LegacyPreMigrationFunc = func(
+	ctx context.Context,
+	sm *stmgr.StateManager, cache stmgr.MigrationCache,
+	oldState cid.Cid,
+	height abi.ChainEpoch, ts *types.TipSet,
+) error
+
+func legacyMigration(f LegacyMigrationFunc) stmgr.MigrationFunc {
+	return func(
+		ctx context.Context,
+		sm *stmgr.StateManager, cache stmgr.MigrationCache,
+		cb stmgr.ExecMonitor,
+		manifest cid.Cid,
+		oldState cid.Cid,
+		height abi.ChainEpoch, ts *types.TipSet,
+	) (newState cid.Cid, err error) {
+		return f(ctx, sm, cache, cb, oldState, height, ts)
+	}
+}
+
+func legacyPreMigration(f LegacyPreMigrationFunc) stmgr.PreMigrationFunc {
+	return func(
+		ctx context.Context,
+		sm *stmgr.StateManager, cache stmgr.MigrationCache,
+		manifest cid.Cid,
+		oldState cid.Cid,
+		height abi.ChainEpoch, ts *types.TipSet,
+	) error {
+		return f(ctx, sm, cache, oldState, height, ts)
+	}
+}
+
 func DefaultUpgradeSchedule() stmgr.UpgradeSchedule {
 	var us stmgr.UpgradeSchedule
 
 	updates := []stmgr.Upgrade{{
 		Height:    build.UpgradeBreezeHeight,
 		Network:   network.Version1,
-		Migration: UpgradeFaucetBurnRecovery,
+		Migration: legacyMigration(UpgradeFaucetBurnRecovery),
+		Manifest:  cid.Undef,
 	}, {
 		Height:    build.UpgradeSmokeHeight,
 		Network:   network.Version2,
 		Migration: nil,
+		Manifest:  cid.Undef,
 	}, {
 		Height:    build.UpgradeIgnitionHeight,
 		Network:   network.Version3,
-		Migration: UpgradeIgnition,
+		Migration: legacyMigration(UpgradeIgnition),
+		Manifest:  cid.Undef,
 	}, {
 		Height:    build.UpgradeRefuelHeight,
 		Network:   network.Version3,
-		Migration: UpgradeRefuel,
+		Migration: legacyMigration(UpgradeRefuel),
+		Manifest:  cid.Undef,
 	}, {
 		Height:    build.UpgradeAssemblyHeight,
 		Network:   network.Version4,
 		Expensive: true,
-		Migration: UpgradeActorsV2,
+		Migration: legacyMigration(UpgradeActorsV2),
+		Manifest:  cid.Undef,
 	}, {
 		Height:    build.UpgradeTapeHeight,
 		Network:   network.Version5,
 		Migration: nil,
+		Manifest:  cid.Undef,
 	}, {
 		Height:    build.UpgradeLiftoffHeight,
 		Network:   network.Version5,
-		Migration: UpgradeLiftoff,
+		Migration: legacyMigration(UpgradeLiftoff),
+		Manifest:  cid.Undef,
 	}, {
 		Height:    build.UpgradeKumquatHeight,
 		Network:   network.Version6,
 		Migration: nil,
+		Manifest:  cid.Undef,
 	}, {
 		Height:    build.UpgradeCalicoHeight,
 		Network:   network.Version7,
-		Migration: UpgradeCalico,
+		Migration: legacyMigration(UpgradeCalico),
+		Manifest:  cid.Undef,
 	}, {
 		Height:    build.UpgradePersianHeight,
 		Network:   network.Version8,
 		Migration: nil,
+		Manifest:  cid.Undef,
 	}, {
 		Height:    build.UpgradeOrangeHeight,
 		Network:   network.Version9,
 		Migration: nil,
+		Manifest:  cid.Undef,
 	}, {
 		Height:    build.UpgradeTrustHeight,
 		Network:   network.Version10,
-		Migration: UpgradeActorsV3,
+		Migration: legacyMigration(UpgradeActorsV3),
 		PreMigrations: []stmgr.PreMigration{{
-			PreMigration:    PreUpgradeActorsV3,
+			PreMigration:    legacyPreMigration(PreUpgradeActorsV3),
 			StartWithin:     120,
 			DontStartWithin: 60,
 			StopWithin:      35,
 		}, {
-			PreMigration:    PreUpgradeActorsV3,
+			PreMigration:    legacyPreMigration(PreUpgradeActorsV3),
 			StartWithin:     30,
 			DontStartWithin: 15,
 			StopWithin:      5,
 		}},
+		Manifest:  cid.Undef,
 		Expensive: true,
 	}, {
 		Height:    build.UpgradeNorwegianHeight,
 		Network:   network.Version11,
 		Migration: nil,
+		Manifest:  cid.Undef,
 	}, {
 		Height:    build.UpgradeTurboHeight,
 		Network:   network.Version12,
-		Migration: UpgradeActorsV4,
+		Migration: legacyMigration(UpgradeActorsV4),
 		PreMigrations: []stmgr.PreMigration{{
-			PreMigration:    PreUpgradeActorsV4,
+			PreMigration:    legacyPreMigration(PreUpgradeActorsV4),
 			StartWithin:     120,
 			DontStartWithin: 60,
 			StopWithin:      35,
 		}, {
-			PreMigration:    PreUpgradeActorsV4,
+			PreMigration:    legacyPreMigration(PreUpgradeActorsV4),
 			StartWithin:     30,
 			DontStartWithin: 15,
 			StopWithin:      5,
 		}},
+		Manifest:  cid.Undef,
 		Expensive: true,
 	}, {
 		Height:    build.UpgradeHyperdriveHeight,
 		Network:   network.Version13,
-		Migration: UpgradeActorsV5,
+		Migration: legacyMigration(UpgradeActorsV5),
 		PreMigrations: []stmgr.PreMigration{{
-			PreMigration:    PreUpgradeActorsV5,
+			PreMigration:    legacyPreMigration(PreUpgradeActorsV5),
 			StartWithin:     120,
 			DontStartWithin: 60,
 			StopWithin:      35,
 		}, {
-			PreMigration:    PreUpgradeActorsV5,
+			PreMigration:    legacyPreMigration(PreUpgradeActorsV5),
 			StartWithin:     30,
 			DontStartWithin: 15,
 			StopWithin:      5,
 		}},
+		Manifest:  cid.Undef,
 		Expensive: true,
 	}, {
 		Height:    build.UpgradeChocolateHeight,
 		Network:   network.Version14,
-		Migration: UpgradeActorsV6,
+		Migration: legacyMigration(UpgradeActorsV6),
 		PreMigrations: []stmgr.PreMigration{{
-			PreMigration:    PreUpgradeActorsV6,
+			PreMigration:    legacyPreMigration(PreUpgradeActorsV6),
 			StartWithin:     120,
 			DontStartWithin: 60,
 			StopWithin:      35,
 		}, {
-			PreMigration:    PreUpgradeActorsV6,
+			PreMigration:    legacyPreMigration(PreUpgradeActorsV6),
 			StartWithin:     30,
 			DontStartWithin: 15,
 			StopWithin:      5,
 		}},
+		Manifest:  cid.Undef,
 		Expensive: true,
 	}, {
 		Height:    build.UpgradeOhSnapHeight,
 		Network:   network.Version15,
-		Migration: UpgradeActorsV7,
+		Migration: legacyMigration(UpgradeActorsV7),
 		PreMigrations: []stmgr.PreMigration{{
-			PreMigration:    PreUpgradeActorsV7,
+			PreMigration:    legacyPreMigration(PreUpgradeActorsV7),
 			StartWithin:     180,
 			DontStartWithin: 60,
 			StopWithin:      5,
 		}},
+		Manifest:  cid.Undef,
 		Expensive: true,
 	}, {
 		Height:    build.UpgradeFVM1Height,
@@ -182,6 +239,7 @@ func DefaultUpgradeSchedule() stmgr.UpgradeSchedule {
 			DontStartWithin: 60,
 			StopWithin:      5,
 		}},
+		Manifest:  cid.Undef, // TODO this should be the real manifest CID
 		Expensive: true,
 	},
 	}
@@ -1317,7 +1375,7 @@ func upgradeActorsV7Common(
 	return newRoot, nil
 }
 
-func UpgradeActorsV8(ctx context.Context, sm *stmgr.StateManager, cache stmgr.MigrationCache, cb stmgr.ExecMonitor, root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) {
+func UpgradeActorsV8(ctx context.Context, sm *stmgr.StateManager, cache stmgr.MigrationCache, cb stmgr.ExecMonitor, manifest cid.Cid, root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) {
 	// Use all the CPUs except 3.
 	workerCount := runtime.NumCPU() - 3
 	if workerCount <= 0 {
@@ -1331,7 +1389,7 @@ func UpgradeActorsV8(ctx context.Context, sm *stmgr.StateManager, cache stmgr.Mi
 		ProgressLogPeriod: 10 * time.Second,
 	}
 
-	newRoot, err := upgradeActorsV8Common(ctx, sm, cache, root, epoch, ts, config)
+	newRoot, err := upgradeActorsV8Common(ctx, sm, cache, manifest, root, epoch, ts, config)
 	if err != nil {
 		return cid.Undef, xerrors.Errorf("migrating actors v6 state: %w", err)
 	}
@@ -1339,7 +1397,7 @@ func UpgradeActorsV8(ctx context.Context, sm *stmgr.StateManager, cache stmgr.Mi
 	return newRoot, nil
 }
 
-func PreUpgradeActorsV8(ctx context.Context, sm *stmgr.StateManager, cache stmgr.MigrationCache, root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) error {
+func PreUpgradeActorsV8(ctx context.Context, sm *stmgr.StateManager, cache stmgr.MigrationCache, manifest cid.Cid, root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) error {
 	// Use half the CPUs for pre-migration, but leave at least 3.
 	workerCount := runtime.NumCPU()
 	if workerCount <= 4 {
@@ -1356,12 +1414,13 @@ func PreUpgradeActorsV8(ctx context.Context, sm *stmgr.StateManager, cache stmgr
 	config := nv16.Config{MaxWorkers: uint(workerCount),
 		ProgressLogPeriod: time.Minute * 5}
 
-	_, err = upgradeActorsV8Common(ctx, sm, cache, lbRoot, epoch, lbts, config)
+	_, err = upgradeActorsV8Common(ctx, sm, cache, manifest, lbRoot, epoch, lbts, config)
 	return err
 }
 
 func upgradeActorsV8Common(
 	ctx context.Context, sm *stmgr.StateManager, cache stmgr.MigrationCache,
+	manifest cid.Cid,
 	root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet,
 	config nv16.Config,
 ) (cid.Cid, error) {
@@ -1382,7 +1441,7 @@ func upgradeActorsV8Common(
 	}
 
 	// Perform the migration
-	newHamtRoot, err := nv16.MigrateStateTree(ctx, store, stateRoot.Actors, epoch, config, migrationLogger{}, cache)
+	newHamtRoot, err := nv16.MigrateStateTree(ctx, store, manifest, stateRoot.Actors, epoch, config, migrationLogger{}, cache)
 	if err != nil {
 		return cid.Undef, xerrors.Errorf("upgrading to actors v8: %w", err)
 	}

chain/stmgr/forks.go

@@ -8,9 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/filecoin-project/lotus/build"
+	"github.com/filecoin-project/specs-actors/v8/actors/migration/nv16"
-
-	"github.com/filecoin-project/specs-actors/v7/actors/migration/nv15"
 
 	"github.com/ipfs/go-cid"
 	"golang.org/x/xerrors"
@@ -49,7 +47,9 @@ type MigrationCache interface {
 type MigrationFunc func(
 	ctx context.Context,
 	sm *StateManager, cache MigrationCache,
-	cb ExecMonitor, oldState cid.Cid,
+	cb ExecMonitor,
+	manifest cid.Cid,
+	oldState cid.Cid,
 	height abi.ChainEpoch, ts *types.TipSet,
 ) (newState cid.Cid, err error)
 
@@ -58,6 +58,7 @@ type MigrationFunc func(
 type PreMigrationFunc func(
 	ctx context.Context,
 	sm *StateManager, cache MigrationCache,
+	manifest cid.Cid,
 	oldState cid.Cid,
 	height abi.ChainEpoch, ts *types.TipSet,
 ) error
@@ -94,6 +95,10 @@ type Upgrade struct {
 	// These functions should fill the given cache with information that can speed up the
 	// eventual full migration at the upgrade epoch.
 	PreMigrations []PreMigration
+
+	// Manifest is the migration manifest CID, starting with nv16; for older migrations it is
+	// undefined
+	Manifest cid.Cid
 }
 
 type UpgradeSchedule []Upgrade
@@ -177,7 +182,7 @@ func (sm *StateManager) HandleStateForks(ctx context.Context, root cid.Cid, heig
 		// Yes, we clone the cache, even for the final upgrade epoch. Why? Reverts. We may
 		// have to migrate multiple times.
 		tmpCache := u.cache.Clone()
-		retCid, err = u.upgrade(ctx, sm, tmpCache, cb, root, height, ts)
+		retCid, err = u.upgrade(ctx, sm, tmpCache, cb, u.manifest, root, height, ts)
 		if err != nil {
 			log.Errorw("FAILED migration", "height", height, "from", root, "error", err)
 			return cid.Undef, err
@@ -214,7 +219,7 @@ func (sm *StateManager) hasExpensiveFork(height abi.ChainEpoch) bool {
 	return ok
 }
 
-func runPreMigration(ctx context.Context, sm *StateManager, fn PreMigrationFunc, cache *nv15.MemMigrationCache, ts *types.TipSet) {
+func runPreMigration(ctx context.Context, sm *StateManager, manifest cid.Cid, fn PreMigrationFunc, cache *nv16.MemMigrationCache, ts *types.TipSet) {
 	height := ts.Height()
 	parent := ts.ParentState()
 
@@ -226,7 +231,7 @@ func runPreMigration(ctx context.Context, sm *StateManager, fn PreMigrationFunc,
 	// migration to use the cache may assume that
 	// certain blocks exist, even if they don't.
 	tmpCache := cache.Clone()
-	err := fn(ctx, sm, tmpCache, parent, height, ts)
+	err := fn(ctx, sm, tmpCache, manifest, parent, height, ts)
 	if err != nil {
 		log.Errorw("FAILED pre-migration", "error", err)
 		return
@@ -277,7 +282,7 @@ func (sm *StateManager) preMigrationWorker(ctx context.Context) {
 					wg.Add(1)
 					go func() {
 						defer wg.Done()
-						runPreMigration(preCtx, sm, migrationFunc, cache, ts)
+						runPreMigration(preCtx, sm, migration.manifest, migrationFunc, cache, ts)
 					}()
 				},
 			})

chain/stmgr/stmgr.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	"github.com/filecoin-project/specs-actors/v7/actors/migration/nv15"
+	"github.com/filecoin-project/specs-actors/v8/actors/migration/nv16"
 
 	"github.com/filecoin-project/lotus/chain/rand"
 
@@ -54,7 +54,8 @@ type versionSpec struct {
 type migration struct {
 	upgrade       MigrationFunc
 	preMigrations []PreMigration
-	cache         *nv15.MemMigrationCache
+	cache         *nv16.MemMigrationCache
+	manifest      cid.Cid
 }
 
 type Executor interface {
@@ -122,7 +123,8 @@ func NewStateManager(cs *store.ChainStore, exec Executor, sys vm.SyscallBuilder,
 				migration := &migration{
 					upgrade:       upgrade.Migration,
 					preMigrations: upgrade.PreMigrations,
-					cache:         nv15.NewMemMigrationCache(),
+					cache:         nv16.NewMemMigrationCache(),
+					manifest:      upgrade.Manifest,
 				}
 				stateMigrations[upgrade.Height] = migration
 			}