discriminator

This commit is contained in:
Hardhat Chad
2024-02-15 23:43:33 +00:00
parent 086a705a39
commit 754b18e21a
12 changed files with 215 additions and 176 deletions

View File

@@ -7,7 +7,7 @@ use spl_token::state::Mint;
use crate::{
state::{Bus, Proof},
utils::AccountDeserialize,
BUS_COUNT, MINT_ADDRESS, TREASURY_ADDRESS,
BUS_ADDRESSES, BUS_COUNT, MINT_ADDRESS, TREASURY_ADDRESS,
};
pub fn load_signer<'a, 'info>(info: &'a AccountInfo<'info>) -> Result<(), ProgramError> {
@@ -33,10 +33,14 @@ pub fn load_bus<'a, 'info>(
let bus_data = info.data.borrow();
let bus = Bus::try_from_bytes(&bus_data)?;
if !(0..BUS_COUNT).contains(&(bus.id as usize)) {
if bus.id.ge(&(BUS_COUNT as u64)) {
return Err(ProgramError::InvalidAccountData);
}
if info.key.ne(&BUS_ADDRESSES[bus.id as usize]) {
return Err(ProgramError::InvalidSeeds);
}
if is_writable && !info.is_writable {
return Err(ProgramError::InvalidAccountData);
}