Merge pull request #6223 from filecoin-project/fix/calibnet

fix: light-weight patch to fix calibrationnet again by removing move_partitions from built-in actors

Author: LinZexiao

fixtures/networks/butterfly.go

@@ -31,32 +31,33 @@ func ButterflySnapNet() *NetworkConf {
 			MinVerifiedDealSize:     1 << 20,
 			PreCommitChallengeDelay: abi.ChainEpoch(150),
 			ForkUpgradeParam: &config.ForkUpgradeConfig{
-				BreezeGasTampingDuration:   120,
-				UpgradeBreezeHeight:        -1,
-				UpgradeSmokeHeight:         -2,
-				UpgradeIgnitionHeight:      -3,
-				UpgradeRefuelHeight:        -4,
-				UpgradeAssemblyHeight:      -5,
-				UpgradeTapeHeight:          -6,
-				UpgradeLiftoffHeight:       -7,
-				UpgradeKumquatHeight:       -8,
-				UpgradeCalicoHeight:        -9,
-				UpgradePersianHeight:       -10,
-				UpgradeOrangeHeight:        -11,
-				UpgradeClausHeight:         -12,
-				UpgradeTrustHeight:         -13,
-				UpgradeNorwegianHeight:     -14,
-				UpgradeTurboHeight:         -15,
-				UpgradeHyperdriveHeight:    -16,
-				UpgradeChocolateHeight:     -17,
-				UpgradeOhSnapHeight:        -18,
-				UpgradeSkyrHeight:          -19,
-				UpgradeSharkHeight:         -20,
-				UpgradeHyggeHeight:         -21,
-				UpgradeLightningHeight:     -22,
-				UpgradeThunderHeight:       -23,
-				UpgradeWatermelonHeight:    400,
-				UpgradeWatermelonFixHeight: -25, // This fix upgrade only ran on calibrationnet
+				BreezeGasTampingDuration:    120,
+				UpgradeBreezeHeight:         -1,
+				UpgradeSmokeHeight:          -2,
+				UpgradeIgnitionHeight:       -3,
+				UpgradeRefuelHeight:         -4,
+				UpgradeAssemblyHeight:       -5,
+				UpgradeTapeHeight:           -6,
+				UpgradeLiftoffHeight:        -7,
+				UpgradeKumquatHeight:        -8,
+				UpgradeCalicoHeight:         -9,
+				UpgradePersianHeight:        -10,
+				UpgradeOrangeHeight:         -11,
+				UpgradeClausHeight:          -12,
+				UpgradeTrustHeight:          -13,
+				UpgradeNorwegianHeight:      -14,
+				UpgradeTurboHeight:          -15,
+				UpgradeHyperdriveHeight:     -16,
+				UpgradeChocolateHeight:      -17,
+				UpgradeOhSnapHeight:         -18,
+				UpgradeSkyrHeight:           -19,
+				UpgradeSharkHeight:          -20,
+				UpgradeHyggeHeight:          -21,
+				UpgradeLightningHeight:      -22,
+				UpgradeThunderHeight:        -23,
+				UpgradeWatermelonHeight:     400,
+				UpgradeWatermelonFixHeight:  -100, // This fix upgrade only ran on calibrationnet
+				UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 1},
 			AddressNetwork:          address.Testnet,

fixtures/networks/calibration.go

@@ -38,32 +38,33 @@ func Calibration() *NetworkConf {
 			MinVerifiedDealSize:     1 << 20,
 			PreCommitChallengeDelay: abi.ChainEpoch(150),
 			ForkUpgradeParam: &config.ForkUpgradeConfig{
-				BreezeGasTampingDuration:   120,
-				UpgradeBreezeHeight:        -1,
-				UpgradeSmokeHeight:         -2,
-				UpgradeIgnitionHeight:      -3,
-				UpgradeRefuelHeight:        -4,
-				UpgradeAssemblyHeight:      30,
-				UpgradeTapeHeight:          60,
-				UpgradeLiftoffHeight:       -5,
-				UpgradeKumquatHeight:       90,
-				UpgradeCalicoHeight:        120,
-				UpgradePersianHeight:       120 + (builtin2.EpochsInHour * 1),
-				UpgradeClausHeight:         270,
-				UpgradeOrangeHeight:        300,
-				UpgradeTrustHeight:         330,
-				UpgradeNorwegianHeight:     360,
-				UpgradeTurboHeight:         390,
-				UpgradeHyperdriveHeight:    420,
-				UpgradeChocolateHeight:     450,
-				UpgradeOhSnapHeight:        480,
-				UpgradeSkyrHeight:          510,
-				UpgradeSharkHeight:         16800,
-				UpgradeHyggeHeight:         322354,        // 2023-02-21T16:30:00Z
-				UpgradeLightningHeight:     489094,        // 2023-04-20T14:00:00Z
-				UpgradeThunderHeight:       489094 + 3120, // 2023-04-21T16:00:00Z
-				UpgradeWatermelonHeight:    1013134,       // 2023-10-19T13:00:00Z
-				UpgradeWatermelonFixHeight: 1070494,       // 2023-11-07T13:00:00Z
+				BreezeGasTampingDuration:    120,
+				UpgradeBreezeHeight:         -1,
+				UpgradeSmokeHeight:          -2,
+				UpgradeIgnitionHeight:       -3,
+				UpgradeRefuelHeight:         -4,
+				UpgradeAssemblyHeight:       30,
+				UpgradeTapeHeight:           60,
+				UpgradeLiftoffHeight:        -5,
+				UpgradeKumquatHeight:        90,
+				UpgradeCalicoHeight:         120,
+				UpgradePersianHeight:        120 + (builtin2.EpochsInHour * 1),
+				UpgradeClausHeight:          270,
+				UpgradeOrangeHeight:         300,
+				UpgradeTrustHeight:          330,
+				UpgradeNorwegianHeight:      360,
+				UpgradeTurboHeight:          390,
+				UpgradeHyperdriveHeight:     420,
+				UpgradeChocolateHeight:      450,
+				UpgradeOhSnapHeight:         480,
+				UpgradeSkyrHeight:           510,
+				UpgradeSharkHeight:          16800,
+				UpgradeHyggeHeight:          322354,        // 2023-02-21T16:30:00Z
+				UpgradeLightningHeight:      489094,        // 2023-04-20T14:00:00Z
+				UpgradeThunderHeight:        489094 + 3120, // 2023-04-21T16:00:00Z
+				UpgradeWatermelonHeight:     1013134,       // 2023-10-19T13:00:00Z
+				UpgradeWatermelonFixHeight:  1070494,       // 2023-11-07T13:00:00Z
+				UpgradeWatermelonFix2Height: 1108174,       // 2023-11-21T13:00:00Z
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 1},
 			AddressNetwork:          address.Testnet,

fixtures/networks/forcenet.go

@@ -40,25 +40,26 @@ func ForceNet() *NetworkConf {
 				// Miners, clients, developers, custodians all need time to prepare.
 				// We still have upgrades and state changes to do, but can happen after signaling timing here.
 
-				UpgradeAssemblyHeight:      -7, // critical: the network can bootstrap from v1 only
-				UpgradeKumquatHeight:       -8,
-				UpgradeCalicoHeight:        -9,
-				UpgradePersianHeight:       -10,
-				UpgradeOrangeHeight:        -11,
-				UpgradeClausHeight:         -12,
-				UpgradeTrustHeight:         -13,
-				UpgradeNorwegianHeight:     -14,
-				UpgradeTurboHeight:         -15,
-				UpgradeHyperdriveHeight:    -16,
-				UpgradeChocolateHeight:     -17,
-				UpgradeOhSnapHeight:        -18,
-				UpgradeSkyrHeight:          -19,
-				UpgradeSharkHeight:         -20,
-				UpgradeHyggeHeight:         -21,
-				UpgradeLightningHeight:     -22,
-				UpgradeThunderHeight:       -23,
-				UpgradeWatermelonHeight:    200,
-				UpgradeWatermelonFixHeight: -25, // This fix upgrade only ran on calibrationnet
+				UpgradeAssemblyHeight:       -7, // critical: the network can bootstrap from v1 only
+				UpgradeKumquatHeight:        -8,
+				UpgradeCalicoHeight:         -9,
+				UpgradePersianHeight:        -10,
+				UpgradeOrangeHeight:         -11,
+				UpgradeClausHeight:          -12,
+				UpgradeTrustHeight:          -13,
+				UpgradeNorwegianHeight:      -14,
+				UpgradeTurboHeight:          -15,
+				UpgradeHyperdriveHeight:     -16,
+				UpgradeChocolateHeight:      -17,
+				UpgradeOhSnapHeight:         -18,
+				UpgradeSkyrHeight:           -19,
+				UpgradeSharkHeight:          -20,
+				UpgradeHyggeHeight:          -21,
+				UpgradeLightningHeight:      -22,
+				UpgradeThunderHeight:        -23,
+				UpgradeWatermelonHeight:     200,
+				UpgradeWatermelonFixHeight:  -100, // This fix upgrade only ran on calibrationnet
+				UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: config.DrandMainnet},
 			AddressNetwork:          address.Testnet,

fixtures/networks/hyperspace.go

@@ -34,28 +34,33 @@ func HyperspaceNet() *NetworkConf {
 			MinVerifiedDealSize:     1 << 20,
 			PreCommitChallengeDelay: abi.ChainEpoch(10),
 			ForkUpgradeParam: &config.ForkUpgradeConfig{
-				BreezeGasTampingDuration: 120,
-				UpgradeBreezeHeight:      -1,
-				UpgradeSmokeHeight:       -2,
-				UpgradeIgnitionHeight:    -3,
-				UpgradeRefuelHeight:      -4,
-				UpgradeAssemblyHeight:    -5,
-				UpgradeTapeHeight:        -6,
-				UpgradeLiftoffHeight:     -7,
-				UpgradeKumquatHeight:     -8,
-				UpgradeCalicoHeight:      -9,
-				UpgradePersianHeight:     -10,
-				UpgradeOrangeHeight:      -11,
-				UpgradeClausHeight:       -12,
-				UpgradeTrustHeight:       -13,
-				UpgradeNorwegianHeight:   -14,
-				UpgradeTurboHeight:       -15,
-				UpgradeHyperdriveHeight:  -16,
-				UpgradeChocolateHeight:   -17,
-				UpgradeOhSnapHeight:      -18,
-				UpgradeSkyrHeight:        -19,
-				UpgradeSharkHeight:       -20,
-				UpgradeHyggeHeight:       -21,
+				BreezeGasTampingDuration:    120,
+				UpgradeBreezeHeight:         -1,
+				UpgradeSmokeHeight:          -2,
+				UpgradeIgnitionHeight:       -3,
+				UpgradeRefuelHeight:         -4,
+				UpgradeAssemblyHeight:       -5,
+				UpgradeTapeHeight:           -6,
+				UpgradeLiftoffHeight:        -7,
+				UpgradeKumquatHeight:        -8,
+				UpgradeCalicoHeight:         -9,
+				UpgradePersianHeight:        -10,
+				UpgradeOrangeHeight:         -11,
+				UpgradeClausHeight:          -12,
+				UpgradeTrustHeight:          -13,
+				UpgradeNorwegianHeight:      -14,
+				UpgradeTurboHeight:          -15,
+				UpgradeHyperdriveHeight:     -16,
+				UpgradeChocolateHeight:      -17,
+				UpgradeOhSnapHeight:         -18,
+				UpgradeSkyrHeight:           -19,
+				UpgradeSharkHeight:          -20,
+				UpgradeHyggeHeight:          -21,
+				UpgradeLightningHeight:      -22,
+				UpgradeThunderHeight:        -23,
+				UpgradeWatermelonHeight:     200,
+				UpgradeWatermelonFixHeight:  -100, // This fix upgrade only ran on calibrationnet
+				UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 1},
 			AddressNetwork:          address.Testnet,

fixtures/networks/integrationtestnet.go

@@ -26,32 +26,33 @@ func IntegrationNet() *NetworkConf {
 			MinVerifiedDealSize:     1 << 20,
 			PreCommitChallengeDelay: abi.ChainEpoch(150),
 			ForkUpgradeParam: &config.ForkUpgradeConfig{
-				BreezeGasTampingDuration:   120,
-				UpgradeBreezeHeight:        41280,
-				UpgradeSmokeHeight:         51000,
-				UpgradeIgnitionHeight:      94000,
-				UpgradeRefuelHeight:        130800,
-				UpgradeAssemblyHeight:      138720,
-				UpgradeTapeHeight:          140760,
-				UpgradeLiftoffHeight:       148888,
-				UpgradeKumquatHeight:       170000,
-				UpgradeCalicoHeight:        265200,
-				UpgradePersianHeight:       265200 + (120 * 60),
-				UpgradeOrangeHeight:        336458,
-				UpgradeClausHeight:         343200,
-				UpgradeTrustHeight:         550321,
-				UpgradeNorwegianHeight:     665280,
-				UpgradeTurboHeight:         712320,
-				UpgradeHyperdriveHeight:    892800,
-				UpgradeChocolateHeight:     1231620,
-				UpgradeOhSnapHeight:        1594680,
-				UpgradeSkyrHeight:          1960320,
-				UpgradeSharkHeight:         2383680,
-				UpgradeHyggeHeight:         2683348,
-				UpgradeLightningHeight:     2809800,
-				UpgradeThunderHeight:       2809800 + 2880*21,
-				UpgradeWatermelonHeight:    3431940,
-				UpgradeWatermelonFixHeight: -25, // This fix upgrade only ran on calibrationnet
+				BreezeGasTampingDuration:    120,
+				UpgradeBreezeHeight:         41280,
+				UpgradeSmokeHeight:          51000,
+				UpgradeIgnitionHeight:       94000,
+				UpgradeRefuelHeight:         130800,
+				UpgradeAssemblyHeight:       138720,
+				UpgradeTapeHeight:           140760,
+				UpgradeLiftoffHeight:        148888,
+				UpgradeKumquatHeight:        170000,
+				UpgradeCalicoHeight:         265200,
+				UpgradePersianHeight:        265200 + (120 * 60),
+				UpgradeOrangeHeight:         336458,
+				UpgradeClausHeight:          343200,
+				UpgradeTrustHeight:          550321,
+				UpgradeNorwegianHeight:      665280,
+				UpgradeTurboHeight:          712320,
+				UpgradeHyperdriveHeight:     892800,
+				UpgradeChocolateHeight:      1231620,
+				UpgradeOhSnapHeight:         1594680,
+				UpgradeSkyrHeight:           1960320,
+				UpgradeSharkHeight:          2383680,
+				UpgradeHyggeHeight:          2683348,
+				UpgradeLightningHeight:      2809800,
+				UpgradeThunderHeight:        2809800 + 2880*21,
+				UpgradeWatermelonHeight:     3431940,
+				UpgradeWatermelonFixHeight:  -100, // This fix upgrade only ran on calibrationnet
+				UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 5, 51000: 1},
 			AddressNetwork:          address.Testnet,

fixtures/networks/interopnet.go

@@ -31,32 +31,33 @@ func InteropNet() *NetworkConf {
 			MinVerifiedDealSize:     256,
 			PreCommitChallengeDelay: abi.ChainEpoch(10),
 			ForkUpgradeParam: &config.ForkUpgradeConfig{
-				BreezeGasTampingDuration:   0,
-				UpgradeBreezeHeight:        -1,
-				UpgradeSmokeHeight:         -2,
-				UpgradeIgnitionHeight:      -3,
-				UpgradeRefuelHeight:        -4,
-				UpgradeAssemblyHeight:      -5,
-				UpgradeTapeHeight:          -6,
-				UpgradeLiftoffHeight:       -7,
-				UpgradeKumquatHeight:       -8,
-				UpgradeCalicoHeight:        -9,
-				UpgradePersianHeight:       -10,
-				UpgradeOrangeHeight:        -11,
-				UpgradeClausHeight:         -12,
-				UpgradeTrustHeight:         -13,
-				UpgradeNorwegianHeight:     -14,
-				UpgradeTurboHeight:         -15,
-				UpgradeHyperdriveHeight:    -16,
-				UpgradeChocolateHeight:     -17,
-				UpgradeOhSnapHeight:        -18,
-				UpgradeSkyrHeight:          -19,
-				UpgradeSharkHeight:         -20,
-				UpgradeHyggeHeight:         -21,
-				UpgradeLightningHeight:     -22,
-				UpgradeThunderHeight:       -23,
-				UpgradeWatermelonHeight:    50,
-				UpgradeWatermelonFixHeight: -25, // This fix upgrade only ran on calibrationnet
+				BreezeGasTampingDuration:    0,
+				UpgradeBreezeHeight:         -1,
+				UpgradeSmokeHeight:          -2,
+				UpgradeIgnitionHeight:       -3,
+				UpgradeRefuelHeight:         -4,
+				UpgradeAssemblyHeight:       -5,
+				UpgradeTapeHeight:           -6,
+				UpgradeLiftoffHeight:        -7,
+				UpgradeKumquatHeight:        -8,
+				UpgradeCalicoHeight:         -9,
+				UpgradePersianHeight:        -10,
+				UpgradeOrangeHeight:         -11,
+				UpgradeClausHeight:          -12,
+				UpgradeTrustHeight:          -13,
+				UpgradeNorwegianHeight:      -14,
+				UpgradeTurboHeight:          -15,
+				UpgradeHyperdriveHeight:     -16,
+				UpgradeChocolateHeight:      -17,
+				UpgradeOhSnapHeight:         -18,
+				UpgradeSkyrHeight:           -19,
+				UpgradeSharkHeight:          -20,
+				UpgradeHyggeHeight:          -21,
+				UpgradeLightningHeight:      -22,
+				UpgradeThunderHeight:        -23,
+				UpgradeWatermelonHeight:     50,
+				UpgradeWatermelonFixHeight:  -100, // This fix upgrade only ran on calibrationnet
+				UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 1},
 			AddressNetwork:          address.Testnet,

fixtures/networks/mainnet.go

@@ -54,24 +54,25 @@ func Mainnet() *NetworkConf {
 				// This signals our tentative epoch for mainnet launch. Can make it later, but not earlier.
 				// Miners, clients, developers, custodians all need time to prepare.
 				// We still have upgrades and state changes to do, but can happen after signaling timing here.
-				UpgradeKumquatHeight:       170000,
-				UpgradeCalicoHeight:        265200,
-				UpgradePersianHeight:       265200 + (builtin2.EpochsInHour * 60),
-				UpgradeOrangeHeight:        336458,
-				UpgradeClausHeight:         343200, // 2020-12-22T02:00:00Z
-				UpgradeTrustHeight:         550321, // 2021-03-04T00:00:30Z
-				UpgradeNorwegianHeight:     665280, // 2021-04-12T22:00:00Z
-				UpgradeTurboHeight:         712320, // 2021-04-29T06:00:00Z
-				UpgradeHyperdriveHeight:    892800, // 2021-06-30T22:00:00Z
-				UpgradeChocolateHeight:     1231620,
-				UpgradeOhSnapHeight:        1594680,           // 2022-03-01T15:00:00Z
-				UpgradeSkyrHeight:          1960320,           // 2022-07-06T14:00:00Z
-				UpgradeSharkHeight:         2383680,           // 2022-11-30T14:00:00Z
-				UpgradeHyggeHeight:         2683348,           // 2023-03-14T15:14:00Z
-				UpgradeLightningHeight:     2809800,           // 2023-04-27T13:00:00Z
-				UpgradeThunderHeight:       2809800 + 2880*21, // 2023-05-18T13:00:00Z
-				UpgradeWatermelonHeight:    3431940,           // 2023-11-29T13:30:00Z
-				UpgradeWatermelonFixHeight: -1,                // This fix upgrade only ran on calibrationnet
+				UpgradeKumquatHeight:        170000,
+				UpgradeCalicoHeight:         265200,
+				UpgradePersianHeight:        265200 + (builtin2.EpochsInHour * 60),
+				UpgradeOrangeHeight:         336458,
+				UpgradeClausHeight:          343200, // 2020-12-22T02:00:00Z
+				UpgradeTrustHeight:          550321, // 2021-03-04T00:00:30Z
+				UpgradeNorwegianHeight:      665280, // 2021-04-12T22:00:00Z
+				UpgradeTurboHeight:          712320, // 2021-04-29T06:00:00Z
+				UpgradeHyperdriveHeight:     892800, // 2021-06-30T22:00:00Z
+				UpgradeChocolateHeight:      1231620,
+				UpgradeOhSnapHeight:         1594680,           // 2022-03-01T15:00:00Z
+				UpgradeSkyrHeight:           1960320,           // 2022-07-06T14:00:00Z
+				UpgradeSharkHeight:          2383680,           // 2022-11-30T14:00:00Z
+				UpgradeHyggeHeight:          2683348,           // 2023-03-14T15:14:00Z
+				UpgradeLightningHeight:      2809800,           // 2023-04-27T13:00:00Z
+				UpgradeThunderHeight:        2809800 + 2880*21, // 2023-05-18T13:00:00Z
+				UpgradeWatermelonHeight:     3469380,           // 2023-12-12T13:30:00Z
+				UpgradeWatermelonFixHeight:  -100,              // This fix upgrade only ran on calibrationnet
+				UpgradeWatermelonFix2Height: -101,              // This fix upgrade only ran on calibrationnet
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 5, 51000: 1},
 			AddressNetwork:          address.Mainnet,