Code cleanup v0

Author: mvines

stake-pool/cli/src/main.rs

@@ -3,7 +3,7 @@
 #![allow(clippy::too_many_arguments)]
 
 use {
-    crate::stake,
+    crate::stake_program,
     borsh::{BorshDeserialize, BorshSchema, BorshSerialize},
     solana_program::{
         instruction::{AccountMeta, Instruction},
@@ -200,9 +200,9 @@ pub fn create_validator_stake_account(
         AccountMeta::new_readonly(sysvar::rent::id(), false),
         AccountMeta::new_readonly(sysvar::clock::id(), false),
         AccountMeta::new_readonly(sysvar::stake_history::id(), false),
-        AccountMeta::new_readonly(stake::config_id(), false),
+        AccountMeta::new_readonly(stake_program::config_id(), false),
         AccountMeta::new_readonly(system_program::id(), false),
-        AccountMeta::new_readonly(stake::id(), false),
+        AccountMeta::new_readonly(stake_program::id(), false),
     ];
     Ok(Instruction {
         program_id: *program_id,
@@ -236,7 +236,7 @@ pub fn add_validator_to_pool(
         AccountMeta::new_readonly(sysvar::clock::id(), false),
         AccountMeta::new_readonly(sysvar::stake_history::id(), false),
         AccountMeta::new_readonly(*token_program_id, false),
-        AccountMeta::new_readonly(stake::id(), false),
+        AccountMeta::new_readonly(stake_program::id(), false),
     ];
     Ok(Instruction {
         program_id: *program_id,
@@ -269,7 +269,7 @@ pub fn remove_validator_from_pool(
         AccountMeta::new(*pool_mint, false),
         AccountMeta::new_readonly(sysvar::clock::id(), false),
         AccountMeta::new_readonly(*token_program_id, false),
-        AccountMeta::new_readonly(stake::id(), false),
+        AccountMeta::new_readonly(stake_program::id(), false),
     ];
     Ok(Instruction {
         program_id: *program_id,
@@ -342,7 +342,7 @@ pub fn deposit(
         AccountMeta::new_readonly(sysvar::clock::id(), false),
         AccountMeta::new_readonly(sysvar::stake_history::id(), false),
         AccountMeta::new_readonly(*token_program_id, false),
-        AccountMeta::new_readonly(stake::id(), false),
+        AccountMeta::new_readonly(stake_program::id(), false),
     ];
     Ok(Instruction {
         program_id: *program_id,
@@ -376,7 +376,7 @@ pub fn withdraw(
         AccountMeta::new(*pool_mint, false),
         AccountMeta::new_readonly(sysvar::clock::id(), false),
         AccountMeta::new_readonly(*token_program_id, false),
-        AccountMeta::new_readonly(stake::id(), false),
+        AccountMeta::new_readonly(stake_program::id(), false),
     ];
     Ok(Instruction {
         program_id: *program_id,

stake-pool/program/src/instruction.rs

@@ -6,13 +6,54 @@ pub mod borsh;
 pub mod error;
 pub mod instruction;
 pub mod processor;
-pub mod stake;
+pub mod stake_program;
 pub mod state;
 
 #[cfg(not(feature = "no-entrypoint"))]
 pub mod entrypoint;
 
 // Export current sdk types for downstream users building with a different sdk version
 pub use solana_program;
+use solana_program::{program_error::ProgramError, pubkey::Pubkey};
+
+/// Seed for deposit authority seed
+pub const AUTHORITY_DEPOSIT: &[u8] = b"deposit";
+
+/// Seed for withdraw authority seed
+pub const AUTHORITY_WITHDRAW: &[u8] = b"withdraw";
+
+/// Calculates the authority address
+pub fn create_pool_authority_address(
+    program_id: &Pubkey,
+    stake_pool: &Pubkey,
+    authority: &[u8],
+    bump_seed: u8,
+) -> Result<Pubkey, ProgramError> {
+    Pubkey::create_program_address(
+        &[&stake_pool.to_bytes()[..32], authority, &[bump_seed]],
+        program_id,
+    )
+    .map_err(|_| crate::error::StakePoolError::InvalidProgramAddress.into())
+}
+
+/// Generates seed bump for stake pool authorities
+pub fn find_authority_bump_seed(
+    program_id: &Pubkey,
+    stake_pool: &Pubkey,
+    authority: &[u8],
+) -> (Pubkey, u8) {
+    Pubkey::find_program_address(&[&stake_pool.to_bytes()[..32], authority], program_id)
+}
+/// Generates stake account address for the validator
+pub fn find_stake_address_for_validator(
+    program_id: &Pubkey,
+    validator: &Pubkey,
+    stake_pool: &Pubkey,
+) -> (Pubkey, u8) {
+    Pubkey::find_program_address(
+        &[&validator.to_bytes()[..32], &stake_pool.to_bytes()[..32]],
+        program_id,
+    )
+}
 
 solana_program::declare_id!("poo1B9L9nR3CrcaziKVYVpRX6A9Y1LAXYasjjfCbApj");