Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cli: skip no-op program buffer writes #277

Merged
merged 1 commit into from
Mar 18, 2024
Merged

cli: skip no-op program buffer writes #277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 49 additions & 30 deletions cli/src/program.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2213,11 +2213,12 @@ fn do_process_program_write_and_deploy(
let blockhash = rpc_client.get_latest_blockhash()?;

// Initialize buffer account or complete if already partially initialized
let (initial_instructions, balance_needed) = if let Some(account) = rpc_client
.get_account_with_commitment(buffer_pubkey, config.commitment)?
.value
let (initial_instructions, balance_needed, buffer_program_data) = if let Some(mut account) =
rpc_client
.get_account_with_commitment(buffer_pubkey, config.commitment)?
.value
{
complete_partial_program_init(
let (ixs, balance_needed) = complete_partial_program_init(
loader_id,
&fee_payer_signer.pubkey(),
buffer_pubkey,
Expand All @@ -2229,7 +2230,11 @@ fn do_process_program_write_and_deploy(
},
min_rent_exempt_program_data_balance,
allow_excessive_balance,
)?
)?;
let buffer_program_data = account
.data
.split_off(UpgradeableLoaderState::size_of_buffer_metadata());
(ixs, balance_needed, buffer_program_data)
} else if loader_id == &bpf_loader_upgradeable::id() {
(
bpf_loader_upgradeable::create_buffer(
Expand All @@ -2240,6 +2245,7 @@ fn do_process_program_write_and_deploy(
program_len,
)?,
min_rent_exempt_program_data_balance,
vec![0; program_len],
)
} else {
(
Expand All @@ -2251,6 +2257,7 @@ fn do_process_program_write_and_deploy(
loader_id,
)],
min_rent_exempt_program_data_balance,
vec![0; program_len],
)
};
let initial_message = if !initial_instructions.is_empty() {
Expand Down Expand Up @@ -2281,7 +2288,10 @@ fn do_process_program_write_and_deploy(
let mut write_messages = vec![];
let chunk_size = calculate_max_chunk_size(&create_msg);
for (chunk, i) in program_data.chunks(chunk_size).zip(0..) {
write_messages.push(create_msg((i * chunk_size) as u32, chunk.to_vec()));
let offset = i * chunk_size;
if chunk != &buffer_program_data[offset..offset + chunk.len()] {
write_messages.push(create_msg(offset as u32, chunk.to_vec()));
}
}

// Create and add final message
Expand Down Expand Up @@ -2370,31 +2380,37 @@ fn do_process_program_upgrade(
let (initial_message, write_messages, balance_needed) =
if let Some(buffer_signer) = buffer_signer {
// Check Buffer account to see if partial initialization has occurred
let (initial_instructions, balance_needed) = if let Some(account) = rpc_client
.get_account_with_commitment(&buffer_signer.pubkey(), config.commitment)?
.value
{
complete_partial_program_init(
&bpf_loader_upgradeable::id(),
&fee_payer_signer.pubkey(),
&buffer_signer.pubkey(),
&account,
UpgradeableLoaderState::size_of_buffer(program_len),
min_rent_exempt_program_data_balance,
true,
)?
} else {
(
bpf_loader_upgradeable::create_buffer(
let (initial_instructions, balance_needed, buffer_program_data) =
if let Some(mut account) = rpc_client
.get_account_with_commitment(&buffer_signer.pubkey(), config.commitment)?
.value
{
let (ixs, balance_needed) = complete_partial_program_init(
&bpf_loader_upgradeable::id(),
&fee_payer_signer.pubkey(),
buffer_pubkey,
&upgrade_authority.pubkey(),
&buffer_signer.pubkey(),
&account,
UpgradeableLoaderState::size_of_buffer(program_len),
min_rent_exempt_program_data_balance,
program_len,
)?,
min_rent_exempt_program_data_balance,
)
};
true,
)?;
let buffer_program_data = account
.data
.split_off(UpgradeableLoaderState::size_of_buffer_metadata());
(ixs, balance_needed, buffer_program_data)
} else {
(
bpf_loader_upgradeable::create_buffer(
&fee_payer_signer.pubkey(),
buffer_pubkey,
&upgrade_authority.pubkey(),
min_rent_exempt_program_data_balance,
program_len,
)?,
min_rent_exempt_program_data_balance,
vec![0; program_len],
)
};

let initial_message = if !initial_instructions.is_empty() {
Some(Message::new_with_blockhash(
Expand Down Expand Up @@ -2426,7 +2442,10 @@ fn do_process_program_upgrade(
let mut write_messages = vec![];
let chunk_size = calculate_max_chunk_size(&create_msg);
for (chunk, i) in program_data.chunks(chunk_size).zip(0..) {
write_messages.push(create_msg((i * chunk_size) as u32, chunk.to_vec()));
let offset = i * chunk_size;
if chunk != &buffer_program_data[offset..offset + chunk.len()] {
write_messages.push(create_msg(offset as u32, chunk.to_vec()));
}
}

(initial_message, write_messages, balance_needed)
Expand Down
Loading