Merge branch 'main' into dependabot/go_modules/google.golang.org/grpc…

…-1.69.4
skip-mev · Jan 23, 2025 · c0870f3 · c0870f3
2 parents 532b041 + c992b85
commit c0870f3
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 17 deletions.
diff --git a/app/genesis.go b/app/genesis.go
@@ -13,7 +13,7 @@ import (
 var FeeDenom = "untrn"
 
 // GenesisState is the genesis state of the blockchain represented here as a map of raw json
-// messages key'd by a identifier string.
+// messages key'd by an identifier string.
 // The identifier is used to determine which module genesis information belongs
 // to so it may be appropriately routed during init chain.
 // Within this application default genesis information is retrieved from

diff --git a/app/params/encoding.go b/app/params/encoding.go
@@ -20,7 +20,7 @@ type EncodingConfig struct {
 	Amino             *codec.LegacyAmino
 }
 
-// makeEncodingConfig creates an EncodingConfig for an amino based test configuration.
+// MakeEncodingConfig creates an EncodingConfig for an amino based test configuration.
 func MakeEncodingConfig() EncodingConfig {
 	amino := codec.NewLegacyAmino()
 	reg, err := types.NewInterfaceRegistryWithOptions(types.InterfaceRegistryOptions{

diff --git a/testutil/apptesting/test_suite.go b/testutil/apptesting/test_suite.go
@@ -49,7 +49,7 @@ func (s *KeeperTestHelper) Setup() {
 	}
 }
 
-// setupAddr takes a balance, prefix, and address number. Then returns the respective account address byte array.
+// SetupAddr takes a balance, prefix, and address number. Then returns the respective account address byte array.
 // If prefix is left blank, it will be replaced with a random prefix.
 func SetupAddr(index int) sdk.AccAddress {
 	prefixBz := make([]byte, 8)

diff --git a/wasmbinding/bindings/query.go b/wasmbinding/bindings/query.go
@@ -63,11 +63,9 @@ type QueryRegisteredQueryResultRequest struct {
 type OracleQuery struct {
 	GetAllCurrencyPairs *oracletypes.GetAllCurrencyPairsRequest `json:"get_all_currency_pairs,omitempty"`
 	GetPrice            *oracletypes.GetPriceRequest            `json:"get_price,omitempty"`
-	GetPrices           *oracletypes.GetPricesRequest           `json:"get_prices,omitempty"`
 }
 
 type MarketMapQuery struct {
-	MarketMap   *marketmaptypes.MarketMapRequest   `json:"market_map,omitempty"`
 	LastUpdated *marketmaptypes.LastUpdatedRequest `json:"last_updated,omitempty"`
 	Params      *marketmaptypes.ParamsRequest      `json:"params,omitempty"`
 	Market      *marketmaptypes.MarketRequest      `json:"market,omitempty"`

diff --git a/wasmbinding/queries.go b/wasmbinding/queries.go
@@ -216,8 +216,6 @@ func (qp *QueryPlugin) OracleQuery(ctx sdk.Context, query bindings.OracleQuery)
 		return processResponse(oracleQueryServer.GetAllCurrencyPairs(ctx, query.GetAllCurrencyPairs))
 	case query.GetPrice != nil:
 		return processResponse(oracleQueryServer.GetPrice(ctx, query.GetPrice))
-	case query.GetPrices != nil:
-		return processResponse(oracleQueryServer.GetPrices(ctx, query.GetPrices))
 	default:
 		return nil, wasmvmtypes.UnsupportedRequest{Kind: "unknown neutron.oracle query type"}
 	}
@@ -231,8 +229,6 @@ func (qp *QueryPlugin) MarketMapQuery(ctx sdk.Context, query bindings.MarketMapQ
 		return processResponse(marketMapQueryServer.Params(ctx, query.Params))
 	case query.LastUpdated != nil:
 		return processResponse(marketMapQueryServer.LastUpdated(ctx, query.LastUpdated))
-	case query.MarketMap != nil:
-		return processResponse(marketMapQueryServer.MarketMap(ctx, query.MarketMap))
 	case query.Market != nil:
 		return processResponse(marketMapQueryServer.Market(ctx, query.Market))
 	default:

diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go
@@ -104,10 +104,10 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedQueries {
 		// oracle
 		"/slinky.oracle.v1.Query/GetAllCurrencyPairs": &oracletypes.GetAllCurrencyPairsResponse{},
 		"/slinky.oracle.v1.Query/GetPrice":            &oracletypes.GetPriceResponse{},
-		"/slinky.oracle.v1.Query/GetPrices":           &oracletypes.GetPricesResponse{},
+		// "/slinky.oracle.v1.Query/GetPrices":           &oracletypes.GetPricesResponse{},
 
 		// marketmap
-		"/slinky.marketmap.v1.Query/MarketMap":   &marketmaptypes.MarketMapResponse{},
+		// "/slinky.marketmap.v1.Query/MarketMap":   &marketmaptypes.MarketMapResponse{},
 		"/slinky.marketmap.v1.Query/LastUpdated": &marketmaptypes.LastUpdatedResponse{},
 		"/slinky.marketmap.v1.Query/Params":      &marketmaptypes.ParamsResponse{},
 		"/slinky.marketmap.v1.Query/Market":      &marketmaptypes.MarketResponse{},

diff --git a/x/dex/keeper/pool.go b/x/dex/keeper/pool.go
@@ -56,7 +56,7 @@ func (k Keeper) incrementPoolCount(ctx sdk.Context) {
 	k.SetPoolCount(ctx, currentCount+1)
 }
 
-// GetNextPoolId get ID for the next pool to be created
+// GetNextPoolID get ID for the next pool to be created
 func (k Keeper) GetNextPoolID(ctx sdk.Context) uint64 {
 	return k.GetPoolCount(ctx)
 }

diff --git a/x/ibc-rate-limit/README.md b/x/ibc-rate-limit/README.md
@@ -216,7 +216,7 @@ is built on the `relay.SendTransfer()` in the transfer module and then passed to
 
 ##### Receives
 
-This behaves slightly different if the asset is an Neutron asset that was sent to the counterparty and is being
+This behaves slightly different if the asset is a Neutron asset that was sent to the counterparty and is being
 returned to the chain, or if the asset is being received by the chain and originates on the counterparty. In ibc this
 is called being a "source" or a "sink" respectively.
 

diff --git a/x/tokenfactory/README.md b/x/tokenfactory/README.md
@@ -1,6 +1,6 @@
 # Token Factory (by Osmosis Labs)
 
-> This module was taken from Osmosis chain codebase (commit: https://github.com/osmosis-labs/osmosis/commit/9e178a631f91ffc91c51f3665ed915c9f15e1807). The reason of this action was to adopt module and tests to our codebase because it was not possible to import it without code modification
+> This module was taken from Osmosis chain codebase (commit: https://github.com/osmosis-labs/osmosis/commit/9e178a631f91ffc91c51f3665ed915c9f15e1807). The reason of this action was to adapt module and tests to our codebase because it was not possible to import it without code modification
 > that was made by Osmosis team to the original Cosmos SDK. These changes made it not possible (without deep modifications of the whole code) to import module to our code.
 > Also support of the creation fee was removed at the moment because we do not have community pool in the Neutron. 
 
@@ -73,7 +73,7 @@ message MsgBurn {
 ```
 
 **State Modifications:**
-- Saftey check the following
+- Safety check the following
   - Check that the denom minting is created via `tokenfactory` module
   - Check that the sender of the message is the admin of the denom
 - Burn designated amount of tokens for the denom via `bank` module
@@ -119,4 +119,4 @@ The choice between how we standardized the split these 60 bytes between maxes fr
 For explicitness, its currently set to `len(longest_subdenom) = 44` and `len(longest_chain_addr_prefix) = 16`.
 
 Please note, if the SDK increases the maximum length of a denom from 128 bytes, these caps should increase.
-So please don't make code rely on these max lengths for parsing.
+So please don't make code rely on these max lengths for parsing.
diff --git a/x/tokenfactory/types/keys.go b/x/tokenfactory/types/keys.go
@@ -44,7 +44,7 @@ func GetDenomPrefixStore(denom string) []byte {
 	return []byte(strings.Join([]string{DenomsPrefixKey, denom, ""}, KeySeparator))
 }
 
-// GetCreatorsPrefix returns the store prefix where the list of the denoms created by a specific
+// GetCreatorPrefix returns the store prefix where the list of the denoms created by a specific
 // creator are stored
 func GetCreatorPrefix(creator string) []byte {
 	return []byte(strings.Join([]string{CreatorPrefixKey, creator, ""}, KeySeparator))