Jelajahi Sumber

Remove debug-signature feature from transaction-context (#6647)

* remove debug-signature feat from transaction-context

* missed one usage of the feature

* remove from svm examples deps

* one more missing lock file

* missed usage of set_signature

* sort deps for tx context
Mircea Colonescu 5 bulan lalu
induk
melakukan
bd8ccc6a22

+ 1 - 1
Cargo.toml

@@ -540,7 +540,7 @@ solana-tps-client = { path = "tps-client", version = "=3.0.0" }
 solana-tpu-client = { path = "tpu-client", version = "=3.0.0", default-features = false }
 solana-tpu-client = { path = "tpu-client", version = "=3.0.0", default-features = false }
 solana-tpu-client-next = { path = "tpu-client-next", version = "=3.0.0" }
 solana-tpu-client-next = { path = "tpu-client-next", version = "=3.0.0" }
 solana-transaction = "2.2.3"
 solana-transaction = "2.2.3"
-solana-transaction-context = { path = "transaction-context", version = "=3.0.0", features = ["bincode", "debug-signature"] }
+solana-transaction-context = { path = "transaction-context", version = "=3.0.0", features = ["bincode"] }
 solana-transaction-error = "2.2.1"
 solana-transaction-error = "2.2.1"
 solana-transaction-metrics-tracker = { path = "transaction-metrics-tracker", version = "=3.0.0" }
 solana-transaction-metrics-tracker = { path = "transaction-metrics-tracker", version = "=3.0.0" }
 solana-transaction-status = { path = "transaction-status", version = "=3.0.0" }
 solana-transaction-status = { path = "transaction-status", version = "=3.0.0" }

+ 0 - 1
programs/sbf/Cargo.lock

@@ -9457,7 +9457,6 @@ dependencies = [
  "solana-pubkey",
  "solana-pubkey",
  "solana-rent",
  "solana-rent",
  "solana-sdk-ids",
  "solana-sdk-ids",
- "solana-signature",
 ]
 ]
 
 
 [[package]]
 [[package]]

+ 3 - 3
svm/Cargo.toml

@@ -75,7 +75,7 @@ solana-svm-transaction = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-sysvar-id = { workspace = true }
 solana-sysvar-id = { workspace = true }
 solana-timings = { workspace = true }
 solana-timings = { workspace = true }
-solana-transaction-context = { workspace = true, features = ["debug-signature"] }
+solana-transaction-context = { workspace = true }
 solana-transaction-error = { workspace = true }
 solana-transaction-error = { workspace = true }
 solana-type-overrides = { workspace = true }
 solana-type-overrides = { workspace = true }
 spl-generic-token = { workspace = true }
 spl-generic-token = { workspace = true }
@@ -105,12 +105,12 @@ solana-logger = { workspace = true }
 solana-native-token = { workspace = true }
 solana-native-token = { workspace = true }
 solana-precompile-error = { workspace = true }
 solana-precompile-error = { workspace = true }
 solana-program-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 solana-program-runtime = { workspace = true, features = ["dev-context-only-utils"] }
-solana-pubkey = { workspace = true, features = [ "rand" ] }
+solana-pubkey = { workspace = true, features = ["rand"] }
 solana-rent = { workspace = true }
 solana-rent = { workspace = true }
 solana-sbpf = { workspace = true }
 solana-sbpf = { workspace = true }
 solana-secp256k1-program = { workspace = true }
 solana-secp256k1-program = { workspace = true }
 solana-secp256r1-program = { workspace = true, features = ["openssl-vendored"] }
 solana-secp256r1-program = { workspace = true, features = ["openssl-vendored"] }
-solana-signature = { workspace = true, features = [ "rand" ] }
+solana-signature = { workspace = true, features = ["rand"] }
 solana-signer = { workspace = true }
 solana-signer = { workspace = true }
 # See order-crates-for-publishing.py for using this unusual `path = "."`
 # See order-crates-for-publishing.py for using this unusual `path = "."`
 solana-svm = { path = ".", features = ["dev-context-only-utils", "svm-internal"] }
 solana-svm = { path = ".", features = ["dev-context-only-utils", "svm-internal"] }

+ 0 - 1
svm/examples/Cargo.lock

@@ -8557,7 +8557,6 @@ dependencies = [
  "solana-pubkey",
  "solana-pubkey",
  "solana-rent",
  "solana-rent",
  "solana-sdk-ids",
  "solana-sdk-ids",
- "solana-signature",
 ]
 ]
 
 
 [[package]]
 [[package]]

+ 0 - 2
svm/src/transaction_processor.rs

@@ -860,8 +860,6 @@ impl<FG: ForkGraph> TransactionBatchProcessor<FG> {
                 .feature_set
                 .feature_set
                 .remove_accounts_executable_flag_checks,
                 .remove_accounts_executable_flag_checks,
         );
         );
-        #[cfg(debug_assertions)]
-        transaction_context.set_signature(tx.signature());
 
 
         let pre_account_state_info =
         let pre_account_state_info =
             TransactionAccountStateInfo::new(&transaction_context, tx, rent_collector);
             TransactionAccountStateInfo::new(&transaction_context, tx, rent_collector);

+ 1 - 6
transaction-context/Cargo.toml

@@ -16,12 +16,7 @@ rustdoc-args = ["--cfg=docsrs"]
 
 
 [features]
 [features]
 bincode = ["dep:bincode", "serde", "solana-account/bincode"]
 bincode = ["dep:bincode", "serde", "solana-account/bincode"]
-debug-signature = ["dep:solana-signature"]
-dev-context-only-utils = [
-    "bincode",
-    "debug-signature",
-    "solana-account/dev-context-only-utils",
-]
+dev-context-only-utils = ["bincode", "solana-account/dev-context-only-utils"]
 serde = ["dep:serde", "dep:serde_derive"]
 serde = ["dep:serde", "dep:serde_derive"]
 
 
 [dependencies]
 [dependencies]

+ 0 - 39
transaction-context/src/lib.rs

@@ -2,12 +2,6 @@
 #![deny(clippy::indexing_slicing)]
 #![deny(clippy::indexing_slicing)]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 
 
-#[cfg(all(
-    not(target_os = "solana"),
-    feature = "debug-signature",
-    debug_assertions
-))]
-use solana_signature::Signature;
 #[cfg(not(target_os = "solana"))]
 #[cfg(not(target_os = "solana"))]
 use {solana_account::WritableAccount, solana_rent::Rent, std::mem::MaybeUninit};
 use {solana_account::WritableAccount, solana_rent::Rent, std::mem::MaybeUninit};
 use {
 use {
@@ -177,13 +171,6 @@ pub struct TransactionContext {
     remove_accounts_executable_flag_checks: bool,
     remove_accounts_executable_flag_checks: bool,
     #[cfg(not(target_os = "solana"))]
     #[cfg(not(target_os = "solana"))]
     rent: Rent,
     rent: Rent,
-    /// Useful for debugging to filter by or to look it up on the explorer
-    #[cfg(all(
-        not(target_os = "solana"),
-        feature = "debug-signature",
-        debug_assertions
-    ))]
-    signature: Signature,
 }
 }
 
 
 impl TransactionContext {
 impl TransactionContext {
@@ -210,12 +197,6 @@ impl TransactionContext {
             return_data: TransactionReturnData::default(),
             return_data: TransactionReturnData::default(),
             remove_accounts_executable_flag_checks: true,
             remove_accounts_executable_flag_checks: true,
             rent,
             rent,
-            #[cfg(all(
-                not(target_os = "solana"),
-                feature = "debug-signature",
-                debug_assertions
-            ))]
-            signature: Signature::default(),
         }
         }
     }
     }
 
 
@@ -244,26 +225,6 @@ impl TransactionContext {
         &self.accounts
         &self.accounts
     }
     }
 
 
-    /// Stores the signature of the current transaction
-    #[cfg(all(
-        not(target_os = "solana"),
-        feature = "debug-signature",
-        debug_assertions
-    ))]
-    pub fn set_signature(&mut self, signature: &Signature) {
-        self.signature = *signature;
-    }
-
-    /// Returns the signature of the current transaction
-    #[cfg(all(
-        not(target_os = "solana"),
-        feature = "debug-signature",
-        debug_assertions
-    ))]
-    pub fn get_signature(&self) -> &Signature {
-        &self.signature
-    }
-
     /// Returns the total number of accounts loaded in this Transaction
     /// Returns the total number of accounts loaded in this Transaction
     pub fn get_number_of_accounts(&self) -> IndexOfAccount {
     pub fn get_number_of_accounts(&self) -> IndexOfAccount {
         self.accounts.len() as IndexOfAccount
         self.accounts.len() as IndexOfAccount