Log price update

Author: DaSichuan

token-lending/program/src/logs.rs

@@ -1,22 +1,15 @@
 #![allow(missing_docs)]
-use solana_program::{
-    msg,
-    pubkey::Pubkey,
-};
-use std::{fmt};
-use crate::{
-    pyth,
-    math::{Decimal},
-};
-
+use crate::math::Decimal;
+use solana_program::{msg, pubkey::Pubkey};
+use std::fmt;
 
 #[derive(Debug)]
 enum LogEventType {
     PythOraclePriceUpdateType,
     SwitchboardV1OraclePriceUpdateType,
 }
 
-impl fmt::Display for LogEventType{
+impl fmt::Display for LogEventType {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "{:?}", self)
     }
@@ -27,43 +20,40 @@ pub fn emit_log_event(e: &dyn LogEvent) {
     msg!(&e.to_string());
 }
 
-
 pub trait LogEvent {
     fn to_string(&self) -> String;
 }
 
 pub struct PythOraclePriceUpdate {
-    oracle_pubkey: Pubkey,
-    price: i64,
-    conf: u64,
-    status: pyth::PriceStatus,
-    published_slot: u64,
+    pub oracle_pubkey: Pubkey,
+    pub price: Decimal,
+    pub conf: u64,
+    pub published_slot: u64,
 }
 
 impl LogEvent for PythOraclePriceUpdate {
     fn to_string(&self) -> String {
         return format!(
-            "{},{},{},{},{},{}", 
+            "{},{},{},{},{}",
             LogEventType::PythOraclePriceUpdateType.to_string(),
             self.oracle_pubkey.to_string(),
             self.price.to_string(),
             self.conf.to_string(),
-            self.status.to_string(),
             self.published_slot,
         );
     }
 }
 
 pub struct SwitchboardV1OraclePriceUpdate {
-    oracle_pubkey: Pubkey,
-    price: Decimal,
-    published_slot: u64,
+    pub oracle_pubkey: Pubkey,
+    pub price: Decimal,
+    pub published_slot: u64,
 }
 
 impl LogEvent for SwitchboardV1OraclePriceUpdate {
     fn to_string(&self) -> String {
         return format!(
-            "{},{},{},{}", 
+            "{},{},{},{}",
             LogEventType::SwitchboardV1OraclePriceUpdateType.to_string(),
             self.oracle_pubkey.to_string(),
             self.price.to_string(),

token-lending/program/src/processor.rs

@@ -4,7 +4,7 @@ use crate::{
     self as spl_token_lending,
     error::LendingError,
     instruction::LendingInstruction,
-    logs::{emit_log_event},
+    logs::{emit_log_event, PythOraclePriceUpdate, SwitchboardV1OraclePriceUpdate},
     math::{Decimal, Rate, TryAdd, TryDiv, TryMul, TrySub, WAD},
     pyth,
     state::{
@@ -2215,6 +2215,12 @@ fn get_pyth_price(pyth_price_info: &AccountInfo, clock: &Clock) -> Result<Decima
             .ok_or(LendingError::MathOverflow)?;
         Decimal::from(price).try_div(decimals)?
     };
+    emit_log_event(&PythOraclePriceUpdate {
+        oracle_pubkey: *pyth_price_info.key,
+        price: market_price,
+        conf: conf,
+        published_slot: pyth_price.valid_slot,
+    });
 
     Ok(market_price)
 }
@@ -2242,10 +2248,10 @@ fn get_switchboard_price(
     //     return Err(LendingError::InvalidAccountInput.into());
     // }
     let round_result: RoundResult = get_aggregator_result(&aggregator)?;
-
+    let open_slot = round_result.round_open_slot.unwrap();
     let slots_elapsed = clock
         .slot
-        .checked_sub(round_result.round_open_slot.unwrap())
+        .checked_sub(open_slot)
         .ok_or(LendingError::MathOverflow)?;
     if slots_elapsed >= STALE_AFTER_SLOTS_ELAPSED {
         msg!("Switchboard oracle price is stale");
@@ -2259,7 +2265,13 @@ fn get_switchboard_price(
     let price_quotient = 10u64.pow(9);
     let price = ((price_quotient as f64) * price_float) as u128;
 
-    Decimal::from(price).try_div(price_quotient)
+    let market_price = Decimal::from(price).try_div(price_quotient)?;
+    emit_log_event(&SwitchboardV1OraclePriceUpdate {
+        oracle_pubkey: *switchboard_feed_info.key,
+        price: market_price,
+        published_slot: open_slot,
+    });
+    Ok(market_price)
 }
 
 /// Issue a spl_token `InitializeAccount` instruction.

token-lending/program/src/pyth.rs

@@ -4,10 +4,7 @@ use bytemuck::{
     cast_slice, cast_slice_mut, from_bytes, from_bytes_mut, try_cast_slice, try_cast_slice_mut,
     Pod, PodCastError, Zeroable,
 };
-use std::{
-    mem::size_of,
-    fmt,
-};
+use std::mem::size_of;
 
 pub const MAGIC: u32 = 0xa1b2c3d4;
 pub const VERSION_2: u32 = 2;
@@ -32,7 +29,7 @@ pub enum AccountType {
     Price,
 }
 
-#[derive(PartialEq, Copy, Clone, Debug)]
+#[derive(PartialEq, Copy, Clone)]
 #[repr(C)]
 pub enum PriceStatus {
     Unknown,
@@ -41,13 +38,6 @@ pub enum PriceStatus {
     Auction,
 }
 
-impl fmt::Display for PriceStatus{
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{:?}", self)
-    }
-}
-
-
 #[derive(PartialEq, Copy, Clone)]
 #[repr(C)]
 pub enum CorpAction {