From 932664eface10edd8f51bc4c9fdfa8f1374ba023 Mon Sep 17 00:00:00 2001 From: 0g-wh Date: Sat, 3 Aug 2024 14:23:15 +0800 Subject: [PATCH] prepare upgrade --- app/upgrades.go | 10 ++-------- go.mod | 2 +- go.sum | 3 +++ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/upgrades.go b/app/upgrades.go index 703cba30..8f0884ac 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -25,18 +25,13 @@ import ( ) const ( - UpgradeName_Mainnet = "v0.26.0" - UpgradeName_Testnet = "v0.26.0-alpha.0" + UpgradeName_Testnet = "v0.3.0" CDPLiquidationBlockInterval = int64(50) ) // RegisterUpgradeHandlers registers the upgrade handlers for the app. func (app App) RegisterUpgradeHandlers() { - app.upgradeKeeper.SetUpgradeHandler( - UpgradeName_Mainnet, - upgradeHandler(app, UpgradeName_Mainnet), - ) app.upgradeKeeper.SetUpgradeHandler( UpgradeName_Testnet, upgradeHandler(app, UpgradeName_Testnet), @@ -47,8 +42,7 @@ func (app App) RegisterUpgradeHandlers() { panic(err) } - doUpgrade := upgradeInfo.Name == UpgradeName_Mainnet || - upgradeInfo.Name == UpgradeName_Testnet + doUpgrade := upgradeInfo.Name == UpgradeName_Testnet if doUpgrade && !app.upgradeKeeper.IsSkipHeight(upgradeInfo.Height) { storeUpgrades := storetypes.StoreUpgrades{ diff --git a/go.mod b/go.mod index 763245b3..6264a14e 100644 --- a/go.mod +++ b/go.mod @@ -229,7 +229,7 @@ replace ( github.com/cometbft/cometbft-db => github.com/kava-labs/cometbft-db v0.9.1-kava.1 // Use cosmos-sdk fork with backported fix for unsafe-reset-all, staking transfer events, and custom tally handler support // github.com/cosmos/cosmos-sdk => github.com/0glabs/cosmos-sdk v0.46.11-kava.3 - github.com/cosmos/cosmos-sdk => /home/wenhui/v047/cosmos-sdk + github.com/cosmos/cosmos-sdk => github.com/0glabs/cosmos-sdk v0.47.10-0glabs.3 // See https://github.com/cosmos/cosmos-sdk/pull/13093 github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 // Use go-ethereum fork with precompiles diff --git a/go.sum b/go.sum index f47d8235..b0e8b5b2 100644 --- a/go.sum +++ b/go.sum @@ -222,6 +222,8 @@ git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFN git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9/go.mod h1:BVJwbDfVjCjoFiKrhkei6NdGcZYpkDkdyCdg1ukytRA= github.com/0g-wh/ethermint v0.21.0-0glabs-v26.3.1 h1:45iLmhD+WV3YTn87T4H70lZFu/X7/uV3TFY3IK4Uh0E= github.com/0g-wh/ethermint v0.21.0-0glabs-v26.3.1/go.mod h1:GdFUfO60Wkr+ofAv4Kz+wDCsobHnwhhv8Gly6a9+k0Y= +github.com/0glabs/cosmos-sdk v0.47.10-0glabs.3 h1:Wx3tVMTuFaaHDeJT/OzT7QLfAIpeaZsG9R6XoTOyKCw= +github.com/0glabs/cosmos-sdk v0.47.10-0glabs.3/go.mod h1:BWo24B8cApWcO2/widWYIdt3CPxbh+HCSypCPpjTjog= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= github.com/Antonboom/errname v0.1.7/go.mod h1:g0ONh16msHIPgJSGsecu1G/dcF2hlYR/0SddnIAGavU= @@ -2015,6 +2017,7 @@ golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=