add a new insctruction and interecepted update price calls

Author: majabbour

program/c/src/oracle/oracle.h

@@ -269,6 +269,12 @@ typedef enum {
   // key[1] price account         [writable]
   // key[2] sysvar_clock account  [readable]
   e_cmd_upd_price_no_fail_on_error,
+
+  // performs migation logic on the upgraded account. (resizes price accounts)
+  // key[0] funding account       [signer writable]
+  // key[1] upgraded account      [writable]
+  // key[2] system program        [readable]
+  e_cmd_upd_account_version,
 } command_t;
 
 typedef struct cmd_hdr

program/rust/src/lib.rs

@@ -1,10 +1,19 @@
-mod c_oracle_header;
+pub mod c_oracle_header;
+mod rust_oracle;
 mod time_machine_types;
+<<<<<<< HEAD
 mod error;
 mod log;
 
 use crate::log::{post_log, pre_log};
 use solana_program::entrypoint::deserialize;
+=======
+use borsh::{BorshDeserialize, BorshSerialize};
+use solana_program::entrypoint::deserialize;
+use solana_program::pubkey::Pubkey;
+use solana_program::sysvar::slot_history::AccountInfo;
+
+>>>>>>> 4656a2b (add a new insctruction and interecepted update price calls)
 
 //Below is a high lever description of the rust/c setup.
 
@@ -45,7 +54,32 @@ pub extern "C" fn entrypoint(input: *mut u8) -> u64 {
         _ => {}
     }
 
-    let c_ret_val = unsafe { c_entrypoint(input) };
+    let cmd_hdr_size = ::std::mem::size_of::<c_oracle_header::cmd_hdr>();
+    if instruction_data.len() < cmd_hdr_size {
+        panic!("insufficient data, could not parse instruction");
+    }
+
+    let cmd_data = c_oracle_header::cmd_hdr::try_from_slice(&instruction_data[..cmd_hdr_size]).unwrap();
+
+    if cmd_data.ver_ != c_oracle_header::PC_VERSION {
+        //FIXME: I am not sure what's best to do here (this is copied from C)
+        // it seems to me like we should not break when version numbers change
+        //instead we should maintain the update logic accross version in the
+        //upd_account_version command
+        panic!("incorrect version numbers");
+    }
+
+    let c_ret_val = match cmd_data.cmd_ as u32 {
+        c_oracle_header::command_t_e_cmd_upd_price
+        | c_oracle_header::command_t_e_cmd_upd_price_no_fail_on_error
+        | c_oracle_header::command_t_e_cmd_agg_price => {
+            rust_oracle::update_price(program_id, accounts, instruction_data, input)
+        }
+        c_oracle_header::command_t_e_cmd_upd_account_version => {
+            rust_oracle::update_version(program_id, accounts, instruction_data)
+        }
+        _ => unsafe { return c_entrypoint(input) },
+    }
 
     match post_log(c_ret_val, &accounts) {
         Err(error) => return error.into(),

program/rust/src/rust_oracle.rs

@@ -0,0 +1,33 @@
+use super::c_entrypoint;
+use super::c_oracle_header;
+use solana_program::pubkey::Pubkey;
+use solana_program::sysvar::slot_history::AccountInfo;
+
+///Calls the c oracle update_price, and updates the Time Machine if needed
+pub fn update_price(
+    program_id: &Pubkey,
+    accounts: Vec<AccountInfo>,
+    instruction_data: &[u8],
+    input: *mut u8,
+) -> u64 {
+    //For now, we did not change the behavior of this. this is just to show the proposed structure of the
+    //program
+    let c_ret_val = unsafe { c_entrypoint(input) };
+    if c_ret_val == c_oracle_header::SUCCESSFULLY_UPDATED_AGGREGATE {
+        //0 is the SUCCESS value for solana
+        return 0;
+    } else {
+        return c_ret_val;
+    }
+}
+/// has version number/ account type dependant logic to make sure the given account is compatible
+/// with the current version
+/// updates the version number for all accounts, and resizes price accounts
+pub fn update_version(
+    program_id: &Pubkey,
+    accounts: Vec<AccountInfo>,
+    instruction_data: &[u8],
+) -> u64 {
+    panic!("Need to merge fix to pythd in order to implement this");
+    0 //SUCCESS
+}