CHANGELOG.md

@@ -6,14 +6,6 @@
 
 ## Improvements
 
-# v1.26.1 / 2024-03-27
-
-**This is a patch release for the Calibration network user.** The Calibration network is scheduled for an upgrade to include the two additional built-in actor events to ease the transition and observability of DDO for the ecosystem ([#964](https://github.com/filecoin-project/FIPs/pull/964) and [#968](https://github.com/filecoin-project/FIPs/pull/968)).
-
-The agreed-upon epoch between the Filecoin implementer team for the update is `1493854`, corresponding to `2024-04-03T11:00:00Z`. All Calibration network users need to upgrade to this patch release before that.
-
- **Lotus Mainnet Users**: For users on the Mainnet, the [Lotus v1.26.0](https://github.com/filecoin-project/lotus/releases/tag/v1.26.0) release already includes the aforementioned events in preparation for the Mainnet nv22 upgrade. Therefore, both v1.26.0 and v1.26.1 versions are suitable for use on the Mainnet for the coming network version 22 upgrade.
-
 # v1.26.0 / 2024-03-21
 
 This is the stable release for the upcoming MANDATORY Filecoin network upgrade v22, codenamed Dragon 🐉, at `epoch 3817920 - 2024-04-11 - 14:00:00Z`
@@ -411,6 +403,8 @@ This patch release allows for up to 10k messages per block. Additionally, it int
 ## Improvements
 - fix: exchange: allow up to 10k messages per block ([filecoin-project/lotus#11506](https://github.com/filecoin-project/lotus/pull/11506))
 
+>>>>>>> releases
+
 # v 1.25.0 / 2023-11-22
 
 This is a highly recommended feature release of Lotus. This optional release supports the Filecoin network version 21 upgrade, codenamed Watermelon 🍉, in addition to the numerous improvements and enhancements for node operators, ETH RPC-providers and storage providers.
@@ -498,7 +492,6 @@ Lotus-workers can now be built to leverage the SupraSeal C2 sealing optimization
 - fix: lotus-provider: lotus-provider msg sending ([filecoin-project/lotus#11480](https://github.com/filecoin-project/lotus/pull/11480))
 - fix: lotus-provider: Fix winning PoSt ([filecoin-project/lotus#11483](https://github.com/filecoin-project/lotus/pull/11483))
 - chore: fix: sql Scan cannot write to an object ([filecoin-project/lotus#11487](https://github.com/filecoin-project/lotus/pull/11487))
-- fix: Exclude reverted events in `eth_getLogs` results [filecoin-project/lotus#11318](https://github.com/filecoin-project/lotus/pull/11318)
 
 ## Dependencies
 - deps: update go-libp2p to v0.28.1 ([filecoin-project/lotus#10998](https://github.com/filecoin-project/lotus/pull/10998))

build/builtin_actors.go

@@ -48,7 +48,6 @@ func init() {
 	if NetworkBundle == "calibrationnet" {
 		actors.AddActorMeta("storageminer", cid.MustParse("bafk2bzacecnh2ouohmonvebq7uughh4h3ppmg4cjsk74dzxlbbtlcij4xbzxq"), actorstypes.Version12)
 		actors.AddActorMeta("storageminer", cid.MustParse("bafk2bzaced7emkbbnrewv5uvrokxpf5tlm4jslu2jsv77ofw2yqdglg657uie"), actorstypes.Version12)
-		actors.AddActorMeta("verifiedregistry", cid.MustParse("bafk2bzacednskl3bykz5qpo54z2j2p4q44t5of4ktd6vs6ymmg2zebsbxazkm"), actorstypes.Version13)
 	}
 }
 
@@ -195,8 +194,7 @@ func readEmbeddedBuiltinActorsMetadata(bundle string) ([]*BuiltinActorsMetadata,
 		// The following manifest cids existed temporarily on the calibnet testnet
 		// We include them in our builtin bundle, but intentionally omit from metadata
 		if root == cid.MustParse("bafy2bzacedrunxfqta5skb7q7x32lnp4efz2oq7fn226ffm7fu5iqs62jkmvs") ||
-			root == cid.MustParse("bafy2bzacebl4w5ptfvuw6746w7ev562idkbf5ppq72e6zub22435ws2rukzru") ||
-			root == cid.MustParse("bafy2bzacea4firkyvt2zzdwqjrws5pyeluaesh6uaid246tommayr4337xpmi") {
+			root == cid.MustParse("bafy2bzacebl4w5ptfvuw6746w7ev562idkbf5ppq72e6zub22435ws2rukzru") {
 			continue
 		}
 		bundles = append(bundles, &BuiltinActorsMetadata{

build/builtin_actors_gen.go

@@ -249,8 +249,8 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 }, {
 	Network:      "calibrationnet",
 	Version:      13,
-	BundleGitTag: "v13.0.0",
-	ManifestCid:  MustParseCid("bafy2bzacect4ktyujrwp6mjlsitnpvuw2pbuppz6w52sfljyo4agjevzm75qs"),
+	BundleGitTag: "v13.0.0-rc.3",
+	ManifestCid:  MustParseCid("bafy2bzacea4firkyvt2zzdwqjrws5pyeluaesh6uaid246tommayr4337xpmi"),
 	Actors: map[string]cid.Cid{
 		"account":          MustParseCid("bafk2bzaceb3j36ri5y5mfklgp5emlvrms6g4733ss2j3l7jismrxq6ng3tcc6"),
 		"cron":             MustParseCid("bafk2bzaceaz6rocamdxehgpwcbku6wlapwpgzyyvkrploj66mlqptsulf52bs"),
@@ -267,7 +267,7 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 		"storageminer":     MustParseCid("bafk2bzaceckzw3v7wqliyggvjvihz4wywchnnsie4frfvkm3fm5znb64mofri"),
 		"storagepower":     MustParseCid("bafk2bzacea7t4wynzjajl442mpdqbnh3wusjusqtnzgpvefvweh4n2tgzgqhu"),
 		"system":           MustParseCid("bafk2bzacedjnrb5glewazsxpcx6rwiuhl4kwrfcqolyprn6rrjtlzmthlhdq6"),
-		"verifiedregistry": MustParseCid("bafk2bzacebj2zdquagzy2xxn7up574oemg3w7ed3fe4aujkyhgdwj57voesn2"),
+		"verifiedregistry": MustParseCid("bafk2bzacednskl3bykz5qpo54z2j2p4q44t5of4ktd6vs6ymmg2zebsbxazkm"),
 	},
 }, {
 	Network: "caterpillarnet",

build/params_2k.go

@@ -77,9 +77,6 @@ const UpgradeWatermelonFixHeight = -100
 // This fix upgrade only ran on calibrationnet
 const UpgradeWatermelonFix2Height = -101
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeCalibrationDragonFixHeight = -102
-
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0:                    DrandMainnet,
 	UpgradePhoenixHeight: DrandQuicknet,

build/params_butterfly.go

@@ -67,9 +67,6 @@ const UpgradeWatermelonFixHeight = -100
 // This fix upgrade only ran on calibrationnet
 const UpgradeWatermelonFix2Height = -101
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeCalibrationDragonFixHeight = -102
-
 var SupportedProofTypes = []abi.RegisteredSealProof{
 	abi.RegisteredSealProof_StackedDrg512MiBV1,
 	abi.RegisteredSealProof_StackedDrg32GiBV1,

build/params_calibnet.go

@@ -95,9 +95,6 @@ const UpgradeDragonHeight = 1427974
 // This epoch, 120 epochs after the "rest" of the nv22 upgrade, is when we switch to Drand quicknet
 const UpgradePhoenixHeight = UpgradeDragonHeight + 120
 
-// 2024-04-03T11:00:00Z
-const UpgradeCalibrationDragonFixHeight = 1493854
-
 var SupportedProofTypes = []abi.RegisteredSealProof{
 	abi.RegisteredSealProof_StackedDrg32GiBV1,
 	abi.RegisteredSealProof_StackedDrg64GiBV1,

build/params_interop.go

@@ -65,9 +65,6 @@ const UpgradeWatermelonFixHeight = -1
 // This fix upgrade only ran on calibrationnet
 const UpgradeWatermelonFix2Height = -2
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeCalibrationDragonFixHeight = -3
-
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0:                    DrandMainnet,
 	UpgradePhoenixHeight: DrandQuicknet,

build/params_mainnet.go

@@ -103,7 +103,7 @@ const UpgradeWatermelonHeight = 3469380
 var UpgradeDragonHeight = abi.ChainEpoch(3817920)
 
 // This epoch, 120 epochs after the "rest" of the nv22 upgrade, is when we switch to Drand quicknet
-// 2024-04-11T15:00:00Z
+// 2024-04-02T15:00:00Z
 var UpgradePhoenixHeight = UpgradeDragonHeight + 120
 
 // This fix upgrade only ran on calibrationnet
@@ -112,9 +112,6 @@ const UpgradeWatermelonFixHeight = -1
 // This fix upgrade only ran on calibrationnet
 const UpgradeWatermelonFix2Height = -2
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeCalibrationDragonFixHeight = -3
-
 var SupportedProofTypes = []abi.RegisteredSealProof{
 	abi.RegisteredSealProof_StackedDrg32GiBV1,
 	abi.RegisteredSealProof_StackedDrg64GiBV1,

build/params_testground.go

@@ -87,34 +87,33 @@ var (
 	UpgradeBreezeHeight      abi.ChainEpoch = -1
 	BreezeGasTampingDuration abi.ChainEpoch = 0
 
-	UpgradeSmokeHeight                abi.ChainEpoch = -1
-	UpgradeIgnitionHeight             abi.ChainEpoch = -2
-	UpgradeRefuelHeight               abi.ChainEpoch = -3
-	UpgradeTapeHeight                 abi.ChainEpoch = -4
-	UpgradeAssemblyHeight             abi.ChainEpoch = 10
-	UpgradeLiftoffHeight              abi.ChainEpoch = -5
-	UpgradeKumquatHeight              abi.ChainEpoch = -6
-	UpgradeCalicoHeight               abi.ChainEpoch = -8
-	UpgradePersianHeight              abi.ChainEpoch = -9
-	UpgradeOrangeHeight               abi.ChainEpoch = -10
-	UpgradeClausHeight                abi.ChainEpoch = -11
-	UpgradeTrustHeight                abi.ChainEpoch = -12
-	UpgradeNorwegianHeight            abi.ChainEpoch = -13
-	UpgradeTurboHeight                abi.ChainEpoch = -14
-	UpgradeHyperdriveHeight           abi.ChainEpoch = -15
-	UpgradeChocolateHeight            abi.ChainEpoch = -16
-	UpgradeOhSnapHeight               abi.ChainEpoch = -17
-	UpgradeSkyrHeight                 abi.ChainEpoch = -18
-	UpgradeSharkHeight                abi.ChainEpoch = -19
-	UpgradeHyggeHeight                abi.ChainEpoch = -20
-	UpgradeLightningHeight            abi.ChainEpoch = -21
-	UpgradeThunderHeight              abi.ChainEpoch = -22
-	UpgradeWatermelonHeight           abi.ChainEpoch = -23
-	UpgradeWatermelonFixHeight        abi.ChainEpoch = -24
-	UpgradeWatermelonFix2Height       abi.ChainEpoch = -25
-	UpgradeDragonHeight               abi.ChainEpoch = -26
-	UpgradePhoenixHeight              abi.ChainEpoch = -27
-	UpgradeCalibrationDragonFixHeight abi.ChainEpoch = -28
+	UpgradeSmokeHeight          abi.ChainEpoch = -1
+	UpgradeIgnitionHeight       abi.ChainEpoch = -2
+	UpgradeRefuelHeight         abi.ChainEpoch = -3
+	UpgradeTapeHeight           abi.ChainEpoch = -4
+	UpgradeAssemblyHeight       abi.ChainEpoch = 10
+	UpgradeLiftoffHeight        abi.ChainEpoch = -5
+	UpgradeKumquatHeight        abi.ChainEpoch = -6
+	UpgradeCalicoHeight         abi.ChainEpoch = -8
+	UpgradePersianHeight        abi.ChainEpoch = -9
+	UpgradeOrangeHeight         abi.ChainEpoch = -10
+	UpgradeClausHeight          abi.ChainEpoch = -11
+	UpgradeTrustHeight          abi.ChainEpoch = -12
+	UpgradeNorwegianHeight      abi.ChainEpoch = -13
+	UpgradeTurboHeight          abi.ChainEpoch = -14
+	UpgradeHyperdriveHeight     abi.ChainEpoch = -15
+	UpgradeChocolateHeight      abi.ChainEpoch = -16
+	UpgradeOhSnapHeight         abi.ChainEpoch = -17
+	UpgradeSkyrHeight           abi.ChainEpoch = -18
+	UpgradeSharkHeight          abi.ChainEpoch = -19
+	UpgradeHyggeHeight          abi.ChainEpoch = -20
+	UpgradeLightningHeight      abi.ChainEpoch = -21
+	UpgradeThunderHeight        abi.ChainEpoch = -22
+	UpgradeWatermelonHeight     abi.ChainEpoch = -23
+	UpgradeWatermelonFixHeight  abi.ChainEpoch = -24
+	UpgradeWatermelonFix2Height abi.ChainEpoch = -25
+	UpgradeDragonHeight         abi.ChainEpoch = -26
+	UpgradePhoenixHeight        abi.ChainEpoch = -27
 
 	DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 		0:                    DrandMainnet,

build/version.go

@@ -37,7 +37,7 @@ func BuildTypeString() string {
 }
 
 // BuildVersion is the local build version
-const BuildVersion = "1.26.1"
+const BuildVersion = "1.26.0"
 
 func UserVersion() string {
 	if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" {

chain/consensus/filcns/upgrades.go

@@ -23,9 +23,7 @@ import (
 	init11 "github.com/filecoin-project/go-state-types/builtin/v11/init"
 	nv19 "github.com/filecoin-project/go-state-types/builtin/v11/migration"
 	system11 "github.com/filecoin-project/go-state-types/builtin/v11/system"
-	init12 "github.com/filecoin-project/go-state-types/builtin/v12/init"
 	nv21 "github.com/filecoin-project/go-state-types/builtin/v12/migration"
-	system12 "github.com/filecoin-project/go-state-types/builtin/v12/system"
 	nv22 "github.com/filecoin-project/go-state-types/builtin/v13/migration"
 	nv17 "github.com/filecoin-project/go-state-types/builtin/v9/migration"
 	"github.com/filecoin-project/go-state-types/manifest"
@@ -298,10 +296,6 @@ func DefaultUpgradeSchedule() stmgr.UpgradeSchedule {
 			StopWithin:      10,
 		}},
 		Expensive: true,
-	}, {
-		Height:    build.UpgradeCalibrationDragonFixHeight,
-		Network:   network.Version22,
-		Migration: upgradeActorsV13VerifregFix(calibnetv13BuggyVerifregCID1, calibnetv13CorrectManifestCID1),
 	},
 	}
 
@@ -1908,13 +1902,6 @@ var (
 	calibnetv12BuggyManifestCID1   = cid.MustParse("bafy2bzacedrunxfqta5skb7q7x32lnp4efz2oq7fn226ffm7fu5iqs62jkmvs")
 	calibnetv12BuggyManifestCID2   = cid.MustParse("bafy2bzacebl4w5ptfvuw6746w7ev562idkbf5ppq72e6zub22435ws2rukzru")
 	calibnetv12CorrectManifestCID1 = cid.MustParse("bafy2bzacednzb3pkrfnbfhmoqtb3bc6dgvxszpqklf3qcc7qzcage4ewzxsca")
-
-	calibnetv13BuggyVerifregCID1 = cid.MustParse("bafk2bzacednskl3bykz5qpo54z2j2p4q44t5of4ktd6vs6ymmg2zebsbxazkm")
-
-	calibnetv13BuggyBundleSuffix1 = "calibrationnet-13-rc3"
-
-	calibnetv13BuggyManifestCID1   = cid.MustParse("bafy2bzacea4firkyvt2zzdwqjrws5pyeluaesh6uaid246tommayr4337xpmi")
-	calibnetv13CorrectManifestCID1 = cid.MustParse("bafy2bzacect4ktyujrwp6mjlsitnpvuw2pbuppz6w52sfljyo4agjevzm75qs")
 )
 
 func upgradeActorsV12Common(
@@ -2240,53 +2227,16 @@ func upgradeActorsV13Common(
 		)
 	}
 
-	// check whether or not this is a calibnet upgrade
-	// we do this because calibnet upgraded to a "wrong" actors bundle, which was then corrected
-	// we thus upgrade to calibrationnet-buggy in this upgrade
-	actorsIn, err := state.LoadStateTree(adtStore, root)
-	if err != nil {
-		return cid.Undef, xerrors.Errorf("loading state tree: %w", err)
-	}
-
-	initActor, err := actorsIn.GetActor(builtin.InitActorAddr)
-	if err != nil {
-		return cid.Undef, xerrors.Errorf("failed to get system actor: %w", err)
-	}
-
-	var initState init12.State
-	if err := adtStore.Get(ctx, initActor.Head, &initState); err != nil {
-		return cid.Undef, xerrors.Errorf("failed to get system actor state: %w", err)
-	}
-
-	var manifestCid cid.Cid
-	if initState.NetworkName == "calibrationnet" {
-		embedded, ok := build.GetEmbeddedBuiltinActorsBundle(actorstypes.Version13, calibnetv13BuggyBundleSuffix1)
-		if !ok {
-			return cid.Undef, xerrors.Errorf("didn't find buggy calibrationnet bundle")
-		}
-
-		var err error
-		manifestCid, err = bundle.LoadBundle(ctx, writeStore, bytes.NewReader(embedded))
-		if err != nil {
-			return cid.Undef, xerrors.Errorf("failed to load buggy calibnet bundle: %w", err)
-		}
-
-		if manifestCid != calibnetv13BuggyManifestCID1 {
-			return cid.Undef, xerrors.Errorf("didn't find expected buggy calibnet bundle manifest: %s != %s", manifestCid, calibnetv12BuggyManifestCID1)
-		}
-	} else {
-		ok := false
-		manifestCid, ok = actors.GetManifest(actorstypes.Version13)
-		if !ok {
-			return cid.Undef, xerrors.Errorf("no manifest CID for v13 upgrade")
-		}
+	manifest, ok := actors.GetManifest(actorstypes.Version13)
+	if !ok {
+		return cid.Undef, xerrors.Errorf("no manifest CID for v13 upgrade")
 	}
 
 	// Perform the migration
-	newHamtRoot, err := nv22.MigrateStateTree(ctx, adtStore, manifestCid, stateRoot.Actors, epoch, config,
+	newHamtRoot, err := nv22.MigrateStateTree(ctx, adtStore, manifest, stateRoot.Actors, epoch, config,
 		migrationLogger{}, cache)
 	if err != nil {
-		return cid.Undef, xerrors.Errorf("upgrading to actors v13: %w", err)
+		return cid.Undef, xerrors.Errorf("upgrading to actors v11: %w", err)
 	}
 
 	// Persist the result.
@@ -2311,163 +2261,6 @@ func upgradeActorsV13Common(
 	return newRoot, nil
 }
 
-// ////////////////////
-func upgradeActorsV13VerifregFix(oldBuggyVerifregCID, newManifestCID cid.Cid) func(ctx context.Context, sm *stmgr.StateManager, cache stmgr.MigrationCache, cb stmgr.ExecMonitor, root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) {
-	return func(ctx context.Context, sm *stmgr.StateManager, cache stmgr.MigrationCache, cb stmgr.ExecMonitor, root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) {
-		stateStore := sm.ChainStore().StateBlockstore()
-		adtStore := store.ActorStore(ctx, stateStore)
-
-		// ensure that the manifest is loaded in the blockstore
-
-		// this loads the "correct" bundle for UpgradeCalibrationDragonFixHeight
-		if err := bundle.LoadBundles(ctx, stateStore, actorstypes.Version13); err != nil {
-			return cid.Undef, xerrors.Errorf("failed to load manifest bundle: %w", err)
-		}
-
-		// this loads the buggy bundle, for UpgradeDragonHeight
-		embedded, ok := build.GetEmbeddedBuiltinActorsBundle(actorstypes.Version13, calibnetv13BuggyBundleSuffix1)
-		if !ok {
-			return cid.Undef, xerrors.Errorf("didn't find buggy calibrationnet bundle")
-		}
-
-		_, err := bundle.LoadBundle(ctx, stateStore, bytes.NewReader(embedded))
-		if err != nil {
-			return cid.Undef, xerrors.Errorf("failed to load buggy calibnet bundle: %w", err)
-		}
-
-		// now confirm we have the one we're migrating to
-		if haveManifest, err := stateStore.Has(ctx, newManifestCID); err != nil {
-			return cid.Undef, xerrors.Errorf("blockstore error when loading manifest %s: %w", newManifestCID, err)
-		} else if !haveManifest {
-			return cid.Undef, xerrors.Errorf("missing new manifest %s in blockstore", newManifestCID)
-		}
-
-		// Load input state tree
-		actorsIn, err := state.LoadStateTree(adtStore, root)
-		if err != nil {
-			return cid.Undef, xerrors.Errorf("loading state tree: %w", err)
-		}
-
-		// load old manifest data
-		systemActor, err := actorsIn.GetActor(builtin.SystemActorAddr)
-		if err != nil {
-			return cid.Undef, xerrors.Errorf("failed to get system actor: %w", err)
-		}
-
-		var systemState system12.State
-		if err := adtStore.Get(ctx, systemActor.Head, &systemState); err != nil {
-			return cid.Undef, xerrors.Errorf("failed to get system actor state: %w", err)
-		}
-
-		var oldManifestData manifest.ManifestData
-		if err := adtStore.Get(ctx, systemState.BuiltinActors, &oldManifestData); err != nil {
-			return cid.Undef, xerrors.Errorf("failed to get old manifest data: %w", err)
-		}
-
-		// load new manifest
-		var newManifest manifest.Manifest
-		if err := adtStore.Get(ctx, newManifestCID, &newManifest); err != nil {
-			return cid.Undef, xerrors.Errorf("error reading actor manifest: %w", err)
-		}
-
-		if err := newManifest.Load(ctx, adtStore); err != nil {
-			return cid.Undef, xerrors.Errorf("error loading actor manifest: %w", err)
-		}
-
-		// build the CID mapping
-		codeMapping := make(map[cid.Cid]cid.Cid, len(oldManifestData.Entries))
-		for _, oldEntry := range oldManifestData.Entries {
-			newCID, ok := newManifest.Get(oldEntry.Name)
-			if !ok {
-				return cid.Undef, xerrors.Errorf("missing manifest entry for %s", oldEntry.Name)
-			}
-
-			// Note: we expect newCID to be the same as oldEntry.Code for all actors except the verifreg actor
-			codeMapping[oldEntry.Code] = newCID
-		}
-
-		// Create empty actorsOut
-
-		actorsOut, err := state.NewStateTree(adtStore, actorsIn.Version())
-		if err != nil {
-			return cid.Undef, xerrors.Errorf("failed to create new tree: %w", err)
-		}
-
-		// Perform the migration
-		err = actorsIn.ForEach(func(a address.Address, actor *types.Actor) error {
-			newCid, ok := codeMapping[actor.Code]
-			if !ok {
-				return xerrors.Errorf("didn't find mapping for %s", actor.Code)
-			}
-
-			return actorsOut.SetActor(a, &types.ActorV5{
-				Code:    newCid,
-				Head:    actor.Head,
-				Nonce:   actor.Nonce,
-				Balance: actor.Balance,
-				Address: actor.Address,
-			})
-		})
-		if err != nil {
-			return cid.Undef, xerrors.Errorf("failed to perform migration: %w", err)
-		}
-
-		systemState.BuiltinActors = newManifest.Data
-		newSystemHead, err := adtStore.Put(ctx, &systemState)
-		if err != nil {
-			return cid.Undef, xerrors.Errorf("failed to put new system state: %w", err)
-		}
-
-		systemActor.Head = newSystemHead
-		if err = actorsOut.SetActor(builtin.SystemActorAddr, systemActor); err != nil {
-			return cid.Undef, xerrors.Errorf("failed to put new system actor: %w", err)
-		}
-
-		// Sanity checking
-
-		err = actorsIn.ForEach(func(a address.Address, inActor *types.Actor) error {
-			outActor, err := actorsOut.GetActor(a)
-			if err != nil {
-				return xerrors.Errorf("failed to get actor in outTree: %w", err)
-			}
-
-			if inActor.Nonce != outActor.Nonce {
-				return xerrors.Errorf("mismatched nonce for actor %s", a)
-			}
-
-			if !inActor.Balance.Equals(outActor.Balance) {
-				return xerrors.Errorf("mismatched balance for actor %s: %d != %d", a, inActor.Balance, outActor.Balance)
-			}
-
-			if inActor.Address != outActor.Address && inActor.Address.String() != outActor.Address.String() {
-				return xerrors.Errorf("mismatched address for actor %s: %s != %s", a, inActor.Address, outActor.Address)
-			}
-
-			if inActor.Head != outActor.Head && a != builtin.SystemActorAddr {
-				return xerrors.Errorf("mismatched head for actor %s", a)
-			}
-
-			// Actor Codes are only expected to change for the verifreg actor
-			if inActor.Code != oldBuggyVerifregCID && inActor.Code != outActor.Code {
-				return xerrors.Errorf("unexpected change in code for actor %s", a)
-			}
-
-			return nil
-		})
-		if err != nil {
-			return cid.Undef, xerrors.Errorf("failed to sanity check migration: %w", err)
-		}
-
-		// Persist the result.
-		newRoot, err := actorsOut.Flush(ctx)
-		if err != nil {
-			return cid.Undef, xerrors.Errorf("failed to persist new state root: %w", err)
-		}
-
-		return newRoot, nil
-	}
-}
-
 ////////////////////
 
 // Example upgrade function if upgrade requires only code changes

chain/events/filter/index.go

@@ -46,7 +46,6 @@ var ddls = []string{
 	)`,
 
 	`CREATE INDEX IF NOT EXISTS height_tipset_key ON event (height,tipset_key)`,
-	`CREATE INDEX IF NOT EXISTS event_emitter_addr ON event (emitter_addr)`,
 
 	`CREATE TABLE IF NOT EXISTS event_entry (
 		event_id INTEGER,
@@ -57,8 +56,6 @@ var ddls = []string{
 		value BLOB NOT NULL
 	)`,
 
-	`CREATE INDEX IF NOT EXISTS event_entry_key_index ON event_entry (key)`,
-
 	// metadata containing version of schema
 	`CREATE TABLE IF NOT EXISTS _meta (
     	version UINT64 NOT NULL UNIQUE
@@ -66,7 +63,6 @@ var ddls = []string{
 
 	`INSERT OR IGNORE INTO _meta (version) VALUES (1)`,
 	`INSERT OR IGNORE INTO _meta (version) VALUES (2)`,
-	`INSERT OR IGNORE INTO _meta (version) VALUES (3)`,
 }
 
 var (
@@ -74,7 +70,7 @@ var (
 )
 
 const (
-	schemaVersion = 3
+	schemaVersion = 2
 
 	eventExists          = `SELECT MAX(id) FROM event WHERE height=? AND tipset_key=? AND tipset_key_cid=? AND emitter_addr=? AND event_index=? AND message_cid=? AND message_index=?`
 	insertEvent          = `INSERT OR IGNORE INTO event(height, tipset_key, tipset_key_cid, emitter_addr, event_index, message_cid, message_index, reverted) VALUES(?, ?, ?, ?, ?, ?, ?, ?)`
@@ -325,22 +321,6 @@ func NewEventIndex(ctx context.Context, path string, chainStore *store.ChainStor
 			version = 2
 		}
 
-		if version == 2 {
-			log.Infof("upgrading event index from version 2 to version 3")
-
-			// to upgrade to version 3 we only need to create an index on the event_entry.key column
-			// and on the event.emitter_addr column
-			// which means we can just reapply the schema (it will not have any effect on existing data)
-			for _, ddl := range ddls {
-				if _, err := db.Exec(ddl); err != nil {
-					_ = db.Close()
-					return nil, xerrors.Errorf("could not upgrade index to version 3, exec ddl %q: %w", ddl, err)
-				}
-			}
-
-			version = 3
-		}
-
 		if version != schemaVersion {
 			_ = db.Close()
 			return nil, xerrors.Errorf("invalid database version: got %d, expected %d", version, schemaVersion)

documentation/en/cli-lotus-miner.md

@@ -7,7 +7,7 @@ USAGE:
    lotus-miner [global options] command [command options] [arguments...]
 
 VERSION:
-   1.26.1
+   1.26.0
 
 COMMANDS:
    init     Initialize a lotus miner repo

documentation/en/cli-lotus-provider.md

@@ -7,7 +7,7 @@ USAGE:
    lotus-provider [global options] command [command options] [arguments...]
 
 VERSION:
-   1.26.1
+   1.26.0
 
 COMMANDS:
    run      Start a lotus provider process

documentation/en/cli-lotus-worker.md

@@ -7,7 +7,7 @@ USAGE:
    lotus-worker [global options] command [command options] [arguments...]
 
 VERSION:
-   1.26.1
+   1.26.0
 
 COMMANDS:
    run        Start lotus worker

documentation/en/cli-lotus.md

@@ -7,7 +7,7 @@ USAGE:
    lotus [global options] command [command options] [arguments...]
 
 VERSION:
-   1.26.1
+   1.26.0
 
 COMMANDS:
    daemon   Start a lotus daemon process