test(message-buffer): add rust integration tests

add rust-toolchain.toml to pin rust version, add integration tests, update cpi caller auth seeds

Author: swimricky

message_buffer/Cargo.lock

@@ -14,6 +14,10 @@ use {
     },
 };
 
+//TODO: make sure this works regardless if the msg_buffer is initialized already or not
+// we could be in a sitaution where we have a new price account & new msg_buffer acount
+// and we know we need more than 10KB to fit all the messages. In this situation
+// we would call create_buffer(10240) then resize_buffer(target_size)
 pub fn resize_buffer<'info>(
     ctx: Context<'_, '_, '_, 'info, ResizeBuffer<'info>>,
     allowed_program_auth: Pubkey,
@@ -36,8 +40,11 @@ pub fn resize_buffer<'info>(
         MessageBuffer::HEADER_LEN as u32,
         MessageBufferError::MessageBufferTooSmall
     );
+
     let target_size = target_size as usize;
-    let target_size_delta = target_size.saturating_sub(message_buffer_account_info.data_len());
+
+    let current_account_size = message_buffer_account_info.data_len();
+    let target_size_delta = target_size.saturating_sub(current_account_size);
     require_gte!(
         MAX_PERMITTED_DATA_INCREASE,
         target_size_delta,
@@ -61,10 +68,10 @@ pub fn resize_buffer<'info>(
         MessageBufferError::InvalidPDA
     );
 
-    // allow for delta == 0 in case Rent requirements have changed
+    // allow for target_size == account_size in case Rent requirements have changed
     // and additional lamports need to be transferred.
     // the realloc step will be a no-op in this case.
-    if target_size_delta >= 0 {
+    if target_size >= current_account_size {
         let target_rent = Rent::get()?.minimum_balance(target_size);
         if message_buffer_account_info.lamports() < target_rent {
             system_program::transfer(

message_buffer/programs/message_buffer/src/instructions/resize_buffer.rs

@@ -1,4 +1,4 @@
-mod instructions;
+pub mod instructions;
 mod macros;
 mod state;
 
@@ -15,13 +15,62 @@ declare_id!("Vbmv1jt4vyuqBZcpYPpnVhrqVe5e6ZPb6JxDcffRHUM");
 pub mod message_buffer {
     use super::*;
 
+    pub fn test(ctx: Context<Test>, admin: Pubkey) -> Result<()> {
+        use anchor_lang::{
+            prelude::*,
+            system_program::{
+                self,
+                Transfer,
+            },
+        };
+        msg!("in test");
+        let (whitelist_pda, whitelist_bump) =
+            Pubkey::find_program_address(&[b"message", b"whitelist"], &crate::ID);
+        msg!("crate_id: {:?}", crate::ID);
+        let payer_pk = ctx.accounts.payer.key();
+        msg!("payer_pk: {:?}", payer_pk);
+        msg!("admin: {:?}", admin);
+        msg!(
+            "whitelist_pda: {:?}, whitelist_bump: {:?}",
+            whitelist_pda,
+            whitelist_bump
+        );
+        let whitelist_acct_pk = ctx.accounts.whitelist.key();
+        msg!("whitelist_acct_pk: {:?}", whitelist_acct_pk);
+
+        // let whitelist = &mut ctx.accounts.whitelist;
+        // whitelist.bump = w_bump;
+
+        // let whitelist_bump = *ctx.bumps.get("whitelist").unwrap();
+        // msg!("whitelist_bump: {:?}", whitelist_bump);
+        // whitelist.admin = Pubkey::default();
+        // let init = &mut ctx.accounts.init;
+        // init.bump = *ctx.bumps.get("init").unwrap();
+        // msg!("[test]: initialized init");
+        let system_prog = ctx.accounts.system_program.key();
+        msg!("system_prog: {:?}", system_prog);
+        system_program::transfer(
+            CpiContext::new(
+                ctx.accounts.system_program.to_account_info(),
+                Transfer {
+                    from: ctx.accounts.payer.to_account_info(),
+                    to:   ctx.accounts.whitelist.to_account_info(),
+                },
+            ),
+            Rent::get()?.minimum_balance(0),
+        )?;
+        msg!("transferred to payer");
+        Ok(())
+    }
 
     /// Initializes the whitelist and sets it's admin to the provided pubkey
     /// Once initialized, the authority must sign all further changes to the whitelist.
     pub fn initialize(ctx: Context<Initialize>, admin: Pubkey) -> Result<()> {
         require_keys_neq!(admin, Pubkey::default());
+        msg!("in initialize");
         let whitelist = &mut ctx.accounts.whitelist;
         whitelist.bump = *ctx.bumps.get("whitelist").unwrap();
+        // whitelist.bump = bump;
         whitelist.admin = admin;
         Ok(())
     }
@@ -149,6 +198,41 @@ pub mod message_buffer {
     }
 }
 
+#[derive(Accounts)]
+pub struct Test<'info> {
+    #[account(mut)]
+    pub payer: Signer<'info>,
+
+    // #[account(
+    // init,
+    // payer = payer,
+    // seeds = [b"message".as_ref(), b"whitelist".as_ref()],
+    // bump,
+    // space = 8 + Whitelist::INIT_SPACE,
+    // )]
+    // pub whitelist:      Account<'info, Whitelist>,
+    #[account(
+    seeds = [b"message".as_ref(), b"whitelist".as_ref()],
+    bump,
+    )]
+    /// CHECK: test
+    pub whitelist:      UncheckedAccount<'info>,
+    pub system_program: Program<'info, System>,
+    // #[account(
+    // init,
+    // payer = payer,
+    // seeds = [b"message".as_ref(), b"init".as_ref()],
+    // bump,
+    // space = 8,
+    // )]
+    // pub init:           Account<'info, Init>,
+}
+
+#[account]
+pub struct Init {
+    pub bump: u8,
+}
+
 #[derive(Accounts)]
 pub struct Initialize<'info> {
     #[account(mut)]
@@ -158,7 +242,7 @@ pub struct Initialize<'info> {
         payer = payer,
         seeds = [b"message".as_ref(), b"whitelist".as_ref()],
         bump,
-        space = 8 + Whitelist::INIT_SPACE
+        space = 8 + Whitelist::INIT_SPACE,
     )]
     pub whitelist:      Account<'info, Whitelist>,
     pub system_program: Program<'info, System>,

message_buffer/programs/message_buffer/src/lib.rs

@@ -11,6 +11,8 @@ use {
 pub struct Whitelist {
     pub bump:             u8,
     pub admin:            Pubkey,
+    // This is used by the `#[derive(InitSpace)]`
+    // to determine initial account size
     #[max_len(32)]
     pub allowed_programs: Vec<Pubkey>,
 }

message_buffer/programs/message_buffer/src/state/whitelist.rs

@@ -14,9 +14,21 @@ no-idl = []
 no-log-ix-name = []
 cpi = ["no-entrypoint"]
 default = []
+test-bpf = []
 
 [dependencies]
 anchor-lang = "0.27.0"
 message_buffer = { path = "../message_buffer", features = ["cpi"] }
 # needed for the new #[account(zero_copy)] in anchor 0.27.0
 bytemuck = { version = "1.4.0", features = ["derive", "min_const_generics"]}
+
+[dev-dependencies]
+anchor-client = { version = "0.27.0", features = ["debug"] }
+solana-rpc-client-api = "1.14.16"
+solana-sdk = "1.14.16"
+solana-sdk-macro = "1.14.16"
+solana-program-test = "1.14.16"
+solana-validator = "1.14.16"
+assert_matches = "1.4.0"
+solana-logger = "1.14.16"
+byteorder = "1.4.3"

message_buffer/programs/mock-cpi-caller/Cargo.toml

@@ -3,7 +3,7 @@ use {
         instructions::{
             sighash,
             ACCUMULATOR_UPDATER_IX_NAME,
-            CPI,
+            UPD_PRICE_WRITE,
         },
         message::{
             get_schemas,
@@ -51,13 +51,13 @@ pub fn add_price<'info>(
     // Note: normally pyth oracle add_price wouldn't call emit_accumulator_inputs
     // since add_price doesn't actually add/update any price data we would
     // want included in the accumulator anyways. This is just for testing
-    AddPrice::emit_accumulator_inputs(ctx, inputs)
+    AddPrice::emit_messages(ctx, inputs)
 }
 
 
 impl<'info> AddPrice<'info> {
-    /// Invoke accumulator-updater emit-inputs ix cpi call using solana
-    pub fn emit_accumulator_inputs(
+    /// Invoke message_buffer::put_all ix cpi call using solana
+    pub fn emit_messages(
         ctx: Context<'_, '_, '_, 'info, AddPrice<'info>>,
         inputs: Vec<Vec<u8>>,
     ) -> anchor_lang::Result<()> {
@@ -89,17 +89,19 @@ impl<'info> AddPrice<'info> {
         // that won't be available in the oracle program
         let (_, bump) = Pubkey::find_program_address(
             &[
+                UPD_PRICE_WRITE.as_bytes(),
                 ctx.accounts.message_buffer_program.key().as_ref(),
-                CPI.as_bytes(),
             ],
             &crate::ID,
         );
         anchor_lang::solana_program::program::invoke_signed(
             &create_inputs_ix,
             account_infos,
             &[&[
+                UPD_PRICE_WRITE.as_bytes(),
                 ctx.accounts.message_buffer_program.key().as_ref(),
-                CPI.as_bytes(),
+                // ctx.accounts.message_buffer_program.key().as_ref(),
+                // UPD_PRICE_WRITE.as_bytes(),
                 &[bump],
             ]],
         )?;
@@ -136,7 +138,7 @@ pub struct AddPrice<'info> {
     /// PDA representing this program's authority
     /// to call the accumulator program
     #[account(
-        seeds = [message_buffer_program.key().as_ref(), b"cpi".as_ref()],
+        seeds = [b"upd_price_write".as_ref(), message_buffer_program.key().as_ref()],
         owner = system_program::System::id(),
         bump,
     )]

message_buffer/programs/mock-cpi-caller/src/instructions/add_price.rs

@@ -33,5 +33,5 @@ pub fn cpi_max_test<'info>(
     msg!("input_len: {}", input_len);
 
 
-    UpdatePrice::emit_accumulator_inputs(ctx, inputs)
+    UpdatePrice::emit_messages(ctx, inputs)
 }

message_buffer/programs/mock-cpi-caller/src/instructions/cpi_max_test.rs

@@ -24,4 +24,4 @@ pub fn sighash(namespace: &str, name: &str) -> [u8; 8] {
 }
 
 pub const ACCUMULATOR_UPDATER_IX_NAME: &str = "put_all";
-pub const CPI: &str = "cpi";
+pub const UPD_PRICE_WRITE: &str = "upd_price_write";

message_buffer/programs/mock-cpi-caller/src/instructions/mod.rs

@@ -3,7 +3,7 @@ use {
         instructions::{
             sighash,
             ACCUMULATOR_UPDATER_IX_NAME,
-            CPI,
+            UPD_PRICE_WRITE,
         },
         message::{
             price::{
@@ -45,7 +45,7 @@ pub struct UpdatePrice<'info> {
     /// CHECK: whitelist
     pub accumulator_whitelist:  UncheckedAccount<'info>,
     #[account(
-        seeds = [message_buffer_program.key().as_ref(), b"cpi".as_ref()],
+        seeds = [b"upd_price_write".as_ref(), message_buffer_program.key().as_ref()],
         owner = system_program::System::id(),
         bump,
     )]
@@ -76,12 +76,12 @@ pub fn update_price<'info>(
     }
 
 
-    UpdatePrice::emit_accumulator_inputs(ctx, inputs)
+    UpdatePrice::emit_messages(ctx, inputs)
 }
 
 impl<'info> UpdatePrice<'info> {
-    /// Invoke accumulator-updater emit-inputs ix cpi call
-    pub fn emit_accumulator_inputs(
+    /// Invoke message_buffer::put_all ix cpi call
+    pub fn emit_messages(
         ctx: Context<'_, '_, '_, 'info, UpdatePrice<'info>>,
         values: Vec<Vec<u8>>,
     ) -> anchor_lang::Result<()> {
@@ -113,20 +113,38 @@ impl<'info> UpdatePrice<'info> {
         // that won't be available in the oracle program
         let (_, bump) = Pubkey::find_program_address(
             &[
+                UPD_PRICE_WRITE.as_bytes(),
                 ctx.accounts.message_buffer_program.key().as_ref(),
-                CPI.as_bytes(),
             ],
             &crate::ID,
         );
         anchor_lang::solana_program::program::invoke_signed(
             &update_inputs_ix,
             account_infos,
             &[&[
+                UPD_PRICE_WRITE.as_bytes(),
                 ctx.accounts.message_buffer_program.key().as_ref(),
-                CPI.as_bytes(),
+                // ctx.accounts.message_buffer_program.key().as_ref(),
+                // UPD_PRICE_WRITE.as_bytes(),
                 &[bump],
             ]],
         )?;
+        // let (_, bump) = Pubkey::find_program_address(
+        //     &[
+        //         ctx.accounts.message_buffer_program.key().as_ref(),
+        //         UPD_PRICE_WRITE.as_bytes(),
+        //     ],
+        //     &crate::ID,
+        // );
+        // anchor_lang::solana_program::program::invoke_signed(
+        //     &update_inputs_ix,
+        //     account_infos,
+        //     &[&[
+        //         ctx.accounts.message_buffer_program.key().as_ref(),
+        //         UPD_PRICE_WRITE.as_bytes(),
+        //         &[bump],
+        //     ]],
+        // )?;
         Ok(())
     }
 }