refactor: remove transfer to save contract size

Riateche · Riateche · commit f466deb73c4a · 2024-08-06T13:20:00.000+01:00
diff --git a/program/rust/src/processor.rs b/program/rust/src/processor.rs
@@ -17,9 +17,7 @@ use {
     },
     solana_program::{
         entrypoint::ProgramResult,
-        program::invoke,
         pubkey::Pubkey,
-        system_instruction,
         sysvar::slot_history::AccountInfo,
     },
 };
@@ -109,30 +107,15 @@ pub fn process_instruction(
     }
 }
 
-fn reserve_new_price_feed_index<'a>(
-    funding_account: &AccountInfo<'a>,
-    permissions_account: &AccountInfo<'a>,
-    system_program: &AccountInfo<'a>,
-) -> Result<u32, ProgramError> {
+fn reserve_new_price_feed_index(permissions_account: &AccountInfo) -> Result<u32, ProgramError> {
     if permissions_account.data_len() < PermissionAccount::MIN_SIZE_WITH_LAST_FEED_INDEX {
         let new_size = PermissionAccount::MIN_SIZE_WITH_LAST_FEED_INDEX;
         let rent = Rent::get()?;
         let new_minimum_balance = rent.minimum_balance(new_size);
-        let lamports_diff = new_minimum_balance.saturating_sub(permissions_account.lamports());
-        if lamports_diff > 0 {
-            invoke(
-                &system_instruction::transfer(
-                    funding_account.key,
-                    permissions_account.key,
-                    lamports_diff,
-                ),
-                &[
-                    funding_account.clone(),
-                    permissions_account.clone(),
-                    system_program.clone(),
-                ],
-            )?;
-        }
+        pyth_assert(
+            permissions_account.lamports() >= new_minimum_balance,
+            ProgramError::AccountNotRentExempt,
+        )?;
 
         permissions_account.realloc(new_size, true)?;
         let mut header = load_account_as_mut::<AccountHeader>(permissions_account)?;
diff --git a/program/rust/src/processor/add_price.rs b/program/rust/src/processor/add_price.rs
@@ -37,7 +37,6 @@ use {
 // account[1] product account        [writable]
 // account[2] new price account      [writable]
 // account[3] permissions account    [writable]
-// account[4] system program account []
 pub fn add_price(
     program_id: &Pubkey,
     accounts: &[AccountInfo],
@@ -51,12 +50,10 @@ pub fn add_price(
         ProgramError::InvalidArgument,
     )?;
 
-
-    let (funding_account, product_account, price_account, permissions_account, system_program) =
-        match accounts {
-            [x, y, z, p, q] => Ok((x, y, z, p, q)),
-            _ => Err(OracleError::InvalidNumberOfAccounts),
-        }?;
+    let (funding_account, product_account, price_account, permissions_account) = match accounts {
+        [x, y, z, p] => Ok((x, y, z, p)),
+        _ => Err(OracleError::InvalidNumberOfAccounts),
+    }?;
 
     check_valid_funding_account(funding_account)?;
     check_permissioned_funding_account(
@@ -74,10 +71,6 @@ pub fn add_price(
         &cmd_args.header,
     )?;
     check_valid_writable_account(program_id, permissions_account)?;
-    pyth_assert(
-        solana_program::system_program::check_id(system_program.key),
-        OracleError::InvalidSystemAccount.into(),
-    )?;
 
     let mut product_data =
         load_checked::<ProductAccount>(product_account, cmd_args.header.version)?;
@@ -89,8 +82,7 @@ pub fn add_price(
     price_data.product_account = *product_account.key;
     price_data.next_price_account = product_data.first_price_account;
     price_data.min_pub_ = PRICE_ACCOUNT_DEFAULT_MIN_PUB;
-    price_data.feed_index =
-        reserve_new_price_feed_index(funding_account, permissions_account, system_program)?;
+    price_data.feed_index = reserve_new_price_feed_index(permissions_account)?;
     product_data.first_price_account = *price_account.key;
 
     Ok(())
diff --git a/program/rust/src/processor/add_product.rs b/program/rust/src/processor/add_product.rs
@@ -65,7 +65,6 @@ pub fn add_product(
         hdr,
     )?;
 
-
     let mut mapping_data = load_checked::<MappingAccount>(tail_mapping_account, hdr.version)?;
     // The mapping account must have free space to add the product account
     pyth_assert(
diff --git a/program/rust/src/processor/del_product.rs b/program/rust/src/processor/del_product.rs
@@ -68,7 +68,6 @@ pub fn del_product(
         cmd_args,
     )?;
 
-
     {
         let mut mapping_data = load_checked::<MappingAccount>(mapping_account, cmd_args.version)?;
         let product_data = load_checked::<ProductAccount>(product_account, cmd_args.version)?;
diff --git a/program/rust/src/processor/init_price.rs b/program/rust/src/processor/init_price.rs
@@ -55,7 +55,6 @@ pub fn init_price(
         &cmd_args.header,
     )?;
 
-
     let mut price_data = load_checked::<PriceAccount>(price_account, cmd_args.header.version)?;
     pyth_assert(
         price_data.price_type == cmd_args.price_type,
diff --git a/program/rust/src/processor/init_price_feed_index.rs b/program/rust/src/processor/init_price_feed_index.rs
@@ -28,7 +28,6 @@ use {
 // account[0] funding account        [signer writable]
 // account[1] price account          [writable]
 // account[2] permissions account    [writable]
-// account[3] system program account []
 pub fn init_price_feed_index(
     program_id: &Pubkey,
     accounts: &[AccountInfo],
@@ -41,8 +40,8 @@ pub fn init_price_feed_index(
         ProgramError::InvalidArgument,
     )?;
 
-    let (funding_account, price_account, permissions_account, system_program) = match accounts {
-        [x, y, p, z] => Ok((x, y, p, z)),
+    let (funding_account, price_account, permissions_account) = match accounts {
+        [x, y, p] => Ok((x, y, p)),
         _ => Err(OracleError::InvalidNumberOfAccounts),
     }?;
 
@@ -55,18 +54,13 @@ pub fn init_price_feed_index(
         cmd,
     )?;
     check_valid_writable_account(program_id, permissions_account)?;
-    pyth_assert(
-        solana_program::system_program::check_id(system_program.key),
-        OracleError::InvalidSystemAccount.into(),
-    )?;
 
     let mut price_account_data = load_checked::<PriceAccount>(price_account, cmd.version)?;
     pyth_assert(
         price_account_data.feed_index == 0,
         OracleError::FeedIndexAlreadyInitialized.into(),
     )?;
-    price_account_data.feed_index =
-        reserve_new_price_feed_index(funding_account, permissions_account, system_program)?;
+    price_account_data.feed_index = reserve_new_price_feed_index(permissions_account)?;
 
     Ok(())
 }
diff --git a/program/rust/src/processor/set_min_pub.rs b/program/rust/src/processor/set_min_pub.rs
@@ -51,7 +51,6 @@ pub fn set_min_pub(
         &cmd.header,
     )?;
 
-
     let mut price_account_data = load_checked::<PriceAccount>(price_account, cmd.header.version)?;
     price_account_data.min_pub_ = cmd.minimum_publishers;
 
diff --git a/program/rust/src/processor/upd_permissions.rs b/program/rust/src/processor/upd_permissions.rs
@@ -61,7 +61,6 @@ pub fn upd_permissions(
         OracleError::InvalidSystemAccount.into(),
     )?;
 
-
     // Create PermissionAccount if it doesn't exist
     PermissionAccount::initialize_pda(
         permissions_account,
diff --git a/program/rust/src/processor/upd_product.rs b/program/rust/src/processor/upd_product.rs
@@ -47,7 +47,6 @@ pub fn upd_product(
         hdr,
     )?;
 
-
     {
         // Validate that product_account contains the appropriate account header
         let mut _product_data = load_checked::<ProductAccount>(product_account, hdr.version)?;
diff --git a/program/rust/src/tests/mod.rs b/program/rust/src/tests/mod.rs
@@ -28,6 +28,5 @@ mod test_upd_price_with_validator;
 mod test_upd_product;
 mod test_utils;
 
-
 mod test_twap;
 mod test_upd_price_v2;
diff --git a/program/rust/src/tests/pyth_simulator.rs b/program/rust/src/tests/pyth_simulator.rs
@@ -338,7 +338,6 @@ impl PythSimulator {
                 AccountMeta::new(product_keypair.pubkey(), true),
                 AccountMeta::new(price_keypair.pubkey(), true),
                 AccountMeta::new(self.get_permissions_pubkey(), false),
-                AccountMeta::new(system_program::id(), false),
             ],
         );
 
diff --git a/program/rust/src/tests/test_add_price.rs b/program/rust/src/tests/test_add_price.rs
@@ -62,9 +62,6 @@ fn test_add_price() {
     let mut permissions_setup = AccountSetup::new_permission(&program_id);
     let permissions_account = permissions_setup.as_account_info();
 
-    let mut system_program = AccountSetup::new_system_program();
-    let system_program_account = system_program.as_account_info();
-
     {
         let mut permissions_account_data =
             PermissionAccount::initialize(&permissions_account, PC_VERSION).unwrap();
@@ -92,7 +89,6 @@ fn test_add_price() {
             product_account.clone(),
             price_account.clone(),
             permissions_account.clone(),
-            system_program_account.clone(),
         ],
         instruction_data_add_price,
     )
@@ -116,7 +112,6 @@ fn test_add_price() {
             product_account.clone(),
             price_account_2.clone(),
             permissions_account.clone(),
-            system_program_account.clone(),
         ],
         instruction_data_add_price,
     )
@@ -142,7 +137,6 @@ fn test_add_price() {
                 product_account.clone(),
                 price_account.clone(),
                 permissions_account.clone(),
-                system_program_account.clone(),
                 permissions_account.clone(),
             ],
             instruction_data_add_price
@@ -159,7 +153,6 @@ fn test_add_price() {
                 product_account.clone(),
                 price_account.clone(),
                 permissions_account.clone(),
-                system_program_account.clone(),
             ],
             instruction_data_add_price
         ),
@@ -184,7 +177,6 @@ fn test_add_price() {
                 product_account.clone(),
                 price_account.clone(),
                 permissions_account.clone(),
-                system_program_account.clone(),
             ],
             instruction_data_add_price
         ),
@@ -210,7 +202,6 @@ fn test_add_price() {
                 product_account.clone(),
                 price_account.clone(),
                 permissions_account.clone(),
-                system_program_account.clone(),
             ],
             instruction_data_add_price
         ),
diff --git a/program/rust/src/tests/test_add_product.rs b/program/rust/src/tests/test_add_product.rs
@@ -38,7 +38,6 @@ use {
     std::mem::size_of,
 };
 
-
 #[test]
 fn test_add_product() {
     let mut instruction_data = [0u8; PC_PROD_ACC_SIZE as usize];
@@ -201,7 +200,6 @@ fn test_add_product() {
     assert_eq!(mapping_data.number_of_products, PC_MAP_TABLE_SIZE);
 }
 
-
 // Create an add_product instruction that sets the product metadata to strings
 pub fn populate_instruction(instruction_data: &mut [u8], strings: &[&str]) -> usize {
     {
diff --git a/program/rust/src/tests/test_del_price.rs b/program/rust/src/tests/test_del_price.rs
@@ -36,7 +36,6 @@ async fn test_del_price() {
         .unwrap();
     assert!(product1_data.first_price_account == Pubkey::default());
 
-
     // price2_1 is the 2nd item in the linked list since price2_2 got added after t.
     assert!(sim.del_price(&product2, &price2_1).await.is_err());
     // Can delete the accounts in the opposite order though
diff --git a/program/rust/src/tests/test_del_product.rs b/program/rust/src/tests/test_del_product.rs
@@ -11,7 +11,6 @@ use {
     },
 };
 
-
 #[tokio::test]
 async fn test_del_product() {
     let mut sim = PythSimulator::new().await;
@@ -56,7 +55,6 @@ async fn test_del_product() {
     ));
     assert!(sim.get_account(product5.pubkey()).await.is_some());
 
-
     assert!(sim.del_product(&mapping_keypair, &product4).await.is_ok());
     let mapping_data = sim
         .get_account_data_as::<MappingAccount>(mapping_keypair.pubkey())
diff --git a/program/rust/src/tests/test_ema.rs b/program/rust/src/tests/test_ema.rs
@@ -18,7 +18,6 @@ use {
     test_generator::test_resources,
 };
 
-
 #[test_resources("program/rust/test_data/ema/*.csv")]
 fn test_ema(input_path_raw: &str) {
     let (inputs, expected_outputs) = read_test_data(input_path_raw);
@@ -110,7 +109,6 @@ fn run_ema_test(inputs: &[InputRecord], expected_outputs: &[OutputRecord]) {
     }
 }
 
-
 // TODO: put these functions somewhere more accessible
 pub fn upd_aggregate(
     price_account: &mut PriceAccount,
@@ -130,7 +128,6 @@ pub fn upd_twap(price_account: &mut PriceAccount, nslots: i64) {
     unsafe { c_upd_twap((price_account as *mut PriceAccount) as *mut u8, nslots) }
 }
 
-
 #[derive(Serialize, Deserialize, Debug)]
 struct InputRecord {
     price:  i64,
diff --git a/program/rust/src/tests/test_full_publisher_set.rs b/program/rust/src/tests/test_full_publisher_set.rs
@@ -36,7 +36,6 @@ async fn test_full_publisher_set() -> Result<(), Box<dyn std::error::Error>> {
         .await;
     let price = price_accounts["LTC"];
 
-
     let n_pubs = pub_keypairs.len();
 
     // Divide publishers into two even parts (assuming the max PC_NUM_COMP size is even)
diff --git a/program/rust/src/tests/test_message.rs b/program/rust/src/tests/test_message.rs
@@ -44,7 +44,6 @@ fn test_twap_message_roundtrip(input: TwapMessage) -> bool {
     }
 }
 
-
 fn prop_publisher_caps_message_roundtrip(input: PublisherStakeCapsMessage) -> bool {
     let reconstructed = from_slice::<BigEndian, Message>(&input.clone().to_bytes()).unwrap();
 
diff --git a/program/rust/src/tests/test_permission_migration.rs b/program/rust/src/tests/test_permission_migration.rs
@@ -67,10 +67,6 @@ fn test_permission_migration() {
     let mut price_account = price_setup.as_account_info();
     PriceAccount::initialize(&price_account, PC_VERSION).unwrap();
 
-    let mut system_program = AccountSetup::new_system_program();
-    let system_program_account = system_program.as_account_info();
-
-
     product_account.is_signer = false;
     mapping_account.is_signer = false;
     price_account.is_signer = false;
@@ -155,7 +151,6 @@ fn test_permission_migration() {
                 product_account.clone(),
                 price_account.clone(),
                 permissions_account.clone(),
-                system_program_account.clone(),
             ],
             bytes_of::<AddPriceArgs>(&AddPriceArgs {
                 header:     AddPrice.into(),
diff --git a/program/rust/src/tests/test_upd_aggregate.rs b/program/rust/src/tests/test_upd_aggregate.rs
@@ -67,7 +67,6 @@ fn test_upd_aggregate() {
         corp_act_status_: 0,
     };
 
-
     let mut instruction_data = [0u8; size_of::<UpdPriceArgs>()];
     populate_instruction(&mut instruction_data, 42, 2, 1);
 
diff --git a/program/rust/src/tests/test_upd_permissions.rs b/program/rust/src/tests/test_upd_permissions.rs
@@ -88,7 +88,6 @@ async fn test_upd_permissions() {
     master_authority = Pubkey::new_unique();
     security_authority = Pubkey::new_unique();
 
-
     // Should fail because payer is not the authority
     assert_eq!(
         sim.upd_permissions(
diff --git a/program/rust/src/tests/test_upd_price_no_fail_on_error.rs b/program/rust/src/tests/test_upd_price_no_fail_on_error.rs
@@ -52,7 +52,6 @@ fn test_upd_price_no_fail_on_error_no_fail_on_error() {
 
     update_clock_slot(&mut clock_account, 1);
 
-
     // Check that the normal upd_price fails
     populate_instruction(&mut instruction_data, 42, 9, 1, true);
 
@@ -69,7 +68,6 @@ fn test_upd_price_no_fail_on_error_no_fail_on_error() {
         Err(OracleError::PermissionViolation.into())
     );
 
-
     populate_instruction(&mut instruction_data, 42, 9, 1, false);
     // We haven't permissioned the publish account for the price account
     // yet, so any update should fail silently and have no effect. The
@@ -85,7 +83,6 @@ fn test_upd_price_no_fail_on_error_no_fail_on_error() {
     )
     .is_ok());
 
-
     {
         let mut price_data = load_checked::<PriceAccount>(&price_account, PC_VERSION).unwrap();
         assert_eq!(price_data.comp_[0].latest_.price_, 0);
@@ -169,7 +166,6 @@ fn test_upd_price_no_fail_on_error_no_fail_on_error() {
     }
 }
 
-
 // Create an upd_price_no_fail_on_error or upd_price instruction with the provided parameters
 fn populate_instruction(
     instruction_data: &mut [u8],
diff --git a/program/rust/src/tests/test_upd_price_v2.rs b/program/rust/src/tests/test_upd_price_v2.rs
diff --git a/program/rust/src/tests/test_upd_price_with_validator.rs b/program/rust/src/tests/test_upd_price_with_validator.rs
diff --git a/program/rust/src/tests/test_utils.rs b/program/rust/src/tests/test_utils.rs

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ pub fn del_product(`
`68`	`68`	`cmd_args,`
`69`	`69`	`)?;`
`70`	`70`
`71`		`-`
`72`	`71`	`{`
`73`	`72`	`let mut mapping_data = load_checked::<MappingAccount>(mapping_account, cmd_args.version)?;`
`74`	`73`	`let product_data = load_checked::<ProductAccount>(product_account, cmd_args.version)?;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ pub fn upd_product(`
`47`	`47`	`hdr,`
`48`	`48`	`)?;`
`49`	`49`
`50`		`-`
`51`	`50`	`{`
`52`	`51`	`// Validate that product_account contains the appropriate account header`
`53`	`52`	`let mut _product_data = load_checked::<ProductAccount>(product_account, hdr.version)?;`