feat: read pyth token mint from staking program in initialize pool

staking/integration-tests/src/integrity_pool/instructions.rs

@@ -90,9 +90,9 @@ pub fn create_pool_data_account(
     payer: &Keypair,
     pool_data_keypair: &Keypair,
     reward_program_authority: Pubkey,
-    pyth_token_mint: Pubkey,
 ) -> TransactionResult {
     let pool_data_space: u64 = PoolData::LEN.try_into().unwrap();
+    let global_config = get_config_address();
 
     let rent = svm.minimum_balance_for_rent_exemption(pool_data_space.try_into().unwrap());
 
@@ -107,7 +107,6 @@ pub fn create_pool_data_account(
     let pool_config_pubkey = get_pool_config_address();
 
     let initialize_pool_data = integrity_pool::instruction::InitializePool {
-        pyth_token_mint,
         reward_program_authority,
         y: YIELD,
     };
@@ -116,6 +115,7 @@ pub fn create_pool_data_account(
         payer:          payer.pubkey(),
         pool_data:      pool_data_keypair.pubkey(),
         pool_config:    pool_config_pubkey,
+        config_account: global_config,
         system_program: system_program::ID,
     };
 
@@ -132,7 +132,7 @@ pub fn create_pool_data_account(
         svm.latest_blockhash(),
     );
 
-    svm.send_transaction(initialize_pool_tx.clone())
+    svm.send_transaction(initialize_pool_tx)
 }
 
 pub fn update_y(
@@ -164,7 +164,7 @@ pub fn update_y(
         svm.latest_blockhash(),
     );
 
-    svm.send_transaction(update_y_tx.clone())
+    svm.send_transaction(update_y_tx)
 }
 
 pub fn update_reward_program_authority(
@@ -233,7 +233,7 @@ pub fn update_delegation_fee(
         svm.latest_blockhash(),
     );
 
-    svm.send_transaction(update_delegation_fee_tx.clone())
+    svm.send_transaction(update_delegation_fee_tx)
 }
 
 

staking/integration-tests/src/setup.rs

@@ -101,7 +101,6 @@ pub fn setup(props: SetupProps) -> SetupResult {
             &payer,
             &pool_data_keypair,
             reward_program_authority.pubkey(),
-            pyth_token_mint.pubkey(),
         )
         .unwrap();
     }

staking/integration-tests/tests/initialize_pool.rs

@@ -36,11 +36,8 @@ fn initialize_pool() {
     let SetupResult {
         mut svm,
         payer,
-        pyth_token_mint,
-        publisher_keypair: _,
         pool_data_pubkey,
-        reward_program_authority: _,
-        maybe_publisher_index: _,
+        ..
     } = setup(SetupProps {
         init_config:            true,
         init_target:            true,
@@ -58,13 +55,8 @@ fn initialize_pool() {
 
     // Trying to initialize the pool again should fail
     let pool_data2_keypair = Keypair::new();
-    let initialize_pool_2_res = create_pool_data_account(
-        &mut svm,
-        &payer,
-        &pool_data2_keypair,
-        Pubkey::new_unique(),
-        pyth_token_mint.pubkey(),
-    );
+    let initialize_pool_2_res =
+        create_pool_data_account(&mut svm, &payer, &pool_data2_keypair, Pubkey::new_unique());
     assert_anchor_program_error!(initialize_pool_2_res, ProgramError::Custom(0), 1);
 }
 

staking/programs/integrity-pool/src/context.rs

@@ -29,6 +29,13 @@ pub struct InitializePool<'info> {
     #[account(mut)]
     pub payer: Signer<'info>,
 
+    #[account(
+        seeds = [staking::context::CONFIG_SEED.as_bytes()],
+        bump,
+        seeds::program = staking::ID,
+    )]
+    pub config_account: Account<'info, staking::state::global_config::GlobalConfig>,
+
     #[account(zero)]
     pub pool_data: AccountLoader<'info, PoolData>,
 

staking/programs/integrity-pool/src/lib.rs

@@ -33,15 +33,16 @@ pub mod integrity_pool {
     pub fn initialize_pool(
         ctx: Context<InitializePool>,
         reward_program_authority: Pubkey,
-        pyth_token_mint: Pubkey,
         y: frac64,
     ) -> Result<()> {
+        let global_config = &ctx.accounts.config_account;
+        let pool_config = &mut ctx.accounts.pool_config;
+
         require_gte!(FRAC_64_MULTIPLIER / 100, y, IntegrityPoolError::InvalidY);
 
-        let pool_config = &mut ctx.accounts.pool_config;
         pool_config.pool_data = ctx.accounts.pool_data.key();
         pool_config.reward_program_authority = reward_program_authority;
-        pool_config.pyth_token_mint = pyth_token_mint;
+        pool_config.pyth_token_mint = global_config.pyth_token_mint;
         pool_config.y = y;
 
         let mut pool_data = ctx.accounts.pool_data.load_init()?;