Reduce public visibile APIs in solana-fee (#4588)

anza-xyz · Jan 23, 2025 · 4f98820 · 4f98820
1 parent 441619d
commit 4f98820
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/fee/Cargo.toml b/fee/Cargo.toml
@@ -10,6 +10,10 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+qualifier_attr = { workspace = true }
 solana-feature-set = { workspace = true }
 solana-fee-structure = { workspace = true }
 solana-svm-transaction = { workspace = true }
+
+[features]
+svm-internal = []
diff --git a/fee/src/lib.rs b/fee/src/lib.rs
@@ -1,3 +1,5 @@
+#[cfg(feature = "svm-internal")]
+use qualifier_attr::field_qualifiers;
 use {
     solana_feature_set::{
         enable_secp256r1_precompile, remove_rounding_in_fee_calculation, FeatureSet,
@@ -13,9 +15,16 @@ use {
 // instead of removing, since fees will naturally be changed via feature-gates
 // in the future. Keeping this struct will help keep things organized.
 #[derive(Copy, Clone)]
+#[cfg_attr(
+    feature = "svm-internal",
+    field_qualifiers(
+        remove_rounding_in_fee_calculation(pub),
+        enable_secp256r1_precompile(pub)
+    )
+)]
 pub struct FeeFeatures {
-    pub remove_rounding_in_fee_calculation: bool,
-    pub enable_secp256r1_precompile: bool,
+    remove_rounding_in_fee_calculation: bool,
+    enable_secp256r1_precompile: bool,
 }
 
 impl From<&FeatureSet> for FeeFeatures {
@@ -89,10 +98,10 @@ fn calculate_signature_fee(
 }
 
 struct SignatureCounts {
-    pub num_transaction_signatures: u64,
-    pub num_ed25519_signatures: u64,
-    pub num_secp256k1_signatures: u64,
-    pub num_secp256r1_signatures: u64,
+    num_transaction_signatures: u64,
+    num_ed25519_signatures: u64,
+    num_secp256k1_signatures: u64,
+    num_secp256r1_signatures: u64,
 }
 
 impl<Tx: SVMMessage> From<&Tx> for SignatureCounts {

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/svm/Cargo.toml b/svm/Cargo.toml
@@ -23,7 +23,7 @@ solana-clock = { workspace = true }
 solana-compute-budget = { workspace = true }
 solana-compute-budget-instruction = { workspace = true }
 solana-feature-set = { workspace = true }
-solana-fee = { workspace = true }
+solana-fee = { workspace = true, features = ["svm-internal"] }
 solana-fee-structure = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [
     "frozen-abi",

diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock