smeb_y/0g-chain
1
0
Fork 0
mirror of https://github.com/0glabs/0g-chain.git synced 2024-12-24 15:25:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: only set config in migration if unsealed (#1142)

Browse Source
This commit is contained in:
Kevin Davis 2022-01-17 08:27:11 -07:00 committed by GitHub
parent 2e99b716e2
commit 691a483675
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
migrate/v0_16/cosmos.go
View File

@ -38,7 +38,6 @@ import (
ibchost "github.com/cosmos/ibc-go/modules/core/24-host" ibchost "github.com/cosmos/ibc-go/modules/core/24-host"
ibctypes "github.com/cosmos/ibc-go/modules/core/types" ibctypes "github.com/cosmos/ibc-go/modules/core/types"
"github.com/kava-labs/kava/app"
v015kavadist "github.com/kava-labs/kava/x/kavadist/legacy/v0_15" v015kavadist "github.com/kava-labs/kava/x/kavadist/legacy/v0_15"
v015validatorvesting "github.com/kava-labs/kava/x/validator-vesting/legacy/v0_15" v015validatorvesting "github.com/kava-labs/kava/x/validator-vesting/legacy/v0_15"
) )
@ -71,7 +70,7 @@ func migrateV043(appState genutiltypes.AppMap, clientCtx client.Context) genutil
// migrateV040 migrates cosmos modules from v0.39 to a v0.40 genesis state. // migrateV040 migrates cosmos modules from v0.39 to a v0.40 genesis state.
// This is based on the genutil/legacy/v40 migration logic but adapted to handle custom types from the kava module. // This is based on the genutil/legacy/v40 migration logic but adapted to handle custom types from the kava module.
func migrateV040(appState genutiltypes.AppMap, clientCtx client.Context, genesisTime time.Time) genutiltypes.AppMap { func migrateV040(appState genutiltypes.AppMap, clientCtx client.Context, genesisTime time.Time) genutiltypes.AppMap {
app.SetSDKConfig() setConfigIfUnsealed()
v039Codec := codec.NewLegacyAmino() v039Codec := codec.NewLegacyAmino()
v039auth.RegisterLegacyAminoCodec(v039Codec) v039auth.RegisterLegacyAminoCodec(v039Codec)
v036gov.RegisterLegacyAminoCodec(v039Codec) v036gov.RegisterLegacyAminoCodec(v039Codec)

14
migrate/v0_16/migrate.go
View File

@ -6,10 +6,10 @@ import (
"time" "time"
"github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client"
sdk "github.com/cosmos/cosmos-sdk/types"
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
tmtypes "github.com/tendermint/tendermint/types"
"github.com/kava-labs/kava/app" "github.com/kava-labs/kava/app"
tmtypes "github.com/tendermint/tendermint/types"
) )
var ( var (
@ -17,9 +17,17 @@ var (
ChainID = "kava-9" ChainID = "kava-9"
) )
func setConfigIfUnsealed() {
config := sdk.GetConfig()
if config.GetBech32AccountAddrPrefix() == "kava" {
return
}
app.SetSDKConfig()
}
// Migrate converts v15 genesis doc to v16 genesis doc // Migrate converts v15 genesis doc to v16 genesis doc
func Migrate(genDoc *tmtypes.GenesisDoc, ctx client.Context) (*tmtypes.GenesisDoc, error) { func Migrate(genDoc *tmtypes.GenesisDoc, ctx client.Context) (*tmtypes.GenesisDoc, error) {
app.SetSDKConfig() setConfigIfUnsealed()
var appState genutiltypes.AppMap var appState genutiltypes.AppMap
var err error var err error

2
migrate/v0_16/migrate_test.go
View File

@ -63,7 +63,7 @@ func TestMigrateFull(t *testing.T) {
func TestAccountBalances(t *testing.T) { func TestAccountBalances(t *testing.T) {
t.Skip() // avoid committing test data t.Skip() // avoid committing test data
app.SetSDKConfig() setConfigIfUnsealed()
// load auth state from kava-8 with empty accounts removed (keeps size down) // load auth state from kava-8 with empty accounts removed (keeps size down)
authbz, err := ioutil.ReadFile(filepath.Join("testdata", "kava-8-test-auth-state.json")) authbz, err := ioutil.ReadFile(filepath.Join("testdata", "kava-8-test-auth-state.json"))