Refactor ComputeBudget and ComputeBudgetLimits

- Move relevant structs into SVM boundaries
anza-xyz · Mar 4, 2025 · a57aae2 · a57aae2
1 parent 69c503a
commit a57aae2
Show file tree

Hide file tree

Showing 41 changed files with 620 additions and 491 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/src/compute_budget.rs b/cli/src/compute_budget.rs
@@ -1,10 +1,10 @@
 use {
     solana_borsh::v1::try_from_slice_unchecked,
     solana_clap_utils::compute_budget::ComputeUnitLimit,
-    solana_compute_budget::compute_budget_limits::MAX_COMPUTE_UNIT_LIMIT,
     solana_compute_budget_interface::{self as compute_budget, ComputeBudgetInstruction},
     solana_instruction::Instruction,
     solana_message::Message,
+    solana_program_runtime::execution_budget::MAX_COMPUTE_UNIT_LIMIT,
     solana_rpc_client::rpc_client::RpcClient,
     solana_rpc_client_api::config::RpcSimulateTransactionConfig,
     solana_transaction::Transaction,

diff --git a/compute-budget-instruction/Cargo.toml b/compute-budget-instruction/Cargo.toml
@@ -18,6 +18,7 @@ solana-compute-budget-interface = { workspace = true, features = ["borsh"] }
 solana-feature-set = { workspace = true }
 solana-instruction = { workspace = true }
 solana-packet = { workspace = true }
+solana-program-runtime = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-sdk-ids = { workspace = true }
 solana-svm-transaction = { workspace = true }
@@ -33,6 +34,7 @@ bincode = { workspace = true }
 criterion = { workspace = true }
 rand = { workspace = true }
 solana-builtins-default-costs = { workspace = true, features = ["dev-context-only-utils", "svm-internal"] }
+solana-compute-budget-program = { workspace = true }
 solana-hash = { workspace = true }
 solana-keypair = { workspace = true }
 solana-message = { workspace = true }

diff --git a/compute-budget-instruction/src/compute_budget_instruction_details.rs b/compute-budget-instruction/src/compute_budget_instruction_details.rs
@@ -9,6 +9,10 @@ use {
     solana_compute_budget_interface::ComputeBudgetInstruction,
     solana_feature_set::{self as feature_set, FeatureSet},
     solana_instruction::error::InstructionError,
+    solana_program_runtime::execution_budget::{
+        DEFAULT_INSTRUCTION_COMPUTE_UNIT_LIMIT, MAX_BUILTIN_ALLOCATION_COMPUTE_UNIT_LIMIT,
+        MAX_COMPUTE_UNIT_LIMIT, MAX_HEAP_FRAME_BYTES, MIN_HEAP_FRAME_BYTES,
+    },
     solana_pubkey::Pubkey,
     solana_svm_transaction::instruction::SVMInstruction,
     solana_transaction_error::{TransactionError, TransactionResult as Result},
@@ -232,6 +236,10 @@ mod test {
         solana_instruction::Instruction,
         solana_keypair::Keypair,
         solana_message::Message,
+        solana_program_runtime::execution_budget::{
+            DEFAULT_INSTRUCTION_COMPUTE_UNIT_LIMIT, MAX_BUILTIN_ALLOCATION_COMPUTE_UNIT_LIMIT,
+            MAX_COMPUTE_UNIT_LIMIT, MAX_HEAP_FRAME_BYTES, MIN_HEAP_FRAME_BYTES,
+        },
         solana_pubkey::Pubkey,
         solana_signer::Signer,
         solana_svm_transaction::svm_message::SVMMessage,

diff --git a/compute-budget-instruction/src/instructions_processor.rs b/compute-budget-instruction/src/instructions_processor.rs
@@ -22,11 +22,16 @@ pub fn process_compute_budget_instructions<'a>(
 mod tests {
     use {
         super::*,
+        solana_compute_budget::compute_budget_limits::ComputeBudgetLimits,
         solana_compute_budget_interface::ComputeBudgetInstruction,
         solana_hash::Hash,
         solana_instruction::{error::InstructionError, Instruction},
         solana_keypair::Keypair,
         solana_message::Message,
+        solana_program_runtime::execution_budget::{
+            DEFAULT_INSTRUCTION_COMPUTE_UNIT_LIMIT, MAX_BUILTIN_ALLOCATION_COMPUTE_UNIT_LIMIT,
+            MAX_COMPUTE_UNIT_LIMIT, MAX_HEAP_FRAME_BYTES, MIN_HEAP_FRAME_BYTES,
+        },
         solana_pubkey::Pubkey,
         solana_signer::Signer,
         solana_svm_transaction::svm_message::SVMMessage,
@@ -78,6 +83,30 @@ mod tests {
                 ..ComputeBudgetLimits::default()
             })
         );
+        test!(
+            &[
+                ComputeBudgetInstruction::set_compute_unit_limit(2000u32),
+                ComputeBudgetInstruction::set_compute_unit_price(1_000_000_000),
+            ],
+            Ok(ComputeBudgetLimits {
+                compute_unit_limit: 2000u32,
+                compute_unit_price: 1_000_000_000u64,
+                ..ComputeBudgetLimits::default()
+            })
+        );
+        test!(
+            &[
+                ComputeBudgetInstruction::set_compute_unit_limit(
+                    2 * solana_compute_budget_program::DEFAULT_COMPUTE_UNITS as u32
+                ),
+                ComputeBudgetInstruction::set_compute_unit_price(1_000_000),
+            ],
+            Ok(ComputeBudgetLimits {
+                compute_unit_limit: 2 * solana_compute_budget_program::DEFAULT_COMPUTE_UNITS as u32,
+                compute_unit_price: 1_000_000u64,
+                ..ComputeBudgetLimits::default()
+            })
+        );
         test!(
             &[
                 ComputeBudgetInstruction::set_compute_unit_limit(MAX_COMPUTE_UNIT_LIMIT + 1),
@@ -279,6 +308,14 @@ mod tests {
             Err(TransactionError::DuplicateInstruction(2))
         );
 
+        test!(
+            &[
+                ComputeBudgetInstruction::set_compute_unit_limit(2000u32),
+                ComputeBudgetInstruction::set_compute_unit_limit(42u32),
+            ],
+            Err(TransactionError::DuplicateInstruction(1))
+        );
+
         test!(
             &[
                 Instruction::new_with_bincode(Pubkey::new_unique(), &0_u8, vec![]),

diff --git a/compute-budget/Cargo.toml b/compute-budget/Cargo.toml
@@ -15,7 +15,7 @@ solana-fee-structure = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [
     "frozen-abi",
 ] }
-solana-program-entrypoint = { workspace = true }
+solana-program-runtime = { workspace = true }
 
 [features]
 dev-context-only-utils = ["dep:qualifier_attr"]