cosmos · mergify · Oct 5, 2020 · Jul 29, 2020 · Jul 29, 2020 · Jul 29, 2020
diff --git a/proto/cosmos/distribution/genesis.proto b/proto/cosmos/distribution/genesis.proto
@@ -116,10 +116,10 @@ message ValidatorSlashEventRecord {
   ];
   uint64 height = 2;
   uint64 period = 3;
-  ValidatorSlashEvent event = 4 [
+  ValidatorSlashEvent validator_slash_event = 4 [
 Event            ValidatorSlashEvent `json:"validator_slash_event" yaml:"validator_slash_event"` 
 Event            ValidatorSlashEvent `json:"validator_slash_event" yaml:"validator_slash_event"` 
     (gogoproto.casttype) = "ValidatorSlashEvent",
     (gogoproto.nullable) = false,
-    (gogoproto.moretags) = "yaml:\"event\""
+    (gogoproto.moretags) = "yaml:\"validator_slash_event\""
   ];
 }
 

diff --git a/x/auth/legacy/v0_34/types.go b/x/auth/legacy/v0_34/types.go
@@ -1,6 +1,6 @@
 // DONTCOVER
 // nolint
-package v0_34
+package v034
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"

diff --git a/x/auth/legacy/v0_36/migrate.go b/x/auth/legacy/v0_36/migrate.go
@@ -1,6 +1,6 @@
 // DONTCOVER
 // nolint
-package v0_36
+package v036
 
 import (
 	v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_34"

diff --git a/x/auth/legacy/v0_36/migrate_test.go b/x/auth/legacy/v0_36/migrate_test.go
@@ -1,4 +1,4 @@
-package v0_36
+package v036
 
 import (
 	"testing"

diff --git a/x/auth/legacy/v0_36/types.go b/x/auth/legacy/v0_36/types.go
@@ -1,6 +1,6 @@
 // DONTCOVER
 // nolint
-package v0_36
+package v036
 
 import v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_34"
 

diff --git a/x/auth/legacy/v0_38/types.go b/x/auth/legacy/v0_38/types.go
@@ -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()
 }
 

diff --git a/x/auth/legacy/v0_39/types.go b/x/auth/legacy/v0_39/types.go
@@ -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()
 }
 

diff --git a/x/auth/legacy/v0_40/migrate_test.go b/x/auth/legacy/v0_40/migrate_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_34"
+	v034 "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_34"
 	v038auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_38"
 	v039auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_39"
 	v040 "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_40"
@@ -30,7 +30,7 @@ func TestMigrate(t *testing.T) {
 	)
 
 	gs := v039auth.GenesisState{
-		Params: v0_34.Params{
+		Params: v034.Params{
 			MaxMemoCharacters:      10,
 			TxSigLimit:             10,
 			TxSizeCostPerByte:      10,

diff --git a/x/bank/legacy/v0_36/types.go b/x/bank/legacy/v0_36/types.go
@@ -1,6 +1,6 @@
 // DONTCOVER
 // nolint
-package v0_36
+package v036
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"

diff --git a/x/bank/legacy/v0_40/migrate.go b/x/bank/legacy/v0_40/migrate.go
@@ -2,14 +2,20 @@ package v040
 
 import (
 	v039auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_39"
+	v036supply "github.com/cosmos/cosmos-sdk/x/bank/legacy/v0_36"
 	v038bank "github.com/cosmos/cosmos-sdk/x/bank/legacy/v0_38"
 )
 
 // Migrate accepts exported v0.39 x/auth and v0.38 x/bank genesis state and
 // migrates it to v0.40 x/bank genesis state. The migration includes:
 //
 // - Moving balances from x/auth to x/bank genesis state.
-func Migrate(bankGenState v038bank.GenesisState, authGenState v039auth.GenesisState) GenesisState {
+// - Moving supply from x/supply to x/bank genesis state.
+func Migrate(
+	bankGenState v038bank.GenesisState,
+	authGenState v039auth.GenesisState,
+	supplyGenState v036supply.GenesisState,
+) GenesisState {
 	balances := make([]Balance, len(authGenState.Accounts))
 	for i, acc := range authGenState.Accounts {
 		balances[i] = Balance{
@@ -18,5 +24,14 @@ func Migrate(bankGenState v038bank.GenesisState, authGenState v039auth.GenesisSt
 		}
 	}
 
-	return NewGenesisState(bankGenState.SendEnabled, balances)
+	return GenesisState{
+		Params: Params{
+			SendEnabled:        []*SendEnabled{},
+			DefaultSendEnabled: bankGenState.SendEnabled,
+		},
+		Balances:      balances,
+		Supply:        supplyGenState.Supply,
+		DenomMetadata: []Metadata{},
+	}
+
 }
diff --git a/x/bank/legacy/v0_40/migrate_test.go b/x/bank/legacy/v0_40/migrate_test.go
@@ -3,15 +3,16 @@ package v040_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/cosmos/cosmos-sdk/codec"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	v038auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_38"
 	v039auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v0_39"
+	v036supply "github.com/cosmos/cosmos-sdk/x/bank/legacy/v0_36"
 	v038bank "github.com/cosmos/cosmos-sdk/x/bank/legacy/v0_38"
 	v040bank "github.com/cosmos/cosmos-sdk/x/bank/legacy/v0_40"
-
-	"github.com/stretchr/testify/require"
 )
 
 func TestMigrate(t *testing.T) {
@@ -31,16 +32,23 @@ func TestMigrate(t *testing.T) {
 		1580309972,
 	)
 
+	supply := sdk.NewCoins(sdk.NewInt64Coin("stake", 1000))
+
 	bankGenState := v038bank.GenesisState{
 		SendEnabled: true,
 	}
 	authGenState := v039auth.GenesisState{
 		Accounts: v038auth.GenesisAccounts{acc1, vaac},
 	}
+	supplyGenState := v036supply.GenesisState{
+		Supply: supply,
+	}
 
-	migrated := v040bank.Migrate(bankGenState, authGenState)
+	migrated := v040bank.Migrate(bankGenState, authGenState, supplyGenState)
 	expected := `{
-  "send_enabled": true,
+  "params": {
+    "default_send_enabled": true
+  },
   "balances": [
     {
       "address": "cosmos1xxkueklal9vejv9unqu80w9vptyepfa95pd53u",
@@ -60,7 +68,14 @@ func TestMigrate(t *testing.T) {
         }
       ]
     }
-  ]
+  ],
+  "supply": [
+    {
+      "denom": "stake",
+      "amount": "1000"
+    }
+  ],
+  "denom_metadata": []
 }`
 
 	bz, err := v040Codec.MarshalJSONIndent(migrated, "", "  ")

diff --git a/x/bank/legacy/v0_40/types.go b/x/bank/legacy/v0_40/types.go
@@ -11,6 +11,43 @@ const (
 	ModuleName = "bank"
 )
 
+// DenomUnits represents a struct that describes different
+// denominations units of the basic token
+type DenomUnits struct {
+	Denom    string   `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty"`
+	Exponent uint32   `protobuf:"varint,2,opt,name=exponent,proto3" json:"exponent,omitempty"`
+	Aliases  []string `protobuf:"bytes,3,rep,name=aliases,proto3" json:"aliases,omitempty"`
+}
+
+// Metadata represents a struct that describes
+// a basic token
+type Metadata struct {
+	Description string        `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"`
+	DenomUnits  []*DenomUnits `protobuf:"bytes,2,rep,name=denom_units,json=denomUnits,proto3" json:"denom_units,omitempty"`
+	Base        string        `protobuf:"bytes,3,opt,name=base,proto3" json:"base,omitempty"`
+	Display     string        `protobuf:"bytes,4,opt,name=display,proto3" json:"display,omitempty"`
+}
+
+// Send enabled configuration properties for each denomination
+type SendEnabled struct {
+	Denom   string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty"`
+	Enabled bool   `protobuf:"varint,2,opt,name=enabled,proto3" json:"enabled,omitempty"`
+}
+
+// Params defines the set of bank parameters.
+type Params struct {
+	SendEnabled        []*SendEnabled `protobuf:"bytes,1,rep,name=send_enabled,json=sendEnabled,proto3" json:"send_enabled,omitempty" yaml:"send_enabled,omitempty"`
+	DefaultSendEnabled bool           `protobuf:"varint,2,opt,name=default_send_enabled,json=defaultSendEnabled,proto3" json:"default_send_enabled,omitempty" yaml:"default_send_enabled,omitempty"`
+}
+
+// GenesisState defines the bank module's genesis state.
+type GenesisState struct {
+	Params        Params     `protobuf:"bytes,1,opt,name=params,proto3,casttype=Params" json:"params"`
+	Balances      []Balance  `protobuf:"bytes,2,rep,name=balances,proto3,casttype=Balance" json:"balances"`
+	Supply        sdk.Coins  `protobuf:"bytes,3,rep,name=supply,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"supply"`
+	DenomMetadata []Metadata `protobuf:"bytes,4,rep,name=denom_metadata,json=denomMetadata,proto3,casttype=Metadata" json:"denom_metadata" yaml:"denom_metadata"`
+}
+
 var _ GenesisBalance = (*Balance)(nil)
 
 type (
@@ -19,21 +56,12 @@ type (
 		GetCoins() sdk.Coins
 	}
 
-	GenesisState struct {
-		SendEnabled bool      `json:"send_enabled" yaml:"send_enabled"`
-		Balances    []Balance `json:"balances" yaml:"balances"`
-	}
-
 	Balance struct {
 		Address sdk.AccAddress `json:"address" yaml:"address"`
 		Coins   sdk.Coins      `json:"coins" yaml:"coins"`
 	}
 )
 
-func NewGenesisState(sendEnabled bool, balances []Balance) GenesisState {
-	return GenesisState{SendEnabled: sendEnabled, Balances: balances}
-}
-
 func (b Balance) GetAddress() sdk.AccAddress {
 	return b.Address
 }

diff --git a/x/distribution/keeper/genesis.go b/x/distribution/keeper/genesis.go
@@ -37,7 +37,7 @@ func (k Keeper) InitGenesis(ctx sdk.Context, data types.GenesisState) {
 		k.SetDelegatorStartingInfo(ctx, del.ValidatorAddress, del.DelegatorAddress, del.StartingInfo)
 	}
 	for _, evt := range data.ValidatorSlashEvents {
-		k.SetValidatorSlashEvent(ctx, evt.ValidatorAddress, evt.Height, evt.Period, evt.Event)
+		k.SetValidatorSlashEvent(ctx, evt.ValidatorAddress, evt.Height, evt.Period, evt.ValidatorSlashEvent)
 	}
 
 	moduleHoldings = moduleHoldings.Add(data.FeePool.CommunityPool...)
@@ -136,10 +136,10 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) types.GenesisState {
 	k.IterateValidatorSlashEvents(ctx,
 		func(val sdk.ValAddress, height uint64, event types.ValidatorSlashEvent) (stop bool) {
 			slashes = append(slashes, types.ValidatorSlashEventRecord{
-				ValidatorAddress: val,
-				Height:           height,
-				Period:           event.ValidatorPeriod,
-				Event:            event,
+				ValidatorAddress:    val,
+				Height:              height,
+				Period:              event.ValidatorPeriod,
+				ValidatorSlashEvent: event,
 			})
 			return false
 		},

diff --git a/x/distribution/legacy/v0_34/types.go b/x/distribution/legacy/v0_34/types.go
@@ -1,6 +1,6 @@
 // DONTCOVER
 // nolint
-package v0_34
+package v034
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"

diff --git a/x/distribution/legacy/v0_36/migrate.go b/x/distribution/legacy/v0_36/migrate.go
@@ -1,4 +1,4 @@
-package v0_36
+package v036
 
 import (
 	v034distr "github.com/cosmos/cosmos-sdk/x/distribution/legacy/v0_34"

diff --git a/x/distribution/legacy/v0_36/migrate_test.go b/x/distribution/legacy/v0_36/migrate_test.go
@@ -1,4 +1,4 @@
-package v0_36
+package v036
 
 import (
 	"testing"

diff --git a/x/distribution/legacy/v0_36/types.go b/x/distribution/legacy/v0_36/types.go
@@ -1,6 +1,6 @@
 // DONTCOVER
 // nolint
-package v0_36
+package v036
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"

diff --git a/x/distribution/legacy/v0_38/migrate.go b/x/distribution/legacy/v0_38/migrate.go
@@ -1,4 +1,4 @@
-package v0_38
+package v038
 
 // DONTCOVER
 // nolint

diff --git a/x/distribution/legacy/v0_38/types.go b/x/distribution/legacy/v0_38/types.go
@@ -1,4 +1,4 @@
-package v0_38
+package v038
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"