test: fix old pyth tests

Author: Riateche

Cargo.lock

@@ -20,13 +20,14 @@ use {
 pub const ACCUMULATOR_RING_SIZE: u32 = 10_000;
 
 lazy_static! {
-    static ref ORACLE_PUBKEY: Option<Pubkey> = match env::var("PYTH_ORACLE_PUBKEY") {
-        Ok(value) => Some(
-            value
-                .parse()
-                .expect("invalid value of PYTH_ORACLE_PUBKEY env var")
-        ),
-        Err(VarError::NotPresent) => None,
+    pub static ref ORACLE_PUBKEY: Pubkey = match env::var("PYTH_ORACLE_PUBKEY") {
+        Ok(value) => value
+            .parse()
+            .expect("invalid value of PYTH_ORACLE_PUBKEY env var"),
+        Err(VarError::NotPresent) => {
+            // Pythnet oracle program address
+            "FsJ3A3u2vn5cTVofAjvy6y5kwABJAqYWpe4975bi2epH".parse().unwrap()
+        }
         Err(VarError::NotUnicode(err)) => {
             panic!("invalid value of PYTH_ORACLE_PUBKEY env var: {err:?}");
         }
@@ -51,9 +52,6 @@ pub enum AccumulatorUpdateErrorV1 {
 
     #[error("could not parse Pubkey from environment")]
     InvalidEnvPubkey(#[from] solana_sdk::pubkey::ParsePubkeyError),
-
-    #[error("no oracle pubkey")]
-    NoOraclePubkey,
 }
 
 /// Updates the Accumulator Sysvar at the start of a new slot. See `update_clock` to see a similar
@@ -376,10 +374,8 @@ fn post_accumulator_attestation(
 }
 
 pub fn update_v2(bank: &Bank) -> std::result::Result<(), AccumulatorUpdateErrorV1> {
-    let oracle_pubkey = ORACLE_PUBKEY.ok_or(AccumulatorUpdateErrorV1::NoOraclePubkey)?;
-
     let accounts = bank
-        .get_program_accounts(&oracle_pubkey, &ScanConfig::new(true))
+        .get_program_accounts(&ORACLE_PUBKEY, &ScanConfig::new(true))
         .map_err(AccumulatorUpdateErrorV1::GetProgramAccounts)?;
 
     let mut any_v1_aggregations = false;
@@ -395,12 +391,10 @@ pub fn update_v2(bank: &Bank) -> std::result::Result<(), AccumulatorUpdateErrorV
             &pubkey.to_bytes().into(),
             &mut price_account_data,
         ) {
-            Ok(outcome) => {
-                if outcome.commit {
-                    account.set_data(price_account_data);
-                    bank.store_account_and_update_capitalization(&pubkey, &account);
-                }
-                v2_messages.extend(outcome.messages);
+            Ok(messages) => {
+                account.set_data(price_account_data);
+                bank.store_account_and_update_capitalization(&pubkey, &account);
+                v2_messages.extend(messages);
             }
             Err(err) => match err {
                 AggregationError::NotPriceFeedAccount => {}

runtime/src/bank/pyth_accumulator.rs

@@ -1,13 +1,15 @@
 use crate::{
     bank::{
-        pyth_accumulator::{get_accumulator_keys, ACCUMULATOR_RING_SIZE},
+        pyth_accumulator::{get_accumulator_keys, ACCUMULATOR_RING_SIZE, ORACLE_PUBKEY},
         Bank,
     },
     genesis_utils::{create_genesis_config_with_leader, GenesisConfigInfo},
 };
 use byteorder::ByteOrder;
 use byteorder::{LittleEndian, ReadBytesExt};
 use itertools::Itertools;
+use pyth_oracle::solana_program::account_info::AccountInfo;
+use pyth_oracle::{PriceAccount, PythAccount};
 use pythnet_sdk::{
     accumulators::{merkle::MerkleAccumulator, Accumulator},
     hashers::{keccak256_160::Keccak160, Hasher},
@@ -17,6 +19,7 @@ use pythnet_sdk::{
 use solana_sdk::{
     account::{AccountSharedData, ReadableAccount, WritableAccount},
     borsh::{BorshDeserialize, BorshSerialize},
+    clock::Epoch,
     epoch_schedule::EpochSchedule,
     feature::{self, Feature},
     feature_set,
@@ -25,7 +28,7 @@ use solana_sdk::{
     signature::keypair_from_seed,
     signer::Signer,
 };
-use std::{io::Read, sync::Arc};
+use std::{io::Read, mem::size_of, sync::Arc};
 
 // Create Message Account Bytes
 //
@@ -125,6 +128,25 @@ fn test_update_accumulator_sysvar() {
     // Store Message account so the accumulator sysvar updater can find it.
     bank.store_account(&price_message_key.pubkey(), &price_message_account);
 
+    let (price_feed_key, _bump) = Pubkey::find_program_address(&[b"123"], &ORACLE_PUBKEY);
+    let mut price_feed_account =
+        AccountSharedData::new(42, size_of::<PriceAccount>(), &ORACLE_PUBKEY);
+    PriceAccount::initialize(
+        &AccountInfo::new(
+            &price_feed_key.to_bytes().into(),
+            false,
+            true,
+            &mut 0,
+            &mut price_feed_account.data_mut(),
+            &ORACLE_PUBKEY.to_bytes().into(),
+            false,
+            Epoch::default(),
+        ),
+        0,
+    )
+    .unwrap();
+    bank.store_account(&price_feed_key, &price_feed_account);
+
     // Derive the Wormhole Message Account that will be generated by the sysvar updater.
     let (wormhole_message_pubkey, _bump) = Pubkey::find_program_address(
         &[b"AccumulatorMessage", &(bank.slot() as u32).to_be_bytes()],
@@ -396,6 +418,25 @@ fn test_update_accumulator_end_of_block() {
     // Store Message account so the accumulator sysvar updater can find it.
     bank.store_account(&price_message_key.pubkey(), &price_message_account);
 
+    let (price_feed_key, _bump) = Pubkey::find_program_address(&[b"123"], &ORACLE_PUBKEY);
+    let mut price_feed_account =
+        AccountSharedData::new(42, size_of::<PriceAccount>(), &ORACLE_PUBKEY);
+    PriceAccount::initialize(
+        &AccountInfo::new(
+            &price_feed_key.to_bytes().into(),
+            false,
+            true,
+            &mut 0,
+            &mut price_feed_account.data_mut(),
+            &ORACLE_PUBKEY.to_bytes().into(),
+            false,
+            Epoch::default(),
+        ),
+        0,
+    )
+    .unwrap();
+    bank.store_account(&price_feed_key, &price_feed_account);
+
     // Derive the Wormhole Message Account that will be generated by the sysvar updater.
     let (wormhole_message_pubkey, _bump) = Pubkey::find_program_address(
         &[b"AccumulatorMessage", &(bank.slot() as u32).to_be_bytes()],
@@ -631,7 +672,6 @@ fn test_update_accumulator_end_of_block() {
 #[test]
 fn test_get_accumulator_keys() {
     use pythnet_sdk::{pythnet, ACCUMULATOR_EMITTER_ADDRESS, MESSAGE_BUFFER_PID};
-    let leader_pubkey = solana_sdk::pubkey::new_rand();
     let accumulator_keys: Vec<Pubkey> = get_accumulator_keys()
         .iter()
         .map(|(_, pk_res)| *pk_res.as_ref().unwrap())