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

Feature - UpgradeableLoaderInstruction::ExtendProgramChecked #2440

Closed
wants to merge 5 commits into from
Closed

Feature - UpgradeableLoaderInstruction::ExtendProgramChecked #2440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfe6cee
Adds the feature.
Lichtso Aug 5, 2024
f896250
Adds UpgradeableLoaderInstruction::ExtendProgramChecked.
Lichtso Aug 5, 2024
1285557
Adds feature gating logic.
Lichtso Aug 5, 2024
7263d96
Adjusts transaction-status parser.
Lichtso Aug 5, 2024
1a99d70
Adjusts CLI parser.
Lichtso Aug 5, 2024
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
34 changes: 20 additions & 14 deletions cli/src/program.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ use {
bpf_loader_upgradeable::{self, get_program_data_address, UpgradeableLoaderState},
commitment_config::CommitmentConfig,
compute_budget,
feature_set::{FeatureSet, FEATURE_NAMES},
feature_set::{enable_extend_program_checked, FeatureSet, FEATURE_NAMES},
instruction::{Instruction, InstructionError},
message::Message,
packet::PACKET_DATA_SIZE,
Expand Down Expand Up @@ -166,7 +166,7 @@ pub enum ProgramCliCommand {
use_lamports_unit: bool,
bypass_warning: bool,
},
ExtendProgram {
ExtendProgramChecked {
program_pubkey: Pubkey,
additional_bytes: u32,
},
Expand Down Expand Up @@ -983,7 +983,7 @@ pub fn parse_program_subcommand(
)?;

CliCommandInfo {
command: CliCommand::Program(ProgramCliCommand::ExtendProgram {
command: CliCommand::Program(ProgramCliCommand::ExtendProgramChecked {
program_pubkey,
additional_bytes,
}),
Expand Down Expand Up @@ -1170,7 +1170,7 @@ pub fn process_program_subcommand(
*use_lamports_unit,
*bypass_warning,
),
ProgramCliCommand::ExtendProgram {
ProgramCliCommand::ExtendProgramChecked {
program_pubkey,
additional_bytes,
} => process_extend_program(&rpc_client, config, *program_pubkey, *additional_bytes),
Expand Down Expand Up @@ -2338,21 +2338,27 @@ fn process_extend_program(
_ => Err(format!("Program {program_pubkey} is closed")),
}?;

match upgrade_authority_address {
None => Err(format!("Program {program_pubkey} is not upgradeable")),
_ => Ok(()),
}?;
let upgrade_authority_address = upgrade_authority_address
.ok_or_else(|| format!("Program {program_pubkey} is not upgradeable"))?;

let blockhash = rpc_client.get_latest_blockhash()?;
let feature_set = fetch_feature_set(rpc_client)?;

let mut tx = Transaction::new_unsigned(Message::new(
&[bpf_loader_upgradeable::extend_program(
let instruction = if feature_set.is_active(&enable_extend_program_checked::id()) {
bpf_loader_upgradeable::extend_program_checked(
&program_pubkey,
&upgrade_authority_address,
Some(&payer_pubkey),
additional_bytes,
)],
Some(&payer_pubkey),
));
)
} else {
bpf_loader_upgradeable::extend_program(
&program_pubkey,
Some(&payer_pubkey),
additional_bytes,
)
};
let mut tx = Transaction::new_unsigned(Message::new(&[instruction], Some(&payer_pubkey)));

tx.try_sign(&[config.signers[0]], blockhash)?;
let result = rpc_client.send_and_confirm_transaction_with_spinner_and_config(
Expand Down Expand Up @@ -4227,7 +4233,7 @@ mod tests {
assert_eq!(
parse_command(&test_command, &default_signer, &mut None).unwrap(),
CliCommandInfo {
command: CliCommand::Program(ProgramCliCommand::ExtendProgram {
command: CliCommand::Program(ProgramCliCommand::ExtendProgramChecked {
program_pubkey,
additional_bytes
}),
Expand Down
4 changes: 2 additions & 2 deletions cli/tests/program.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,7 +1423,7 @@ fn test_cli_program_extend_program() {
let new_max_len = new_program_data.len();
let additional_bytes = (new_max_len - max_len) as u32;
config.signers = vec![&keypair];
config.command = CliCommand::Program(ProgramCliCommand::ExtendProgram {
config.command = CliCommand::Program(ProgramCliCommand::ExtendProgramChecked {
program_pubkey: program_keypair.pubkey(),
additional_bytes: additional_bytes - 1,
});
Expand Down Expand Up @@ -1470,7 +1470,7 @@ fn test_cli_program_extend_program() {

// Extend 1 last byte
config.signers = vec![&keypair];
config.command = CliCommand::Program(ProgramCliCommand::ExtendProgram {
config.command = CliCommand::Program(ProgramCliCommand::ExtendProgramChecked {
program_pubkey: program_keypair.pubkey(),
additional_bytes: 1,
});
Expand Down
5 changes: 4 additions & 1 deletion programs/bpf-loader-tests/tests/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use {
account::AccountSharedData,
account_utils::StateMut,
bpf_loader_upgradeable::{id, UpgradeableLoaderState},
feature_set::enable_extend_program_checked,
instruction::{Instruction, InstructionError},
pubkey::Pubkey,
signature::{Keypair, Signer},
Expand All @@ -14,7 +15,9 @@ use {
};

pub async fn setup_test_context() -> ProgramTestContext {
let program_test = ProgramTest::new("", id(), Some(solana_bpf_loader_program::Entrypoint::vm));
let mut program_test =
ProgramTest::new("", id(), Some(solana_bpf_loader_program::Entrypoint::vm));
program_test.deactivate_feature(enable_extend_program_checked::id());
program_test.start_with_context().await
}

Expand Down
Loading