Merge branch 'main' into remove-borsh

Author: majabbour

program/rust/src/c_oracle_header.rs

@@ -53,6 +53,7 @@ unsafe impl Pod for cmd_hdr {
 }
 
 #[cfg(target_endian = "little")]
+
 unsafe impl Zeroable for pc_price_info {
 }
 
@@ -74,4 +75,19 @@ unsafe impl Zeroable for pc_ema {
 
 #[cfg(target_endian = "little")]
 unsafe impl Pod for pc_ema {
+
+unsafe impl Zeroable for cmd_add_price_t {
+}
+
+#[cfg(target_endian = "little")]
+unsafe impl Pod for cmd_add_price_t {
+}
+
+#[cfg(target_endian = "little")]
+unsafe impl Zeroable for pc_pub_key_t {
+}
+
+#[cfg(target_endian = "little")]
+unsafe impl Pod for pc_pub_key_t {
+
 }

program/rust/src/processor.rs

@@ -8,6 +8,7 @@ use crate::c_entrypoint_wrapper;
 use crate::c_oracle_header::{
     cmd_hdr,
     command_t_e_cmd_add_mapping,
+    command_t_e_cmd_add_price,
     command_t_e_cmd_agg_price,
     command_t_e_cmd_init_mapping,
     command_t_e_cmd_upd_account_version,
@@ -21,6 +22,7 @@ use crate::error::{
 };
 use crate::rust_oracle::{
     add_mapping,
+    add_price,
     init_mapping,
     update_price,
     update_version,
@@ -58,6 +60,7 @@ pub fn process_instruction(
         command_t_e_cmd_upd_account_version => {
             update_version(program_id, accounts, instruction_data)
         }
+        command_t_e_cmd_add_price => add_price(program_id, accounts, instruction_data),
         command_t_e_cmd_init_mapping => init_mapping(program_id, accounts, instruction_data),
         command_t_e_cmd_add_mapping => add_mapping(program_id, accounts, instruction_data),
         _ => c_entrypoint_wrapper(input),

program/rust/src/rust_oracle.rs

@@ -20,12 +20,21 @@ use solana_program::pubkey::Pubkey;
 use solana_program::rent::Rent;
 
 use crate::c_oracle_header::{
+    cmd_add_price_t,
     cmd_hdr_t,
     pc_acc,
     pc_map_table_t,
+    pc_price_t,
+    pc_prod_t,
+    pc_pub_key_t,
     PC_ACCTYPE_MAPPING,
+    PC_ACCTYPE_PRICE,
+    PC_ACCTYPE_PRODUCT,
     PC_MAGIC,
     PC_MAP_TABLE_SIZE,
+    PC_MAX_NUM_DECIMALS,
+    PC_PROD_ACC_SIZE,
+    PC_PTYPE_UNKNOWN,
 };
 use crate::error::OracleResult;
 
@@ -109,13 +118,56 @@ pub fn add_mapping(
     )?;
 
     initialize_mapping_account(next_mapping, hdr.ver_)?;
-    unsafe {
-        cur_mapping
-            .next_
-            .k1_
-            .copy_from_slice(&next_mapping.key.to_bytes());
+    pubkey_assign(&mut cur_mapping.next_, &next_mapping.key.to_bytes());
+
+    Ok(SUCCESS)
+}
+
+/// add a price account to a product account
+/// accounts[0] funding account                                   [signer writable]
+/// accounts[1] product account to add the price account to       [signer writable]
+/// accounts[2] newly created price account                       [signer writable]
+pub fn add_price(
+    program_id: &Pubkey,
+    accounts: &[AccountInfo],
+    instruction_data: &[u8],
+) -> OracleResult {
+    let cmd_args = load::<cmd_add_price_t>(instruction_data)?;
+
+    if cmd_args.expo_ > PC_MAX_NUM_DECIMALS as i32
+        || cmd_args.expo_ < -(PC_MAX_NUM_DECIMALS as i32)
+        || cmd_args.ptype_ == PC_PTYPE_UNKNOWN
+    {
+        return Err(ProgramError::InvalidArgument);
     }
 
+    let [_funding_account, product_account, price_account] = match accounts {
+        [x, y, z]
+            if valid_funding_account(x)
+                && valid_signable_account(program_id, y, PC_PROD_ACC_SIZE as usize)
+                && valid_signable_account(program_id, z, size_of::<pc_price_t>())
+                && valid_fresh_account(z) =>
+        {
+            Ok([x, y, z])
+        }
+        _ => Err(ProgramError::InvalidArgument),
+    }?;
+
+    let mut product_data = load_product_account_mut(product_account, cmd_args.ver_)?;
+
+    clear_account(price_account)?;
+
+    let mut price_data = load_account_as_mut::<pc_price_t>(price_account)?;
+    price_data.magic_ = PC_MAGIC;
+    price_data.ver_ = cmd_args.ver_;
+    price_data.type_ = PC_ACCTYPE_PRICE;
+    price_data.size_ = (size_of::<pc_price_t>() - size_of_val(&price_data.comp_)) as u32;
+    price_data.expo_ = cmd_args.expo_;
+    price_data.ptype_ = cmd_args.ptype_;
+    pubkey_assign(&mut price_data.prod_, &product_account.key.to_bytes());
+    pubkey_assign(&mut price_data.next_, bytes_of(&product_data.px_acc_));
+    pubkey_assign(&mut product_data.px_acc_, &price_account.key.to_bytes());
+
     Ok(SUCCESS)
 }
 
@@ -159,17 +211,16 @@ fn load_mapping_account_mut<'a>(
     account: &'a AccountInfo,
     expected_version: u32,
 ) -> Result<RefMut<'a, pc_map_table_t>, ProgramError> {
-    let mapping_account_ref = load_account_as_mut::<pc_map_table_t>(account)?;
-    let mapping_account = *mapping_account_ref;
+    let mapping_data = load_account_as_mut::<pc_map_table_t>(account)?;
 
     pyth_assert(
-        mapping_account.magic_ == PC_MAGIC
-            && mapping_account.ver_ == expected_version
-            && mapping_account.type_ == PC_ACCTYPE_MAPPING,
+        mapping_data.magic_ == PC_MAGIC
+            && mapping_data.ver_ == expected_version
+            && mapping_data.type_ == PC_ACCTYPE_MAPPING,
         ProgramError::InvalidArgument,
     )?;
 
-    Ok(mapping_account_ref)
+    Ok(mapping_data)
 }
 
 /// Initialize account as a new mapping account. This function will zero out any existing data in
@@ -186,3 +237,27 @@ fn initialize_mapping_account(account: &AccountInfo, version: u32) -> Result<(),
 
     Ok(())
 }
+
+/// Mutably borrow the data in `account` as a product account, validating that the account
+/// is properly formatted. Any mutations to the returned value will be reflected in the
+/// account data. Use this to read already-initialized accounts.
+fn load_product_account_mut<'a>(
+    account: &'a AccountInfo,
+    expected_version: u32,
+) -> Result<RefMut<'a, pc_prod_t>, ProgramError> {
+    let product_data = load_account_as_mut::<pc_prod_t>(account)?;
+
+    pyth_assert(
+        product_data.magic_ == PC_MAGIC
+            && product_data.ver_ == expected_version
+            && product_data.type_ == PC_ACCTYPE_PRODUCT,
+        ProgramError::InvalidArgument,
+    )?;
+
+    Ok(product_data)
+}
+
+// Assign pubkey bytes from source to target, fails if source is not 32 bytes
+fn pubkey_assign(target: &mut pc_pub_key_t, source: &[u8]) {
+    unsafe { target.k1_.copy_from_slice(source) }
+}