fix: deprecated use of sdkerrors (#1788)

## Description

Fixes golangci-lint complains about usage of deprecated function

(cherry picked from commit 37909a3)

# Conflicts:
#	x/incentive/errors.go
#	x/leverage/keeper/oracle.go
#	x/oracle/types/errors.go
#	x/uibc/errors.go
#	x/uibc/msg.go
#	x/uibc/quota/ibc_module.go
#	x/uibc/quota/keeper/quota.go
#	x/uibc/quota/keeper/relay.go

app/upgrades.go

@@ -1,9 +1,9 @@
 package app
 
 import (
+	"cosmossdk.io/errors"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	"github.com/cosmos/cosmos-sdk/x/group"
@@ -143,7 +143,7 @@ func (app *UmeeApp) registerUpgrade3_0(upgradeInfo upgradetypes.Plan) {
 			ctx.Logger().Info("Running setupBech32ibcKeeper")
 			err := upgradev3.SetupBech32ibcKeeper(&app.bech32IbcKeeper, ctx)
 			if err != nil {
-				return nil, sdkerrors.Wrapf(
+				return nil, errors.Wrapf(
 					err, "%q Upgrade: Unable to upgrade, bech32ibc module not initialized", planName)
 			}
 
@@ -156,7 +156,7 @@ func (app *UmeeApp) registerUpgrade3_0(upgradeInfo upgradetypes.Plan) {
 			ctx.Logger().Info("Updating validator minimum commission rate param of staking module")
 			minCommissionRate, err := upgradev3.UpdateMinimumCommissionRateParam(ctx, app.StakingKeeper)
 			if err != nil {
-				return vm, sdkerrors.Wrapf(
+				return vm, errors.Wrapf(
 					err, "%q Upgrade: failed to update minimum commission rate param of staking module",
 					planName)
 			}
@@ -165,7 +165,7 @@ func (app *UmeeApp) registerUpgrade3_0(upgradeInfo upgradetypes.Plan) {
 				"name", planName)
 			err = upgradev3.SetMinimumCommissionRateToValidators(ctx, app.StakingKeeper, minCommissionRate)
 			if err != nil {
-				return vm, sdkerrors.Wrapf(
+				return vm, errors.Wrapf(
 					err, "%q Upgrade: failed to update minimum commission rate for validators",
 					planName)
 			}

util/checkers/proposal.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strings"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
@@ -56,3 +57,10 @@ func ValidateProposal(title, description, authority string) error {
 
 	return nil
 }
+
+func ValidateAddr(addr, name string) error {
+	if _, err := sdk.AccAddressFromBech32(addr); err != nil {
+		return sdkerrors.ErrInvalidAddress.Wrapf("invalid %s address: %s", name, err)
+	}
+	return nil
+}

x/ibctransfer/keeper/keeper.go

@@ -4,7 +4,6 @@ import (
 	"strings"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	ibctransferkeeper "github.com/cosmos/ibc-go/v5/modules/apps/transfer/keeper"
 	ibctransfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types"
@@ -64,12 +63,12 @@ func (k Keeper) SendTransfer(
 
 		hash, err := ibctransfertypes.ParseHexHash(hexHash)
 		if err != nil {
-			return sdkerrors.Wrap(ibctransfertypes.ErrInvalidDenomForTransfer, err.Error())
+			return ibctransfertypes.ErrInvalidDenomForTransfer.Wrap(err.Error())
 		}
 
 		denomTrace, ok := k.GetDenomTrace(ctx, hash)
 		if !ok {
-			return sdkerrors.Wrap(ibctransfertypes.ErrTraceNotFound, hexHash)
+			return ibctransfertypes.ErrTraceNotFound.Wrap(hexHash)
 		}
 
 		k.TrackDenomMetadata(ctx, denomTrace)

x/incentive/errors.go

@@ -3,24 +3,30 @@ package incentive
 // DONTCOVER
 
 import (
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	"cosmossdk.io/errors"
 )
 
 var (
 	// 0 = TODO
-	ErrNotImplemented = sdkerrors.Register(ModuleName, 0, "not implemented")
+	ErrNotImplemented = errors.Register(ModuleName, 0, "not implemented")
 
 	// 1XX = General
-	ErrInvalidProgramID = sdkerrors.Register(ModuleName, 100, "invalid program ID")
-	ErrNilAsset         = sdkerrors.Register(ModuleName, 101, "nil asset")
-	ErrInvalidTier      = sdkerrors.Register(ModuleName, 102, "invalid unbonding tier")
-	ErrEmptyAddress     = sdkerrors.Register(ModuleName, 103, "empty address")
+	ErrInvalidProgramID = errors.Register(ModuleName, 100, "invalid program ID")
+	ErrNilAsset         = errors.Register(ModuleName, 101, "nil asset")
+	ErrInvalidTier      = errors.Register(ModuleName, 102, "invalid unbonding tier")
+	ErrEmptyAddress     = errors.Register(ModuleName, 103, "empty address")
 
 	// 2XX = Params
-	ErrUnbondingTierOrder   = sdkerrors.Register(ModuleName, 200, "unbonding tier lock durations out of order")
-	ErrUnbondingWeightOrder = sdkerrors.Register(ModuleName, 201, "unbonding tier weights out of order")
+	ErrUnbondingTierOrder   = errors.Register(ModuleName, 200, "unbonding tier lock durations out of order")
+	ErrUnbondingWeightOrder = errors.Register(ModuleName, 201, "unbonding tier weights out of order")
 
 	// 3XX = Gov Proposal
+<<<<<<< HEAD
 	ErrNonzeroRemainingRewards = sdkerrors.Register(ModuleName, 300, "remaining rewards must be zero in proposal")
 	ErrNonzeroFundedRewards    = sdkerrors.Register(ModuleName, 301, "funded rewards must be zero in proposal")
+=======
+	ErrNonzeroRemainingRewards = errors.Register(ModuleName, 300, "remaining rewards must be zero in proposal")
+	ErrNonzeroFundedRewards    = errors.Register(ModuleName, 301, "funded rewards must be zero in proposal")
+	ErrEmptyProposal           = errors.Register(ModuleName, 302, "proposal contains no incentive programs")
+>>>>>>> 37909a3 (fix: deprecated use of sdkerrors (#1788))
 )

x/incentive/msgs.go

@@ -1,8 +1,8 @@
 package incentive
 
 import (
+	"cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
 	"github.com/umee-network/umee/v4/util/checkers"
 	leveragetypes "github.com/umee-network/umee/v4/x/leverage/types"
@@ -241,7 +241,7 @@ func (ip IncentiveProgram) Validate() error {
 	}
 	if !leveragetypes.HasUTokenPrefix(ip.Denom) {
 		// only allow uToken denoms
-		return sdkerrors.Wrap(leveragetypes.ErrNotUToken, ip.Denom)
+		return errors.Wrap(leveragetypes.ErrNotUToken, ip.Denom)
 	}
 
 	// TODO: Finish validate logic

x/leverage/keeper/exchange_rate.go

@@ -2,7 +2,6 @@ package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
 	"github.com/umee-network/umee/v4/x/leverage/types"
 )
@@ -16,7 +15,7 @@ func (k Keeper) ExchangeToken(ctx sdk.Context, token sdk.Coin) (sdk.Coin, error)
 
 	uTokenDenom := types.ToUTokenDenom(token.Denom)
 	if uTokenDenom == "" {
-		return sdk.Coin{}, sdkerrors.Wrap(types.ErrUToken, token.Denom)
+		return sdk.Coin{}, types.ErrUToken.Wrap(token.Denom)
 	}
 
 	exchangeRate := k.DeriveExchangeRate(ctx, token.Denom)
@@ -34,7 +33,7 @@ func (k Keeper) ExchangeUToken(ctx sdk.Context, uToken sdk.Coin) (sdk.Coin, erro
 
 	tokenDenom := types.ToTokenDenom(uToken.Denom)
 	if tokenDenom == "" {
-		return sdk.Coin{}, sdkerrors.Wrap(types.ErrNotUToken, uToken.Denom)
+		return sdk.Coin{}, types.ErrNotUToken.Wrap(uToken.Denom)
 	}
 
 	exchangeRate := k.DeriveExchangeRate(ctx, tokenDenom)

x/leverage/keeper/keeper.go

@@ -6,7 +6,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	"github.com/tendermint/tendermint/libs/log"
@@ -126,7 +125,7 @@ func (k Keeper) Withdraw(ctx sdk.Context, supplierAddr sdk.AccAddress, uToken sd
 	// Ensure module account has sufficient unreserved tokens to withdraw
 	availableAmount := k.AvailableLiquidity(ctx, token.Denom)
 	if token.Amount.GT(availableAmount) {
-		return sdk.Coin{}, sdkerrors.Wrap(types.ErrLendingPoolInsufficient, token.String())
+		return sdk.Coin{}, types.ErrLendingPoolInsufficient.Wrap(token.String())
 	}
 
 	// Withdraw will first attempt to use any uTokens in the supplier's wallet

x/leverage/keeper/oracle.go

@@ -1,14 +1,22 @@
 package keeper
 
 import (
+<<<<<<< HEAD
 	"strings"
 
+=======
+	"cosmossdk.io/errors"
+>>>>>>> 37909a3 (fix: deprecated use of sdkerrors (#1788))
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
+<<<<<<< HEAD
 	oracletypes "github.com/umee-network/umee/v4/x/oracle/types"
 
+=======
+	"github.com/umee-network/umee/v4/util/sdkutil"
+>>>>>>> 37909a3 (fix: deprecated use of sdkerrors (#1788))
 	"github.com/umee-network/umee/v4/x/leverage/types"
+	oracletypes "github.com/umee-network/umee/v4/x/oracle/types"
 )
 
 var ten = sdk.MustNewDecFromStr("10")
@@ -35,7 +43,7 @@ func (k Keeper) TokenPrice(ctx sdk.Context, baseDenom string, mode types.PriceMo
 		// spot price is required for modes other than historic
 		spotPrice, err = k.oracleKeeper.GetExchangeRate(ctx, t.SymbolDenom)
 		if err != nil {
-			return sdk.ZeroDec(), t.Exponent, sdkerrors.Wrap(err, "oracle")
+			return sdk.ZeroDec(), t.Exponent, errors.Wrap(err, "oracle")
 		}
 	}
 	if mode != types.PriceModeSpot {
@@ -44,7 +52,7 @@ func (k Keeper) TokenPrice(ctx sdk.Context, baseDenom string, mode types.PriceMo
 		historicPrice, numStamps, err = k.oracleKeeper.MedianOfHistoricMedians(
 			ctx, strings.ToUpper(t.SymbolDenom), uint64(t.HistoricMedians))
 		if err != nil {
-			return sdk.ZeroDec(), t.Exponent, sdkerrors.Wrap(err, "oracle")
+			return sdk.ZeroDec(), t.Exponent, errors.Wrap(err, "oracle")
 		}
 		if numStamps < t.HistoricMedians {
 			return sdk.ZeroDec(), t.Exponent, types.ErrNoHistoricMedians.Wrapf(
@@ -69,7 +77,7 @@ func (k Keeper) TokenPrice(ctx sdk.Context, baseDenom string, mode types.PriceMo
 	}
 
 	if price.IsNil() || !price.IsPositive() {
-		return sdk.ZeroDec(), t.Exponent, sdkerrors.Wrap(types.ErrInvalidOraclePrice, baseDenom)
+		return sdk.ZeroDec(), t.Exponent, types.ErrInvalidOraclePrice.Wrap(baseDenom)
 	}
 
 	return price, t.Exponent, nil

x/leverage/keeper/token.go

@@ -2,7 +2,6 @@ package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/umee-network/umee/v4/x/leverage/types"
 )
 
@@ -33,7 +32,7 @@ func (k Keeper) GetTokenSettings(ctx sdk.Context, denom string) (types.Token, er
 	token := types.Token{}
 	bz := store.Get(tokenKey)
 	if len(bz) == 0 {
-		return token, sdkerrors.Wrap(types.ErrNotRegisteredToken, denom)
+		return token, types.ErrNotRegisteredToken.Wrap(denom)
 	}
 
 	err := k.cdc.Unmarshal(bz, &token)

x/leverage/types/errors.go

@@ -3,57 +3,57 @@ package types
 // DONTCOVER
 
 import (
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	"cosmossdk.io/errors"
 )
 
 var (
 	// 1XX = General Validation
-	ErrEmptyAddress     = sdkerrors.Register(ModuleName, 100, "empty address")
-	ErrNilAsset         = sdkerrors.Register(ModuleName, 101, "nil asset")
-	ErrGetAmount        = sdkerrors.Register(ModuleName, 102, "retrieved invalid amount")
-	ErrSetAmount        = sdkerrors.Register(ModuleName, 103, "cannot set invalid amount")
-	ErrInvalidPriceMode = sdkerrors.Register(ModuleName, 104, "invalid price mode")
+	ErrEmptyAddress     = errors.Register(ModuleName, 100, "empty address")
+	ErrNilAsset         = errors.Register(ModuleName, 101, "nil asset")
+	ErrGetAmount        = errors.Register(ModuleName, 102, "retrieved invalid amount")
+	ErrSetAmount        = errors.Register(ModuleName, 103, "cannot set invalid amount")
+	ErrInvalidPriceMode = errors.Register(ModuleName, 104, "invalid price mode")
 
 	// 2XX = Token Registry
-	ErrNotRegisteredToken   = sdkerrors.Register(ModuleName, 200, "not a registered Token")
-	ErrUToken               = sdkerrors.Register(ModuleName, 201, "denom should not be a uToken")
-	ErrNotUToken            = sdkerrors.Register(ModuleName, 202, "denom should be a uToken")
-	ErrSupplyNotAllowed     = sdkerrors.Register(ModuleName, 203, "supplying of Token disabled")
-	ErrBorrowNotAllowed     = sdkerrors.Register(ModuleName, 204, "borrowing of Token disabled")
-	ErrBlacklisted          = sdkerrors.Register(ModuleName, 205, "blacklisted Token")
-	ErrDuplicateToken       = sdkerrors.Register(ModuleName, 207, "duplicate token")
-	ErrCollateralWeightZero = sdkerrors.Register(ModuleName, 206,
+	ErrNotRegisteredToken   = errors.Register(ModuleName, 200, "not a registered Token")
+	ErrUToken               = errors.Register(ModuleName, 201, "denom should not be a uToken")
+	ErrNotUToken            = errors.Register(ModuleName, 202, "denom should be a uToken")
+	ErrSupplyNotAllowed     = errors.Register(ModuleName, 203, "supplying of Token disabled")
+	ErrBorrowNotAllowed     = errors.Register(ModuleName, 204, "borrowing of Token disabled")
+	ErrBlacklisted          = errors.Register(ModuleName, 205, "blacklisted Token")
+	ErrDuplicateToken       = errors.Register(ModuleName, 207, "duplicate token")
+	ErrCollateralWeightZero = errors.Register(ModuleName, 206,
 		"collateral weight of Token is zero: can't be used as a collateral")
 
 	// 3XX = User Positions
-	ErrInsufficientBalance    = sdkerrors.Register(ModuleName, 300, "insufficient balance")
-	ErrInsufficientCollateral = sdkerrors.Register(ModuleName, 301, "insufficient collateral")
-	ErrLiquidationRepayZero   = sdkerrors.Register(ModuleName, 303, "liquidation would repay zero tokens")
+	ErrInsufficientBalance    = errors.Register(ModuleName, 300, "insufficient balance")
+	ErrInsufficientCollateral = errors.Register(ModuleName, 301, "insufficient collateral")
+	ErrLiquidationRepayZero   = errors.Register(ModuleName, 303, "liquidation would repay zero tokens")
 
 	// 4XX = Price Sensitive
-	ErrBadValue              = sdkerrors.Register(ModuleName, 400, "bad USD value")
-	ErrInvalidOraclePrice    = sdkerrors.Register(ModuleName, 401, "invalid oracle price")
-	ErrUndercollaterized     = sdkerrors.Register(ModuleName, 402, "borrow positions are undercollaterized")
-	ErrLiquidationIneligible = sdkerrors.Register(ModuleName, 403, "borrower not eligible for liquidation")
-	ErrNoHistoricMedians     = sdkerrors.Register(ModuleName, 405, "insufficient historic medians available")
+	ErrBadValue              = errors.Register(ModuleName, 400, "bad USD value")
+	ErrInvalidOraclePrice    = errors.Register(ModuleName, 401, "invalid oracle price")
+	ErrUndercollaterized     = errors.Register(ModuleName, 402, "borrow positions are undercollaterized")
+	ErrLiquidationIneligible = errors.Register(ModuleName, 403, "borrower not eligible for liquidation")
+	ErrNoHistoricMedians     = errors.Register(ModuleName, 405, "insufficient historic medians available")
 
 	// 5XX = Market Conditions
-	ErrLendingPoolInsufficient = sdkerrors.Register(ModuleName, 500, "lending pool insufficient")
-	ErrMaxSupplyUtilization    = sdkerrors.Register(ModuleName, 501, "market would exceed MaxSupplyUtilization")
-	ErrMinCollateralLiquidity  = sdkerrors.Register(ModuleName, 502, "market would fall below MinCollateralLiquidity")
-	ErrMaxCollateralShare      = sdkerrors.Register(ModuleName, 503, "market would exceed MaxCollateralShare")
-	ErrMaxSupply               = sdkerrors.Register(ModuleName, 504, "market would exceed MaxSupply")
+	ErrLendingPoolInsufficient = errors.Register(ModuleName, 500, "lending pool insufficient")
+	ErrMaxSupplyUtilization    = errors.Register(ModuleName, 501, "market would exceed MaxSupplyUtilization")
+	ErrMinCollateralLiquidity  = errors.Register(ModuleName, 502, "market would fall below MinCollateralLiquidity")
+	ErrMaxCollateralShare      = errors.Register(ModuleName, 503, "market would exceed MaxCollateralShare")
+	ErrMaxSupply               = errors.Register(ModuleName, 504, "market would exceed MaxSupply")
 
 	// 6XX = Internal Failsafes
-	ErrInvalidUtilization      = sdkerrors.Register(ModuleName, 600, "invalid token utilization")
-	ErrNegativeTotalBorrowed   = sdkerrors.Register(ModuleName, 601, "total borrowed was negative")
-	ErrNegativeAPY             = sdkerrors.Register(ModuleName, 602, "negative APY")
-	ErrNegativeTimeElapsed     = sdkerrors.Register(ModuleName, 603, "negative time elapsed since last interest time")
-	ErrInvalidExchangeRate     = sdkerrors.Register(ModuleName, 604, "exchange rate less than one")
-	ErrInconsistentTotalBorrow = sdkerrors.Register(ModuleName, 605, "total adjusted borrow inconsistency")
-	ErrExcessiveTimeElapsed    = sdkerrors.Register(ModuleName, 606, "excessive time elapsed since last interest time")
+	ErrInvalidUtilization      = errors.Register(ModuleName, 600, "invalid token utilization")
+	ErrNegativeTotalBorrowed   = errors.Register(ModuleName, 601, "total borrowed was negative")
+	ErrNegativeAPY             = errors.Register(ModuleName, 602, "negative APY")
+	ErrNegativeTimeElapsed     = errors.Register(ModuleName, 603, "negative time elapsed since last interest time")
+	ErrInvalidExchangeRate     = errors.Register(ModuleName, 604, "exchange rate less than one")
+	ErrInconsistentTotalBorrow = errors.Register(ModuleName, 605, "total adjusted borrow inconsistency")
+	ErrExcessiveTimeElapsed    = errors.Register(ModuleName, 606, "excessive time elapsed since last interest time")
 
 	// 7XX = Disabled Functionality
-	ErrNotLiquidatorNode = sdkerrors.Register(ModuleName, 700, "node has disabled liquidator queries")
-	ErrNotImplemented    = sdkerrors.Register(ModuleName, 701, "not implemented")
+	ErrNotLiquidatorNode = errors.Register(ModuleName, 700, "node has disabled liquidator queries")
+	ErrNotImplemented    = errors.Register(ModuleName, 701, "not implemented")
 )

x/leverage/types/genesis.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 // NewGenesisState creates a new GenesisState object
@@ -95,7 +94,7 @@ func (gs GenesisState) Validate() error {
 		}
 
 		if rate.Scalar.LT(sdk.OneDec()) {
-			return sdkerrors.Wrap(ErrInvalidExchangeRate, rate.String())
+			return ErrInvalidExchangeRate.Wrap(rate.String())
 		}
 	}
 

x/leverage/types/msgs.go

@@ -1,8 +1,8 @@
 package types
 
 import (
+	"cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
 	"github.com/umee-network/umee/v4/util/checkers"
 	"gopkg.in/yaml.v3"
@@ -42,7 +42,7 @@ func (msg MsgGovUpdateRegistry) ValidateBasic() error {
 
 	for _, token := range msg.AddTokens {
 		if err := token.Validate(); err != nil {
-			return sdkerrors.Wrap(err, "token")
+			return errors.Wrap(err, "token")
 		}
 	}
 
@@ -52,7 +52,7 @@ func (msg MsgGovUpdateRegistry) ValidateBasic() error {
 
 	for _, token := range msg.UpdateTokens {
 		if err := token.Validate(); err != nil {
-			return sdkerrors.Wrap(err, "token")
+			return errors.Wrap(err, "token")
 		}
 	}
 
@@ -75,7 +75,7 @@ func validateRegistryTokenDenoms(tokens []Token) error {
 	tokenDenoms := map[string]bool{}
 	for _, token := range tokens {
 		if _, ok := tokenDenoms[token.BaseDenom]; ok {
-			return sdkerrors.Wrapf(ErrDuplicateToken, "duplicate token with baseDenom %s", token.BaseDenom)
+			return ErrDuplicateToken.Wrapf("duplicate token with baseDenom %s", token.BaseDenom)
 		}
 		tokenDenoms[token.BaseDenom] = true
 	}