blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cli: don't overallocate upgradeable buffer accounts (#15603)

This commit is contained in:
Jack May 2021-03-02 00:45:53 -08:00 committed by GitHub
parent 4789a13a6e
commit d73af9c1dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cli/src/program.rs
View File

@ -718,7 +718,8 @@ fn process_program_deploy(
} else { } else {
return Err("Program location required if buffer not supplied".into()); return Err("Program location required if buffer not supplied".into());
}; };
let buffer_data_len = if let Some(len) = max_len { let buffer_data_len = program_len;
let programdata_len = if let Some(len) = max_len {
if program_len > len { if program_len > len {
return Err("Max length specified not large enough".into()); return Err("Max length specified not large enough".into());
} }
@ -738,6 +739,7 @@ fn process_program_deploy(
config, config,
&program_data, &program_data,
buffer_data_len, buffer_data_len,
programdata_len,
minimum_balance, minimum_balance,
&bpf_loader_upgradeable::id(), &bpf_loader_upgradeable::id(),
Some(&[program_signer.unwrap(), upgrade_authority_signer]), Some(&[program_signer.unwrap(), upgrade_authority_signer]),
@ -825,7 +827,7 @@ fn process_write_buffer(
let buffer_data_len = if let Some(len) = max_len { let buffer_data_len = if let Some(len) = max_len {
len len
} else { } else {
program_data.len() * 2 program_data.len()
}; };
let minimum_balance = rpc_client.get_minimum_balance_for_rent_exemption( let minimum_balance = rpc_client.get_minimum_balance_for_rent_exemption(
UpgradeableLoaderState::programdata_len(buffer_data_len)?, UpgradeableLoaderState::programdata_len(buffer_data_len)?,
@ -836,6 +838,7 @@ fn process_write_buffer(
config, config,
&program_data, &program_data,
program_data.len(), program_data.len(),
program_data.len(),
minimum_balance, minimum_balance,
&bpf_loader_upgradeable::id(), &bpf_loader_upgradeable::id(),
None, None,
@ -1082,6 +1085,7 @@ pub fn process_deploy(
config, config,
&program_data, &program_data,
program_data.len(), program_data.len(),
program_data.len(),
minimum_balance, minimum_balance,
&loader_id, &loader_id,
Some(&[buffer_signer]), Some(&[buffer_signer]),
@ -1102,6 +1106,7 @@ fn do_process_program_write_and_deploy(
config: &CliConfig, config: &CliConfig,
program_data: &[u8], program_data: &[u8],
buffer_data_len: usize, buffer_data_len: usize,
programdata_len: usize,
minimum_balance: u64, minimum_balance: u64,
loader_id: &Pubkey, loader_id: &Pubkey,
program_signers: Option<&[&dyn Signer]>, program_signers: Option<&[&dyn Signer]>,
@ -1217,7 +1222,7 @@ fn do_process_program_write_and_deploy(
rpc_client.get_minimum_balance_for_rent_exemption( rpc_client.get_minimum_balance_for_rent_exemption(
UpgradeableLoaderState::program_len()?, UpgradeableLoaderState::program_len()?,
)?, )?,
buffer_data_len, programdata_len,
)?, )?,
Some(&config.signers[0].pubkey()), Some(&config.signers[0].pubkey()),
) )

2
cli/tests/program.rs
View File

@ -571,7 +571,7 @@ fn test_cli_program_write_buffer() {
.unwrap(); .unwrap();
let minimum_balance_for_buffer_default = rpc_client let minimum_balance_for_buffer_default = rpc_client
.get_minimum_balance_for_rent_exemption( .get_minimum_balance_for_rent_exemption(
UpgradeableLoaderState::programdata_len(max_len * 2).unwrap(), UpgradeableLoaderState::programdata_len(max_len).unwrap(),
) )
.unwrap(); .unwrap();

3
programs/bpf_loader/src/lib.rs
View File

@ -457,15 +457,14 @@ fn process_loader_upgradeable_instruction(
programdata.try_account_ref_mut()?.data programdata.try_account_ref_mut()?.data
[programdata_data_offset..programdata_data_offset + buffer_data_len] [programdata_data_offset..programdata_data_offset + buffer_data_len]
.copy_from_slice(&buffer.try_account_ref()?.data[buffer_data_offset..]); .copy_from_slice(&buffer.try_account_ref()?.data[buffer_data_offset..]);
// Update the Program account
// Update the Program account
program.set_state(&UpgradeableLoaderState::Program { program.set_state(&UpgradeableLoaderState::Program {
programdata_address: *programdata.unsigned_key(), programdata_address: *programdata.unsigned_key(),
})?; })?;
program.try_account_ref_mut()?.executable = true; program.try_account_ref_mut()?.executable = true;
// Drain the Buffer account back to the payer // Drain the Buffer account back to the payer
payer.try_account_ref_mut()?.lamports += buffer.lamports()?; payer.try_account_ref_mut()?.lamports += buffer.lamports()?;
buffer.try_account_ref_mut()?.lamports = 0; buffer.try_account_ref_mut()?.lamports = 0;