diff --git a/app/app.go b/app/app.go index e05039ac4..d3b628c2d 100644 --- a/app/app.go +++ b/app/app.go @@ -360,6 +360,9 @@ func SetUpgradeConfig(upgradeConfig *config.UpgradeConfig) { upgrade.Mgr.AddUpgradeHeight(upgrade.FixDoubleSignChainId, upgradeConfig.FixDoubleSignChainIdHeight) upgrade.Mgr.AddUpgradeHeight(upgrade.BEP126, upgradeConfig.BEP126Height) upgrade.Mgr.AddUpgradeHeight(upgrade.BEP255, upgradeConfig.BEP255Height) + upgrade.Mgr.AddUpgradeHeight(upgrade.FirstSunset, upgradeConfig.FirstSunsetHeight) + upgrade.Mgr.AddUpgradeHeight(upgrade.SecondSunset, upgradeConfig.SecondSunsetHeight) + upgrade.Mgr.AddUpgradeHeight(upgrade.FinalSunset, upgradeConfig.FinalSunsetHeight) // register store keys of upgrade upgrade.Mgr.RegisterStoreKeys(upgrade.BEP9, common.TimeLockStoreKey.Name()) diff --git a/app/config/config.go b/app/config/config.go index 63df8ce91..5a0285cb5 100644 --- a/app/config/config.go +++ b/app/config/config.go @@ -103,6 +103,12 @@ FixDoubleSignChainIdHeight = {{ .UpgradeConfig.FixDoubleSignChainIdHeight }} BEP126Height = {{ .UpgradeConfig.BEP126Height }} # Block height of BEP255 upgrade BEP255Height = {{ .UpgradeConfig.BEP255Height }} +# Block height of FirstSunset upgrade +FirstSunsetHeight = {{ .UpgradeConfig.FirstSunsetHeight }} +# Block height of SecondSunset upgrade +SecondSunsetHeight = {{ .UpgradeConfig.SecondSunsetHeight }} +# Block height of FinalSunset upgrade +FinalSunsetHeight = {{ .UpgradeConfig.FinalSunsetHeight }} [query] # ABCI query interface black list, suggested value: ["custom/gov/proposals", "custom/timelock/timelocks", "custom/atomicSwap/swapcreator", "custom/atomicSwap/swaprecipient"] @@ -552,6 +558,9 @@ type UpgradeConfig struct { FixDoubleSignChainIdHeight int64 `mapstructure:"FixDoubleSignChainIdHeight"` BEP126Height int64 `mapstructure:"BEP126Height"` BEP255Height int64 `mapstructure:"BEP255Height"` + FirstSunsetHeight int64 `mapstructure:"FirstSunsetHeight"` + SecondSunsetHeight int64 `mapstructure:"SecondSunsetHeight"` + FinalSunsetHeight int64 `mapstructure:"FinalSunsetHeight"` } func defaultUpgradeConfig() *UpgradeConfig { @@ -586,7 +595,10 @@ func defaultUpgradeConfig() *UpgradeConfig { BEP171Height: math.MaxInt64, FixFailAckPackageHeight: math.MaxInt64, EnableAccountScriptsForCrossChainTransferHeight: math.MaxInt64, - BEP255Height: math.MaxInt64, + BEP255Height: math.MaxInt64, + FirstSunsetHeight: math.MaxInt64, + SecondSunsetHeight: math.MaxInt64, + FinalSunsetHeight: math.MaxInt64, } } diff --git a/common/upgrade/upgrade.go b/common/upgrade/upgrade.go index d304e4c32..cb52b401c 100644 --- a/common/upgrade/upgrade.go +++ b/common/upgrade/upgrade.go @@ -49,7 +49,10 @@ const ( BEP171 = sdk.BEP171 // https://github.com/bnb-chain/BEPs/pull/171 Security Enhancement for Cross-Chain Module BEP173 = sdk.BEP173 // https://github.com/bnb-chain/BEPs/pull/173 Text Proposal FixDoubleSignChainId = sdk.FixDoubleSignChainId - BEP255 = sdk.BEP255 // https://github.com/bnb-chain/BEPs/pull/255 Asset Reconciliation for Security Enhancement + BEP255 = sdk.BEP255 // https://github.com/bnb-chain/BEPs/pull/255 Asset Reconciliation for Security Enhancement + FirstSunset = sdk.FirstSunsetFork // https://github.com/bnb-chain/BEPs/pull/333 BNB Chain Fusion + SecondSunset = sdk.SecondSunsetFork // https://github.com/bnb-chain/BEPs/pull/333 BNB Chain Fusion + FinalSunset = sdk.FinalSunsetFork // https://github.com/bnb-chain/BEPs/pull/333 BNB Chain Fusion ) func UpgradeBEP10(before func(), after func()) {