cli: allow drift in simulated CUs (#7447)

Author: 2501babe

clap-utils/src/compute_budget.rs

@@ -43,4 +43,6 @@ pub enum ComputeUnitLimit {
     Static(u32),
     /// Simulate the transaction to find out the compute unit usage
     Simulated,
+    /// Simulate the transaction and add a small percentage to account for potential drift
+    SimulatedWithExtraPercentage(u8),
 }

cli/src/compute_budget.rs

@@ -98,10 +98,19 @@ pub(crate) fn simulate_and_update_compute_unit_limit(
     };
 
     match compute_unit_limit {
-        ComputeUnitLimit::Simulated => {
-            let compute_unit_limit =
+        ComputeUnitLimit::Simulated | ComputeUnitLimit::SimulatedWithExtraPercentage(_) => {
+            let base_compute_unit_limit =
                 simulate_for_compute_unit_limit_unchecked(rpc_client, message)?;
 
+            let compute_unit_limit =
+                if let ComputeUnitLimit::SimulatedWithExtraPercentage(n) = compute_unit_limit {
+                    (base_compute_unit_limit as u64)
+                        .saturating_mul(100_u64.saturating_add(*n as u64))
+                        .saturating_div(100) as u32
+                } else {
+                    base_compute_unit_limit
+                };
+
             // Overwrite the compute unit limit instruction with the actual units consumed
             message.instructions[compute_unit_limit_ix_index].data =
                 ComputeBudgetInstruction::set_compute_unit_limit(compute_unit_limit).data;
@@ -138,7 +147,7 @@ impl WithComputeUnitConfig for Vec<Instruction> {
                         compute_unit_limit,
                     ));
                 }
-                ComputeUnitLimit::Simulated => {
+                ComputeUnitLimit::Simulated | ComputeUnitLimit::SimulatedWithExtraPercentage(_) => {
                     // Default to the max compute unit limit because later transactions will be
                     // simulated to get the exact compute units consumed.
                     self.push(ComputeBudgetInstruction::set_compute_unit_limit(

cli/src/stake.rs

@@ -1709,8 +1709,12 @@ pub fn process_deactivate_stake_account(
         *stake_account_pubkey
     };
 
+    // DeactivateDelinquent parses a VoteState, which may change between simulation and execution
     let compute_unit_limit = match blockhash_query {
         BlockhashQuery::None(_) | BlockhashQuery::FeeCalculator(_, _) => ComputeUnitLimit::Default,
+        BlockhashQuery::All(_) if deactivate_delinquent => {
+            ComputeUnitLimit::SimulatedWithExtraPercentage(5)
+        }
         BlockhashQuery::All(_) => ComputeUnitLimit::Simulated,
     };
     let ixs = vec![if deactivate_delinquent {
@@ -2805,9 +2809,10 @@ pub fn process_delegate_stake(
 
     let recent_blockhash = blockhash_query.get_blockhash(rpc_client, config.commitment)?;
 
+    // DelegateStake parses a VoteState, which may change between simulation and execution
     let compute_unit_limit = match blockhash_query {
         BlockhashQuery::None(_) | BlockhashQuery::FeeCalculator(_, _) => ComputeUnitLimit::Default,
-        BlockhashQuery::All(_) => ComputeUnitLimit::Simulated,
+        BlockhashQuery::All(_) => ComputeUnitLimit::SimulatedWithExtraPercentage(5),
     };
     let ixs = vec![stake_instruction::delegate_stake(
         stake_account_pubkey,