Adjusts CLI and transaction-status parser.

anza-xyz · Aug 5, 2024 · db1cfa9 · db1cfa9
1 parent 1285557
commit db1cfa9
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 18 deletions.
diff --git a/cli/src/program.rs b/cli/src/program.rs
@@ -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,
@@ -166,7 +166,7 @@ pub enum ProgramCliCommand {
         use_lamports_unit: bool,
         bypass_warning: bool,
     },
-    ExtendProgram {
+    ExtendProgramChecked {
         program_pubkey: Pubkey,
         additional_bytes: u32,
     },
@@ -983,7 +983,7 @@ pub fn parse_program_subcommand(
             )?;
 
             CliCommandInfo {
-                command: CliCommand::Program(ProgramCliCommand::ExtendProgram {
+                command: CliCommand::Program(ProgramCliCommand::ExtendProgramChecked {
                     program_pubkey,
                     additional_bytes,
                 }),
@@ -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),
@@ -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(
@@ -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
                 }),

diff --git a/cli/tests/program.rs b/cli/tests/program.rs
@@ -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,
     });
@@ -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,
     });

diff --git a/transaction-status/src/parse_bpf_loader.rs b/transaction-status/src/parse_bpf_loader.rs
@@ -175,19 +175,41 @@ pub fn parse_bpf_upgradeable_loader(
                     "additionalBytes": additional_bytes,
                     "programDataAccount": account_keys[instruction.accounts[0] as usize].to_string(),
                     "programAccount": account_keys[instruction.accounts[1] as usize].to_string(),
-                    "systemProgram": if instruction.accounts.len() > 3 {
+                    "systemProgram": if instruction.accounts.len() > 2 {
                         Some(account_keys[instruction.accounts[2] as usize].to_string())
                     } else {
                         None
                     },
-                    "payerAccount": if instruction.accounts.len() > 4 {
+                    "payerAccount": if instruction.accounts.len() > 3 {
                         Some(account_keys[instruction.accounts[3] as usize].to_string())
                     } else {
                         None
                     },
                 }),
             })
         }
+        UpgradeableLoaderInstruction::ExtendProgramChecked { additional_bytes } => {
+            check_num_bpf_upgradeable_loader_accounts(&instruction.accounts, 3)?;
+            Ok(ParsedInstructionEnum {
+                instruction_type: "extendProgramChecked".to_string(),
+                info: json!({
+                    "additionalBytes": additional_bytes,
+                    "programDataAccount": account_keys[instruction.accounts[0] as usize].to_string(),
+                    "programAccount": account_keys[instruction.accounts[1] as usize].to_string(),
+                    "authority": account_keys[instruction.accounts[2] as usize].to_string(),
+                    "systemProgram": if instruction.accounts.len() > 3 {
+                        Some(account_keys[instruction.accounts[3] as usize].to_string())
+                    } else {
+                        None
+                    },
+                    "payerAccount": if instruction.accounts.len() > 4 {
+                        Some(account_keys[instruction.accounts[4] as usize].to_string())
+                    } else {
+                        None
+                    },
+                }),
+            })
+        }
     }
 }