Updating toke-lending to use pyth v2 (#1959)

Author: nope-finance

token-lending/cli/src/main.rs

@@ -43,7 +43,7 @@ struct Config {
 type Error = Box<dyn std::error::Error>;
 type CommandResult = Result<(), Error>;
 
-const PYTH_PROGRAM_ID: &str = "5mkqGkkWSaSk2NL9p4XptwEQu4d5jFTJiurbbzdqYexF";
+const PYTH_PROGRAM_ID: &str = "gSbePebfvPy7tRqimPoVecS2UsBvYv46ynrzWocc92s";
 
 fn main() {
     solana_logger::setup_with_default("solana=info");

token-lending/program/src/processor.rs

@@ -274,7 +274,7 @@ fn process_init_reserve(
         msg!("Pyth product account provided is not a valid Pyth account");
         return Err(LendingError::InvalidOracleConfig.into());
     }
-    if pyth_product.ver != pyth::VERSION_1 {
+    if pyth_product.ver != pyth::VERSION_2 {
         msg!("Pyth product account provided has a different version than expected");
         return Err(LendingError::InvalidOracleConfig.into());
     }
@@ -497,7 +497,9 @@ fn process_deposit_reserve_liquidity(
         Pubkey::create_program_address(authority_signer_seeds, program_id)?;
     if &lending_market_authority_pubkey != lending_market_authority_info.key {
         msg!(
-            "Derived lending market authority does not match the lending market authority provided"
+            "Derived lending market authority {} does not match the lending market authority provided {}",
+            &lending_market_authority_pubkey.to_string(),
+            &lending_market_authority_info.key.to_string(),
         );
         return Err(LendingError::InvalidMarketAuthority.into());
     }

token-lending/program/src/pyth.rs

@@ -7,8 +7,8 @@ use bytemuck::{
 use std::mem::size_of;
 
 pub const MAGIC: u32 = 0xa1b2c3d4;
-pub const VERSION_1: u32 = 1;
-pub const VERSION: u32 = VERSION_1;
+pub const VERSION_2: u32 = 2;
+pub const VERSION: u32 = VERSION_2;
 pub const MAP_TABLE_SIZE: usize = 640;
 pub const PROD_ACCT_SIZE: usize = 512;
 pub const PROD_HDR_SIZE: usize = 48;
@@ -67,29 +67,34 @@ pub struct PriceComp {
 pub enum PriceType {
     Unknown,
     Price,
-    #[allow(clippy::upper_case_acronyms)]
-    TWAP,
-    Volatility,
 }
 
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct Price {
-    pub magic: u32,       // Pyth magic number.
-    pub ver: u32,         // Program version.
-    pub atype: u32,       // Account type.
-    pub size: u32,        // Price account size.
-    pub ptype: PriceType, // Price or calculation type.
-    pub expo: i32,        // Price exponent.
-    pub num: u32,         // Number of component prices.
+    pub magic: u32,       // pyth magic number
+    pub ver: u32,         // program version
+    pub atype: u32,       // account type
+    pub size: u32,        // price account size
+    pub ptype: PriceType, // price or calculation type
+    pub expo: i32,        // price exponent
+    pub num: u32,         // number of component prices
     pub unused: u32,
-    pub curr_slot: u64,  // Currently accumulating price slot.
-    pub valid_slot: u64, // Valid slot-time of agg price.
-    pub prod: AccKey,
-    pub next: AccKey,
-    pub agg_pub: AccKey,
-    pub agg: PriceInfo,
-    pub comp: [PriceComp; 16],
+    pub curr_slot: u64,        // currently accumulating price slot
+    pub valid_slot: u64,       // valid slot-time of agg. price
+    pub twap: i64,             // time-weighted average price
+    pub avol: u64,             // annualized price volatility
+    pub drv0: i64,             // space for future derived values
+    pub drv1: i64,             // space for future derived values
+    pub drv2: i64,             // space for future derived values
+    pub drv3: i64,             // space for future derived values
+    pub drv4: i64,             // space for future derived values
+    pub drv5: i64,             // space for future derived values
+    pub prod: AccKey,          // product account key
+    pub next: AccKey,          // next Price account in linked list
+    pub agg_pub: AccKey,       // quoter who computed last aggregate price
+    pub agg: PriceInfo,        // aggregate price info
+    pub comp: [PriceComp; 32], // price components one per quoter
 }
 
 #[cfg(target_endian = "little")]

token-lending/program/tests/fixtures/3Mnn2fX6rQyUsyELYms1sBJyChWofzSNRoqYzvgMVz5E.bin

@@ -55,11 +55,11 @@ pub const TEST_RESERVE_CONFIG: ReserveConfig = ReserveConfig {
     },
 };
 
-pub const SOL_PYTH_PRODUCT: &str = "8yrQMUyJRnCJ72NWwMiPV9dNGw465Z8bKUvnUC8P5L6F";
-pub const SOL_PYTH_PRICE: &str = "BdgHsXrH1mXqhdosXavYxZgX6bGqTdj5mh2sxDhF8bJy";
+pub const SOL_PYTH_PRODUCT: &str = "3Mnn2fX6rQyUsyELYms1sBJyChWofzSNRoqYzvgMVz5E";
+pub const SOL_PYTH_PRICE: &str = "J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix";
 
-pub const SRM_PYTH_PRODUCT: &str = "5agdsn3jogTt8F537GW3g8BuLaBGrg9Q2gPKUNqBV6Dh";
-pub const SRM_PYTH_PRICE: &str = "2Mt2wcRXpCAbTRp2VjFqGa8SbJVzjJvyK4Tx7aqbRtBJ";
+pub const SRM_PYTH_PRODUCT: &str = "6MEwdxe4g1NeAF9u6KDG14anJpFsVEa2cvr5H6iriFZ8";
+pub const SRM_PYTH_PRICE: &str = "992moaMQKs32GKZ9dxi8keyM2bUmbrwBZpK4p2K6X5Vs";
 
 pub const USDC_MINT: &str = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";