[TRA-611] Get exponent from marketmap

indexer/packages/v4-protos/src/codegen/dydxprotocol/prices/market_param.ts

@@ -18,8 +18,12 @@ export interface MarketParam {
    * For example if `Exponent == -5` then a `Value` of `1,000,000,000`
    * represents ``$10,000`. Therefore `10 ^ Exponent` represents the smallest
    * price step (in dollars) that can be recorded.
+   * 
+   * Deprecated since v7.1.x. This value is now determined from the marketmap.
    */
 
+  /** @deprecated */
+
   exponent: number;
   /**
    * The minimum number of exchanges that should be reporting a live price for
@@ -58,8 +62,12 @@ export interface MarketParamSDKType {
    * For example if `Exponent == -5` then a `Value` of `1,000,000,000`
    * represents ``$10,000`. Therefore `10 ^ Exponent` represents the smallest
    * price step (in dollars) that can be recorded.
+   * 
+   * Deprecated since v7.1.x. This value is now determined from the marketmap.
    */
 
+  /** @deprecated */
+
   exponent: number;
   /**
    * The minimum number of exchanges that should be reporting a live price for

indexer/packages/v4-protos/src/codegen/dydxprotocol/prices/market_price.ts

@@ -8,6 +8,9 @@ export interface MarketPrice {
   /**
    * Static value. The exponent of the price. See the comment on the duplicate
    * MarketParam field for more information.
+   * 
+   * As of v7.1.x, this value is determined from the marketmap instead of
+   * needing to match the MarketParam field.
    */
 
   exponent: number;
@@ -26,6 +29,9 @@ export interface MarketPriceSDKType {
   /**
    * Static value. The exponent of the price. See the comment on the duplicate
    * MarketParam field for more information.
+   * 
+   * As of v7.1.x, this value is determined from the marketmap instead of
+   * needing to match the MarketParam field.
    */
 
   exponent: number;

proto/dydxprotocol/prices/market_param.proto

@@ -18,7 +18,9 @@ message MarketParam {
   // For example if `Exponent == -5` then a `Value` of `1,000,000,000`
   // represents ``$10,000`. Therefore `10 ^ Exponent` represents the smallest
   // price step (in dollars) that can be recorded.
-  sint32 exponent = 3;
+  //
+  // Deprecated since v7.1.x. This value is now determined from the marketmap.
+  sint32 exponent = 3 [ deprecated = true ];
 
   // The minimum number of exchanges that should be reporting a live price for
   // a price update to be considered valid.

proto/dydxprotocol/prices/market_price.proto

@@ -10,6 +10,9 @@ message MarketPrice {
 
   // Static value. The exponent of the price. See the comment on the duplicate
   // MarketParam field for more information.
+  //
+  // As of v7.1.x, this value is determined from the marketmap instead of
+  // needing to match the MarketParam field.
   sint32 exponent = 2;
 
   // The variable value that is updated by oracle price updates. `0` if it has

protocol/app/ante/market_update_test.go

@@ -1,10 +1,11 @@
 package ante_test
 
 import (
-	storetypes "cosmossdk.io/store/types"
 	"math/rand"
 	"testing"
 
+	storetypes "cosmossdk.io/store/types"
+
 	sdkmath "cosmossdk.io/math"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/dydxprotocol/v4-chain/protocol/dtypes"
@@ -185,7 +186,7 @@ var (
 				Base:  "TESTING",
 				Quote: "USD",
 			},
-			Decimals:         1,
+			Decimals:         8,
 			MinProviderCount: 1,
 			Enabled:          false,
 			Metadata_JSON:    "",
@@ -199,7 +200,7 @@ var (
 				Base:  "TESTING",
 				Quote: "USD",
 			},
-			Decimals:         1,
+			Decimals:         8,
 			MinProviderCount: 1,
 			Enabled:          false,
 			Metadata_JSON:    "",
@@ -218,7 +219,7 @@ var (
 				Base:  "TESTING",
 				Quote: "USD",
 			},
-			Decimals:         1,
+			Decimals:         8,
 			MinProviderCount: 1,
 			Enabled:          true,
 			Metadata_JSON:    "",
@@ -237,7 +238,7 @@ var (
 				Base:  "TESTING",
 				Quote: "USD",
 			},
-			Decimals:         1,
+			Decimals:         8,
 			MinProviderCount: 1,
 			Enabled:          true,
 			Metadata_JSON:    "",
@@ -763,7 +764,7 @@ func TestValidateMarketUpdateDecorator_AnteHandle(t *testing.T) {
 						ctx,
 						mmtypes.Market{
 							Ticker: mmtypes.Ticker{
-								Decimals:     uint64(pair.market.Exponent),
+								Decimals:     uint64(pair.market.Exponent * -1),
 								Enabled:      false, // will be enabled later
 								CurrencyPair: cp,
 							},

protocol/testing/e2e/gov/prices_test.go

@@ -67,20 +67,6 @@ func TestUpdateMarketParam(t *testing.T) {
 			},
 			expectedProposalStatus: govtypesv1.ProposalStatus_PROPOSAL_STATUS_FAILED,
 		},
-		"Failure: exponent is updated": {
-			msg: &pricestypes.MsgUpdateMarketParam{
-				Authority: lib.GovModuleAddress.String(),
-				MarketParam: pricestypes.MarketParam{
-					Id:                 MODIFIED_MARKET_PARAM.Id,
-					Pair:               MODIFIED_MARKET_PARAM.Pair,
-					Exponent:           MODIFIED_MARKET_PARAM.Exponent + 1, // update to exponent is not permitted.
-					MinExchanges:       MODIFIED_MARKET_PARAM.MinExchanges,
-					MinPriceChangePpm:  MODIFIED_MARKET_PARAM.MinPriceChangePpm,
-					ExchangeConfigJson: MODIFIED_MARKET_PARAM.ExchangeConfigJson,
-				},
-			},
-			expectedProposalStatus: govtypesv1.ProposalStatus_PROPOSAL_STATUS_FAILED,
-		},
 		"Failure: empty pair": {
 			msg: &pricestypes.MsgUpdateMarketParam{
 				Authority: lib.GovModuleAddress.String(),

protocol/testutil/app/order.go

@@ -40,11 +40,17 @@ func MustMakeOrderFromHumanInput(
 	if !exists {
 		panic(fmt.Sprintf("marketParam does not exist: %v", perp.Params.MarketId))
 	}
-	marketPrice := pricestest.MustHumanPriceToMarketPrice(humanPrice, marketParams.Exponent)
+
+	exponent, err := app.PricesKeeper.GetExponent(ctx, marketParams.Pair)
+	if err != nil {
+		panic(err)
+	}
+
+	marketPrice := pricestest.MustHumanPriceToMarketPrice(humanPrice, exponent)
 	subticks := clobtypes.PriceToSubticks(
 		pricestypes.MarketPrice{
 			Price:    marketPrice,
-			Exponent: marketParams.Exponent,
+			Exponent: exponent,
 		},
 		clobPair,
 		perp.Params.AtomicResolution,

protocol/testutil/constants/genesis.go

@@ -4002,7 +4002,7 @@ const GenesisState = `{
         },
         {
           "exchange_config_json": "{\"exchanges\":[{\"exchangeName\":\"Binance\",\"ticker\":\"\\\"LINKUSDT\\\"\"},{\"exchangeName\":\"BinanceUS\",\"ticker\":\"\\\"LINKUSD\\\"\"},{\"exchangeName\":\"CoinbasePro\",\"ticker\":\"LINK-USD\"},{\"exchangeName\":\"CryptoCom\",\"ticker\":\"LINK_USD\"},{\"exchangeName\":\"Huobi\",\"ticker\":\"linkusdt\"},{\"exchangeName\":\"Kraken\",\"ticker\":\"LINKUSD\"},{\"exchangeName\":\"Kucoin\",\"ticker\":\"LINK-USDT\"},{\"exchangeName\":\"Okx\",\"ticker\":\"LINK-USDT\"}]}",
-          "exponent": -8,
+          "exponent": -9,
           "id": 2,
           "min_exchanges": 1,
           "min_price_change_ppm": 2000,
@@ -4170,7 +4170,7 @@ const GenesisState = `{
         },
         {
           "exchange_config_json": "{\"exchanges\":[{\"exchangeName\":\"Binance\",\"ticker\":\"\\\"MKRUSDT\\\"\"},{\"exchangeName\":\"BinanceUS\",\"ticker\":\"\\\"MKRUSD\\\"\"},{\"exchangeName\":\"Bitfinex\",\"ticker\":\"tMKRUSD\"},{\"exchangeName\":\"CoinbasePro\",\"ticker\":\"MKR-USD\"},{\"exchangeName\":\"Gate\",\"ticker\":\"MKR_USDT\"},{\"exchangeName\":\"Huobi\",\"ticker\":\"mkrusdt\"},{\"exchangeName\":\"Kucoin\",\"ticker\":\"MKR-USDT\"},{\"exchangeName\":\"Okx\",\"ticker\":\"MKR-USDT\"}]}",
-          "exponent": -7,
+          "exponent": -6,
           "id": 23,
           "min_exchanges": 1,
           "min_price_change_ppm": 2000,
@@ -4186,7 +4186,7 @@ const GenesisState = `{
         },
         {
           "exchange_config_json": "{\"exchanges\":[{\"exchangeName\":\"Binance\",\"ticker\":\"\\\"XLMUSDT\\\"\"},{\"exchangeName\":\"BinanceUS\",\"ticker\":\"\\\"XLMUSD\\\"\"},{\"exchangeName\":\"Bitfinex\",\"ticker\":\"tXLMUSD\"},{\"exchangeName\":\"CoinbasePro\",\"ticker\":\"XLM-USD\"},{\"exchangeName\":\"Gate\",\"ticker\":\"XLM_USDT\"},{\"exchangeName\":\"Kraken\",\"ticker\":\"XXLMZUSD\"},{\"exchangeName\":\"Kucoin\",\"ticker\":\"XLM-USDT\"},{\"exchangeName\":\"Okx\",\"ticker\":\"XLM-USDT\"}]}",
-          "exponent": -11,
+          "exponent": -10,
           "id": 25,
           "min_exchanges": 1,
           "min_price_change_ppm": 2000,
@@ -4261,7 +4261,7 @@ const GenesisState = `{
           "price": 1500000000
         },
         {
-          "exponent": -8,
+          "exponent": -9,
           "id": 2,
           "price": 700000000
         },
@@ -4366,7 +4366,7 @@ const GenesisState = `{
           "price": 2200000000
         },
         {
-          "exponent": -7,
+          "exponent": -6,
           "id": 23,
           "price": 7100000000
         },
@@ -4376,7 +4376,7 @@ const GenesisState = `{
           "price": 7000000000
         },
         {
-          "exponent": -11,
+          "exponent": -10,
           "id": 25,
           "price": 10000000000
         },

protocol/x/prices/keeper/market.go

@@ -57,14 +57,22 @@ func (k Keeper) CreateMarket(
 		)
 	}
 	currencyPairStr := currencyPair.String()
-	_, err = k.MarketMapKeeper.GetMarket(ctx, currencyPairStr)
+	marketMapDetails, err := k.MarketMapKeeper.GetMarket(ctx, currencyPairStr)
 	if err != nil {
 		return types.MarketParam{}, errorsmod.Wrapf(
 			types.ErrTickerNotFoundInMarketMap,
 			currencyPairStr,
 		)
 	}
 
+	// Check that the exponent of market price is the negation of the decimals value in the market map
+	if marketPrice.Exponent != int32(marketMapDetails.Ticker.Decimals)*-1 {
+		return types.MarketParam{}, errorsmod.Wrapf(
+			types.ErrInvalidMarketPriceExponent,
+			currencyPairStr,
+		)
+	}
+
 	paramBytes := k.cdc.MustMarshal(&marketParam)
 	priceBytes := k.cdc.MustMarshal(&marketPrice)
 
@@ -87,7 +95,7 @@ func (k Keeper) CreateMarket(
 				marketParam.Id,
 				marketParam.Pair,
 				marketParam.MinPriceChangePpm,
-				marketParam.Exponent,
+				marketPrice.Exponent, // The exponent of the market price is the source of truth, the exponent of the param is deprecated as of v7.1.x
 			),
 		),
 	)
@@ -111,6 +119,24 @@ func (k Keeper) CreateMarket(
 	return marketParam, nil
 }
 
+// Get the exponent for a market as the negation of the decimals value in the market map
+func (k Keeper) GetExponent(ctx sdk.Context, ticker string) (int32, error) {
+	currencyPair, err := slinky.MarketPairToCurrencyPair(ticker)
+	if err != nil {
+		k.Logger(ctx).Error("Could not convert market pair to currency pair", "error", err)
+		return 0, err
+	}
+
+	marketMapDetails, err := k.MarketMapKeeper.GetMarket(ctx, currencyPair.String())
+	if err != nil {
+		return 0, errorsmod.Wrapf(
+			types.ErrTickerNotFoundInMarketMap,
+			ticker,
+		)
+	}
+	return int32(marketMapDetails.Ticker.Decimals) * -1, nil
+}
+
 // GetAllMarketParamPrices returns a slice of MarketParam, MarketPrice tuples for all markets.
 func (k Keeper) GetAllMarketParamPrices(ctx sdk.Context) ([]types.MarketParamPrice, error) {
 	marketParams := k.GetAllMarketParams(ctx)

protocol/x/prices/keeper/market_param.go

@@ -40,10 +40,6 @@ func (k Keeper) ModifyMarketParam(
 	}
 
 	// Validate update is permitted.
-	if updatedMarketParam.Exponent != existingParam.Exponent {
-		return types.MarketParam{},
-			errorsmod.Wrapf(types.ErrMarketExponentCannotBeUpdated, lib.UintToString(updatedMarketParam.Id))
-	}
 	for _, market := range k.GetAllMarketParams(ctx) {
 		if market.Pair == updatedMarketParam.Pair && market.Id != updatedMarketParam.Id {
 			return types.MarketParam{}, errorsmod.Wrapf(types.ErrMarketParamPairAlreadyExists, updatedMarketParam.Pair)

protocol/x/prices/keeper/market_test.go

@@ -110,13 +110,12 @@ func TestCreateMarket_Errors(t *testing.T) {
 	validExchangeConfigJson := `{"exchanges":[{"exchangeName":"Binance","ticker":"BTCUSDT"}]}`
 	tests := map[string]struct {
 		// Setup
-		pair                                              string
-		minExchanges                                      uint32
-		minPriceChangePpm                                 uint32
-		price                                             uint64
-		marketPriceIdDoesntMatchMarketParamId             bool
-		marketPriceExponentDoesntMatchMarketParamExponent bool
-		exchangeConfigJson                                string
+		pair                                  string
+		minExchanges                          uint32
+		minPriceChangePpm                     uint32
+		price                                 uint64
+		marketPriceIdDoesntMatchMarketParamId bool
+		exchangeConfigJson                    string
 		// Expected
 		expectedErr string
 	}{
@@ -163,18 +162,6 @@ func TestCreateMarket_Errors(t *testing.T) {
 				"market param id 1 does not match market price id 2",
 			).Error(),
 		},
-		"Market param and price exponents don't match": {
-			pair:              constants.BtcUsdPair,
-			minExchanges:      uint32(2),
-			minPriceChangePpm: uint32(50),
-			price:             constants.FiveBillion,
-			marketPriceExponentDoesntMatchMarketParamExponent: true,
-			exchangeConfigJson: validExchangeConfigJson,
-			expectedErr: errorsmod.Wrap(
-				types.ErrInvalidInput,
-				"market param 1 exponent -6 does not match market price 1 exponent -5",
-			).Error(),
-		},
 		"Pair already exists": {
 			pair:               "0-0",
 			minExchanges:       uint32(2),
@@ -201,9 +188,6 @@ func TestCreateMarket_Errors(t *testing.T) {
 			}
 
 			marketPriceExponentOffset := int32(0)
-			if tc.marketPriceExponentDoesntMatchMarketParamExponent {
-				marketPriceExponentOffset = int32(1)
-			}
 
 			_, err := keeper.CreateMarket(
 				ctx,

protocol/x/prices/keeper/msg_server_create_oracle_market.go

@@ -44,12 +44,17 @@ func (k msgServer) CreateOracleMarket(
 
 	ctx := lib.UnwrapSDKContext(goCtx, types.ModuleName)
 
+	exponent, err := k.Keeper.GetExponent(ctx, msg.Params.Pair)
+	if err != nil {
+		return nil, err
+	}
+
 	// Use zero oracle price to create the new market.
 	// Note that valid oracle price updates cannot be zero (checked in MsgUpdateMarketPrices.ValidateBasic),
 	// so a zero oracle price indicates that the oracle price has never been updated.
 	zeroMarketPrice := types.MarketPrice{
 		Id:       msg.Params.Id,
-		Exponent: msg.Params.Exponent,
+		Exponent: exponent,
 		Price:    0,
 	}
 	if _, err = k.Keeper.CreateMarket(ctx, msg.Params, zeroMarketPrice); err != nil {