chore: store protorev pool and spot price requests in asset

Author: ironman0x7b2

proto/sentinel/oracle/v1/asset.proto

@@ -2,6 +2,8 @@ syntax = "proto3";
 package sentinel.oracle.v1;
 
 import "gogoproto/gogo.proto";
+import "osmosis/poolmanager/v1beta1/query.proto";
+import "osmosis/protorev/v1beta1/query.proto";
 
 option go_package = "github.com/sentinel-official/sentinelhub/v12/x/oracle/types/v1";
 option (gogoproto.equal_all) = false;
@@ -10,11 +12,11 @@ option (gogoproto.goproto_getters_all) = false;
 message Asset {
   string denom = 1;
   int64 decimals = 2;
-  string base_asset_denom = 3;
-  string quote_asset_denom = 4;
-  string price = 5 [
-    (gogoproto.customtype) = "cosmossdk.io/math.Int",
+  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 [
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
-  int64 height = 6;
 }

proto/sentinel/oracle/v1/events.proto

@@ -8,19 +8,19 @@ option (gogoproto.equal_all) = false;
 option (gogoproto.goproto_getters_all) = false;
 
 message EventCreate {
-  string denom = 2;
-  int64 decimals = 3;
-  string base_asset_denom = 4;
-  string quote_asset_denom = 5;
+  string denom = 1;
+  int64 decimals = 2;
+  string base_asset_denom = 3;
+  string quote_asset_denom = 4;
 }
 
 message EventDelete {
-  string denom = 2;
+  string denom = 1;
 }
 
 message EventUpdateDetails {
-  string denom = 2;
-  int64 decimals = 3;
-  string base_asset_denom = 4;
-  string quote_asset_denom = 5;
+  string denom = 1;
+  int64 decimals = 2;
+  string base_asset_denom = 3;
+  string quote_asset_denom = 4;
 }

proto/sentinel/oracle/v1/msg.proto

@@ -2,6 +2,8 @@ syntax = "proto3";
 package sentinel.oracle.v1;
 
 import "gogoproto/gogo.proto";
+import "osmosis/poolmanager/v1beta1/query.proto";
+import "osmosis/protorev/v1beta1/query.proto";
 import "sentinel/oracle/v1/params.proto";
 
 option go_package = "github.com/sentinel-official/sentinelhub/v12/x/oracle/types/v1";
@@ -12,8 +14,8 @@ message MsgCreateAssetRequest {
   string from = 1;
   string denom = 2;
   int64 decimals = 3;
-  string base_asset_denom = 4;
-  string quote_asset_denom = 5;
+  osmosis.protorev.v1beta1.QueryGetProtoRevPoolRequest proto_rev_pool_request = 4 [(gogoproto.nullable) = false];
+  osmosis.poolmanager.v1beta1.SpotPriceRequest spot_price_request = 5 [(gogoproto.nullable) = false];
 }
 
 message MsgDeleteAssetRequest {
@@ -25,8 +27,8 @@ message MsgUpdateAssetRequest {
   string from = 1;
   string denom = 2;
   int64 decimals = 3;
-  string base_asset_denom = 4;
-  string quote_asset_denom = 5;
+  osmosis.protorev.v1beta1.QueryGetProtoRevPoolRequest proto_rev_pool_request = 4 [(gogoproto.nullable) = false];
+  osmosis.poolmanager.v1beta1.SpotPriceRequest spot_price_request = 5 [(gogoproto.nullable) = false];
 }
 
 message MsgUpdateParamsRequest {

x/oracle/keeper/abci.go

@@ -46,8 +46,8 @@ func (k *Keeper) BeginBlock(ctx sdk.Context) {
 		req := abcitypes.RequestQuery{
 			Data: k.cdc.MustMarshal(
 				&protorevtypes.QueryGetProtoRevPoolRequest{
-					BaseDenom:  item.BaseAssetDenom,
-					OtherDenom: item.QuoteAssetDenom,
+					BaseDenom:  item.ProtoRevPoolRequest.BaseDenom,
+					OtherDenom: item.ProtoRevPoolRequest.OtherDenom,
 				},
 			),
 			Path: "/osmosis.protorev.v1beta1.Query/GetProtoRevPool",

x/oracle/keeper/asset.go

@@ -126,11 +126,11 @@ func (k *Keeper) GetQuotePrice(ctx sdk.Context, basePrice sdk.DecCoin) (sdk.Coin
 	// Retrieve the asset associated with the coin denomination.
 	asset, found := k.GetAsset(ctx, basePrice.Denom)
 	if !found {
-		return sdk.Coin{Amount: sdk.ZeroInt()}, types.NewErrorAssetNotFound(basePrice.Denom)
+		return sdk.Coin{}, types.NewErrorAssetNotFound(basePrice.Denom)
 	}
 
 	// Calculate the quote price by multiplying the base price with the asset's price.
-	amount := basePrice.Amount.MulInt(asset.Price).TruncateInt()
+	amount := basePrice.Amount.Mul(asset.SpotPrice).TruncateInt()
 
 	// Return the resulting coin with the same denomination as the base price.
 	return sdk.Coin{Denom: basePrice.Denom, Amount: amount}, nil

x/oracle/keeper/msg_handler.go

@@ -23,12 +23,12 @@ func (k *Keeper) HandleMsgCreateAsset(ctx sdk.Context, msg *v1.MsgCreateAssetReq
 
 	// Initialize asset with provided metadata, zero price and zero height
 	asset := v1.Asset{
-		Denom:           msg.Denom,
-		Decimals:        msg.Decimals,
-		BaseAssetDenom:  msg.BaseAssetDenom,
-		QuoteAssetDenom: msg.QuoteAssetDenom,
-		Price:           sdkmath.ZeroInt(),
-		Height:          0,
+		Denom:               msg.Denom,
+		Decimals:            msg.Decimals,
+		ProtoRevPoolRequest: msg.ProtoRevPoolRequest,
+		SpotPriceRequest:    msg.SpotPriceRequest,
+		Height:              0,
+		SpotPrice:           sdkmath.LegacyZeroDec(),
 	}
 
 	k.SetAsset(ctx, asset)
@@ -38,8 +38,8 @@ func (k *Keeper) HandleMsgCreateAsset(ctx sdk.Context, msg *v1.MsgCreateAssetReq
 		&v1.EventCreate{
 			Denom:           asset.Denom,
 			Decimals:        asset.Decimals,
-			BaseAssetDenom:  asset.BaseAssetDenom,
-			QuoteAssetDenom: asset.QuoteAssetDenom,
+			BaseAssetDenom:  asset.SpotPriceRequest.BaseAssetDenom,
+			QuoteAssetDenom: asset.SpotPriceRequest.QuoteAssetDenom,
 		},
 	)
 
@@ -87,8 +87,8 @@ func (k *Keeper) HandleMsgUpdateAsset(ctx sdk.Context, msg *v1.MsgUpdateAssetReq
 
 	// Apply updated metadata to the asset
 	asset.Decimals = msg.Decimals
-	asset.BaseAssetDenom = msg.BaseAssetDenom
-	asset.QuoteAssetDenom = msg.QuoteAssetDenom
+	asset.ProtoRevPoolRequest = msg.ProtoRevPoolRequest
+	asset.SpotPriceRequest = msg.SpotPriceRequest
 
 	k.SetAsset(ctx, asset)
 
@@ -97,8 +97,8 @@ func (k *Keeper) HandleMsgUpdateAsset(ctx sdk.Context, msg *v1.MsgUpdateAssetReq
 		&v1.EventUpdateDetails{
 			Denom:           asset.Denom,
 			Decimals:        asset.Decimals,
-			BaseAssetDenom:  asset.BaseAssetDenom,
-			QuoteAssetDenom: asset.QuoteAssetDenom,
+			BaseAssetDenom:  asset.SpotPriceRequest.BaseAssetDenom,
+			QuoteAssetDenom: asset.SpotPriceRequest.QuoteAssetDenom,
 		},
 	)
 

x/oracle/keeper/relay.go

@@ -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.Price = spotPrice.MulInt(asset.Multiplier()).TruncateInt()
 	asset.Height = resp.GetHeight()
+	asset.SpotPrice = spotPrice.MulInt(asset.Multiplier())
 
 	// Persist the updated asset information in the store.
 	k.SetAsset(ctx, asset)
@@ -179,8 +179,8 @@ func (k *Keeper) handleProtoRevPoolQueryResponse(ctx sdk.Context, asset v1.Asset
 		Data: k.cdc.MustMarshal(
 			&queryproto.SpotPriceRequest{
 				PoolId:          res.GetPoolId(),
-				BaseAssetDenom:  asset.BaseAssetDenom,
-				QuoteAssetDenom: asset.QuoteAssetDenom,
+				BaseAssetDenom:  asset.SpotPriceRequest.BaseAssetDenom,
+				QuoteAssetDenom: asset.SpotPriceRequest.QuoteAssetDenom,
 			},
 		),
 		Path: "/osmosis.poolmanager.v1beta1.Query/SpotPrice",

x/oracle/types/v1/asset.go

@@ -2,6 +2,7 @@ package v1
 
 import (
 	"errors"
+	"fmt"
 	"math/big"
 
 	sdkmath "cosmossdk.io/math"
@@ -29,33 +30,57 @@ func (a *Asset) Validate() error {
 		return errors.New("decimals cannot be negative")
 	}
 
-	if a.BaseAssetDenom == "" {
-		return errors.New("base_asset_denom cannot be empty")
+	if a.ProtoRevPoolRequest.BaseDenom == "" {
+		return errors.New("base_denom cannot be empty")
 	}
 
-	if a.QuoteAssetDenom == "" {
-		return errors.New("quote_asset_denom cannot be empty")
+	if err := sdk.ValidateDenom(a.ProtoRevPoolRequest.BaseDenom); err != nil {
+		return fmt.Errorf("invalid base_denom: %w", err)
+	}
+
+	if a.ProtoRevPoolRequest.OtherDenom == "" {
+		return errors.New("other_denom cannot be empty")
+	}
+
+	if err := sdk.ValidateDenom(a.ProtoRevPoolRequest.OtherDenom); err != nil {
+		return fmt.Errorf("invalid other_denom: %w", err)
+	}
+
+	if a.ProtoRevPoolRequest.BaseDenom == a.ProtoRevPoolRequest.OtherDenom {
+		return errors.New("base_denom and other_denom cannot be the same")
 	}
 
-	if a.BaseAssetDenom == a.QuoteAssetDenom {
-		return errors.New("base_asset_denom and quote_asset_denom cannot be same")
+	if a.SpotPriceRequest.BaseAssetDenom == "" {
+		return errors.New("base_asset_denom cannot be empty")
+	}
+
+	if err := sdk.ValidateDenom(a.SpotPriceRequest.BaseAssetDenom); err != nil {
+		return fmt.Errorf("invalid base_asset_denom: %w", err)
 	}
 
-	if a.Price.IsNil() {
-		return errors.New("price cannot be nil")
+	if a.SpotPriceRequest.QuoteAssetDenom == "" {
+		return errors.New("quote_asset_denom cannot be empty")
 	}
 
-	if a.Price.IsNegative() {
-		return errors.New("price cannot be negative")
+	if err := sdk.ValidateDenom(a.SpotPriceRequest.QuoteAssetDenom); err != nil {
+		return fmt.Errorf("invalid quote_asset_denom: %w", err)
 	}
 
-	if a.Price.IsZero() {
-		return errors.New("price cannot be zero")
+	if a.SpotPriceRequest.BaseAssetDenom == a.SpotPriceRequest.QuoteAssetDenom {
+		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")
+	}
+
+	if a.SpotPrice.IsNegative() {
+		return errors.New("spot_price cannot be negative")
+	}
+
 	return nil
 }