Merge branch 'main' into tyler/blo-1459-simapp-doesnt-work-with-xupgrade

x/marketmap/types/market.go

@@ -13,11 +13,16 @@ import (
 //		2. Ensure that each provider config has a valid corresponding ticker.
 //	 	3. Ensure that all normalization markets are enabled.
 func (mm *MarketMap) ValidateBasic() error {
-	for _, market := range mm.Markets {
+	for ticker, market := range mm.Markets {
 		if err := market.ValidateBasic(); err != nil {
 			return err
 		}
 
+		// expect that the ticker (index) is equal to the market.Ticker.String()
+		if ticker != market.Ticker.String() {
+			return fmt.Errorf("ticker %s does not match market.Ticker.String() %s", ticker, market.Ticker.String())
+		}
+
 		for _, providerConfig := range market.ProviderConfigs {
 			if providerConfig.NormalizeByPair != nil {
 				normalizeMarket, found := mm.Markets[providerConfig.NormalizeByPair.String()]

x/marketmap/types/market_test.go

@@ -295,6 +295,27 @@ func TestMarketMapValidateBasic(t *testing.T) {
 			},
 			expectErr: true,
 		},
+		{
+			name: "market-map with invalid key",
+			marketMap: types.MarketMap{
+				Markets: map[string]types.Market{
+					ethusd.String(): {
+						Ticker: types.Ticker{
+							CurrencyPair:     btcusdtCP,
+							Decimals:         8,
+							MinProviderCount: 1,
+						},
+						ProviderConfigs: []types.ProviderConfig{
+							{
+								Name:           coinbase.Name,
+								OffChainTicker: "BTC-USD",
+							},
+						},
+					},
+				},
+			},
+			expectErr: true,
+		},
 		{
 			name: "valid single provider",
 			marketMap: types.MarketMap{