Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Fix deployment slot for upgraded programs #30902

Merged
merged 1 commit into from
Mar 27, 2023
Merged
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions programs/bpf_loader/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ fn process_loader_upgradeable_instruction(
);
return Err(InstructionError::InsufficientFunds);
}
let deployment_slot = if let UpgradeableLoaderState::ProgramData {
if let UpgradeableLoaderState::ProgramData {
slot,
upgrade_authority_address,
} = programdata.get_state()?
Expand All @@ -959,7 +959,6 @@ fn process_loader_upgradeable_instruction(
ic_logger_msg!(log_collector, "Upgrade authority did not sign");
return Err(InstructionError::MissingRequiredSignature);
}
slot
} else {
ic_logger_msg!(log_collector, "Invalid ProgramData account");
return Err(InstructionError::InvalidAccountData);
Expand All @@ -976,7 +975,7 @@ fn process_loader_upgradeable_instruction(
new_program_id,
program_id,
UpgradeableLoaderState::size_of_program().saturating_add(programdata_len),
deployment_slot,
clock.slot,
{
drop(buffer);
},
Expand Down