Change SWB pull oracle to the actual mainnet key (was using swb v2 ke…

…y incorrectly)
mrgnlabs · Aug 19, 2024 · 4dfbb0e · 4dfbb0e
1 parent 9eae066
commit 4dfbb0e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/programs/marginfi/src/constants.rs b/programs/marginfi/src/constants.rs
@@ -25,6 +25,9 @@ cfg_if::cfg_if! {
     }
 }
 
+// TODO add localnet/devnet
+pub const SWITCHBOARD_PULL_ID: Pubkey = pubkey!("SBondMDrcV3K4kxZR1HNVT7osZxAHVHgYXL5Ze1oMUv");
+
 /// TODO: Make these variable per bank
 pub const LIQUIDATION_LIQUIDATOR_FEE: I80F48 = I80F48!(0.025);
 pub const LIQUIDATION_INSURANCE_FEE: I80F48 = I80F48!(0.025);

diff --git a/programs/marginfi/src/state/price.rs b/programs/marginfi/src/state/price.rs
@@ -16,7 +16,7 @@ use crate::{
     check,
     constants::{
         CONF_INTERVAL_MULTIPLE, EXP_10, EXP_10_I80F48, MAX_CONF_INTERVAL,
-        MIN_PYTH_PUSH_VERIFICATION_LEVEL, PYTH_ID, STD_DEV_MULTIPLE,
+        MIN_PYTH_PUSH_VERIFICATION_LEVEL, PYTH_ID, STD_DEV_MULTIPLE, SWITCHBOARD_PULL_ID,
     },
     debug, math_error,
     prelude::*,
@@ -320,7 +320,7 @@ impl SwitchboardPullPriceFeed {
         let ai_data = ai.data.borrow();
 
         check!(
-            ai.owner.eq(&switchboard_on_demand::SWITCHBOARD_PROGRAM_ID),
+            ai.owner.eq(&SWITCHBOARD_PULL_ID),
             MarginfiError::InvalidOracleAccount
         );
 
@@ -342,7 +342,7 @@ impl SwitchboardPullPriceFeed {
         let ai_data = ai.data.borrow();
 
         check!(
-            ai.owner.eq(&switchboard_on_demand::SWITCHBOARD_PROGRAM_ID),
+            ai.owner.eq(&SWITCHBOARD_PULL_ID),
             MarginfiError::InvalidOracleAccount
         );
 
@@ -1210,7 +1210,7 @@ mod tests {
         Account {
             lamports: 1_000_000,
             data,
-            owner: switchboard_on_demand::SWITCHBOARD_PROGRAM_ID,
+            owner: SWITCHBOARD_PULL_ID,
             executable: false,
             rent_epoch: 361,
         }

diff --git a/test-utils/src/utils.rs b/test-utils/src/utils.rs
@@ -2,6 +2,7 @@ use anchor_lang::prelude::*;
 use anchor_lang_29::Discriminator;
 use anchor_spl::token_2022::spl_token_2022::extension::transfer_fee::MAX_FEE_BASIS_POINTS;
 use marginfi::constants::PYTH_ID;
+use marginfi::constants::SWITCHBOARD_PULL_ID;
 use pyth_sdk_solana::state::{
     AccountType, PriceInfo, PriceStatus, Rational, SolanaPriceAccount, MAGIC, VERSION_2,
 };
@@ -152,7 +153,7 @@ pub fn create_switch_pull_oracle_account_from_bytes(data: Vec<u8>) -> Account {
     Account {
         lamports: 1_000_000,
         data,
-        owner: switchboard_on_demand::SWITCHBOARD_PROGRAM_ID,
+        owner: SWITCHBOARD_PULL_ID,
         executable: false,
         rent_epoch: 361,
     }