diff --git a/fixtures/networks/butterfly.go b/fixtures/networks/butterfly.go index 74a1bbfbdf..2ac8a71e5f 100644 --- a/fixtures/networks/butterfly.go +++ b/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, diff --git a/fixtures/networks/calibration.go b/fixtures/networks/calibration.go index f77b9afa4f..2f12780555 100644 --- a/fixtures/networks/calibration.go +++ b/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, diff --git a/fixtures/networks/forcenet.go b/fixtures/networks/forcenet.go index a51b7ba910..0210179d2a 100644 --- a/fixtures/networks/forcenet.go +++ b/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, diff --git a/fixtures/networks/hyperspace.go b/fixtures/networks/hyperspace.go index 3bdb156073..2a65dbfe3b 100644 --- a/fixtures/networks/hyperspace.go +++ b/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, diff --git a/fixtures/networks/integrationtestnet.go b/fixtures/networks/integrationtestnet.go index 8b48b9ff18..ffd8d6aa80 100644 --- a/fixtures/networks/integrationtestnet.go +++ b/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, diff --git a/fixtures/networks/interopnet.go b/fixtures/networks/interopnet.go index e41f1c88be..bae776d8b0 100644 --- a/fixtures/networks/interopnet.go +++ b/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, diff --git a/fixtures/networks/mainnet.go b/fixtures/networks/mainnet.go index 948af57313..e4b6ee2fbf 100644 --- a/fixtures/networks/mainnet.go +++ b/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, diff --git a/fixtures/networks/net_2k.go b/fixtures/networks/net_2k.go index 7dc6e801ed..5d586120c9 100644 --- a/fixtures/networks/net_2k.go +++ b/fixtures/networks/net_2k.go @@ -27,32 +27,33 @@ func Net2k() *NetworkConf { MinVerifiedDealSize: 256, PreCommitChallengeDelay: abi.ChainEpoch(10), ForkUpgradeParam: &config.ForkUpgradeConfig{ - BreezeGasTampingDuration: 0, - UpgradeBreezeHeight: -1, - UpgradeSmokeHeight: -2, - UpgradeIgnitionHeight: -3, - UpgradeRefuelHeight: -4, - UpgradeTapeHeight: -5, - UpgradeAssemblyHeight: -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: -25, // This fix upgrade only ran on calibrationnet + BreezeGasTampingDuration: 0, + UpgradeBreezeHeight: -1, + UpgradeSmokeHeight: -2, + UpgradeIgnitionHeight: -3, + UpgradeRefuelHeight: -4, + UpgradeTapeHeight: -5, + UpgradeAssemblyHeight: -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, diff --git a/fixtures/networks/wallaby.go b/fixtures/networks/wallaby.go index ddc7e1d52b..856b90a27f 100644 --- a/fixtures/networks/wallaby.go +++ b/fixtures/networks/wallaby.go @@ -34,28 +34,33 @@ func WallabyNet() *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, diff --git a/pkg/config/config.go b/pkg/config/config.go index 27bece81eb..a747ab9f83 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -309,33 +309,34 @@ type NetworkParamsConfig struct { // ForkUpgradeConfig record upgrade parameters type ForkUpgradeConfig struct { - UpgradeSmokeHeight abi.ChainEpoch `json:"upgradeSmokeHeight"` - UpgradeBreezeHeight abi.ChainEpoch `json:"upgradeBreezeHeight"` - UpgradeIgnitionHeight abi.ChainEpoch `json:"upgradeIgnitionHeight"` - UpgradeLiftoffHeight abi.ChainEpoch `json:"upgradeLiftoffHeight"` - UpgradeAssemblyHeight abi.ChainEpoch `json:"upgradeActorsV2Height"` - UpgradeRefuelHeight abi.ChainEpoch `json:"upgradeRefuelHeight"` - UpgradeTapeHeight abi.ChainEpoch `json:"upgradeTapeHeight"` - UpgradeKumquatHeight abi.ChainEpoch `json:"upgradeKumquatHeight"` - UpgradePriceListOopsHeight abi.ChainEpoch `json:"upgradePriceListOopsHeight"` - BreezeGasTampingDuration abi.ChainEpoch `json:"breezeGasTampingDuration"` - UpgradeCalicoHeight abi.ChainEpoch `json:"upgradeCalicoHeight"` - UpgradePersianHeight abi.ChainEpoch `json:"upgradePersianHeight"` - UpgradeOrangeHeight abi.ChainEpoch `json:"upgradeOrangeHeight"` - UpgradeClausHeight abi.ChainEpoch `json:"upgradeClausHeight"` - UpgradeTrustHeight abi.ChainEpoch `json:"upgradeActorsV3Height"` - UpgradeNorwegianHeight abi.ChainEpoch `json:"upgradeNorwegianHeight"` - UpgradeTurboHeight abi.ChainEpoch `json:"upgradeActorsV4Height"` - UpgradeHyperdriveHeight abi.ChainEpoch `json:"upgradeHyperdriveHeight"` - UpgradeChocolateHeight abi.ChainEpoch `json:"upgradeChocolateHeight"` - UpgradeOhSnapHeight abi.ChainEpoch `json:"upgradeOhSnapHeight"` - UpgradeSkyrHeight abi.ChainEpoch `json:"upgradeSkyrHeight"` - UpgradeSharkHeight abi.ChainEpoch `json:"upgradeSharkHeight"` - UpgradeHyggeHeight abi.ChainEpoch `json:"upgradeHyggeHeight"` - UpgradeLightningHeight abi.ChainEpoch `json:"upgradeLightningHeight"` - UpgradeThunderHeight abi.ChainEpoch `json:"upgradeThunderHeight"` - UpgradeWatermelonHeight abi.ChainEpoch `json:"upgradeWatermelonHeight"` - UpgradeWatermelonFixHeight abi.ChainEpoch `json:"upgradeWatermelonFixHeight"` + UpgradeSmokeHeight abi.ChainEpoch `json:"upgradeSmokeHeight"` + UpgradeBreezeHeight abi.ChainEpoch `json:"upgradeBreezeHeight"` + UpgradeIgnitionHeight abi.ChainEpoch `json:"upgradeIgnitionHeight"` + UpgradeLiftoffHeight abi.ChainEpoch `json:"upgradeLiftoffHeight"` + UpgradeAssemblyHeight abi.ChainEpoch `json:"upgradeActorsV2Height"` + UpgradeRefuelHeight abi.ChainEpoch `json:"upgradeRefuelHeight"` + UpgradeTapeHeight abi.ChainEpoch `json:"upgradeTapeHeight"` + UpgradeKumquatHeight abi.ChainEpoch `json:"upgradeKumquatHeight"` + UpgradePriceListOopsHeight abi.ChainEpoch `json:"upgradePriceListOopsHeight"` + BreezeGasTampingDuration abi.ChainEpoch `json:"breezeGasTampingDuration"` + UpgradeCalicoHeight abi.ChainEpoch `json:"upgradeCalicoHeight"` + UpgradePersianHeight abi.ChainEpoch `json:"upgradePersianHeight"` + UpgradeOrangeHeight abi.ChainEpoch `json:"upgradeOrangeHeight"` + UpgradeClausHeight abi.ChainEpoch `json:"upgradeClausHeight"` + UpgradeTrustHeight abi.ChainEpoch `json:"upgradeActorsV3Height"` + UpgradeNorwegianHeight abi.ChainEpoch `json:"upgradeNorwegianHeight"` + UpgradeTurboHeight abi.ChainEpoch `json:"upgradeActorsV4Height"` + UpgradeHyperdriveHeight abi.ChainEpoch `json:"upgradeHyperdriveHeight"` + UpgradeChocolateHeight abi.ChainEpoch `json:"upgradeChocolateHeight"` + UpgradeOhSnapHeight abi.ChainEpoch `json:"upgradeOhSnapHeight"` + UpgradeSkyrHeight abi.ChainEpoch `json:"upgradeSkyrHeight"` + UpgradeSharkHeight abi.ChainEpoch `json:"upgradeSharkHeight"` + UpgradeHyggeHeight abi.ChainEpoch `json:"upgradeHyggeHeight"` + UpgradeLightningHeight abi.ChainEpoch `json:"upgradeLightningHeight"` + UpgradeThunderHeight abi.ChainEpoch `json:"upgradeThunderHeight"` + UpgradeWatermelonHeight abi.ChainEpoch `json:"upgradeWatermelonHeight"` + UpgradeWatermelonFixHeight abi.ChainEpoch `json:"upgradeWatermelonFixHeight"` + UpgradeWatermelonFix2Height abi.ChainEpoch `json:"upgradeWatermelonFix2Height"` } func IsNearUpgrade(epoch, upgradeEpoch abi.ChainEpoch) bool { @@ -370,6 +371,8 @@ var DefaultForkUpgradeParam = &ForkUpgradeConfig{ UpgradeWatermelonHeight: 3431940, // This fix upgrade only ran on calibrationnet UpgradeWatermelonFixHeight: -1, + // This fix upgrade only ran on calibrationnet + UpgradeWatermelonFix2Height: -2, } func newDefaultNetworkParamsConfig() *NetworkParamsConfig { diff --git a/pkg/fork/fork.go b/pkg/fork/fork.go index 0c5d285a95..390c309e43 100644 --- a/pkg/fork/fork.go +++ b/pkg/fork/fork.go @@ -405,7 +405,12 @@ func DefaultUpgradeSchedule(cf *ChainFork, upgradeHeight *config.ForkUpgradeConf }, { Height: upgradeHeight.UpgradeWatermelonFixHeight, Network: network.Version21, - Migration: cf.upgradeActorsV12Fix, + Migration: cf.buildUpgradeActorsV12MinerFix(calibnetv12BuggyMinerCID1, calibnetv12BuggyManifestCID2), + }, + { + Height: upgradeHeight.UpgradeWatermelonFix2Height, + Network: network.Version21, + Migration: cf.buildUpgradeActorsV12MinerFix(calibnetv12BuggyMinerCID2, calibnetv12CorrectManifestCID1), }, } @@ -2704,7 +2709,17 @@ func (c *ChainFork) UpgradeActorsV12(ctx context.Context, return newRoot, nil } -var calibnetv12BuggyBundle = cid.MustParse("bafy2bzacedrunxfqta5skb7q7x32lnp4efz2oq7fn226ffm7fu5iqs62jkmvs") +var ( + calibnetv12BuggyMinerCID1 = cid.MustParse("bafk2bzacecnh2ouohmonvebq7uughh4h3ppmg4cjsk74dzxlbbtlcij4xbzxq") + calibnetv12BuggyMinerCID2 = cid.MustParse("bafk2bzaced7emkbbnrewv5uvrokxpf5tlm4jslu2jsv77ofw2yqdglg657uie") + + calibnetv12BuggyBundleSuffix1 = "calibrationnet-12-rc1" + calibnetv12BuggyBundleSuffix2 = "calibrationnet-12-rc2" + + calibnetv12BuggyManifestCID1 = cid.MustParse("bafy2bzacedrunxfqta5skb7q7x32lnp4efz2oq7fn226ffm7fu5iqs62jkmvs") + calibnetv12BuggyManifestCID2 = cid.MustParse("bafy2bzacebl4w5ptfvuw6746w7ev562idkbf5ppq72e6zub22435ws2rukzru") + calibnetv12CorrectManifestCID1 = cid.MustParse("bafy2bzacednzb3pkrfnbfhmoqtb3bc6dgvxszpqklf3qcc7qzcage4ewzxsca") +) func (c *ChainFork) upgradeActorsV12Common( ctx context.Context, @@ -2758,7 +2773,7 @@ func (c *ChainFork) upgradeActorsV12Common( var manifestCid cid.Cid if initState.NetworkName == "calibrationnet" { - embedded, ok := actors.GetEmbeddedBuiltinActorsBundle(actorstypes.Version12, "calibrationnet-buggy") + embedded, ok := actors.GetEmbeddedBuiltinActorsBundle(actorstypes.Version12, calibnetv12BuggyBundleSuffix1) if !ok { return cid.Undef, fmt.Errorf("didn't find buggy calibrationnet bundle") } @@ -2769,8 +2784,8 @@ func (c *ChainFork) upgradeActorsV12Common( return cid.Undef, fmt.Errorf("failed to load buggy calibnet bundle: %w", err) } - if manifestCid != calibnetv12BuggyBundle { - return cid.Undef, fmt.Errorf("didn't find expected buggy calibnet bundle manifest: %s != %s", manifestCid, calibnetv12BuggyBundle) + if manifestCid != calibnetv12BuggyManifestCID1 { + return cid.Undef, fmt.Errorf("didn't find expected buggy calibnet bundle manifest: %s != %s", manifestCid, calibnetv12BuggyManifestCID1) } } else { var ok bool @@ -2809,163 +2824,167 @@ func (c *ChainFork) upgradeActorsV12Common( return newRoot, nil } -////////////////////// - -var calibnetv12BuggyMinerCID = cid.MustParse("bafk2bzacecnh2ouohmonvebq7uughh4h3ppmg4cjsk74dzxlbbtlcij4xbzxq") - -func (c *ChainFork) upgradeActorsV12Fix(ctx context.Context, - cache MigrationCache, - root cid.Cid, - epoch abi.ChainEpoch, - ts *types.TipSet, -) (cid.Cid, error) { - stateStore := c.bs - adtStore := adt.WrapStore(ctx, cbor.NewCborStore(stateStore)) - - // ensure that the manifest is loaded in the blockstore - if err := actors.LoadBundles(ctx, stateStore, actorstypes.Version12); err != nil { - return cid.Undef, fmt.Errorf("failed to load manifest bundle: %w", err) - } +// //////////////////// +func (c *ChainFork) buildUpgradeActorsV12MinerFix(oldBuggyMinerCID, newManifestCID cid.Cid) func(ctx context.Context, cache MigrationCache, root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) { + return func(ctx context.Context, cache MigrationCache, root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) { + stateStore := c.bs + adtStore := adt.WrapStore(ctx, cbor.NewCborStore(stateStore)) - // Load the state root. - var stateRoot vmstate.StateRoot - if err := adtStore.Get(ctx, root, &stateRoot); err != nil { - return cid.Undef, fmt.Errorf("failed to decode state root: %w", err) - } + // ensure that the manifest is loaded in the blockstore - actorsIn, err := vmstate.LoadState(ctx, adtStore, root) - if err != nil { - return cid.Undef, fmt.Errorf("loading state tree: %w", err) - } + // this loads the "correct" bundle for UpgradeWatermelonFix2Height + if err := actors.LoadBundles(ctx, stateStore, actorstypes.Version12); err != nil { + return cid.Undef, fmt.Errorf("failed to load manifest bundle: %w", err) + } - // load old manifest data - systemActor, found, err := actorsIn.GetActor(ctx, builtin.SystemActorAddr) - if err != nil { - return cid.Undef, fmt.Errorf("failed to get system actor: %w", err) - } - if !found { - return cid.Undef, fmt.Errorf("system actor not found") - } + // this loads the second buggy bundle, for UpgradeWatermelonFixHeight + embedded, ok := actors.GetEmbeddedBuiltinActorsBundle(actorstypes.Version12, calibnetv12BuggyBundleSuffix2) + if !ok { + return cid.Undef, fmt.Errorf("didn't find buggy calibrationnet bundle") + } - var systemState system11.State - if err := adtStore.Get(ctx, systemActor.Head, &systemState); err != nil { - return cid.Undef, fmt.Errorf("failed to get system actor state: %w", err) - } + _, err := actors.LoadBundle(ctx, stateStore, bytes.NewReader(embedded)) + if err != nil { + return cid.Undef, fmt.Errorf("failed to load buggy calibnet bundle: %w", err) + } - var oldManifestData manifest.ManifestData - if err := adtStore.Get(ctx, systemState.BuiltinActors, &oldManifestData); err != nil { - return cid.Undef, fmt.Errorf("failed to get old manifest data: %w", err) - } + // now confirm we have the one we're migrating to + if haveManifest, err := stateStore.Has(ctx, newManifestCID); err != nil { + return cid.Undef, fmt.Errorf("blockstore error when loading manifest %s: %w", newManifestCID, err) + } else if !haveManifest { + return cid.Undef, fmt.Errorf("missing new manifest %s in blockstore", newManifestCID) + } - newManifestCID, ok := actors.GetManifest(actorstypes.Version12) - if !ok { - return cid.Undef, fmt.Errorf("no manifest CID for v12 upgrade") - } + // Load input state tree + actorsIn, err := vmstate.LoadState(ctx, adtStore, root) + if err != nil { + return cid.Undef, fmt.Errorf("loading state tree: %w", err) + } - // load new manifest - var newManifest manifest.Manifest - if err := adtStore.Get(ctx, newManifestCID, &newManifest); err != nil { - return cid.Undef, fmt.Errorf("error reading actor manifest: %w", err) - } + // load old manifest data + systemActor, found, err := actorsIn.GetActor(ctx, builtin.SystemActorAddr) + if err != nil { + return cid.Undef, fmt.Errorf("failed to get system actor: %w", err) + } + if !found { + return cid.Undef, fmt.Errorf("system actor not found") + } - if err := newManifest.Load(ctx, adtStore); err != nil { - return cid.Undef, fmt.Errorf("error loading actor manifest: %w", err) - } + var systemState system11.State + if err := adtStore.Get(ctx, systemActor.Head, &systemState); err != nil { + return cid.Undef, fmt.Errorf("failed to get system actor state: %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, fmt.Errorf("missing manifest entry for %s", oldEntry.Name) + var oldManifestData manifest.ManifestData + if err := adtStore.Get(ctx, systemState.BuiltinActors, &oldManifestData); err != nil { + return cid.Undef, fmt.Errorf("failed to get old manifest data: %w", err) } - // Note: we expect newCID to be the same as oldEntry.Code for all actors except the miner actor - codeMapping[oldEntry.Code] = newCID - } + // load new manifest + var newManifest manifest.Manifest + if err := adtStore.Get(ctx, newManifestCID, &newManifest); err != nil { + return cid.Undef, fmt.Errorf("error reading actor manifest: %w", err) + } - // Create empty actorsOut + if err := newManifest.Load(ctx, adtStore); err != nil { + return cid.Undef, fmt.Errorf("error loading actor manifest: %w", err) + } - actorsOut, err := vmstate.NewState(adtStore, actorsIn.Version()) - if err != nil { - return cid.Undef, fmt.Errorf("failed to create new tree: %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, fmt.Errorf("missing manifest entry for %s", oldEntry.Name) + } - // Perform the migration - err = actorsIn.ForEach(func(a address.Address, actor *types.Actor) error { - newCid, ok := codeMapping[actor.Code] - if !ok { - return fmt.Errorf("didn't find mapping for %s", actor.Code) + // Note: we expect newCID to be the same as oldEntry.Code for all actors except the miner actor + codeMapping[oldEntry.Code] = newCID } - return actorsOut.SetActor(ctx, a, &types.Actor{ - Code: newCid, - Head: actor.Head, - Nonce: actor.Nonce, - Balance: actor.Balance, - Address: actor.Address, - }) - }) - if err != nil { - return cid.Undef, fmt.Errorf("failed to perform migration: %w", err) - } - - systemState.BuiltinActors = newManifest.Data - newSystemHead, err := adtStore.Put(ctx, &systemState) - if err != nil { - return cid.Undef, fmt.Errorf("failed to put new system state: %w", err) - } + // Create empty actorsOut - systemActor.Head = newSystemHead - if err = actorsOut.SetActor(ctx, builtin.SystemActorAddr, systemActor); err != nil { - return cid.Undef, fmt.Errorf("failed to put new system actor: %w", err) - } + actorsOut, err := vmstate.NewState(adtStore, actorsIn.Version()) + if err != nil { + return cid.Undef, fmt.Errorf("failed to create new tree: %w", err) + } - // Sanity checking + // Perform the migration + err = actorsIn.ForEach(func(a address.Address, actor *types.Actor) error { + newCid, ok := codeMapping[actor.Code] + if !ok { + return fmt.Errorf("didn't find mapping for %s", actor.Code) + } - err = actorsIn.ForEach(func(a address.Address, inActor *types.Actor) error { - outActor, found, err := actorsOut.GetActor(ctx, a) + return actorsOut.SetActor(ctx, a, &types.Actor{ + Code: newCid, + Head: actor.Head, + Nonce: actor.Nonce, + Balance: actor.Balance, + Address: actor.Address, + }) + }) if err != nil { - return fmt.Errorf("failed to get actor in outTree: %w", err) - } - if !found { - return fmt.Errorf("actor %s not found in outTree", a) + return cid.Undef, fmt.Errorf("failed to perform migration: %w", err) } - if inActor.Nonce != outActor.Nonce { - return fmt.Errorf("mismatched nonce for actor %s", a) + systemState.BuiltinActors = newManifest.Data + newSystemHead, err := adtStore.Put(ctx, &systemState) + if err != nil { + return cid.Undef, fmt.Errorf("failed to put new system state: %w", err) } - if !inActor.Balance.Equals(outActor.Balance) { - return fmt.Errorf("mismatched balance for actor %s: %d != %d", a, inActor.Balance, outActor.Balance) + systemActor.Head = newSystemHead + if err = actorsOut.SetActor(ctx, builtin.SystemActorAddr, systemActor); err != nil { + return cid.Undef, fmt.Errorf("failed to put new system actor: %w", err) } - if inActor.Address != outActor.Address && inActor.Address.String() != outActor.Address.String() { - return fmt.Errorf("mismatched address for actor %s: %s != %s", a, inActor.Address, outActor.Address) - } + // Sanity checking - if inActor.Head != outActor.Head && a != builtin.SystemActorAddr { - return fmt.Errorf("mismatched head for actor %s", a) - } + err = actorsIn.ForEach(func(a address.Address, inActor *types.Actor) error { + outActor, found, err := actorsOut.GetActor(ctx, a) + if err != nil { + return fmt.Errorf("failed to get actor in outTree: %w", err) + } + if !found { + return fmt.Errorf("not found actor in outTree: %s", a) + } + + if inActor.Nonce != outActor.Nonce { + return fmt.Errorf("mismatched nonce for actor %s", a) + } + + if !inActor.Balance.Equals(outActor.Balance) { + return fmt.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 fmt.Errorf("mismatched address for actor %s: %s != %s", a, inActor.Address, outActor.Address) + } + + if inActor.Head != outActor.Head && a != builtin.SystemActorAddr { + return fmt.Errorf("mismatched head for actor %s", a) + } + + // Actor Codes are only expected to change for the miner actor + if inActor.Code != oldBuggyMinerCID && inActor.Code != outActor.Code { + return fmt.Errorf("unexpected change in code for actor %s", a) + } - // This is the hard-coded "buggy" miner actor Code ID - if inActor.Code != calibnetv12BuggyMinerCID && inActor.Code != outActor.Code { - return fmt.Errorf("unexpected change in code for actor %s", a) + return nil + }) + if err != nil { + return cid.Undef, fmt.Errorf("failed to sanity check migration: %w", err) } - return nil - }) - if err != nil { - return cid.Undef, fmt.Errorf("failed to sanity check migration: %w", err) - } + // Persist the result. + newRoot, err := actorsOut.Flush(ctx) + if err != nil { + return cid.Undef, fmt.Errorf("failed to persist new state root: %w", err) + } - // Persist the result. - newRoot, err := actorsOut.Flush(ctx) - if err != nil { - return cid.Undef, fmt.Errorf("failed to persist new state root: %w", err) + return newRoot, nil } - - return newRoot, nil } func (c *ChainFork) GetForkUpgrade() *config.ForkUpgradeConfig { diff --git a/venus-shared/actors/builtin-actors-code/v12.tar.zst b/venus-shared/actors/builtin-actors-code/v12.tar.zst index 859431b58d..981a17c97d 100644 Binary files a/venus-shared/actors/builtin-actors-code/v12.tar.zst and b/venus-shared/actors/builtin-actors-code/v12.tar.zst differ diff --git a/venus-shared/actors/builtin_actors.go b/venus-shared/actors/builtin_actors.go index 2d9934cc5d..7ff3704773 100644 --- a/venus-shared/actors/builtin_actors.go +++ b/venus-shared/actors/builtin_actors.go @@ -133,9 +133,10 @@ func loadManifests(netw string) error { } // The following code cid existed temporarily on the calibnet testnet, as a "buggy" storage miner actor implementation. - // We include it in our builtin bundle, but intentionally omit from metadata. + // We include them in our builtin bundle, but intentionally omit from metadata. if NetworkBundle == "calibrationnet" { AddActorMeta("storageminer", cid.MustParse("bafk2bzacecnh2ouohmonvebq7uughh4h3ppmg4cjsk74dzxlbbtlcij4xbzxq"), actorstypes.Version12) + AddActorMeta("storageminer", cid.MustParse("bafk2bzaced7emkbbnrewv5uvrokxpf5tlm4jslu2jsv77ofw2yqdglg657uie"), actorstypes.Version12) } return nil @@ -230,9 +231,11 @@ func readEmbeddedBuiltinActorsMetadata(bundle string) ([]*BuiltinActorsMetadata, if err != nil { return nil, fmt.Errorf("error loading builtin actors bundle: %w", err) } - // The following manifest cid existed temporarily on the calibnet testnet - // We include it in our builtin bundle, but intentionally omit from metadata - if root == cid.MustParse("bafy2bzacedrunxfqta5skb7q7x32lnp4efz2oq7fn226ffm7fu5iqs62jkmvs") { + + // 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") { continue } bundles = append(bundles, &BuiltinActorsMetadata{ diff --git a/venus-shared/actors/builtin_actors_gen.go b/venus-shared/actors/builtin_actors_gen.go index 1d32ac2e8c..a719def318 100644 --- a/venus-shared/actors/builtin_actors_gen.go +++ b/venus-shared/actors/builtin_actors_gen.go @@ -97,7 +97,7 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet Network: "butterflynet", Version: 12, - ManifestCid: mustParseCid("bafy2bzaceabeegs5mhrxwqodyt7u2ulxr2jg6eh5g3545ganqzkncnxzserue"), + ManifestCid: mustParseCid("bafy2bzacectxvbk77ntedhztd6sszp2btrtvsmy7lp2ypnrk6yl74zb34t2cq"), Actors: map[string]cid.Cid{ "account": mustParseCid("bafk2bzacebp7anjdtg2sohyt6lromx4xs7nujtwdfcsffnptphaayabx7ysxs"), "cron": mustParseCid("bafk2bzacecu2y3awtemmglpkroiglulc2fj3gpdn6eazdqr6avcautiaighrg"), @@ -111,7 +111,7 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet "placeholder": mustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), "reward": mustParseCid("bafk2bzacedebvitdsztwebi44t5es4ls3p3hor252igzawr3s6uznmbvzh2ou"), "storagemarket": mustParseCid("bafk2bzaceb2tdeqtt2eqpzeb3gezuchb7g7uzbd52bgvcdt6bg3ckq7oisb74"), - "storageminer": mustParseCid("bafk2bzacea2jzzulmz6ktj6vndjheybz2io3vznnhsb32zberpaqeo7s7xa56"), + "storageminer": mustParseCid("bafk2bzaceb62clldtod2jimnri5k2koxttf6vqtlsvkjhnwduzs7sgsoakglw"), "storagepower": mustParseCid("bafk2bzacedxvlj5xmhytdjrjqyonz37duvxb2ioyzk75c27yypkqalxuh3xh6"), "system": mustParseCid("bafk2bzacec3vwj2chzaram3iqupkbfiein5h2l5qiltlrngbju2vg5umelclm"), "verifiedregistry": mustParseCid("bafk2bzacedv2irkql7nil3w5v3ohqq3e54w62pxeoppjmaktzokolaaoh5ksu"), @@ -203,7 +203,7 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet Network: "calibrationnet", Version: 12, - ManifestCid: mustParseCid("bafy2bzacebl4w5ptfvuw6746w7ev562idkbf5ppq72e6zub22435ws2rukzru"), + ManifestCid: mustParseCid("bafy2bzacednzb3pkrfnbfhmoqtb3bc6dgvxszpqklf3qcc7qzcage4ewzxsca"), Actors: map[string]cid.Cid{ "account": mustParseCid("bafk2bzacechwwxdqvggkdylm37zldjsra2ivkdzwp7fee56bzxbzs544wv6u6"), "cron": mustParseCid("bafk2bzacec4gdxxkqwxqqodsv6ug5dmdbqdfqwyqfek3yhxc2wweh5psxaeq6"), @@ -217,7 +217,7 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet "placeholder": mustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), "reward": mustParseCid("bafk2bzacedra77pcglf7vdca2itcaa4vd6xrxynxmgfgdjdxqxfwqyhtoxehy"), "storagemarket": mustParseCid("bafk2bzacea7g46y7xxu2zjq2h75x6mmx3utz2uxnlvnwi6tzpsvulna3bmiva"), - "storageminer": mustParseCid("bafk2bzaced7emkbbnrewv5uvrokxpf5tlm4jslu2jsv77ofw2yqdglg657uie"), + "storageminer": mustParseCid("bafk2bzaceb7qzqsi5uyxe4o5iuasi47l2hnznvmqr2eu4pl3qscvarjqlnuxo"), "storagepower": mustParseCid("bafk2bzacedd3ka44k7d46ckbinjhv3diyuu2epgbyvhqqyjkc64qlrg3wlgzi"), "system": mustParseCid("bafk2bzacecioupndtcnyw6iq2hbrxag3aufvczlv5nobnfbkbywqzcyfaa376"), "verifiedregistry": mustParseCid("bafk2bzaceavldupmf7bimeeacs67z5xdfdlfca6p7sn6bev3mt5ggepfqvhqo"), @@ -318,7 +318,7 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet Network: "caterpillarnet", Version: 12, - ManifestCid: mustParseCid("bafy2bzacechvmc3iy6qrsbb6xwjhjibqpznqnkajowjsdmrq42ie5hysqemqa"), + ManifestCid: mustParseCid("bafy2bzacebxiub6qsy67asvl5cx33x5vjbuqinalmf3xtnbmokxmmklzdkvei"), Actors: map[string]cid.Cid{ "account": mustParseCid("bafk2bzacecereuhejfvodut5357cai4lmhsyr7uenhcxvmw6jpmhe6auuly32"), "cron": mustParseCid("bafk2bzacebo2whgy6jla4jsf5j4ovlqm2e4eepedlpw5wadas33yxmunis4b4"), @@ -332,7 +332,7 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet "placeholder": mustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), "reward": mustParseCid("bafk2bzaceb2x5zgkrho373l3ippp6krs7brugssg6hj2tib22xmqjzdm2o25a"), "storagemarket": mustParseCid("bafk2bzaced5j6drzmsebpxbf2dtptrc5tyidlbftdljqxavxqb57s2qpbvdek"), - "storageminer": mustParseCid("bafk2bzacec7al5izu3ynnb7wg6fxxck3hebtkvlgynufjwcio57jd3n4ke2ue"), + "storageminer": mustParseCid("bafk2bzaceckgusfenkczxolfczvnygnuhxbou5to2skwwngbkihla7hgdv4yy"), "storagepower": mustParseCid("bafk2bzaceagp6ilkltsltwii66nz6a4zen4qtfk7rdkvdv3gzq7fbv4ivox3u"), "system": mustParseCid("bafk2bzacedye5j5uxox7knb6zlnhseaadztyav76mjbyk5qslhhbpiy5cdtt2"), "verifiedregistry": mustParseCid("bafk2bzacecduww5pirr7dvaijjijw4gf6ygf7vipgxh4scvv6vseo46gueb46"), @@ -424,7 +424,7 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet Network: "devnet", Version: 12, - ManifestCid: mustParseCid("bafy2bzaceau5i7eanhvss22z5ixmyrihilfniqn22tvkecjj56akz4xj7fvku"), + ManifestCid: mustParseCid("bafy2bzaceasjdukhhyjbegpli247vbf5h64f7uvxhhebdihuqsj2mwisdwa6o"), Actors: map[string]cid.Cid{ "account": mustParseCid("bafk2bzacedki4apynvdxxuoigmqkgaktgy2erjftoxqxqaklnelgveyaqknfu"), "cron": mustParseCid("bafk2bzacebjpczf7qtcisy3zdp3sqoohxe75tgupmdo5dr26vh7orzrsjn3b2"), @@ -438,7 +438,7 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet "placeholder": mustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), "reward": mustParseCid("bafk2bzacebzso6xkjxdscbpncw7el2d4hap6lfkgwqzrbc76lzp33vkwk6obc"), "storagemarket": mustParseCid("bafk2bzacebzg74vyk3gzbhnz4zviwvxblyar574mtd6ayognmsvlkriejmunu"), - "storageminer": mustParseCid("bafk2bzaceckqrzomdnfb35byrhabrmmapxplj66cv3efw7u62qswjaqsuxah4"), + "storageminer": mustParseCid("bafk2bzacecs262232b3awcrilyzpdketeayyqzzwgoavtxilgjvayrz55ovk4"), "storagepower": mustParseCid("bafk2bzacebbtj2m2ajawfuzxqz5nmdep7xevjo2qfjqa5tx3vr5m6qojolya4"), "system": mustParseCid("bafk2bzacecnau5wddulbsvwn75tc3w75jrlvkybgrlxs4ngonqab6xq3eowvg"), "verifiedregistry": mustParseCid("bafk2bzacec37mddea65nvh4htsagtryfa3sq6i67utcupslyhzbhjhoy6hopa"), @@ -553,7 +553,7 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet Network: "mainnet", Version: 12, - ManifestCid: mustParseCid("bafy2bzacecooh5cjxkmraawn7wvmrx7k5hwdmbvqdteujr33mnaeclsazyb6a"), + ManifestCid: mustParseCid("bafy2bzaceapkgfggvxyllnmuogtwasmsv5qi2qzhc2aybockd6kag2g5lzaio"), Actors: map[string]cid.Cid{ "account": mustParseCid("bafk2bzaceboftg75mdiba7xbo2i3uvgtca4brhnr3u5ptihonixgpnrvhpxoa"), "cron": mustParseCid("bafk2bzacechxjkfe2cehx4s7skj3wzfpzf7zolds64khrrrs66bhazsemktls"), @@ -567,7 +567,7 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet "placeholder": mustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), "reward": mustParseCid("bafk2bzacealqnxn5lwzwexd6reav4dppypquklx2ujlnvaxiqk2tzstyvkp5u"), "storagemarket": mustParseCid("bafk2bzacedylkg5am446lcuih4voyzdn4yjeqfsxfzh5b6mcuhx4mok5ph5c4"), - "storageminer": mustParseCid("bafk2bzacedio7wfaqutc4w6gl2dwqkgpcatz2r223ms74zxiovbjrfxmzeiou"), + "storageminer": mustParseCid("bafk2bzacedo75pabe4i2l3hvhtsjmijrcytd2y76xwe573uku25fi7sugqld6"), "storagepower": mustParseCid("bafk2bzacecsij5tpfzjpfuckxvccv2p3bdqjklkrfyyoei6lx5dyj5j4fvjm6"), "system": mustParseCid("bafk2bzacebfqrja2hip7esf4eafxjmu6xcogoqu5xxtgdg7xa5szgvvdguchu"), "verifiedregistry": mustParseCid("bafk2bzacedudgflxc75c77c6zkmfyq4u2xuk7k6xw6dfdccarjrvxx453b77q"), @@ -659,7 +659,7 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet Network: "testing", Version: 12, - ManifestCid: mustParseCid("bafy2bzacec7artlmtdmfuhurd2i7dgturiveblruub5xh3yizjtp5qzye3dly"), + ManifestCid: mustParseCid("bafy2bzaceaaxd6ytavsek5bi5soqo7qamezuqfyfjy42es2clpbzu3pwzcmye"), Actors: map[string]cid.Cid{ "account": mustParseCid("bafk2bzacea74qqkfvacykmq5emzqblh4f4nmxdkiyixxpzs7kkcfnbfa7cb6m"), "cron": mustParseCid("bafk2bzacecotbu7k6awdzfzakf7g5iaas6gswtunjnnb2xm2klqoshjgb4imy"), @@ -673,7 +673,7 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet "placeholder": mustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), "reward": mustParseCid("bafk2bzaceaajyncjxcrl7wbb6ukzkueyqz4uyekxpmtn4mpndkf7ksmggopzq"), "storagemarket": mustParseCid("bafk2bzaced6cexdcinwjhtfvuxgkxukiejp3goylaxtvhqfd24rs5z7g2z7dm"), - "storageminer": mustParseCid("bafk2bzaceclcbtu6edh73cn7ga7kzkmxcfnjt7jnxolkc5id6l6f7sztevm24"), + "storageminer": mustParseCid("bafk2bzacecvkbsjhufq2zr2dojohukdnql3gkqzdkmtp2hxvn5kczxp3tu6ko"), "storagepower": mustParseCid("bafk2bzacedexrf5qplrrl5xzijfrthjdqwodfs5e6zj5kpztc7qnywbqdyiii"), "system": mustParseCid("bafk2bzacecp4roanbxq3bflftlkipsoqqxio5etjjnzxus5pcu7lq43fnxb34"), "verifiedregistry": mustParseCid("bafk2bzaceandytrgcnuvizfi47sijbqh6c243vjtzlzumexm6kjv7s7hye45g"), @@ -765,7 +765,7 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet Network: "testing-fake-proofs", Version: 12, - ManifestCid: mustParseCid("bafy2bzaceand7owcb3omq7zjwir2q3lqapprl2eyiwpzv6oqs5bok4vzzqjbu"), + ManifestCid: mustParseCid("bafy2bzacecver4l5d6jiuzubhrtcxjjfdx6jnxbmyp4bselol2atgkhz3e3um"), Actors: map[string]cid.Cid{ "account": mustParseCid("bafk2bzacea74qqkfvacykmq5emzqblh4f4nmxdkiyixxpzs7kkcfnbfa7cb6m"), "cron": mustParseCid("bafk2bzacecotbu7k6awdzfzakf7g5iaas6gswtunjnnb2xm2klqoshjgb4imy"), @@ -779,7 +779,7 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet "placeholder": mustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), "reward": mustParseCid("bafk2bzaceaajyncjxcrl7wbb6ukzkueyqz4uyekxpmtn4mpndkf7ksmggopzq"), "storagemarket": mustParseCid("bafk2bzaced6cexdcinwjhtfvuxgkxukiejp3goylaxtvhqfd24rs5z7g2z7dm"), - "storageminer": mustParseCid("bafk2bzacebbusvtnyhi7mimbnx2tw2uyvrr3fbmncbf6frx6e4kvjvoqllu36"), + "storageminer": mustParseCid("bafk2bzacedapzgrbc2rsmuqex76ftt2b62q6opi56gh2dr2oyyzuwin62rweg"), "storagepower": mustParseCid("bafk2bzacecdwijcbbryinjtm27pdinqqkyzoskri24pwsvsadwcq2alkkjpnc"), "system": mustParseCid("bafk2bzacecp4roanbxq3bflftlkipsoqqxio5etjjnzxus5pcu7lq43fnxb34"), "verifiedregistry": mustParseCid("bafk2bzaceandytrgcnuvizfi47sijbqh6c243vjtzlzumexm6kjv7s7hye45g"),