diff --git a/app/app.go b/app/app.go index b5f13a0b0..149c2f24b 100644 --- a/app/app.go +++ b/app/app.go @@ -74,7 +74,6 @@ import ( testnetV21alpha1 "github.com/CosmosContracts/juno/v23/app/upgrades/testnet/v21.0.0-alpha.1" testnetV22alpha1 "github.com/CosmosContracts/juno/v23/app/upgrades/testnet/v22.0.0-alpha.1" testnetV23alpha1 "github.com/CosmosContracts/juno/v23/app/upgrades/testnet/v23.0.0-alpha.1" - v10 "github.com/CosmosContracts/juno/v23/app/upgrades/v10" v11 "github.com/CosmosContracts/juno/v23/app/upgrades/v11" v12 "github.com/CosmosContracts/juno/v23/app/upgrades/v12" @@ -118,7 +117,7 @@ var ( testnetV21alpha1.Upgrade, testnetV22alpha1.Upgrade, testnetV23alpha1.Upgrade, - + v10.Upgrade, v11.Upgrade, v12.Upgrade, diff --git a/app/upgrades/testnet/v23.0.0-alpha.1/constants.go b/app/upgrades/testnet/v23.0.0-alpha.1/constants.go index 0109ac6b2..955dac81f 100644 --- a/app/upgrades/testnet/v23.0.0-alpha.1/constants.go +++ b/app/upgrades/testnet/v23.0.0-alpha.1/constants.go @@ -3,11 +3,12 @@ package v23 import ( "fmt" + icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v7/types" + store "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v7/types" "github.com/CosmosContracts/juno/v23/app/keepers" "github.com/CosmosContracts/juno/v23/app/upgrades" @@ -19,7 +20,7 @@ const UpgradeName = "v2300alpha1" var Upgrade = upgrades.Upgrade{ UpgradeName: UpgradeName, CreateUpgradeHandler: v2300Alpha1UpgradeHandler, - StoreUpgrades: store.StoreUpgrades{ + StoreUpgrades: store.StoreUpgrades{ Added: []string{ // updated modules icqtypes.ModuleName, diff --git a/app/upgrades/v23/upgrades.go b/app/upgrades/v23/upgrades.go index 0105bdadf..3c22af71a 100644 --- a/app/upgrades/v23/upgrades.go +++ b/app/upgrades/v23/upgrades.go @@ -3,15 +3,17 @@ package v23 import ( "fmt" - "github.com/CosmosContracts/juno/v23/app/keepers" - "github.com/CosmosContracts/juno/v23/app/upgrades" + icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v7/types" + "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v7/types" + + "github.com/CosmosContracts/juno/v23/app/keepers" + "github.com/CosmosContracts/juno/v23/app/upgrades" ) func CreateV23UpgradeHandler( @@ -52,7 +54,7 @@ func CreateV23UpgradeHandler( if err != nil { return nil, err } - + logger.Info(fmt.Sprintf("post migrate version map: %v", versionMap)) // convert pob builder account to an actual module account diff --git a/x/tokenfactory/keeper/bankactions.go b/x/tokenfactory/keeper/bankactions.go index 62733944b..051984841 100644 --- a/x/tokenfactory/keeper/bankactions.go +++ b/x/tokenfactory/keeper/bankactions.go @@ -110,6 +110,6 @@ func (k Keeper) forceTransfer(ctx sdk.Context, amount sdk.Coin, fromAddr string, } // IsModuleAcc checks if a given address is restricted -func (k Keeper) IsModuleAcc(ctx sdk.Context, addr sdk.AccAddress) bool { +func (k Keeper) IsModuleAcc(_ sdk.Context, addr sdk.AccAddress) bool { return k.permAddrMap[addr.String()] -} \ No newline at end of file +} diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index b53388e42..30d2fb053 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -16,9 +16,9 @@ import ( type ( Keeper struct { - cdc codec.BinaryCodec - storeKey storetypes.StoreKey - permAddrs map[string]authtypes.PermissionsForAddress + cdc codec.BinaryCodec + storeKey storetypes.StoreKey + permAddrs map[string]authtypes.PermissionsForAddress permAddrMap map[string]bool accountKeeper types.AccountKeeper diff --git a/x/tokenfactory/types/errors.go b/x/tokenfactory/types/errors.go index 8337d7b55..c04cc008c 100644 --- a/x/tokenfactory/types/errors.go +++ b/x/tokenfactory/types/errors.go @@ -20,5 +20,5 @@ var ( ErrCreatorTooLong = errorsmod.Register(ModuleName, 9, fmt.Sprintf("creator too long, max length is %d bytes", MaxCreatorLength)) ErrDenomDoesNotExist = errorsmod.Register(ModuleName, 10, "denom does not exist") ErrCapabilityNotEnabled = errorsmod.Register(ModuleName, 11, "this capability is not enabled on chain") - ErrModuleAccount = errorsmod.Register(ModuleName, 12, "interacting with module accounts not allowed") + ErrModuleAccount = errorsmod.Register(ModuleName, 12, "interacting with module accounts not allowed") )