add solana-sdk-ids dependency and remove solana-secp256r1-program…

… dependency
anza-xyz · Dec 3, 2024 · c47cfe6 · c47cfe6
1 parent 3f503c6
commit c47cfe6
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/runtime-transaction/Cargo.toml b/runtime-transaction/Cargo.toml
@@ -16,7 +16,7 @@ solana-builtins-default-costs = { workspace = true }
 solana-compute-budget = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-sdk = { workspace = true }
-solana-secp256r1-program = { workspace = true, features = ["openssl-vendored"] }
+solana-sdk-ids = { workspace = true }
 solana-svm-transaction = { workspace = true }
 thiserror = { workspace = true }
 

diff --git a/runtime-transaction/src/signature_details.rs b/runtime-transaction/src/signature_details.rs
@@ -94,7 +94,7 @@ impl SignatureDetailsFilter {
             ProgramIdStatus::Secp256k1
         } else if program_id == &solana_sdk::ed25519_program::ID {
             ProgramIdStatus::Ed25519
-        } else if program_id == &solana_secp256r1_program::ID {
+        } else if program_id == &solana_sdk_ids::secp256r1_program::ID {
             ProgramIdStatus::Secp256r1
         } else {
             ProgramIdStatus::NotSignature
@@ -150,7 +150,7 @@ mod tests {
             Pubkey::new_unique(),
             solana_sdk::secp256k1_program::ID,
             solana_sdk::ed25519_program::ID,
-            solana_secp256r1_program::ID,
+            solana_sdk_ids::secp256r1_program::ID,
         ];
         let instructions = [
             make_instruction(&program_ids, 1, &[5]),
@@ -174,7 +174,7 @@ mod tests {
         let program_ids = [
             solana_sdk::secp256k1_program::ID,
             solana_sdk::ed25519_program::ID,
-            solana_secp256r1_program::ID,
+            solana_sdk_ids::secp256r1_program::ID,
         ];
         let instructions = [
             make_instruction(&program_ids, 0, &[]),

diff --git a/sdk/message/Cargo.toml b/sdk/message/Cargo.toml
@@ -24,7 +24,6 @@ solana-logger = { workspace = true, optional = true }
 solana-pubkey = { workspace = true }
 solana-sanitize = { workspace = true }
 solana-sdk-ids = { workspace = true }
-solana-secp256r1-program = { workspace = true, features = ["openssl-vendored"] }
 solana-short-vec = { workspace = true, optional = true }
 solana-system-interface = { workspace = true, optional = true, features = [
     "bincode",

diff --git a/sdk/message/src/sanitized.rs b/sdk/message/src/sanitized.rs
@@ -14,7 +14,7 @@ use {
     solana_instruction::{BorrowedAccountMeta, BorrowedInstruction},
     solana_pubkey::Pubkey,
     solana_sanitize::Sanitize,
-    solana_sdk_ids::{ed25519_program, secp256k1_program},
+    solana_sdk_ids::{ed25519_program, secp256k1_program, secp256r1_program},
     std::{borrow::Cow, collections::HashSet, convert::TryFrom},
 };
 
@@ -411,7 +411,7 @@ impl SanitizedMessage {
                             .num_ed25519_instruction_signatures
                             .saturating_add(u64::from(*num_verifies));
                 }
-            } else if solana_secp256r1_program::check_id(program_id) {
+            } else if secp256r1_program::check_id(program_id) {
                 if let Some(num_verifies) = instruction.data.first() {
                     transaction_signature_details.num_secp256r1_instruction_signatures =
                         transaction_signature_details

diff --git a/transaction-view/Cargo.toml b/transaction-view/Cargo.toml
@@ -11,7 +11,7 @@ edition = { workspace = true }
 
 [dependencies]
 solana-sdk = { workspace = true }
-solana-secp256r1-program = { workspace = true }
+solana-sdk-ids = { workspace = true }
 solana-svm-transaction = { workspace = true }
 
 [dev-dependencies]

diff --git a/transaction-view/src/resolved_transaction_view.rs b/transaction-view/src/resolved_transaction_view.rs
@@ -17,6 +17,7 @@ use {
         secp256k1_program,
         signature::Signature,
     },
+    solana_sdk_ids::secp256r1_program,
     solana_svm_transaction::{
         instruction::SVMInstruction, message_address_table_lookup::SVMMessageAddressTableLookup,
         svm_message::SVMMessage, svm_transaction::SVMTransaction,
@@ -177,7 +178,7 @@ impl<D: TransactionData> ResolvedTransactionView<D> {
                     num_ed25519_instruction_signatures =
                         num_ed25519_instruction_signatures.wrapping_add(u64::from(*num_verifies));
                 }
-            } else if solana_secp256r1_program::check_id(program_id) {
+            } else if secp256r1_program::check_id(program_id) {
                 if let Some(num_verifies) = instruction.data.first() {
                     num_secp256r1_instruction_signatures =
                         num_secp256r1_instruction_signatures.wrapping_add(u64::from(*num_verifies));