remove solana-sdk from solana-compute-budget (#3375)

* remove solana-sdk from solana-compute-budget * sort deps
anza-xyz · Oct 30, 2024 · 8e35a4f · 8e35a4f
1 parent c80a411
commit 8e35a4f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compute-budget/Cargo.toml b/compute-budget/Cargo.toml
@@ -10,16 +10,14 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+solana-fee-structure = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [
     "frozen-abi",
 ] }
-solana-sdk = { workspace = true }
+solana-program-entrypoint = { workspace = true }
 
 [features]
-frozen-abi = [
-    "dep:solana-frozen-abi",
-    "solana-sdk/frozen-abi",
-]
+frozen-abi = ["dep:solana-frozen-abi", "solana-fee-structure/frozen-abi"]
 
 [lints]
 workspace = true
diff --git a/compute-budget/src/compute_budget.rs b/compute-budget/src/compute_budget.rs
@@ -177,7 +177,7 @@ impl ComputeBudget {
             curve25519_ristretto_multiply_cost: 2_208,
             curve25519_ristretto_msm_base_cost: 2303,
             curve25519_ristretto_msm_incremental_cost: 788,
-            heap_size: u32::try_from(solana_sdk::entrypoint::HEAP_LENGTH).unwrap(),
+            heap_size: u32::try_from(solana_program_entrypoint::HEAP_LENGTH).unwrap(),
             heap_cost: DEFAULT_HEAP_COST,
             mem_op_base_cost: 10,
             alt_bn128_addition_cost: 334,

diff --git a/compute-budget/src/compute_budget_limits.rs b/compute-budget/src/compute_budget_limits.rs
@@ -1,6 +1,7 @@
 use {
     crate::prioritization_fee::{PrioritizationFeeDetails, PrioritizationFeeType},
-    solana_sdk::{entrypoint::HEAP_LENGTH, fee::FeeBudgetLimits},
+    solana_fee_structure::FeeBudgetLimits,
+    solana_program_entrypoint::HEAP_LENGTH,
     std::num::NonZeroU32,
 };
 

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock