feat: migration: sector deal ids index cached

builtin/v11/migration/top.go

@@ -124,7 +124,7 @@ func MigrateStateTree(ctx context.Context, store cbor.IpldStore, newManifestCID
 		return cid.Undef, xerrors.Errorf("incomplete migration specification with %d code CIDs, need %d", len(migrations), len(oldManifestData.Entries))
 	}
 
-	actorsOut, err := migration.RunMigration(ctx, cfg, cache, store, log, actorsIn, migrations)
+	actorsOut, err := migration.RunMigration(ctx, cfg, cache, store, log, actorsIn, migrations, deferredCodeIDs)
 	if err != nil {
 		return cid.Undef, xerrors.Errorf("failed to run migration: %w", err)
 	}

builtin/v11/miner/miner_state.go

@@ -9,6 +9,7 @@ import (
 	"github.com/filecoin-project/go-state-types/builtin/v11/util/adt"
 	"github.com/filecoin-project/go-state-types/dline"
 	xc "github.com/filecoin-project/go-state-types/exitcode"
+
 	cid "github.com/ipfs/go-cid"
 	"golang.org/x/xerrors"
 )

builtin/v12/check.go

@@ -334,22 +334,6 @@ func CheckVerifregAgainstMiners(acc *builtin.MessageAccumulator, verifregSummary
 }
 
 func CheckMarketAgainstVerifreg(acc *builtin.MessageAccumulator, verifregSummary *verifreg.StateSummary, marketSummary *market.StateSummary) {
-	// all activated verified deals with claim ids reference a claim in verifreg state
-	// note that it is possible for claims to exist with no matching deal if the deal expires
-	for claimId, dealId := range marketSummary.ClaimIdToDealId {
-		claim, found := verifregSummary.Claims[claimId]
-		acc.Require(found, "claim %d not found for activated deal %d", claimId, dealId)
-
-		info, found := marketSummary.Deals[dealId]
-		acc.Require(found, "internal invariant error invalid market state references missing deal %d", dealId)
-
-		providerId, err := address.IDFromAddress(info.Provider)
-		acc.RequireNoError(err, "error getting ID from provider address")
-		acc.Require(abi.ActorID(providerId) == claim.Provider, "mismatches providers %d %d on claim %d and deal %d", providerId, claim.Provider, claimId, dealId)
-
-		acc.Require(info.PieceCid == claim.Data, "mismatches piece cid %s %s on claim %d and deal %d", info.PieceCid, claim.Data, claimId, dealId)
-	}
-
 	// all pending deal allocation ids have an associated allocation
 	// note that it is possible for allocations to exist that don't match any deal
 	// if they are created from a direct DataCap transfer

builtin/v12/gen/gen.go

@@ -128,6 +128,7 @@ func main() {
 		market.GetDealTermReturn{},
 		market.GetDealActivationReturn{},
 		market.OnMinerSectorsTerminateParams{},
+		market.SectorDealIDs{},
 
 		// other types
 		market.DealProposal{},

builtin/v12/market/deal.go

@@ -15,7 +15,6 @@ import (
 	addr "github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
-	"github.com/filecoin-project/go-state-types/builtin/v12/verifreg"
 	acrypto "github.com/filecoin-project/go-state-types/crypto"
 )
 
@@ -27,10 +26,10 @@ var PieceCIDPrefix = cid.Prefix{
 }
 
 type DealState struct {
+	SectorNumber     abi.SectorNumber
 	SectorStartEpoch abi.ChainEpoch // -1 if not yet included in proven sector
 	LastUpdatedEpoch abi.ChainEpoch // -1 if deal state never updated
 	SlashEpoch       abi.ChainEpoch // -1 if deal never slashed
-	VerifiedClaim    verifreg.AllocationId
 }
 
 // The DealLabel is a kinded union of string or byte slice.

builtin/v12/market/invariants.go

@@ -28,7 +28,6 @@ type DealSummary struct {
 type StateSummary struct {
 	Deals                    map[abi.DealID]*DealSummary
 	PendingDealAllocationIds map[abi.DealID]verifreg.AllocationId
-	ClaimIdToDealId          map[verifreg.ClaimId]abi.DealID
 	AllocIdToDealId          map[verifreg.AllocationId]abi.DealID
 	PendingProposalCount     uint64
 	DealStateCount           uint64
@@ -118,7 +117,6 @@ func CheckStateInvariants(st *State, store adt.Store, balance abi.TokenAmount, c
 	}
 
 	dealStateCount := uint64(0)
-	claimIdToDealId := make(map[verifreg.ClaimId]abi.DealID)
 	if dealStates, err := adt.AsArray(store, st.States, StatesAmtBitwidth); err != nil {
 		acc.Addf("error loading deal states: %v", err)
 	} else {
@@ -156,11 +154,6 @@ func CheckStateInvariants(st *State, store adt.Store, balance abi.TokenAmount, c
 			acc.Require(!found, "deal %d has pending allocation", dealID)
 
 			dealStateCount++
-
-			if dealState.VerifiedClaim != verifreg.NoAllocationID {
-				claimIdToDealId[verifreg.ClaimId(dealState.VerifiedClaim)] = abi.DealID(dealID)
-			}
-
 			return nil
 		})
 		acc.RequireNoError(err, "error iterating deal states")
@@ -266,7 +259,6 @@ func CheckStateInvariants(st *State, store adt.Store, balance abi.TokenAmount, c
 		LockTableCount:           lockTableCount,
 		DealOpEpochCount:         dealOpEpochCount,
 		DealOpCount:              dealOpCount,
-		ClaimIdToDealId:          claimIdToDealId,
 		AllocIdToDealId:          allocationIdToDealId,
 	}, acc
 }

builtin/v12/market/market_state.go

@@ -55,6 +55,10 @@ type State struct {
 
 	// Verified registry allocation IDs for deals that are not yet activated.
 	PendingDealAllocationIds cid.Cid // HAMT[DealID]AllocationID
+
+	// New mapping of sector IDs to deal IDS, grouped by storage provider.
+	ProviderSectors cid.Cid // HAMT[Address]HAMT[SectorNumber]SectorDeals
+
 }
 
 func ConstructState(store adt.Store) (*State, error) {
@@ -101,6 +105,10 @@ func ConstructState(store adt.Store) (*State, error) {
 	}, nil
 }
 
+type SectorDealIDs struct {
+	DealIDs []abi.DealID
+}
+
 // A specialization of a array to deals.
 // It is an error to query for a key that doesn't exist.
 type DealArray struct {