Don't load all params (#7074)

x/poolmanager/taker_fee.go

@@ -13,14 +13,21 @@ import (
 	txfeestypes "github.com/osmosis-labs/osmosis/v21/x/txfees/types"
 )
 
+func (k Keeper) GetDefaultTakerFee(ctx sdk.Context) sdk.Dec {
+	var defaultTakerFee sdk.Dec
+	k.paramSpace.Get(ctx, types.KeyDefaultTakerFee, &defaultTakerFee)
+	return defaultTakerFee
+}
+
 // SetDenomPairTakerFee sets the taker fee for the given trading pair.
 // If the taker fee for this denom pair matches the default taker fee, then
 // it is deleted from state.
 func (k Keeper) SetDenomPairTakerFee(ctx sdk.Context, denom0, denom1 string, takerFee osmomath.Dec) {
 	store := ctx.KVStore(k.storeKey)
 	// if given taker fee is equal to the default taker fee,
 	// delete whatever we have in current state to use default taker fee.
-	if takerFee.Equal(k.GetParams(ctx).TakerFeeParams.DefaultTakerFee) {
+	// TODO: This logic is actually wrong imo, where it can be valid to set an override over the default.
+	if takerFee.Equal(k.GetDefaultTakerFee(ctx)) {
 		store.Delete(types.FormatDenomTradePairKey(denom0, denom1))
 		return
 	} else {
@@ -71,7 +78,7 @@ func (k Keeper) GetTradingPairTakerFee(ctx sdk.Context, denom0, denom1 string) (
 		return osmomath.Dec{}, err
 	}
 	if !found {
-		return k.GetParams(ctx).TakerFeeParams.DefaultTakerFee, nil
+		return k.GetDefaultTakerFee(ctx), nil
 	}
 
 	return takerFee.Dec, nil

x/protorev/keeper/rebalance.go

@@ -8,6 +8,8 @@ import (
 	"github.com/osmosis-labs/osmosis/v21/x/protorev/types"
 )
 
+var zeroInt = osmomath.ZeroInt()
+
 // IterateRoutes checks the profitability of every single route that is passed in
 // and returns the optimal route if there is one
 func (k Keeper) IterateRoutes(ctx sdk.Context, routes []RouteMetaData, remainingTxPoolPoints, remainingBlockPoolPoints *uint64) (sdk.Coin, osmomath.Int, poolmanagertypes.SwapAmountInRoutes) {
@@ -30,7 +32,7 @@ func (k Keeper) IterateRoutes(ctx sdk.Context, routes []RouteMetaData, remaining
 		}
 
 		// If the profit is greater than zero, then we convert the profits to uosmo and compare profits in terms of uosmo
-		if profit.GT(osmomath.ZeroInt()) {
+		if profit.GT(zeroInt) {
 			profit, err := k.ConvertProfits(ctx, inputCoin, profit)
 			if err != nil {
 				k.Logger(ctx).Error("Error converting profits: " + err.Error())