simplify implementation

go.mod

@@ -54,7 +54,7 @@ require (
 	github.com/tendermint/btcd v0.1.1
 	github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15
 	github.com/tendermint/go-amino v0.16.0
-	github.com/tendermint/tendermint v0.35.8
+	github.com/tendermint/tendermint v0.35.9
 	github.com/tendermint/tm-db v0.6.7
 	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
 	golang.org/x/exp v0.0.0-20220428152302-39d4317da171
@@ -253,13 +253,13 @@ require (
 	go.etcd.io/bbolt v1.3.6 // indirect
 	go.opencensus.io v0.23.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.7.0 // indirect
-	go.uber.org/zap v1.19.1 // indirect
+	go.uber.org/multierr v1.8.0 // indirect
+	go.uber.org/zap v1.21.0 // indirect
 	golang.org/x/exp/typeparams v0.0.0-20220613132600-b0d781184e0d // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
 	golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect
 	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
-	golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect
+	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
 	golang.org/x/sys v0.0.0-20220702020025-31831981b65f // indirect
 	golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
 	golang.org/x/text v0.3.7 // indirect

server/tm_cmds.go

@@ -169,7 +169,9 @@ func makeKeyMigrateCmd() *cobra.Command {
 					return fmt.Errorf("constructing database handle: %w", err)
 				}
 
-				if err = keymigrate.Migrate(ctx, db); err != nil {
+				// Note storeName argument has been added in TM v0.35.9
+				// I have set it to "" - please verify if correct
+				if err = keymigrate.Migrate(ctx, "", db); err != nil {
 					return fmt.Errorf("running migration for context %q: %w",
 						dbctx, err)
 				}

simapp/app.go

@@ -204,7 +204,10 @@ func NewSimApp(
 				// add here your custom function that implements the minttypes.InflationCalculationFn interface.
 
 				// for providing a custom authority to a module simply add it below. By default the governance module is the default authority.
-				// e.g minttypes.MintAuthority(authtypes.NewModuleAddress(govtypes.ModuleName))
+				// map[string]sdk.AccAddress{
+				// 	minttypes.ModuleName: authtypes.NewModuleAddress(authtypes.ModuleName),
+				// 	// ...
+				// },
 			),
 		)
 	)

x/bank/module.go

@@ -228,12 +228,13 @@ func provideModuleBasic() runtime.AppModuleBasicWrapper {
 type bankInputs struct {
 	depinject.In
 
-	Config *modulev1.Module
-	Cdc    codec.Codec
-	Key    *store.KVStoreKey
+	ModuleKey depinject.OwnModuleKey
+	Config    *modulev1.Module
+	Cdc       codec.Codec
+	Key       *store.KVStoreKey
 
 	AccountKeeper types.AccountKeeper
-	Authority     types.BankAuthority `optional:"true"`
+	Authority     map[string]sdk.AccAddress `optional:"true"`
 
 	// LegacySubspace is used solely for migration of x/params managed parameters
 	LegacySubspace exported.Subspace
@@ -263,10 +264,10 @@ func provideModule(in bankInputs) bankOutputs {
 		}
 	}
 
-	authority := in.Authority
-	if authority == nil || len(authority) == 0 {
+	authority, ok := in.Authority[depinject.ModuleKey(in.ModuleKey).Name()]
+	if !ok {
 		// default to governance authority if not provided
-		authority = types.BankAuthority(authtypes.NewModuleAddress(govtypes.ModuleName))
+		authority = authtypes.NewModuleAddress(govtypes.ModuleName)
 	}
 
 	bankKeeper := keeper.NewBaseKeeper(

x/crisis/module.go

@@ -197,11 +197,12 @@ func init() {
 type crisisInputs struct {
 	depinject.In
 
+	ModuleKey depinject.OwnModuleKey
 	Config    *modulev1.Module
 	Key       *store.KVStoreKey
 	Cdc       codec.Codec
-	AppOpts   servertypes.AppOptions `optional:"true"`
-	Authority types.CrisisAuthority  `optional:"true"`
+	AppOpts   servertypes.AppOptions    `optional:"true"`
+	Authority map[string]sdk.AccAddress `optional:"true"`
 
 	BankKeeper types.SupplyKeeper
 
@@ -228,10 +229,10 @@ func provideModule(in crisisInputs) crisisOutputs {
 		feeCollectorName = authtypes.FeeCollectorName
 	}
 
-	authority := in.Authority
-	if authority == nil || len(authority) == 0 {
+	authority, ok := in.Authority[depinject.ModuleKey(in.ModuleKey).Name()]
+	if !ok {
 		// default to governance authority if not provided
-		authority = types.CrisisAuthority(authtypes.NewModuleAddress(govtypes.ModuleName))
+		authority = authtypes.NewModuleAddress(govtypes.ModuleName)
 	}
 
 	k := keeper.NewKeeper(

x/distribution/module.go

@@ -237,10 +237,11 @@ func provideModuleBasic() runtime.AppModuleBasicWrapper {
 type distrInputs struct {
 	depinject.In
 
+	ModuleKey depinject.OwnModuleKey
 	Config    *modulev1.Module
 	Key       *store.KVStoreKey
 	Cdc       codec.Codec
-	Authority types.DistrAuthority `optional:"true"`
+	Authority map[string]sdk.AccAddress `optional:"true"`
 
 	AccountKeeper types.AccountKeeper
 	BankKeeper    types.BankKeeper
@@ -265,10 +266,10 @@ func provideModule(in distrInputs) distrOutputs {
 		feeCollectorName = authtypes.FeeCollectorName
 	}
 
-	authority := in.Authority
-	if authority == nil || len(authority) == 0 {
+	authority, ok := in.Authority[depinject.ModuleKey(in.ModuleKey).Name()]
+	if !ok {
 		// default to governance authority if not provided
-		authority = types.DistrAuthority(authtypes.NewModuleAddress(govtypes.ModuleName))
+		authority = authtypes.NewModuleAddress(govtypes.ModuleName)
 	}
 
 	k := keeper.NewKeeper(

x/mint/module.go

@@ -236,10 +236,11 @@ func provideModuleBasic() runtime.AppModuleBasicWrapper {
 type mintInputs struct {
 	depinject.In
 
+	ModuleKey              depinject.OwnModuleKey
 	Config                 *modulev1.Module
 	Key                    *store.KVStoreKey
 	Cdc                    codec.Codec
-	Authority              types.MintAuthority          `optional:"true"`
+	Authority              map[string]sdk.AccAddress    `optional:"true"`
 	InflationCalculationFn types.InflationCalculationFn `optional:"true"`
 
 	// LegacySubspace is used solely for migration of x/params managed parameters
@@ -263,10 +264,10 @@ func provideModule(in mintInputs) mintOutputs {
 		feeCollectorName = authtypes.FeeCollectorName
 	}
 
-	authority := in.Authority
-	if authority == nil || len(authority) == 0 {
+	authority, ok := in.Authority[depinject.ModuleKey(in.ModuleKey).Name()]
+	if !ok {
 		// default to governance authority if not provided
-		authority = types.MintAuthority(authtypes.NewModuleAddress(govtypes.ModuleName))
+		authority = authtypes.NewModuleAddress(govtypes.ModuleName)
 	}
 
 	k := keeper.NewKeeper(

x/slashing/module.go

@@ -235,10 +235,11 @@ func provideModuleBasic() runtime.AppModuleBasicWrapper {
 type slashingInputs struct {
 	depinject.In
 
+	ModuleKey   depinject.OwnModuleKey
 	Key         *store.KVStoreKey
 	Cdc         codec.Codec
 	LegacyAmino *codec.LegacyAmino
-	Authority   types.SlashingAuthority `optional:"true"`
+	Authority   map[string]sdk.AccAddress `optional:"true"`
 
 	AccountKeeper types.AccountKeeper
 	BankKeeper    types.BankKeeper
@@ -257,10 +258,10 @@ type slashingOutputs struct {
 }
 
 func provideModule(in slashingInputs) slashingOutputs {
-	authority := in.Authority
-	if authority == nil || len(authority) == 0 {
+	authority, ok := in.Authority[depinject.ModuleKey(in.ModuleKey).Name()]
+	if !ok {
 		// default to governance authority if not provided
-		authority = types.SlashingAuthority(authtypes.NewModuleAddress(govtypes.ModuleName))
+		authority = authtypes.NewModuleAddress(govtypes.ModuleName)
 	}
 
 	k := keeper.NewKeeper(in.Cdc, in.LegacyAmino, in.Key, in.StakingKeeper, authority.String())

x/upgrade/module.go

@@ -168,12 +168,13 @@ func provideModuleBasic() runtime.AppModuleBasicWrapper {
 type upgradeInputs struct {
 	depinject.In
 
-	Config *modulev1.Module
-	Key    *store.KVStoreKey
-	Cdc    codec.Codec
+	ModuleKey depinject.OwnModuleKey
+	Config    *modulev1.Module
+	Key       *store.KVStoreKey
+	Cdc       codec.Codec
 
-	AppOpts   servertypes.AppOptions `optional:"true"`
-	Authority types.UpgradeAuthority `optional:"true"`
+	AppOpts   servertypes.AppOptions    `optional:"true"`
+	Authority map[string]sdk.AccAddress `optional:"true"`
 }
 
 type upgradeOutputs struct {
@@ -198,10 +199,10 @@ func provideModule(in upgradeInputs) upgradeOutputs {
 		homePath = cast.ToString(in.AppOpts.Get(flags.FlagHome))
 	}
 
-	authority := in.Authority
-	if authority == nil || len(authority) == 0 {
+	authority, ok := in.Authority[depinject.ModuleKey(in.ModuleKey).Name()]
+	if !ok {
 		// default to governance authority if not provided
-		authority = types.UpgradeAuthority(authtypes.NewModuleAddress(govtypes.ModuleName))
+		authority = authtypes.NewModuleAddress(govtypes.ModuleName)
 	}
 
 	// set the governance module account as the authority for conducting upgrades