security fixes

This commit is contained in:
Hardhat Chad
2024-03-19 03:08:47 +00:00
parent bb09c693d7
commit 9f6ef5dce1
12 changed files with 231 additions and 85 deletions

View File

@@ -55,34 +55,31 @@ pub fn process_initialize<'a, 'info>(
return Err(ProgramError::NotEnoughAccountKeys);
};
load_signer(signer)?;
load_uninitialized_pda(bus_0_info, &[BUS, &[0], &[args.bus_0_bump]], &crate::id())?;
load_uninitialized_pda(bus_1_info, &[BUS, &[1], &[args.bus_1_bump]], &crate::id())?;
load_uninitialized_pda(bus_2_info, &[BUS, &[2], &[args.bus_2_bump]], &crate::id())?;
load_uninitialized_pda(bus_3_info, &[BUS, &[3], &[args.bus_3_bump]], &crate::id())?;
load_uninitialized_pda(bus_4_info, &[BUS, &[4], &[args.bus_4_bump]], &crate::id())?;
load_uninitialized_pda(bus_5_info, &[BUS, &[5], &[args.bus_5_bump]], &crate::id())?;
load_uninitialized_pda(bus_6_info, &[BUS, &[6], &[args.bus_6_bump]], &crate::id())?;
load_uninitialized_pda(bus_7_info, &[BUS, &[7], &[args.bus_7_bump]], &crate::id())?;
load_uninitialized_pda(bus_0_info, &[BUS, &[0]], args.bus_0_bump, &crate::id())?;
load_uninitialized_pda(bus_1_info, &[BUS, &[1]], args.bus_1_bump, &crate::id())?;
load_uninitialized_pda(bus_2_info, &[BUS, &[2]], args.bus_2_bump, &crate::id())?;
load_uninitialized_pda(bus_3_info, &[BUS, &[3]], args.bus_3_bump, &crate::id())?;
load_uninitialized_pda(bus_4_info, &[BUS, &[4]], args.bus_4_bump, &crate::id())?;
load_uninitialized_pda(bus_5_info, &[BUS, &[5]], args.bus_5_bump, &crate::id())?;
load_uninitialized_pda(bus_6_info, &[BUS, &[6]], args.bus_6_bump, &crate::id())?;
load_uninitialized_pda(bus_7_info, &[BUS, &[7]], args.bus_7_bump, &crate::id())?;
load_uninitialized_pda(
metadata_info,
&[
METADATA,
mpl_token_metadata::ID.as_ref(),
MINT_ADDRESS.as_ref(),
&[args.metadata_bump],
],
args.metadata_bump,
&mpl_token_metadata::ID,
)?;
load_uninitialized_pda(
mint_info,
&[MINT, MINT_NOISE.as_slice(), &[args.mint_bump]],
&crate::id(),
)?;
load_uninitialized_pda(
treasury_info,
&[TREASURY, &[args.treasury_bump]],
&[MINT, MINT_NOISE.as_slice()],
args.mint_bump,
&crate::id(),
)?;
load_uninitialized_pda(treasury_info, &[TREASURY], args.treasury_bump, &crate::id())?;
load_uninitialized_account(treasury_tokens_info)?;
load_program(system_program, system_program::id())?;
load_program(token_program, spl_token::id())?;
@@ -90,17 +87,6 @@ pub fn process_initialize<'a, 'info>(
load_program(metadata_program, mpl_token_metadata::ID)?;
load_sysvar(rent_sysvar, sysvar::rent::id())?;
// Verify keys
if metadata_info.key.ne(&METADATA_ADDRESS) {
return Err(ProgramError::InvalidSeeds);
}
if mint_info.key.ne(&MINT_ADDRESS) {
return Err(ProgramError::InvalidSeeds);
}
if treasury_info.key.ne(&TREASURY_ADDRESS) {
return Err(ProgramError::InvalidSeeds);
}
// Initialize bus accounts
let bus_infos = [
bus_0_info, bus_1_info, bus_2_info, bus_3_info, bus_4_info, bus_5_info, bus_6_info,
@@ -136,6 +122,9 @@ pub fn process_initialize<'a, 'info>(
}
// Initialize treasury
if treasury_info.key.ne(&TREASURY_ADDRESS) {
return Err(ProgramError::InvalidSeeds);
}
create_pda(
treasury_info,
&crate::id(),
@@ -156,6 +145,9 @@ pub fn process_initialize<'a, 'info>(
drop(treasury_data);
// Initialize mint
if mint_info.key.ne(&MINT_ADDRESS) {
return Err(ProgramError::InvalidSeeds);
}
create_pda(
mint_info,
&spl_token::id(),
@@ -182,6 +174,9 @@ pub fn process_initialize<'a, 'info>(
)?;
// Initialize mint metadata
if metadata_info.key.ne(&METADATA_ADDRESS) {
return Err(ProgramError::InvalidSeeds);
}
mpl_token_metadata::instructions::CreateMetadataAccountV3Cpi {
__program: metadata_program,
metadata: metadata_info,