From 73f23e2c159306a7bb0afbdb1eba78a4158a25c7 Mon Sep 17 00:00:00 2001 From: dekm Date: Fri, 26 Jan 2024 15:48:56 +0100 Subject: [PATCH] remove cosmos sdk mintmodule as we use ugdmint module for handling minting --- app/app.go | 12 +++++------- app/app_config.go | 25 ++++++++++++++----------- cmd/paxd/cmd/root.go | 1 + go.mod | 2 +- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/app.go b/app/app.go index f06a4ee..c1cc868 100644 --- a/app/app.go +++ b/app/app.go @@ -40,7 +40,6 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" - mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper" paramsclient "github.com/cosmos/cosmos-sdk/x/params/client" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" @@ -89,11 +88,11 @@ type App struct { interfaceRegistry codectypes.InterfaceRegistry // keepers - AccountKeeper authkeeper.AccountKeeper - BankKeeper bankkeeper.Keeper - StakingKeeper *stakingkeeper.Keeper - SlashingKeeper slashingkeeper.Keeper - MintKeeper mintkeeper.Keeper + AccountKeeper authkeeper.AccountKeeper + BankKeeper bankkeeper.Keeper + StakingKeeper *stakingkeeper.Keeper + SlashingKeeper slashingkeeper.Keeper + //MintKeeper mintkeeper.Keeper DistrKeeper distrkeeper.Keeper GovKeeper *govkeeper.Keeper CrisisKeeper *crisiskeeper.Keeper @@ -249,7 +248,6 @@ func New( &app.BankKeeper, &app.StakingKeeper, &app.SlashingKeeper, - &app.MintKeeper, &app.DistrKeeper, &app.GovKeeper, &app.CrisisKeeper, diff --git a/app/app_config.go b/app/app_config.go index 39aef60..f2745b0 100644 --- a/app/app_config.go +++ b/app/app_config.go @@ -17,7 +17,6 @@ import ( genutilmodulev1 "cosmossdk.io/api/cosmos/genutil/module/v1" govmodulev1 "cosmossdk.io/api/cosmos/gov/module/v1" groupmodulev1 "cosmossdk.io/api/cosmos/group/module/v1" - mintmodulev1 "cosmossdk.io/api/cosmos/mint/module/v1" paramsmodulev1 "cosmossdk.io/api/cosmos/params/module/v1" slashingmodulev1 "cosmossdk.io/api/cosmos/slashing/module/v1" stakingmodulev1 "cosmossdk.io/api/cosmos/staking/module/v1" @@ -52,8 +51,9 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/cosmos/cosmos-sdk/x/group" _ "github.com/cosmos/cosmos-sdk/x/group/module" // import for side-effects - _ "github.com/cosmos/cosmos-sdk/x/mint" // import for side-effects - minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" + + //_ "github.com/cosmos/cosmos-sdk/x/mint" // import for side-effects + //minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" _ "github.com/cosmos/cosmos-sdk/x/params" // import for side-effects paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" _ "github.com/cosmos/cosmos-sdk/x/slashing" // import for side-effects @@ -69,6 +69,8 @@ import ( ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" + //mintmodulev1 "github.com/unigrid-project/cosmos-ugdmint/api/cosmos/ugdmint/module/v1" + ugdmintmodulev1 "github.com/unigrid-project/cosmos-ugdmint/api/cosmos/ugdmint/module/v1" _ "github.com/unigrid-project/cosmos-ugdmint/x/ugdmint/module" // import for side-effects ugdmintmoduletypes "github.com/unigrid-project/cosmos-ugdmint/x/ugdmint/types" @@ -103,7 +105,7 @@ var ( stakingtypes.ModuleName, slashingtypes.ModuleName, govtypes.ModuleName, - minttypes.ModuleName, + //minttypes.ModuleName, crisistypes.ModuleName, ibcexported.ModuleName, genutiltypes.ModuleName, @@ -135,7 +137,7 @@ var ( // NOTE: capability module's beginblocker must come before any modules using capabilities (e.g. IBC) beginBlockers = []string{ // cosmos sdk modules - minttypes.ModuleName, + //minttypes.ModuleName, distrtypes.ModuleName, slashingtypes.ModuleName, evidencetypes.ModuleName, @@ -187,7 +189,7 @@ var ( moduleAccPerms = []*authmodulev1.ModuleAccountPermission{ {Account: authtypes.FeeCollectorName}, {Account: distrtypes.ModuleName}, - {Account: minttypes.ModuleName, Permissions: []string{authtypes.Minter}}, + //{Account: minttypes.ModuleName, Permissions: []string{authtypes.Minter}}, {Account: stakingtypes.BondedPoolName, Permissions: []string{authtypes.Burner, stakingtypes.ModuleName}}, {Account: stakingtypes.NotBondedPoolName, Permissions: []string{authtypes.Burner, stakingtypes.ModuleName}}, {Account: govtypes.ModuleName, Permissions: []string{authtypes.Burner}}, @@ -204,7 +206,8 @@ var ( blockAccAddrs = []string{ authtypes.FeeCollectorName, distrtypes.ModuleName, - minttypes.ModuleName, + //minttypes.ModuleName, + ugdmintmoduletypes.ModuleName, stakingtypes.BondedPoolName, stakingtypes.NotBondedPoolName, // We allow the following module accounts to receive funds: @@ -296,10 +299,10 @@ var ( Name: evidencetypes.ModuleName, Config: appconfig.WrapAny(&evidencemodulev1.Module{}), }, - { - Name: minttypes.ModuleName, - Config: appconfig.WrapAny(&mintmodulev1.Module{}), - }, + // { + // Name: minttypes.ModuleName, + // Config: appconfig.WrapAny(&mintmodulev1.Module{}), + // }, { Name: group.ModuleName, Config: appconfig.WrapAny(&groupmodulev1.Module{ diff --git a/cmd/paxd/cmd/root.go b/cmd/paxd/cmd/root.go index 831c50d..266e42d 100644 --- a/cmd/paxd/cmd/root.go +++ b/cmd/paxd/cmd/root.go @@ -63,6 +63,7 @@ func NewRootCmd() *cobra.Command { &moduleBasicManager, &clientCtx, ); err != nil { + fmt.Printf("Error during dependency injection: %+v\n", err) panic(err) } diff --git a/go.mod b/go.mod index b27703d..317b3a1 100644 --- a/go.mod +++ b/go.mod @@ -257,7 +257,7 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -//replace github.com/unigrid-project/cosmos-ugdmint => /home/evan/work/cosmos-sdk-ugdmint +replace github.com/unigrid-project/cosmos-ugdmint => /home/evan/work/cosmos-sdk-ugdmint //replace github.com/unigrid-project/cosmos-unigrid-hedgehog-vesting => /home/evan/work/cosmos-sdk-unigrid-hedgehog-vesting