Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 api/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ type ForkUpgradeParams struct {
UpgradeTuktukHeight abi.ChainEpoch
UpgradeTeepHeight abi.ChainEpoch
UpgradeTockHeight abi.ChainEpoch
UpgradeXxHeight abi.ChainEpoch
UpgradeGoldenWeekHeight abi.ChainEpoch
}

// ChainExportConfig holds configuration for chain ranged exports.
Expand Down
4 changes: 2 additions & 2 deletions build/buildconstants/params_2k.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ var UpgradeTockHeight = abi.ChainEpoch(-30)

const UpgradeTockFixHeight = -103

var UpgradeXxHeight = abi.ChainEpoch(200)
var UpgradeGoldenWeekHeight = abi.ChainEpoch(200)

var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandQuicknet,
Expand Down Expand Up @@ -177,7 +177,7 @@ func init() {
UpgradeTeepHeight = getUpgradeHeight("LOTUS_TEEP_HEIGHT", UpgradeTeepHeight)
UpgradeTockHeight = getUpgradeHeight("LOTUS_TOCK_HEIGHT", UpgradeTockHeight)
// UpgradeTockFixHeight = getUpgradeHeight("LOTUS_TOCK_FIX_HEIGHT", UpgradeTockFixHeight)
UpgradeXxHeight = getUpgradeHeight("LOTUS_XX_HEIGHT", UpgradeXxHeight)
UpgradeGoldenWeekHeight = getUpgradeHeight("LOTUS_GOLDENWEEK_HEIGHT", UpgradeGoldenWeekHeight)

DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandQuicknet,
Expand Down
2 changes: 1 addition & 1 deletion build/buildconstants/params_butterfly.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const UpgradeTockHeight = -30
const UpgradeTockFixHeight = -103

// ??????
const UpgradeXxHeight = 999999999999999
const UpgradeGoldenWeekHeight = 999999999999999

var ConsensusMinerMinPower = abi.NewStoragePower(2 << 30)
var PreCommitChallengeDelay = abi.ChainEpoch(150)
Expand Down
2 changes: 1 addition & 1 deletion build/buildconstants/params_calibnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ var UpgradeTockHeight abi.ChainEpoch = UpgradeTeepHeight + builtin.EpochsInDay*7
const UpgradeTockFixHeight abi.ChainEpoch = 2558014

// ??????
const UpgradeXxHeight = 999999999999999
const UpgradeGoldenWeekHeight = 999999999999999

var ConsensusMinerMinPower = abi.NewStoragePower(32 << 30)
var PreCommitChallengeDelay = abi.ChainEpoch(150)
Expand Down
2 changes: 1 addition & 1 deletion build/buildconstants/params_interop.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ var UpgradeTockHeight = abi.ChainEpoch(-30)
// This fix upgrade only ran on calibrationnet
const UpgradeTockFixHeight abi.ChainEpoch = -4

const UpgradeXxHeight = 50
const UpgradeGoldenWeekHeight = 50

var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandQuicknet,
Expand Down
6 changes: 3 additions & 3 deletions build/buildconstants/params_mainnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ var UpgradeTockHeight = UpgradeTeepHeight + builtin.EpochsInDay*90
var UpgradeTockFixHeight = abi.ChainEpoch(-1)

// ??????
var UpgradeXxHeight = abi.ChainEpoch(9999999999)
var UpgradeGoldenWeekHeight = abi.ChainEpoch(9999999999)

var UpgradeTeepInitialFilReserved = InitialFilReserved // FIP-0100: no change for mainnet

Expand All @@ -158,8 +158,8 @@ func init() {
}
SetAddressNetwork(addrNetwork)

if os.Getenv("LOTUS_DISABLE_XX") == "1" {
UpgradeXxHeight = math.MaxInt64 - 1
if os.Getenv("LOTUS_DISABLE_GOLDENWEEK") == "1" {
UpgradeGoldenWeekHeight = math.MaxInt64 - 1
}

// NOTE: DO NOT change this unless you REALLY know what you're doing. This is not consensus critical, however,
Expand Down
2 changes: 1 addition & 1 deletion build/buildconstants/params_testground.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ var (
UpgradeTeepInitialFilReserved *big.Int = wholeFIL(300_000_000)
UpgradeTockHeight abi.ChainEpoch = -32
UpgradeTockFixHeight abi.ChainEpoch = -33
UpgradeXxHeight abi.ChainEpoch = -34
UpgradeGoldenWeekHeight abi.ChainEpoch = -34

DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet,
Expand Down
10 changes: 5 additions & 5 deletions build/openrpc/full.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions build/openrpc/gateway.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion chain/consensus/filcns/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ func DefaultUpgradeSchedule() stmgr.UpgradeSchedule {
Network: network.Version26,
Migration: UpgradeActorsV16Fix,
}, {
Height: buildconstants.UpgradeXxHeight,
Height: buildconstants.UpgradeGoldenWeekHeight,
Network: network.Version27,
Migration: UpgradeActorsV17,
PreMigrations: []stmgr.PreMigration{{
Expand Down
2 changes: 1 addition & 1 deletion documentation/en/api-methods-v0-deprecated.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion documentation/en/api-methods-v1-stable.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node/impl/full/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -2163,7 +2163,7 @@ func (a *StateAPI) StateGetNetworkParams(ctx context.Context) (*api.NetworkParam
UpgradeTuktukHeight: buildconstants.UpgradeTuktukHeight,
UpgradeTeepHeight: buildconstants.UpgradeTeepHeight,
UpgradeTockHeight: buildconstants.UpgradeTockHeight,
UpgradeXxHeight: buildconstants.UpgradeXxHeight,
UpgradeGoldenWeekHeight: buildconstants.UpgradeGoldenWeekHeight,
},
}, nil
}
Loading