Refactor PDA seed definitions

Author: sean-kuzco

programs/inference-staking/src/instructions/operator_pool/change_operator_admin.rs

@@ -12,7 +12,7 @@ pub struct ChangeOperatorAdmin<'info> {
  pub new_admin: Signer<'info>,
 
  #[account(
- seeds = [b"PoolOverview".as_ref()],
+ seeds = [PoolOverview::SEED],
  bump = pool_overview.bump,
  constraint = !pool_overview.is_epoch_finalizing @ ErrorCode::EpochMustNotBeFinalizing,
  )]
@@ -21,7 +21,7 @@ pub struct ChangeOperatorAdmin<'info> {
  #[account(
  mut,
  seeds = [
- b"OperatorPool".as_ref(),
+  OperatorPool::SEED,
  operator_pool.initial_pool_admin.as_ref(),
  ],
  bump = operator_pool.bump,

programs/inference-staking/src/instructions/operator_pool/change_operator_staking_record.rs

@@ -16,15 +16,15 @@ pub struct ChangeOperatorStakingRecord<'info> {
  pub owner: Signer<'info>,
 
  #[account(
- seeds = [b"PoolOverview".as_ref()],
+ seeds = [PoolOverview::SEED],
  bump = pool_overview.bump,
  )]
  pub pool_overview: Account<'info, PoolOverview>,
 
  #[account(
  mut,
  seeds = [
- b"OperatorPool".as_ref(),
+ OperatorPool::SEED,
  operator_pool.initial_pool_admin.as_ref(),
  ],
  bump = operator_pool.bump,
@@ -39,7 +39,7 @@ pub struct ChangeOperatorStakingRecord<'info> {
  pub operator_staking_record: Account<'info, StakingRecord>,
 
  #[account(
- seeds = [b"StakingRecord".as_ref(), operator_pool.key().as_ref(), owner.key().as_ref()],
+ seeds = [StakingRecord::SEED, operator_pool.key().as_ref(), owner.key().as_ref()],
  bump,
  has_one = owner,
  has_one = operator_pool,

programs/inference-staking/src/instructions/operator_pool/close_operator_pool.rs

@@ -10,7 +10,7 @@ pub struct CloseOperatorPool<'info> {
  pub admin: Signer<'info>,
 
  #[account(
- seeds = [b"PoolOverview".as_ref()],
+ seeds = [PoolOverview::SEED],
  bump = pool_overview.bump,
  )]
  pub pool_overview: Box<Account<'info, PoolOverview>>,

programs/inference-staking/src/instructions/operator_pool/create_operator_pool.rs

@@ -19,7 +19,7 @@ pub struct CreateOperatorPool<'info> {
  #[account(
  init,
  seeds = [
- b"OperatorPool".as_ref(),
+ OperatorPool::SEED,
  admin.key().as_ref(),
  ],
  bump,
@@ -31,7 +31,7 @@ pub struct CreateOperatorPool<'info> {
  #[account(
  init,
  seeds = [
- b"StakingRecord".as_ref(),
+ StakingRecord::SEED,
  operator_pool.key().as_ref(),
  admin.key().as_ref()
  ],
@@ -43,7 +43,7 @@ pub struct CreateOperatorPool<'info> {
 
  #[account(
  mut,
- seeds = [b"PoolOverview".as_ref()],
+ seeds = [PoolOverview::SEED],
  bump = pool_overview.bump,
  has_one = mint,
  constraint = pool_overview.allow_pool_creation @ ErrorCode::PoolCreationDisabled,
@@ -52,7 +52,7 @@ pub struct CreateOperatorPool<'info> {
 
  #[account(
  init,
- seeds = [b"PoolStakedTokenVault".as_ref(), operator_pool.key().as_ref()],
+ seeds = [OperatorPool::POOL_STAKED_TOKEN_VAULT_SEED, operator_pool.key().as_ref()],
  bump,
  payer = payer,
  token::mint = mint,
@@ -62,7 +62,7 @@ pub struct CreateOperatorPool<'info> {
 
  #[account(
  init,
- seeds = [b"PoolRewardCommissionTokenVault".as_ref(), operator_pool.key().as_ref()],
+ seeds = [OperatorPool::POOL_REWARD_COMMISSION_TOKEN_VAULT_SEED, operator_pool.key().as_ref()],
  bump,
  payer = payer,
  token::mint = mint,
@@ -72,7 +72,7 @@ pub struct CreateOperatorPool<'info> {
 
  #[account(
  init,
- seeds = [b"PoolUsdcCommissionTokenVault".as_ref(), operator_pool.key().as_ref()],
+ seeds = [OperatorPool::POOL_USDC_COMMISSION_TOKEN_VAULT_SEED, operator_pool.key().as_ref()],
  bump,
  payer = payer,
  token::mint = usdc_mint,
@@ -82,7 +82,7 @@ pub struct CreateOperatorPool<'info> {
 
  #[account(
  init,
- seeds = [b"PoolDelegatorUsdcEarningsVault".as_ref(), operator_pool.key().as_ref()],
+ seeds = [OperatorPool::POOL_DELEGATOR_USDC_EARNINGS_VAULT_SEED, operator_pool.key().as_ref()],
  bump,
  payer = payer,
  token::mint = usdc_mint,

programs/inference-staking/src/instructions/operator_pool/set_halt_status.rs

@@ -10,7 +10,7 @@ pub struct SetHaltStatus<'info> {
  pub authority: Signer<'info>,
 
  #[account(
- seeds = [b"PoolOverview".as_ref()],
+ seeds = [PoolOverview::SEED],
  bump = pool_overview.bump,
  constraint = pool_overview.halt_authorities.contains(authority.key)
  @ ErrorCode::InvalidHaltAuthority,
@@ -19,7 +19,7 @@ pub struct SetHaltStatus<'info> {
 
  #[account(
  mut,
- seeds = [b"OperatorPool".as_ref(), operator_pool.initial_pool_admin.as_ref()],
+ seeds = [OperatorPool::SEED, operator_pool.initial_pool_admin.as_ref()],
  bump = operator_pool.bump,
  )]
  pub operator_pool: Account<'info, OperatorPool>,

programs/inference-staking/src/instructions/operator_pool/slash_stake.rs

@@ -15,7 +15,7 @@ pub struct SlashStake<'info> {
  pub authority: Signer<'info>,
 
  #[account(
- seeds = [b"PoolOverview".as_ref()],
+ seeds = [PoolOverview::SEED],
  bump = pool_overview.bump,
  constraint = pool_overview.slashing_authorities.contains(authority.key)
  @ ErrorCode::InvalidSlashingAuthority,
@@ -24,7 +24,7 @@ pub struct SlashStake<'info> {
 
  #[account(
  mut,
- seeds = [b"OperatorPool".as_ref(), operator_pool.initial_pool_admin.as_ref()],
+ seeds = [OperatorPool::SEED, operator_pool.initial_pool_admin.as_ref()],
  bump = operator_pool.bump,
  )]
  pub operator_pool: Account<'info, OperatorPool>,
@@ -37,28 +37,28 @@ pub struct SlashStake<'info> {
 
  #[account(
  mut,
- seeds = [b"PoolStakedTokenVault".as_ref(), operator_pool.key().as_ref()],
+ seeds = [OperatorPool::POOL_STAKED_TOKEN_VAULT_SEED, operator_pool.key().as_ref()],
  bump,
  )]
  pub staked_token_account: Account<'info, TokenAccount>,
 
  #[account(
  mut,
- seeds = [b"PoolDelegatorUsdcEarningsVault", operator_pool.key().as_ref()],
+ seeds = [OperatorPool::POOL_DELEGATOR_USDC_EARNINGS_VAULT_SEED, operator_pool.key().as_ref()],
  bump,
  )]
  pub pool_usdc_vault: Account<'info, TokenAccount>,
 
  #[account(
  mut,
- seeds = [b"PoolRewardCommissionTokenVault".as_ref(), operator_pool.key().as_ref()],
+ seeds = [OperatorPool::POOL_REWARD_COMMISSION_TOKEN_VAULT_SEED, operator_pool.key().as_ref()],
  bump,
  )]
  pub reward_fee_token_account: Account<'info, TokenAccount>,
 
  #[account(
  mut,
- seeds = [b"PoolUsdcCommissionTokenVault".as_ref(), operator_pool.key().as_ref()],
+ seeds = [OperatorPool::POOL_USDC_COMMISSION_TOKEN_VAULT_SEED, operator_pool.key().as_ref()],
  bump,
  )]
  pub usdc_fee_token_account: Account<'info, TokenAccount>,

programs/inference-staking/src/instructions/operator_pool/sweep_closed_pool_usdc_dust.rs

@@ -27,7 +27,7 @@ pub struct SweepClosedPoolUsdcDust<'info> {
  #[account(
  mut,
  // This is the vault we are sweeping.
- seeds = [b"PoolDelegatorUsdcEarningsVault".as_ref(), operator_pool.key().as_ref()],
+ seeds = [OperatorPool::POOL_DELEGATOR_USDC_EARNINGS_VAULT_SEED, operator_pool.key().as_ref()],
  bump,
  )]
  pub operator_usdc_vault: Account<'info, TokenAccount>,
@@ -40,7 +40,7 @@ pub struct SweepClosedPoolUsdcDust<'info> {
  pub admin_usdc_account: Account<'info, TokenAccount>,
 
  #[account(
- seeds = [b"PoolOverview".as_ref()],
+ seeds = [PoolOverview::SEED],
  bump = pool_overview.bump,
  )]
  pub pool_overview: Account<'info, PoolOverview>,

programs/inference-staking/src/instructions/operator_pool/update_operator_pool.rs

@@ -9,7 +9,7 @@ pub struct UpdateOperatorPool<'info> {
  #[account(
  mut,
  seeds = [
- b"OperatorPool".as_ref(),
+ OperatorPool::SEED,
  operator_pool.initial_pool_admin.as_ref(),
  ],
  bump = operator_pool.bump,

programs/inference-staking/src/instructions/operator_pool/withdraw_operator_reward_commission.rs

@@ -14,13 +14,13 @@ pub struct WithdrawOperatorRewardCommission<'info> {
  pub admin: Signer<'info>,
 
  #[account(
- seeds = [b"PoolOverview".as_ref()],
+ seeds = [PoolOverview::SEED],
  bump = pool_overview.bump,
  )]
  pub pool_overview: Account<'info, PoolOverview>,
 
  #[account(
- seeds = [b"OperatorPool".as_ref(), operator_pool.initial_pool_admin.as_ref()],
+ seeds = [OperatorPool::SEED, operator_pool.initial_pool_admin.as_ref()],
  bump = operator_pool.bump,
  // Admin must sign to invoke this instruction
  has_one = admin,
@@ -29,7 +29,7 @@ pub struct WithdrawOperatorRewardCommission<'info> {
 
  #[account(
  mut,
- seeds = [b"PoolRewardCommissionTokenVault".as_ref(), operator_pool.key().as_ref()],
+ seeds = [OperatorPool::POOL_REWARD_COMMISSION_TOKEN_VAULT_SEED, operator_pool.key().as_ref()],
  bump,
  )]
  pub reward_fee_token_account: Account<'info, TokenAccount>,

programs/inference-staking/src/instructions/operator_pool/withdraw_operator_usdc_commission.rs

@@ -14,13 +14,13 @@ pub struct WithdrawOperatorUsdcCommission<'info> {
  pub admin: Signer<'info>,
 
  #[account(
- seeds = [b"PoolOverview".as_ref()],
+ seeds = [PoolOverview::SEED],
  bump = pool_overview.bump,
  )]
  pub pool_overview: Account<'info, PoolOverview>,
 
  #[account(
- seeds = [b"OperatorPool".as_ref(), operator_pool.initial_pool_admin.as_ref()],
+ seeds = [OperatorPool::SEED, operator_pool.initial_pool_admin.as_ref()],
  bump = operator_pool.bump,
  // Admin must sign to invoke this instruction
  has_one = admin,
@@ -29,7 +29,7 @@ pub struct WithdrawOperatorUsdcCommission<'info> {
 
  #[account(
  mut,
- seeds = [b"PoolUsdcCommissionTokenVault".as_ref(), operator_pool.key().as_ref()],
+ seeds = [OperatorPool::POOL_USDC_COMMISSION_TOKEN_VAULT_SEED, operator_pool.key().as_ref()],
  bump,
  )]
  pub usdc_fee_token_account: Account<'info, TokenAccount>,