parent
432b0b2da7
commit
67964b1df4
|
@ -2,6 +2,7 @@ package v040
|
||||||
|
|
||||||
import (
|
import (
|
||||||
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
|
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
|
||||||
|
multisigtypes "github.com/cosmos/cosmos-sdk/crypto/keys/multisig"
|
||||||
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
|
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
|
||||||
v039auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v039"
|
v039auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v039"
|
||||||
v040auth "github.com/cosmos/cosmos-sdk/x/auth/types"
|
v040auth "github.com/cosmos/cosmos-sdk/x/auth/types"
|
||||||
|
@ -11,9 +12,16 @@ import (
|
||||||
// convertBaseAccount converts a 0.39 BaseAccount to a 0.40 BaseAccount.
|
// convertBaseAccount converts a 0.39 BaseAccount to a 0.40 BaseAccount.
|
||||||
func convertBaseAccount(old *v039auth.BaseAccount) *v040auth.BaseAccount {
|
func convertBaseAccount(old *v039auth.BaseAccount) *v040auth.BaseAccount {
|
||||||
var any *codectypes.Any
|
var any *codectypes.Any
|
||||||
// If the old genesis had a pubkey, we pack it inside an Any. Or else, we
|
|
||||||
// just leave it nil.
|
_, ok := old.PubKey.(*multisigtypes.LegacyAminoPubKey)
|
||||||
if old.PubKey != nil {
|
|
||||||
|
// If pubkey is multisig type, then leave it as nil for now
|
||||||
|
// Ref: https://github.com/cosmos/cosmos-sdk/issues/8776#issuecomment-790552126
|
||||||
|
// Else if the old genesis had a pubkey, we pack it inside an Any.
|
||||||
|
// Or else, we just leave it nil.
|
||||||
|
if ok {
|
||||||
|
// TODO migrate multisig public_keys
|
||||||
|
} else if old.PubKey != nil {
|
||||||
var err error
|
var err error
|
||||||
any, err = codectypes.NewAnyWithValue(old.PubKey)
|
any, err = codectypes.NewAnyWithValue(old.PubKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in New Issue