chore: rename height to spot_price_height in asset

Author: ironman0x7b2

proto/sentinel/oracle/v1/asset.proto

@@ -14,9 +14,9 @@ message Asset {
   int64 decimals = 2;
   osmosis.protorev.v1beta1.QueryGetProtoRevPoolRequest proto_rev_pool_request = 3 [(gogoproto.nullable) = false];
   osmosis.poolmanager.v1beta1.SpotPriceRequest spot_price_request = 4 [(gogoproto.nullable) = false];
-  int64 height = 5;
-  string spot_price = 6 [
+  string spot_price = 5 [
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
+  int64 spot_price_height = 6;
 }

x/oracle/keeper/msg_handler.go

@@ -27,8 +27,8 @@ func (k *Keeper) HandleMsgCreateAsset(ctx sdk.Context, msg *v1.MsgCreateAssetReq
 		Decimals:            msg.Decimals,
 		ProtoRevPoolRequest: msg.ProtoRevPoolRequest,
 		SpotPriceRequest:    msg.SpotPriceRequest,
-		Height:              0,
 		SpotPrice:           sdkmath.LegacyZeroDec(),
+		SpotPriceHeight:     0,
 	}
 
 	k.SetAsset(ctx, asset)

x/oracle/keeper/relay.go

@@ -116,7 +116,7 @@ func (k *Keeper) OnAcknowledgementPacket(
 // handleSpotPriceQueryResponse handles the response for the SpotPrice query.
 func (k *Keeper) handleSpotPriceQueryResponse(ctx sdk.Context, asset v1.Asset, resp *abcitypes.ResponseQuery) error {
 	// Skip updates if the response height is older than the current asset height.
-	if resp.GetHeight() < asset.Height {
+	if resp.GetHeight() < asset.SpotPriceHeight {
 		return nil
 	}
 
@@ -146,8 +146,8 @@ func (k *Keeper) handleSpotPriceQueryResponse(ctx sdk.Context, asset v1.Asset, r
 	}
 
 	// Update the asset price using the spot price and its multiplier.
-	asset.Height = resp.GetHeight()
 	asset.SpotPrice = spotPrice.MulInt(asset.Multiplier())
+	asset.SpotPriceHeight = resp.GetHeight()
 
 	// Persist the updated asset information in the store.
 	k.SetAsset(ctx, asset)

x/oracle/types/v1/asset.go

@@ -70,10 +70,6 @@ func (a *Asset) Validate() error {
 		return errors.New("base_asset_denom and quote_asset_denom cannot be the same")
 	}
 
-	if a.Height < 0 {
-		return errors.New("height cannot be negative")
-	}
-
 	if a.SpotPrice.IsNil() {
 		return errors.New("spot_price cannot be nil")
 	}
@@ -82,5 +78,9 @@ func (a *Asset) Validate() error {
 		return errors.New("spot_price cannot be negative")
 	}
 
+	if a.SpotPriceHeight < 0 {
+		return errors.New("spot_price_height cannot be negative")
+	}
+
 	return nil
 }