Check payer balance for program account rent as needed (#12952)

cli/src/checks.rs

@@ -54,12 +54,42 @@ pub fn check_account_for_multiple_fees_with_commitment(
     fee_calculator: &FeeCalculator,
     messages: &[&Message],
     commitment: CommitmentConfig,
+) -> Result<(), CliError> {
+    check_account_for_spend_multiple_fees_with_commitment(
+        rpc_client,
+        account_pubkey,
+        0,
+        fee_calculator,
+        messages,
+        commitment,
+    )
+}
+
+pub fn check_account_for_spend_multiple_fees_with_commitment(
+    rpc_client: &RpcClient,
+    account_pubkey: &Pubkey,
+    balance: u64,
+    fee_calculator: &FeeCalculator,
+    messages: &[&Message],
+    commitment: CommitmentConfig,
 ) -> Result<(), CliError> {
     let fee = calculate_fee(fee_calculator, messages);
-    if !check_account_for_balance_with_commitment(rpc_client, account_pubkey, fee, commitment)
+    if !check_account_for_balance_with_commitment(
-        .map_err(Into::<ClientError>::into)?
+        rpc_client,
+        account_pubkey,
+        balance + fee,
+        commitment,
+    )
+    .map_err(Into::<ClientError>::into)?
     {
-        return Err(CliError::InsufficientFundsForFee(lamports_to_sol(fee)));
+        if balance > 0 {
+            return Err(CliError::InsufficientFundsForSpendAndFee(
+                lamports_to_sol(balance),
+                lamports_to_sol(fee),
+            ));
+        } else {
+            return Err(CliError::InsufficientFundsForFee(lamports_to_sol(fee)));
+        }
     }
     Ok(())
 }

cli/src/cli.rs

@@ -1166,11 +1166,12 @@ fn process_deploy(
     let signers = [config.signers[0], program_id];
 
     // Check program account to see if partial initialization has occurred
-    let initial_instructions = if let Some(account) = rpc_client
+    let (initial_instructions, balance_needed) = if let Some(account) = rpc_client
         .get_account_with_commitment(&program_id.pubkey(), config.commitment)?
         .value
     {
         let mut instructions: Vec<Instruction> = vec![];
+        let mut balance_needed = 0;
         if account.executable {
             return Err(CliError::DynamicProgramError(
                 "Program account is already executable".to_string(),
@@ -1194,21 +1195,26 @@ fn process_deploy(
             }
         }
         if account.lamports < minimum_balance {
+            let balance = minimum_balance - account.lamports;
             instructions.push(system_instruction::transfer(
                 &config.signers[0].pubkey(),
                 &program_id.pubkey(),
-                minimum_balance - account.lamports,
+                balance,
             ));
+            balance_needed = balance;
         }
-        instructions
+        (instructions, balance_needed)
     } else {
-        vec![system_instruction::create_account(
+        (
-            &config.signers[0].pubkey(),
+            vec![system_instruction::create_account(
-            &program_id.pubkey(),
+                &config.signers[0].pubkey(),
+                &program_id.pubkey(),
+                minimum_balance,
+                program_data.len() as u64,
+                &loader_id,
+            )],
             minimum_balance,
-            program_data.len() as u64,
+        )
-            &loader_id,
-        )]
     };
     let initial_message = if !initial_instructions.is_empty() {
         Some(Message::new(
@@ -1251,9 +1257,10 @@ fn process_deploy(
         .get_recent_blockhash_with_commitment(config.commitment)?
         .value;
 
-    check_account_for_multiple_fees_with_commitment(
+    check_account_for_spend_multiple_fees_with_commitment(
         rpc_client,
         &config.signers[0].pubkey(),
+        balance_needed,
         &fee_calculator,
         &messages,
         config.commitment,