update implementations

proto/umee/oracle/v1/oracle.proto

@@ -146,9 +146,7 @@ message AvgCounter {
 
 // ExchangeRate stores exchange rate with timestamp
 message ExchangeRate {
-  option (gogoproto.equal)            = false;
-  option (gogoproto.goproto_getters)  = false;
-  option (gogoproto.goproto_stringer) = false;
+  option (gogoproto.equal) = false;
 
   string rate = 1 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",

x/leverage/keeper/oracle.go

@@ -31,7 +31,8 @@ func (k Keeper) TokenPrice(ctx sdk.Context, baseDenom string, mode types.PriceMo
 		mode = types.PriceModeSpot
 	}
 
-	var price, spotPrice, historicPrice sdk.Dec
+	var price, historicPrice sdk.Dec
+	var spotPrice oracletypes.ExchangeRate
 	if mode != types.PriceModeHistoric {
 		// spot price is required for modes other than historic
 		spotPrice, err = k.oracleKeeper.GetExchangeRate(ctx, t.SymbolDenom)
@@ -58,13 +59,13 @@ func (k Keeper) TokenPrice(ctx sdk.Context, baseDenom string, mode types.PriceMo
 
 	switch mode {
 	case types.PriceModeSpot:
-		price = spotPrice
+		price = spotPrice.Rate
 	case types.PriceModeHistoric:
 		price = historicPrice
 	case types.PriceModeHigh:
-		price = sdk.MaxDec(spotPrice, historicPrice)
+		price = sdk.MaxDec(spotPrice.Rate, historicPrice)
 	case types.PriceModeLow:
-		price = sdk.MinDec(spotPrice, historicPrice)
+		price = sdk.MinDec(spotPrice.Rate, historicPrice)
 	default:
 		return sdk.ZeroDec(), t.Exponent, types.ErrInvalidPriceMode.Wrapf("%d", mode)
 	}

x/leverage/types/expected_types.go

@@ -3,6 +3,8 @@ package types
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+
+	oracle "github.com/umee-network/umee/v6/x/oracle/types"
 )
 
 // AccountKeeper defines the expected account keeper used for leverage simulations (noalias)
@@ -31,6 +33,6 @@ type BankKeeper interface {
 
 // OracleKeeper defines the expected x/oracle keeper interface.
 type OracleKeeper interface {
-	GetExchangeRate(ctx sdk.Context, denom string) (sdk.Dec, error)
+	GetExchangeRate(ctx sdk.Context, denom string) (oracle.ExchangeRate, error)
 	MedianOfHistoricMedians(ctx sdk.Context, denom string, numStamps uint64) (sdk.Dec, uint32, error)
 }

x/oracle/keeper/grpc_query.go

@@ -52,6 +52,8 @@ func (q querier) ExchangeRates(
 
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
+	// TODO: need to decide if we want to return DecCoins here or list of ExchangeRates with denoms (we
+	// need the latter for genesis anyway)
 	var exchangeRates sdk.DecCoins
 
 	if len(req.Denom) > 0 {
@@ -60,7 +62,7 @@ func (q querier) ExchangeRates(
 			return nil, err
 		}
 
-		exchangeRates = exchangeRates.Add(sdk.NewDecCoinFromDec(req.Denom, exchangeRate))
+		exchangeRates = exchangeRates.Add(sdk.NewDecCoinFromDec(req.Denom, exchangeRate.Rate))
 	} else {
 		q.IterateExchangeRates(ctx, func(denom string, rate sdk.Dec) (stop bool) {
 			exchangeRates = exchangeRates.Add(sdk.NewDecCoinFromDec(denom, rate))

x/oracle/keeper/keeper.go

@@ -2,7 +2,6 @@ package keeper
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
@@ -84,6 +83,7 @@ func (k Keeper) GetExchangeRate(ctx sdk.Context, symbol string) (types.ExchangeR
 
 // GetExchangeRateBase gets the consensus exchange rate of an asset
 // in the base denom (e.g. ATOM -> uatom)
+// TODO: needs to return timestamp as well
 func (k Keeper) GetExchangeRateBase(ctx sdk.Context, denom string) (sdk.Dec, error) {
 	var symbol string
 	var exponent uint64
@@ -106,7 +106,7 @@ func (k Keeper) GetExchangeRateBase(ctx sdk.Context, denom string) (sdk.Dec, err
 	}
 
 	powerReduction := ten.Power(exponent)
-	return exchangeRate.Quo(powerReduction), nil
+	return exchangeRate.Rate.Quo(powerReduction), nil
 }
 
 // SetExchangeRate sets the consensus exchange rate of USD denominated in the
@@ -127,6 +127,7 @@ func (k Keeper) SetExchangeRateWithEvent(ctx sdk.Context, denom string, exchange
 }
 
 // IterateExchangeRates iterates over all USD rates in the store.
+// TODO: handler should use ExchangeRate type rather than Dec
 func (k Keeper) IterateExchangeRates(ctx sdk.Context, handler func(string, sdk.Dec) bool) {
 	store := ctx.KVStore(k.storeKey)
 	iter := sdk.KVStorePrefixIterator(store, types.KeyPrefixExchangeRate)
@@ -136,10 +137,10 @@ func (k Keeper) IterateExchangeRates(ctx sdk.Context, handler func(string, sdk.D
 	for ; iter.Valid(); iter.Next() {
 		key := iter.Key()
 		denom := string(key[prefixLen : len(key)-1]) // -1 to remove the null suffix
-		dp := sdk.DecProto{}
-		k.cdc.MustUnmarshal(iter.Value(), &dp)
+		var er types.ExchangeRate
+		k.cdc.MustUnmarshal(iter.Value(), &er)
 
-		if handler(denom, dp.Dec) {
+		if handler(denom, er.Rate) {
 			break
 		}
 	}

x/oracle/types/vote.go

@@ -7,8 +7,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"gopkg.in/yaml.v3"
-
-	"github.com/umee-network/umee/v6/x/leverage/types"
 )
 
 func NewAggregateExchangeRatePrevote(
@@ -83,7 +81,7 @@ func ParseExchangeRateTuples(tuplesStr string) (ExchangeRateTuples, error) {
 			return nil, err
 		}
 		if !decCoin.IsPositive() {
-			return nil, types.ErrInvalidOraclePrice
+			return nil, fmt.Errorf("exchange rate can't be negative: %s", tupleStr)
 		}
 
 		denom := strings.ToUpper(denomAmountStr[0])