cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #5289 from filecoin-project/asr/remove-env-var

Browse Source 
Remove LOTUS_DISABLE_V2_ACTOR_MIGRATION envvar
This commit is contained in:
Łukasz Magiera 2021-01-05 20:10:26 +01:00 committed by GitHub
commit 9b70fdbe9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/params_2k.go
View File

@ -3,9 +3,6 @@
package build package build
import ( import (
"math"
"os"
"github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/lotus/chain/actors/policy" "github.com/filecoin-project/lotus/chain/actors/policy"
) )
@ -18,8 +15,8 @@ const UpgradeIgnitionHeight = -2
const UpgradeRefuelHeight = -3 const UpgradeRefuelHeight = -3
const UpgradeTapeHeight = -4 const UpgradeTapeHeight = -4
var UpgradeActorsV2Height = abi.ChainEpoch(10) const UpgradeActorsV2Height = 10
var UpgradeLiftoffHeight = abi.ChainEpoch(-5) const UpgradeLiftoffHeight = -5
const UpgradeKumquatHeight = 15 const UpgradeKumquatHeight = 15
const UpgradeCalicoHeight = 20 const UpgradeCalicoHeight = 20
@ -36,11 +33,6 @@ func init() {
policy.SetConsensusMinerMinPower(abi.NewStoragePower(2048)) policy.SetConsensusMinerMinPower(abi.NewStoragePower(2048))
policy.SetMinVerifiedDealSize(abi.NewStoragePower(256)) policy.SetMinVerifiedDealSize(abi.NewStoragePower(256))
if os.Getenv("LOTUS_DISABLE_V2_ACTOR_MIGRATION") == "1" {
UpgradeActorsV2Height = math.MaxInt64
UpgradeLiftoffHeight = 11
}
BuildType |= Build2k BuildType |= Build2k
} }

7
build/params_mainnet.go
View File

@ -5,7 +5,6 @@
package build package build
import ( import (
"math"
"os" "os"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
@ -27,7 +26,7 @@ const UpgradeSmokeHeight = 51000
const UpgradeIgnitionHeight = 94000 const UpgradeIgnitionHeight = 94000
const UpgradeRefuelHeight = 130800 const UpgradeRefuelHeight = 130800
var UpgradeActorsV2Height = abi.ChainEpoch(138720) const UpgradeActorsV2Height = 138720
const UpgradeTapeHeight = 140760 const UpgradeTapeHeight = 140760
@ -53,10 +52,6 @@ func init() {
SetAddressNetwork(address.Mainnet) SetAddressNetwork(address.Mainnet)
} }
if os.Getenv("LOTUS_DISABLE_V2_ACTOR_MIGRATION") == "1" {
UpgradeActorsV2Height = math.MaxInt64
}
Devnet = false Devnet = false
} }

2
cmd/tvx/codenames_test.go
View File

@ -18,7 +18,7 @@ func TestProtocolCodenames(t *testing.T) {
t.Fatal("expected breeze codename") t.Fatal("expected breeze codename")
} }
if height := build.UpgradeActorsV2Height + 1; GetProtocolCodename(height) != "actorsv2" { if height := build.UpgradeActorsV2Height + 1; GetProtocolCodename(abi.ChainEpoch(height)) != "actorsv2" {
t.Fatal("expected actorsv2 codename") t.Fatal("expected actorsv2 codename")
} }