0.39->0.40 CLI migrate command

proto/cosmos/distribution/v1beta1/genesis.proto

@@ -107,8 +107,8 @@ message ValidatorSlashEventRecord {
   uint64 height = 2;
   // period is the period of the slash event.
   uint64 period = 3;
-  // event describes the slash event.
-  ValidatorSlashEvent event = 4 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"event\""];
+  // validator_slash_event describes the slash event.
+  ValidatorSlashEvent validator_slash_event = 4 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"event\""];
 }
 
 // GenesisState defines the distribution module's genesis state.

x/auth/legacy/v0_34/types.go → x/auth/legacy/v034/types.go

@@ -1,6 +1,6 @@
 // DONTCOVER
 // nolint
-package v0_34
+package v034
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"

x/auth/legacy/v0_36/migrate.go → x/auth/legacy/v036/migrate.go

@@ -1,9 +1,9 @@
 // DONTCOVER
 // nolint
-package v0_36
+package v036
 
 import (
-	v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_34"
+	v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v034"
 )
 
 // Migrate accepts exported genesis state from v0.34 and migrates it to v0.36

x/auth/legacy/v0_36/migrate_test.go → x/auth/legacy/v036/migrate_test.go

@@ -1,10 +1,10 @@
-package v0_36
+package v036
 
 import (
 	"testing"
 
 	"github.com/cosmos/cosmos-sdk/types"
-	v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_34"
+	v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v034"
 
 	"github.com/stretchr/testify/require"
 )

x/auth/legacy/v0_36/types.go → x/auth/legacy/v036/types.go

@@ -1,8 +1,8 @@
 // DONTCOVER
 // nolint
-package v0_36
+package v036
 
-import v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_34"
+import v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v034"
 
 const (
 	ModuleName = "auth"

x/auth/legacy/v0_38/migrate.go → x/auth/legacy/v038/migrate.go

@@ -1,8 +1,8 @@
 package v038
 
 import (
-	v036auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_36"
-	v036genaccounts "github.com/cosmos/cosmos-sdk/x/genaccounts/legacy/v0_36"
+	v036auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v036"
+	v036genaccounts "github.com/cosmos/cosmos-sdk/x/genaccounts/legacy/v036"
 )
 
 // Migrate accepts exported genesis state from v0.34 and migrates it to v0.38

x/auth/legacy/v0_38/migrate_test.go → x/auth/legacy/v038/migrate_test.go

@@ -5,9 +5,9 @@ import (
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_34"
-	v036auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_36"
-	v036genaccounts "github.com/cosmos/cosmos-sdk/x/genaccounts/legacy/v0_36"
+	v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v034"
+	v036auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v036"
+	v036genaccounts "github.com/cosmos/cosmos-sdk/x/genaccounts/legacy/v036"
 
 	"github.com/stretchr/testify/require"
 )
@@ -102,30 +102,6 @@ func TestMigrateInvalid(t *testing.T) {
 		name string
 		acc  v036genaccounts.GenesisAccount
 	}{
-		{
-			"vesting account with no base coins",
-			v036genaccounts.GenesisAccount{
-				Address:         accAddressFromBech32(t, "cosmos17n9sztlhx32tfy0tg0zc2ttmkeeth50yyuv9he"),
-				Coins:           sdk.Coins{},
-				OriginalVesting: sdk.NewCoins(sdk.NewInt64Coin("stake", 10000205)),
-				StartTime:       time.Now().Unix(),
-				EndTime:         time.Now().Add(48 * time.Hour).Unix(),
-				Sequence:        5,
-				AccountNumber:   3,
-			},
-		},
-		{
-			"vesting account with base coins <= original vesting",
-			v036genaccounts.GenesisAccount{
-				Address:         accAddressFromBech32(t, "cosmos17n9sztlhx32tfy0tg0zc2ttmkeeth50yyuv9he"),
-				Coins:           sdk.NewCoins(sdk.NewInt64Coin("stake", 10000205)),
-				OriginalVesting: sdk.NewCoins(sdk.NewInt64Coin("stake", 50000205)),
-				StartTime:       time.Now().Unix(),
-				EndTime:         time.Now().Add(48 * time.Hour).Unix(),
-				Sequence:        5,
-				AccountNumber:   3,
-			},
-		},
 		{
 			"module account with invalid name",
 			v036genaccounts.GenesisAccount{

x/auth/legacy/v0_38/types.go → x/auth/legacy/v038/types.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_34"
+	v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v034"
 )
 
 const (
@@ -223,11 +223,6 @@ func NewBaseVestingAccount(
 }
 
 func (bva BaseVestingAccount) Validate() error {
-	if (bva.Coins.IsZero() && !bva.OriginalVesting.IsZero()) ||
-		bva.OriginalVesting.IsAnyGT(bva.Coins) {
-		return errors.New("vesting amount cannot be greater than total amount")
-	}
-
 	return bva.BaseAccount.Validate()
 }
 

x/auth/legacy/v0_39/migrate.go → x/auth/legacy/v039/migrate.go

@@ -3,7 +3,7 @@ package v039
 import (
 	"fmt"
 
-	v038auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_38"
+	v038auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v038"
 )
 
 // Migrate accepts exported genesis state from v0.38 and migrates it to v0.39

x/auth/legacy/v0_39/types.go → x/auth/legacy/v039/types.go

@@ -14,8 +14,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/legacy"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_34"
-	v038auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_38"
+	v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v034"
+	v038auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v038"
 )
 
 const (
@@ -204,11 +204,6 @@ func (bva BaseVestingAccount) GetEndTime() int64 {
 }
 
 func (bva BaseVestingAccount) Validate() error {
-	if (bva.Coins.IsZero() && !bva.OriginalVesting.IsZero()) ||
-		bva.OriginalVesting.IsAnyGT(bva.Coins) {
-		return errors.New("vesting amount cannot be greater than total amount")
-	}
-
 	return bva.BaseAccount.Validate()
 }
 

x/auth/legacy/v040/migrate.go

@@ -0,0 +1,133 @@
+package v040
+
+import (
+	pt "github.com/gogo/protobuf/types"
+
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	v039auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v039"
+	"github.com/cosmos/cosmos-sdk/x/auth/tx"
+	v040auth "github.com/cosmos/cosmos-sdk/x/auth/types"
+	v040vesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
+)
+
+// convertBaseAccount converts a 0.39 BaseAccount to a 0.40 BaseAccount.
+func convertBaseAccount(old *v039auth.BaseAccount) *v040auth.BaseAccount {
+	// In `x/auth/legacy/v038/migrate.go`, when creating a BaseAccount, we
+	// explicitly set the PublicKey field to nil. This propagates until 0.40,
+	// and we don't know the PubKey for those accounts, so we just put an empty
+	// string inside the Any.
+	var any *codectypes.Any
+	var err error
+	if old.PubKey != nil {
+		any, err = tx.PubKeyToAny(old.PubKey)
+	} else {
+		s := pt.Empty{}
+		any, err = codectypes.NewAnyWithValue(&s)
+	}
+	if err != nil {
+		panic(err)
+	}
+
+	return &v040auth.BaseAccount{
+		Address:       old.Address.String(),
+		PubKey:        any,
+		AccountNumber: old.AccountNumber,
+		Sequence:      old.Sequence,
+	}
+}
+
+// convertBaseVestingAccount converts a 0.39 BaseVestingAccount to a 0.40 BaseVestingAccount.
+func convertBaseVestingAccount(old *v039auth.BaseVestingAccount) *v040vesting.BaseVestingAccount {
+	baseAccount := convertBaseAccount(old.BaseAccount)
+
+	return &v040vesting.BaseVestingAccount{
+		BaseAccount:      baseAccount,
+		OriginalVesting:  old.OriginalVesting,
+		DelegatedFree:    old.DelegatedFree,
+		DelegatedVesting: old.DelegatedVesting,
+		EndTime:          old.EndTime,
+	}
+}
+
+// Migrate accepts exported x/auth genesis state from v0.38/v0.39 and migrates
+// it to v0.40 x/auth genesis state. The migration includes:
+//
+// - Removing coins from account encoding.
+func Migrate(authGenState v039auth.GenesisState) *v040auth.GenesisState {
+	// Convert v0.39 accounts to v0.40 ones.
+	var v040Accounts = make([]v040auth.GenesisAccount, len(authGenState.Accounts))
+	for i, v039Account := range authGenState.Accounts {
+		switch v039Account := v039Account.(type) {
+		case *v039auth.BaseAccount:
+			{
+				v040Accounts[i] = convertBaseAccount(v039Account)
+			}
+		case *v039auth.ModuleAccount:
+			{
+				v040Accounts[i] = &v040auth.ModuleAccount{
+					BaseAccount: convertBaseAccount(v039Account.BaseAccount),
+					Name:        v039Account.Name,
+					Permissions: v039Account.Permissions,
+				}
+			}
+		case *v039auth.BaseVestingAccount:
+			{
+				v040Accounts[i] = convertBaseVestingAccount(v039Account)
+			}
+		case *v039auth.ContinuousVestingAccount:
+			{
+				v040Accounts[i] = &v040vesting.ContinuousVestingAccount{
+					BaseVestingAccount: convertBaseVestingAccount(v039Account.BaseVestingAccount),
+					StartTime:          v039Account.StartTime,
+				}
+			}
+		case *v039auth.DelayedVestingAccount:
+			{
+				v040Accounts[i] = &v040vesting.DelayedVestingAccount{
+					BaseVestingAccount: convertBaseVestingAccount(v039Account.BaseVestingAccount),
+				}
+			}
+		case *v039auth.PeriodicVestingAccount:
+			{
+				vestingPeriods := make([]v040vesting.Period, len(v039Account.VestingPeriods))
+				for j, period := range v039Account.VestingPeriods {
+					vestingPeriods[j] = v040vesting.Period{
+						Length: period.Length,
+						Amount: period.Amount,
+					}
+				}
+				v040Accounts[i] = &v040vesting.PeriodicVestingAccount{
+					BaseVestingAccount: convertBaseVestingAccount(v039Account.BaseVestingAccount),
+					StartTime:          v039Account.StartTime,
+					VestingPeriods:     vestingPeriods,
+				}
+			}
+		default:
+			panic(sdkerrors.Wrapf(sdkerrors.ErrInvalidType, "got invalid type %T", v039Account))
+		}
+
+	}
+
+	// Convert v0.40 accounts into Anys.
+	anys := make([]*codectypes.Any, len(v040Accounts))
+	for i, v040Account := range v040Accounts {
+		any, err := codectypes.NewAnyWithValue(v040Account)
+		if err != nil {
+			panic(err)
+		}
+
+		anys[i] = any
+	}
+
+	return &v040auth.GenesisState{
+		Params: v040auth.Params{
+			MaxMemoCharacters:      authGenState.Params.MaxMemoCharacters,
+			TxSigLimit:             authGenState.Params.TxSigLimit,
+			TxSizeCostPerByte:      authGenState.Params.TxSizeCostPerByte,
+			SigVerifyCostED25519:   authGenState.Params.SigVerifyCostED25519,
+			SigVerifyCostSecp256k1: authGenState.Params.SigVerifyCostSecp256k1,
+		},
+		Accounts: anys,
+	}
+}