Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fea/impl nv24 #6405

Merged
merged 2 commits into from
Oct 12, 2024
+3,651 −423
Merged

Fea/impl nv24 #6405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a36ad2
chore: update ffi
simlecode Oct 11, 2024
4241e58
feat: implement nv24
simlecode Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extern/filecoin-ffi
Open in desktop
Submodule filecoin-ffi updated 18 files
+0 −372 .circleci/config.yml
+61 −0 .github/actions/configure-environment/action.yml
+147 −0 .github/workflows/ci.yml
+84 −0 .github/workflows/release-check.yml
+21 −0 .github/workflows/releaser.yml
+27 −19 README.md
+28 −0 RELEASE.md
+1 −5 bls_test.go
+1 −1 go.mod
+17 −4 install-filcrypto
+2 −2 proofs_test.go
+11 −11 rust/Cargo.lock
+2 −2 rust/Cargo.toml
+25 −25 rust/scripts/publish-release.sh
+1 −1 rust/src/fvm/engine.rs
+0 −18 sector_update.go
+3 −0 version.json
+5 −6 workflows.go
65 changes: 34 additions & 31 deletions fixtures/networks/butterfly.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/go-state-types/network"
"github.com/filecoin-project/venus/pkg/config"
"github.com/filecoin-project/venus/venus-shared/actors/builtin"
"github.com/filecoin-project/venus/venus-shared/types"
"github.com/ipfs/go-cid"
)
Expand Down Expand Up @@ -32,37 +33,39 @@ 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: -24,
UpgradeWatermelonFixHeight: -100, // This fix upgrade only ran on calibrationnet
UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
UpgradeDragonHeight: -25,
UpgradeCalibrationDragonFixHeight: -102, // This fix upgrade only ran on calibrationnet
UpgradePhoenixHeight: -26,
UpgradeWaffleHeight: 100,
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: -24,
UpgradeWatermelonFixHeight: -100, // This fix upgrade only ran on calibrationnet
UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
UpgradeDragonHeight: -25,
UpgradeCalibrationDragonFixHeight: -102, // This fix upgrade only ran on calibrationnet
UpgradePhoenixHeight: -26,
UpgradeWaffleHeight: -27,
UpgradeTuktukHeight: 9999999,
UpgradeTuktukPowerRampDurationEpochs: builtin.EpochsInYear,
},
DrandSchedule: map[abi.ChainEpoch]config.DrandEnum{0: config.DrandQuicknet},
AddressNetwork: address.Testnet,
Expand Down
63 changes: 33 additions & 30 deletions fixtures/networks/calibration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"github.com/filecoin-project/go-state-types/network"
builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
"github.com/filecoin-project/venus/pkg/config"
"github.com/filecoin-project/venus/venus-shared/actors/builtin"
"github.com/filecoin-project/venus/venus-shared/types"
"github.com/ipfs/go-cid"
)
Expand Down Expand Up @@ -39,36 +40,38 @@ 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
UpgradeWatermelonFix2Height: 1108174, // 2023-11-21T13:00:00Z
UpgradeDragonHeight: 1427974, // 2024-03-11T14:00:00Z
UpgradeCalibrationDragonFixHeight: 1493854, // 2024-04-03T11:00:00Z
UpgradeWaffleHeight: 1779094, // 2024-07-11T12: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
UpgradeDragonHeight: 1427974, // 2024-03-11T14:00:00Z
UpgradeCalibrationDragonFixHeight: 1493854, // 2024-04-03T11:00:00Z
UpgradeWaffleHeight: 1779094, // 2024-07-11T12:00:00Z
UpgradeTuktukHeight: 99999999,
UpgradeTuktukPowerRampDurationEpochs: builtin.EpochsInDay * 3,
},
DrandSchedule: map[abi.ChainEpoch]config.DrandEnum{0: 1},
AddressNetwork: address.Testnet,
Expand Down
52 changes: 27 additions & 25 deletions fixtures/networks/forcenet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func ForceNet() *NetworkConf {
Network: config.NetworkParamsConfig{
DevNet: true,
NetworkType: types.NetworkForce,
GenesisNetworkVersion: network.Version22,
GenesisNetworkVersion: network.Version23,
ReplaceProofTypes: []abi.RegisteredSealProof{
abi.RegisteredSealProof_StackedDrg8MiBV1,
abi.RegisteredSealProof_StackedDrg512MiBV1,
Expand All @@ -41,30 +41,32 @@ 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: -24,
UpgradeWatermelonFixHeight: -100, // This fix upgrade only ran on calibrationnet
UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
UpgradeDragonHeight: -25,
UpgradeCalibrationDragonFixHeight: -102, // This fix upgrade only ran on calibrationnet
UpgradePhoenixHeight: -26,
UpgradeWaffleHeight: 200,
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: -24,
UpgradeWatermelonFixHeight: -100, // This fix upgrade only ran on calibrationnet
UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
UpgradeDragonHeight: -25,
UpgradeCalibrationDragonFixHeight: -102, // This fix upgrade only ran on calibrationnet
UpgradePhoenixHeight: -26,
UpgradeWaffleHeight: -27,
UpgradeTuktukHeight: 200,
UpgradeTuktukPowerRampDurationEpochs: 200,
},
DrandSchedule: map[abi.ChainEpoch]config.DrandEnum{0: config.DrandQuicknet},
AddressNetwork: address.Testnet,
Expand Down
1 change: 1 addition & 0 deletions fixtures/networks/integrationtestnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ func IntegrationNet() *NetworkConf {
UpgradeDragonHeight: 3855360,
UpgradeCalibrationDragonFixHeight: -102, // This fix upgrade only ran on calibrationnet
UpgradeWaffleHeight: 4154640,
UpgradeTuktukHeight: 999999999,
},
DrandSchedule: map[abi.ChainEpoch]config.DrandEnum{0: 5, 51000: 1},
AddressNetwork: address.Testnet,
Expand Down
65 changes: 34 additions & 31 deletions fixtures/networks/interopnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/go-state-types/network"
"github.com/filecoin-project/venus/pkg/config"
"github.com/filecoin-project/venus/venus-shared/actors/builtin"
"github.com/filecoin-project/venus/venus-shared/types"
"github.com/ipfs/go-cid"
)
Expand Down Expand Up @@ -32,37 +33,39 @@ 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: -24,
UpgradeWatermelonFixHeight: -100, // This fix upgrade only ran on calibrationnet
UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
UpgradeDragonHeight: -25,
UpgradeCalibrationDragonFixHeight: -102, // This fix upgrade only ran on calibrationnet
UpgradePhoenixHeight: -26,
UpgradeWaffleHeight: 50,
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: -24,
UpgradeWatermelonFixHeight: -100, // This fix upgrade only ran on calibrationnet
UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
UpgradeDragonHeight: -25,
UpgradeCalibrationDragonFixHeight: -102, // This fix upgrade only ran on calibrationnet
UpgradePhoenixHeight: -26,
UpgradeWaffleHeight: -27,
UpgradeTuktukHeight: 50,
UpgradeTuktukPowerRampDurationEpochs: builtin.EpochsInYear,
},
DrandSchedule: map[abi.ChainEpoch]config.DrandEnum{0: config.DrandQuicknet},
AddressNetwork: address.Testnet,
Expand Down
46 changes: 24 additions & 22 deletions fixtures/networks/mainnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,28 +46,30 @@ 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: 3469380, // 2023-12-12T13:30:00Z
UpgradeWatermelonFixHeight: -100, // This fix upgrade only ran on calibrationnet
UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
UpgradeDragonHeight: 3855360, // 2024-04-24T14:00:00Z
UpgradeCalibrationDragonFixHeight: -102, // This fix upgrade only ran on calibrationnet
UpgradeWaffleHeight: 4154640, // 2024-08-06T12:00:00Z
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
UpgradeDragonHeight: 3855360, // 2024-04-24T14:00:00Z
UpgradeCalibrationDragonFixHeight: -102, // This fix upgrade only ran on calibrationnet
UpgradeWaffleHeight: 4154640, // 2024-08-06T12:00:00Z
UpgradeTuktukHeight: 9999999,
UpgradeTuktukPowerRampDurationEpochs: builtin2.EpochsInYear,
},
DrandSchedule: map[abi.ChainEpoch]config.DrandEnum{0: 5, 51000: 1},
AddressNetwork: address.Mainnet,
Expand Down
Loading
Loading