Merge branch 'main' into alpo/redundant-inc-claim

osmosis-labs · Mar 15, 2024 · b730851 · b730851
2 parents eb02101 + 16f0156
commit b730851
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -65,6 +65,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * [#7685](https://github.com/osmosis-labs/osmosis/pull/7685) Speedup CL actions by only marshalling for CL hooks if they will be used.
 * [#7503](https://github.com/osmosis-labs/osmosis/pull/7503) Add IBC wasm light clients module
 * [#7689](https://github.com/osmosis-labs/osmosis/pull/7689) Make CL price estimations not cause state writes (speed and gas improvements)
+* [#7745](https://github.com/osmosis-labs/osmosis/pull/7745) Add gauge id query to stargate whitelist
 * [#7747](https://github.com/osmosis-labs/osmosis/pull/7747) Remove redundant call to incentive collection in CL position withdrawal logic
 
 ## v23.0.6-iavl-v1 (contains everything in v23.0.6)

diff --git a/wasmbinding/stargate_whitelist.go b/wasmbinding/stargate_whitelist.go
@@ -112,6 +112,7 @@ func init() {
 	// incentives
 	setWhitelistedQuery("/osmosis.incentives.Query/ModuleToDistributeCoins", &incentivestypes.ModuleToDistributeCoinsResponse{})
 	setWhitelistedQuery("/osmosis.incentives.Query/LockableDurations", &incentivestypes.QueryLockableDurationsResponse{})
+	setWhitelistedQuery("/osmosis.incentives.Query/GaugeByID", &incentivestypes.GaugeByIDResponse{})
 
 	// lockup
 	setWhitelistedQuery("/osmosis.lockup.Query/ModuleBalance", &lockuptypes.ModuleBalanceResponse{})

diff --git a/x/cosmwasmpool/README.md b/x/cosmwasmpool/README.md
@@ -253,13 +253,14 @@ enum QueryMessage {
     GetTotalPoolLiquidity {},
 
     /// Returns the spot price of the 'base asset' in terms of the 'quote asset' in the pool,
-    /// errors if either baseAssetDenom, or quoteAssetDenom does not exist.
-    /// For example, if this was a UniV2 50-50 pool, with 2 ETH, and 8000 UST
-    /// pool.SpotPrice(ctx, "eth", "ust") = 4000.00
+    /// errors if either `base_asset_denom`, or `quote_asset_denom` does not exist.
+    /// For example, if this was a UniV2 50-50 pool, with 2ubase and 8000uquot as total pool assets
+    /// `{ "spot_price": { "base_asset_denom": "ubase", "quote_asset_denom": "uquot" }`
+    /// = 8000 / 2 = 4000
     #[returns(SpotPriceResponse)]
     SpotPrice {
-        quote_asset_denom: String,
         base_asset_denom: String,
+        quote_asset_denom: String,
     },
 
     /// CalcOutAmtGivenIn calculates the amount of tokenOut given tokenIn and the pool's current state.

diff --git a/x/txfees/keeper/hooks.go b/x/txfees/keeper/hooks.go
@@ -294,10 +294,11 @@ func (k Keeper) swapNonNativeFeeToDenom(ctx sdk.Context, denomToSwapTo string, f
 				},
 			})
 		}
-		if len(coinsNotSwapped) > 0 {
-			ctx.Logger().Info("The following non-native tokens were not swapped (see debug logs for further details): %s", coinsNotSwapped)
-		}
 	}
+	if len(coinsNotSwapped) > 0 {
+		ctx.Logger().Info("The following non-native tokens were not swapped (see debug logs for further details): %s", coinsNotSwapped)
+	}
+
 	return totalCoinOut
 }