gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cli: Don't overallocate upgradeable program if --final specified (#15011) (#15027)

Browse Source 
(cherry picked from commit a1b9e00c14)

Co-authored-by: Jack May <jack@solana.com>
This commit is contained in:
mergify[bot]
2021-02-03 03:09:27 +00:00
committed by GitHub
parent b35f35a7e8
commit 3610b6f31c
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cli/src/program.rs
View File

@ -657,7 +657,7 @@ fn process_program_deploy(
true true
}; };
let (program_data, buffer_data_len) = if buffer_provided { let (program_data, program_len) = if buffer_provided {
// Check supplied buffer account // Check supplied buffer account
if let Some(account) = rpc_client if let Some(account) = rpc_client
.get_account_with_commitment(&buffer_pubkey, config.commitment)? .get_account_with_commitment(&buffer_pubkey, config.commitment)?
@ -676,15 +676,21 @@ fn process_program_deploy(
} }
} else if let Some(program_location) = program_location { } else if let Some(program_location) = program_location {
let program_data = read_and_verify_elf(&program_location)?; let program_data = read_and_verify_elf(&program_location)?;
let buffer_data_len = if let Some(len) = max_len { let program_len = program_data.len();
len (program_data, program_len)
} else {
program_data.len() * 2
};
(program_data, buffer_data_len)
} 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 {
if program_len > len {
return Err("Max length specified not large enough".into());
}
len
} else if is_final {
program_len
} else {
program_len * 2
};
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)?,
)?; )?;