batching delegations and undelegations

app/upgrades/v14/upgrades.go

@@ -313,7 +313,7 @@ func ClearPendingQueries(ctx sdk.Context, k icqkeeper.Keeper) {
 func EnableLSMForGaia(ctx sdk.Context, k stakeibckeeper.Keeper) error {
 	hostZone, found := k.GetHostZone(ctx, GaiaChainId)
 	if !found {
-		return stakeibctypes.ErrHostZoneNotFound.Wrapf(GaiaChainId)
+		return stakeibctypes.ErrHostZoneNotFound.Wrap(GaiaChainId)
 	}
 
 	hostZone.LsmLiquidStakeEnabled = true

app/upgrades/v6/upgrades.go

@@ -1,8 +1,6 @@
 package v6
 
 import (
-	"fmt"
-
 	errorsmod "cosmossdk.io/errors"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -29,7 +27,7 @@ func CreateUpgradeHandler(
 		airdropClaimTypes := []string{"stride", "gaia", "osmosis", "juno", "stars"}
 		for _, claimType := range airdropClaimTypes {
 			if err := claimKeeper.ResetClaimStatus(ctx, claimType); err != nil {
-				return vm, errorsmod.Wrapf(err, fmt.Sprintf("unable to reset %s claim status", claimType))
+				return vm, errorsmod.Wrapf(err, "unable to reset %s claim status", claimType)
 			}
 		}
 		return mm.RunMigrations(ctx, configurator, vm)

app/upgrades/v8/upgrades.go

@@ -1,7 +1,6 @@
 package v8
 
 import (
-	"fmt"
 	"time"
 
 	errorsmod "cosmossdk.io/errors"
@@ -45,7 +44,7 @@ func CreateUpgradeHandler(
 		ctx.Logger().Info("Resetting airdrop claims...")
 		for _, claimType := range ResetAirdropIdentifiers {
 			if err := claimKeeper.ResetClaimStatus(ctx, claimType); err != nil {
-				return vm, errorsmod.Wrapf(err, fmt.Sprintf("unable to reset %s claim status", claimType))
+				return vm, errorsmod.Wrapf(err, "unable to reset %s claim status", claimType)
 			}
 		}
 

x/airdrop/keeper/query.go

@@ -32,7 +32,7 @@ func (k Keeper) Airdrop(goCtx context.Context, req *types.QueryAirdropRequest) (
 	if err == types.ErrAirdropNotStarted || err == types.ErrAirdropEnded {
 		currentDateIndex = -1
 	} else if err != nil {
-		return nil, status.Errorf(codes.FailedPrecondition, err.Error())
+		return nil, status.Error(codes.FailedPrecondition, err.Error())
 	}
 
 	airdropResponse := types.QueryAirdropResponse{
@@ -148,7 +148,7 @@ func (k Keeper) UserSummary(goCtx context.Context, req *types.QueryUserSummaryRe
 	} else if err == types.ErrAirdropNotStarted || err == types.ErrAirdropEnded {
 		claimable = sdkmath.ZeroInt()
 	} else {
-		return nil, status.Errorf(codes.FailedPrecondition, err.Error())
+		return nil, status.Error(codes.FailedPrecondition, err.Error())
 	}
 
 	claimType := types.CLAIM_DAILY

x/autopilot/keeper/airdrop.go

@@ -40,7 +40,7 @@ func (k Keeper) TryUpdateAirdropClaim(
 	// grab relevant addresses
 	senderStrideAddress := utils.ConvertAddressToStrideAddress(transferMetadata.Sender)
 	if senderStrideAddress == "" {
-		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, fmt.Sprintf("invalid sender address (%s)", transferMetadata.Sender))
+		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid sender address (%s)", transferMetadata.Sender)
 	}
 	newStrideAddress := transferMetadata.Receiver
 

x/autopilot/types/parser.go

@@ -79,7 +79,7 @@ func ParseAutopilotMetadata(metadata string) (*AutopilotMetadata, error) {
 		middlewareModulesEnabled++
 	}
 	if middlewareModulesEnabled > 1 {
-		return nil, errorsmod.Wrapf(ErrInvalidPacketMetadata,
+		return nil, errorsmod.Wrap(ErrInvalidPacketMetadata,
 			"only one of autopilot, pfm, and wasm can both be used in the same packet")
 	}
 
@@ -91,7 +91,7 @@ func ParseAutopilotMetadata(metadata string) (*AutopilotMetadata, error) {
 
 	// Confirm a receiver address was supplied
 	if _, err := sdk.AccAddressFromBech32(raw.Autopilot.Receiver); err != nil {
-		return nil, errorsmod.Wrapf(ErrInvalidPacketMetadata, ErrInvalidReceiverAddress.Error())
+		return nil, errorsmod.Wrap(ErrInvalidPacketMetadata, ErrInvalidReceiverAddress.Error())
 	}
 
 	// Parse the packet info into the specific module type
@@ -111,12 +111,12 @@ func ParseAutopilotMetadata(metadata string) (*AutopilotMetadata, error) {
 		routingInfo = *raw.Autopilot.Claim
 	}
 	if moduleCount != 1 {
-		return nil, errorsmod.Wrapf(ErrInvalidPacketMetadata, ErrInvalidModuleRoutes.Error())
+		return nil, errorsmod.Wrap(ErrInvalidPacketMetadata, ErrInvalidModuleRoutes.Error())
 	}
 
 	// Validate the packet info according to the specific module type
 	if err := routingInfo.Validate(); err != nil {
-		return nil, errorsmod.Wrapf(err, ErrInvalidPacketMetadata.Error())
+		return nil, errorsmod.Wrap(err, ErrInvalidPacketMetadata.Error())
 	}
 
 	return &AutopilotMetadata{

x/icacallbacks/ibc_module.go

@@ -140,9 +140,7 @@ func (im IBCModule) OnTimeoutPacket(
 	}
 
 	if err := im.keeper.CallRegisteredICACallback(ctx, packet, &ackResponse); err != nil {
-		errMsg := fmt.Sprintf("Unable to call registered ICACallback from OnTimeoutPacket, Packet: %+v", packet)
-		im.keeper.Logger(ctx).Error(errMsg)
-		return errorsmod.Wrapf(types.ErrCallbackFailed, errMsg)
+		return errorsmod.Wrapf(err, "Unable to call registered ICACallback from OnTimeoutPacket, Packet: %+v", packet)
 	}
 	return nil
 }

x/icacallbacks/migrations/v2/convert.go

@@ -74,14 +74,14 @@ func convertCallbackData(oldCallbackData icacallbacktypes.CallbackData) (icacall
 		// Deserialize the callback args with the old DelegateCallback type
 		oldDelegateCallback := oldstakeibctypes.DelegateCallback{}
 		if err := proto.Unmarshal(oldCallbackData.CallbackArgs, &oldDelegateCallback); err != nil {
-			return icacallbacktypes.CallbackData{}, errorsmod.Wrapf(stakeibctypes.ErrUnmarshalFailure, err.Error())
+			return icacallbacktypes.CallbackData{}, errorsmod.Wrapf(err, "failed to unmarshal")
 		}
 
 		// Convert and serialize with the new DelegateCallback type
 		newDelegateCallback := convertDelegateCallback(oldDelegateCallback)
 		newDelegateCallbackBz, err := proto.Marshal(&newDelegateCallback)
 		if err != nil {
-			return icacallbacktypes.CallbackData{}, errorsmod.Wrapf(stakeibctypes.ErrMarshalFailure, err.Error())
+			return icacallbacktypes.CallbackData{}, errorsmod.Wrapf(err, "failed to marshal")
 		}
 
 		// Update the CallbackData with the new args
@@ -91,14 +91,14 @@ func convertCallbackData(oldCallbackData icacallbacktypes.CallbackData) (icacall
 		// Deserialize the callback args with the old UndelegateCallback type
 		oldUndelegateCallback := oldstakeibctypes.UndelegateCallback{}
 		if err := proto.Unmarshal(oldCallbackData.CallbackArgs, &oldUndelegateCallback); err != nil {
-			return icacallbacktypes.CallbackData{}, errorsmod.Wrapf(stakeibctypes.ErrUnmarshalFailure, err.Error())
+			return icacallbacktypes.CallbackData{}, errorsmod.Wrapf(err, "failed to unmarshal")
 		}
 
 		// Convert and serialize with the new UndelegateCallback type
 		newUndelegateCallback := convertUndelegateCallback(oldUndelegateCallback)
 		newUndelegateCallbackBz, err := proto.Marshal(&newUndelegateCallback)
 		if err != nil {
-			return icacallbacktypes.CallbackData{}, errorsmod.Wrapf(stakeibctypes.ErrMarshalFailure, err.Error())
+			return icacallbacktypes.CallbackData{}, errorsmod.Wrapf(err, "failed to marshal")
 		}
 
 		// Update the CallbackData with the new args
@@ -108,14 +108,14 @@ func convertCallbackData(oldCallbackData icacallbacktypes.CallbackData) (icacall
 		// Deserialize the callback args with the old RebalanceCallback type
 		oldRebalanceCallback := oldstakeibctypes.RebalanceCallback{}
 		if err := proto.Unmarshal(oldCallbackData.CallbackArgs, &oldRebalanceCallback); err != nil {
-			return icacallbacktypes.CallbackData{}, errorsmod.Wrapf(stakeibctypes.ErrUnmarshalFailure, err.Error())
+			return icacallbacktypes.CallbackData{}, errorsmod.Wrapf(err, "failed to unmarshal")
 		}
 
 		// Convert and serialize with the new RebalanceCallback type
 		newRebalanceCallback := convertRebalanceCallback(oldRebalanceCallback)
 		newRebalanceCallbackBz, err := proto.Marshal(&newRebalanceCallback)
 		if err != nil {
-			return icacallbacktypes.CallbackData{}, errorsmod.Wrapf(stakeibctypes.ErrMarshalFailure, err.Error())
+			return icacallbacktypes.CallbackData{}, errorsmod.Wrapf(err, "failed to marshal")
 		}
 
 		// Update the CallbackData with the new args

x/icacallbacks/migrations/v2/convert_test.go

@@ -161,7 +161,7 @@ func TestConvertCallbackData_Delegate_Error(t *testing.T) {
 
 	// The convert function should fail since it cannot unmarshal the callback args into a DelegateCallback
 	_, err := convertCallbackData(oldCallbackData)
-	require.ErrorContains(t, err, "unable to unmarshal data structure")
+	require.ErrorContains(t, err, "failed to unmarshal")
 }
 
 func TestConvertCallbackData_Rebalance_Success(t *testing.T) {
@@ -207,7 +207,7 @@ func TestConvertCallbackData_Rebalance_Error(t *testing.T) {
 
 	// The convert function should fail since it cannot unmarshal the callback args into a RebalanceCallback
 	_, err := convertCallbackData(oldCallbackData)
-	require.ErrorContains(t, err, "unable to unmarshal data structure")
+	require.ErrorContains(t, err, "failed to unmarshal")
 }
 
 func TestConvertCallbackData_Other(t *testing.T) {

x/mint/types/params.go

@@ -194,7 +194,7 @@ func validateDistributionProportions(i interface{}) error {
 	totalProportions := v.Staking.Add(v.CommunityPoolGrowth).Add(v.CommunityPoolSecurityBudget).Add(v.StrategicReserve)
 
 	if !totalProportions.Equal(sdk.NewDec(1)) {
-		return fmt.Errorf(fmt.Sprintf("total distributions ratio should be 1, instead got %s", totalProportions.String()))
+		return fmt.Errorf("total distributions ratio should be 1, instead got %s", totalProportions.String())
 	}
 
 	return nil