From 48bf70f3ee9315bb42b99155f90965f6b694f42c Mon Sep 17 00:00:00 2001 From: Jennifer Wang Date: Thu, 13 Oct 2022 12:18:28 -0400 Subject: [PATCH 1/5] shark params --- build/params_2k.go | 4 ++-- build/params_butterfly.go | 2 +- build/params_interop.go | 4 ++-- build/params_mainnet.go | 4 ++-- chain/consensus/filcns/upgrades.go | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/params_2k.go b/build/params_2k.go index 1fdeaef24a0..60a18a7f7c8 100644 --- a/build/params_2k.go +++ b/build/params_2k.go @@ -56,7 +56,7 @@ var UpgradeOhSnapHeight = abi.ChainEpoch(-18) var UpgradeSkyrHeight = abi.ChainEpoch(-19) -var UpgradeV17Height = abi.ChainEpoch(100) +var UpgradeSharkHeight = abi.ChainEpoch(100) var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandMainnet, @@ -109,7 +109,7 @@ func init() { UpgradeChocolateHeight = getUpgradeHeight("LOTUS_CHOCOLATE_HEIGHT", UpgradeChocolateHeight) UpgradeOhSnapHeight = getUpgradeHeight("LOTUS_OHSNAP_HEIGHT", UpgradeOhSnapHeight) UpgradeSkyrHeight = getUpgradeHeight("LOTUS_SKYR_HEIGHT", UpgradeSkyrHeight) - UpgradeV17Height = getUpgradeHeight("LOTUS_V17_HEIGHT", UpgradeV17Height) + UpgradeSharkHeight = getUpgradeHeight("LOTUS_V17_HEIGHT", UpgradeSharkHeight) BuildType |= Build2k diff --git a/build/params_butterfly.go b/build/params_butterfly.go index 1624b16111d..19b44a06758 100644 --- a/build/params_butterfly.go +++ b/build/params_butterfly.go @@ -49,7 +49,7 @@ const UpgradeHyperdriveHeight = -16 const UpgradeChocolateHeight = -17 const UpgradeOhSnapHeight = -18 const UpgradeSkyrHeight = -19 -const UpgradeV17Height = abi.ChainEpoch(50) +const UpgradeSharkHeight = abi.ChainEpoch(50) var SupportedProofTypes = []abi.RegisteredSealProof{ abi.RegisteredSealProof_StackedDrg512MiBV1, diff --git a/build/params_interop.go b/build/params_interop.go index 2e089dcd66a..04cb718598b 100644 --- a/build/params_interop.go +++ b/build/params_interop.go @@ -49,7 +49,7 @@ var UpgradeChocolateHeight = abi.ChainEpoch(-17) var UpgradeOhSnapHeight = abi.ChainEpoch(-18) var UpgradeSkyrHeight = abi.ChainEpoch(-19) -const UpgradeV17Height = abi.ChainEpoch(99999999999999) +const UpgradeSharkHeight = abi.ChainEpoch(99999999999999) var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandMainnet, @@ -103,7 +103,7 @@ func init() { UpgradeChocolateHeight = getUpgradeHeight("LOTUS_CHOCOLATE_HEIGHT", UpgradeChocolateHeight) UpgradeOhSnapHeight = getUpgradeHeight("LOTUS_OHSNAP_HEIGHT", UpgradeOhSnapHeight) UpgradeSkyrHeight = getUpgradeHeight("LOTUS_SKYR_HEIGHT", UpgradeSkyrHeight) - UpgradeV17Height = getUpgradeHeight("LOTUS_V17_HEIGHT", UpgradeV17Height) + UpgradeSharkHeight = getUpgradeHeight("LOTUS_V17_HEIGHT", UpgradeSharkHeight) BuildType |= BuildInteropnet SetAddressNetwork(address.Testnet) diff --git a/build/params_mainnet.go b/build/params_mainnet.go index 45ceb89bdbb..84dc3fc61c1 100644 --- a/build/params_mainnet.go +++ b/build/params_mainnet.go @@ -79,7 +79,7 @@ const UpgradeOhSnapHeight = 1594680 // 2022-07-06T14:00:00Z const UpgradeSkyrHeight = 1960320 -var UpgradeV17Height = abi.ChainEpoch(99999999999999) +var UpgradeSharkHeight = abi.ChainEpoch(99999999999999) var SupportedProofTypes = []abi.RegisteredSealProof{ abi.RegisteredSealProof_StackedDrg32GiBV1, @@ -96,7 +96,7 @@ func init() { } if os.Getenv("LOTUS_DISABLE_V17") == "1" { - UpgradeV17Height = math.MaxInt64 + UpgradeSharkHeight = math.MaxInt64 } // NOTE: DO NOT change this unless you REALLY know what you're doing. This is not consensus critical, however, diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go index 411811f36c9..1db17b4ed8f 100644 --- a/chain/consensus/filcns/upgrades.go +++ b/chain/consensus/filcns/upgrades.go @@ -192,7 +192,7 @@ func DefaultUpgradeSchedule() stmgr.UpgradeSchedule { }}, Expensive: true, }, { - Height: build.UpgradeV17Height, + Height: build.UpgradeSharkHeight, Network: network.Version17, Migration: UpgradeActorsV9, PreMigrations: []stmgr.PreMigration{{ From 8fd18b7edeedbc36d8934ea4a6422871ac659c44 Mon Sep 17 00:00:00 2001 From: Jennifer Wang Date: Thu, 13 Oct 2022 14:34:08 -0400 Subject: [PATCH 2/5] miss the stuff --- build/params_calibnet.go | 2 +- build/params_testground.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/params_calibnet.go b/build/params_calibnet.go index cdf8dc6e95a..e2062791931 100644 --- a/build/params_calibnet.go +++ b/build/params_calibnet.go @@ -69,7 +69,7 @@ const UpgradeOhSnapHeight = 682006 // 2022-06-16T17:30:00Z const UpgradeSkyrHeight = 1044660 -var UpgradeV17Height = abi.ChainEpoch(99999999999999) +var UpgradeSharkHeight = abi.ChainEpoch(99999999999999) var SupportedProofTypes = []abi.RegisteredSealProof{ abi.RegisteredSealProof_StackedDrg32GiBV1, diff --git a/build/params_testground.go b/build/params_testground.go index bcbc32b9481..dcdee888dbb 100644 --- a/build/params_testground.go +++ b/build/params_testground.go @@ -107,7 +107,7 @@ var ( UpgradeChocolateHeight abi.ChainEpoch = -16 UpgradeOhSnapHeight abi.ChainEpoch = -17 UpgradeSkyrHeight abi.ChainEpoch = -18 - UpgradeV17Height abi.ChainEpoch = -19 + UpgradeSharkHeight abi.ChainEpoch = -19 DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandMainnet, From b3cffa9ca2e422564eb349f83f193e8bae209297 Mon Sep 17 00:00:00 2001 From: Jennifer Wang Date: Thu, 13 Oct 2022 14:57:00 -0400 Subject: [PATCH 3/5] add calib upgrade epcoh --- build/params_calibnet.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/params_calibnet.go b/build/params_calibnet.go index e2062791931..adca6ecc4a2 100644 --- a/build/params_calibnet.go +++ b/build/params_calibnet.go @@ -69,7 +69,8 @@ const UpgradeOhSnapHeight = 682006 // 2022-06-16T17:30:00Z const UpgradeSkyrHeight = 1044660 -var UpgradeSharkHeight = abi.ChainEpoch(99999999999999) +// 2022-10-20T16:00:07Z +const UpgradeSharkHeight = 1407374 var SupportedProofTypes = []abi.RegisteredSealProof{ abi.RegisteredSealProof_StackedDrg32GiBV1, From 830ff564a3788f6346c06993fe9b92cb15637aa4 Mon Sep 17 00:00:00 2001 From: Jennifer Wang Date: Thu, 13 Oct 2022 15:04:57 -0400 Subject: [PATCH 4/5] update the upgrade envvar --- build/params_2k.go | 2 +- build/params_interop.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/params_2k.go b/build/params_2k.go index 60a18a7f7c8..4c612d3ca64 100644 --- a/build/params_2k.go +++ b/build/params_2k.go @@ -109,7 +109,7 @@ func init() { UpgradeChocolateHeight = getUpgradeHeight("LOTUS_CHOCOLATE_HEIGHT", UpgradeChocolateHeight) UpgradeOhSnapHeight = getUpgradeHeight("LOTUS_OHSNAP_HEIGHT", UpgradeOhSnapHeight) UpgradeSkyrHeight = getUpgradeHeight("LOTUS_SKYR_HEIGHT", UpgradeSkyrHeight) - UpgradeSharkHeight = getUpgradeHeight("LOTUS_V17_HEIGHT", UpgradeSharkHeight) + UpgradeSharkHeight = getUpgradeHeight("LOTUS_SHARK_HEIGHT", UpgradeSharkHeight) BuildType |= Build2k diff --git a/build/params_interop.go b/build/params_interop.go index 04cb718598b..dbc619e1b82 100644 --- a/build/params_interop.go +++ b/build/params_interop.go @@ -103,7 +103,7 @@ func init() { UpgradeChocolateHeight = getUpgradeHeight("LOTUS_CHOCOLATE_HEIGHT", UpgradeChocolateHeight) UpgradeOhSnapHeight = getUpgradeHeight("LOTUS_OHSNAP_HEIGHT", UpgradeOhSnapHeight) UpgradeSkyrHeight = getUpgradeHeight("LOTUS_SKYR_HEIGHT", UpgradeSkyrHeight) - UpgradeSharkHeight = getUpgradeHeight("LOTUS_V17_HEIGHT", UpgradeSharkHeight) + UpgradeSharkHeight = getUpgradeHeight("LOTUS_SHARK_HEIGHT", UpgradeSharkHeight) BuildType |= BuildInteropnet SetAddressNetwork(address.Testnet) From 6d5139e3b2e401ec5caa49db5d3836faa941cd06 Mon Sep 17 00:00:00 2001 From: Jennifer Wang Date: Thu, 13 Oct 2022 15:05:58 -0400 Subject: [PATCH 5/5] kill shark --- build/params_mainnet.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/params_mainnet.go b/build/params_mainnet.go index 84dc3fc61c1..f11abb10758 100644 --- a/build/params_mainnet.go +++ b/build/params_mainnet.go @@ -95,7 +95,7 @@ func init() { SetAddressNetwork(address.Mainnet) } - if os.Getenv("LOTUS_DISABLE_V17") == "1" { + if os.Getenv("LOTUS_DISABLE_SHARK") == "1" { UpgradeSharkHeight = math.MaxInt64 }