Merge branch 'master' into dev

* master:
  chore: avoid CU budget exceeded for lookup table management (#455)

Author: thlorenz

magicblock-table-mania/src/compute_budget.rs

@@ -2,6 +2,14 @@ use solana_sdk::{
     compute_budget::ComputeBudgetInstruction, instruction::Instruction,
 };
 
+/// We multiply the CU values that we determined since we've seen compute budget exceeded errors
+/// if we use them as is. The only way to determine CUs for a particular transaction 100% is
+/// to simulate that exact transaction.
+/// This would make table management even slower, but is an option to consider for the future.
+/// The multiplier is based on the observation that [CREATE_AND_EXTEND_TABLE_CUS] were _safe_ at
+/// 16K-17K CUs which we slightly exceed if we multiply by this multiplier.
+const SAFETY_MULTIPLIER: u32 = 7;
+
 /// Compute units required to create and extend a lookup table, with the initial
 /// pubkeys. This is the same no matter how many pubkeys are added to the table
 /// initially.
@@ -10,14 +18,14 @@ use solana_sdk::{
 /// https://github.com/solana-program/address-lookup-table/blob/main/program/src/processor.rs .
 /// This test repo (https://github.com/thlorenz/create-program-address-cus) verified
 /// that the variation is around 25 CUs, but to be on the safe side we add 10x that.
-pub const CREATE_AND_EXTEND_TABLE_CUS: u32 = 2_400 + 250;
+pub const CREATE_AND_EXTEND_TABLE_CUS: u32 = (2_400 + 250) * SAFETY_MULTIPLIER;
 /// Compute units required to extend a lookup table with additional pubkeys
 /// This is the same no matter how many pubkeys are added to the table.
-pub const EXTEND_TABLE_CUS: u32 = 1_200;
+pub const EXTEND_TABLE_CUS: u32 = 1_200 * SAFETY_MULTIPLIER;
 /// Compute units required to deactivate a lookup table.
-pub const DEACTIVATE_TABLE_CUS: u32 = 1_050;
+pub const DEACTIVATE_TABLE_CUS: u32 = 1_050 * SAFETY_MULTIPLIER;
 /// Compute units required to close a lookup table.
-pub const CLOSE_TABLE_CUS: u32 = 1_050;
+pub const CLOSE_TABLE_CUS: u32 = 1_050 * SAFETY_MULTIPLIER;
 
 #[derive(Clone)]
 pub struct TableManiaComputeBudget {

test-integration/test-table-mania/tests/ix_lookup_table.rs

@@ -267,7 +267,7 @@ async fn test_lookup_table_ixs_cus_per_pubkey() {
             *lookup_table.extend_signatures().unwrap().last().unwrap();
         let cus = get_tx_cus(&rpc_client, &extend_sig).await;
         debug!("Extend for {i:03} CUs  {cus:04}CUs");
-        assert_eq!(cus, EXTEND_TABLE_CUS as u64);
+        assert!(cus <= EXTEND_TABLE_CUS as u64);
 
         lookup_table
             .deactivate(&rpc_client, &validator_auth, &budgets.deactivate)
@@ -280,7 +280,7 @@ async fn test_lookup_table_ixs_cus_per_pubkey() {
         )
         .await;
         debug!("Deactivate table {cus:03}CUs");
-        assert_eq!(cus, DEACTIVATE_TABLE_CUS as u64);
+        assert!(cus <= DEACTIVATE_TABLE_CUS as u64);
 
         #[cfg(feature = "test_table_close")]
         {
@@ -305,7 +305,7 @@ async fn test_lookup_table_ixs_cus_per_pubkey() {
                 assert!(is_closed);
                 let cus = get_tx_cus(&rpc_client, &close_sig.unwrap()).await;
                 debug!("Close table {cus:03}CUs",);
-                assert_eq!(cus, CLOSE_TABLE_CUS as u64);
+                assert!(cus <= CLOSE_TABLE_CUS as u64);
             }
         }
     }