remove solana-sdk from svm-transaction

anza-xyz · Dec 2, 2024 · be53376 · be53376
1 parent 3b6ec80
commit be53376
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/svm-transaction/Cargo.toml b/svm-transaction/Cargo.toml
@@ -10,4 +10,13 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-solana-sdk = { workspace = true }
+solana-hash = { workspace = true }
+solana-program = { workspace = true, default-features = false }
+solana-pubkey = { workspace = true }
+solana-sdk-ids = { workspace = true }
+solana-signature = { workspace = true }
+solana-transaction = { workspace = true }
+
+[dev-dependencies]
+solana-nonce = { workspace = true }
+static_assertions = { workspace = true }
diff --git a/svm-transaction/src/instruction.rs b/svm-transaction/src/instruction.rs
@@ -1,4 +1,4 @@
-use solana_sdk::instruction::CompiledInstruction;
+use solana_program::instruction::CompiledInstruction;
 
 /// A non-owning version of [`CompiledInstruction`] that references
 /// slices of account indexes and data.

diff --git a/svm-transaction/src/message_address_table_lookup.rs b/svm-transaction/src/message_address_table_lookup.rs
@@ -1,4 +1,4 @@
-use solana_sdk::{message::v0, pubkey::Pubkey};
+use {solana_program::message::v0, solana_pubkey::Pubkey};
 
 /// A non-owning version of [`v0::MessageAddressTableLookup`].
 /// This simply references the data in the original message.

diff --git a/svm-transaction/src/svm_message.rs b/svm-transaction/src/svm_message.rs
@@ -3,14 +3,21 @@ use {
         instruction::SVMInstruction, message_address_table_lookup::SVMMessageAddressTableLookup,
     },
     core::fmt::Debug,
-    solana_sdk::{
-        hash::Hash, message::AccountKeys, nonce::NONCED_TX_MARKER_IX_INDEX, pubkey::Pubkey,
-        system_program,
-    },
+    solana_hash::Hash,
+    solana_program::message::AccountKeys,
+    solana_pubkey::Pubkey,
+    solana_sdk_ids::system_program,
 };
 
 mod sanitized_message;
 mod sanitized_transaction;
+// inlined to avoid solana-nonce dep
+#[cfg(test)]
+static_assertions::const_assert_eq!(
+    NONCED_TX_MARKER_IX_INDEX,
+    solana_nonce::NONCED_TX_MARKER_IX_INDEX
+);
+const NONCED_TX_MARKER_IX_INDEX: u8 = 0;
 
 // - Debug to support legacy logging
 pub trait SVMMessage: Debug {

diff --git a/svm-transaction/src/svm_message/sanitized_message.rs b/svm-transaction/src/svm_message/sanitized_message.rs
@@ -3,11 +3,9 @@ use {
         instruction::SVMInstruction, message_address_table_lookup::SVMMessageAddressTableLookup,
         svm_message::SVMMessage,
     },
-    solana_sdk::{
-        hash::Hash,
-        message::{AccountKeys, SanitizedMessage},
-        pubkey::Pubkey,
-    },
+    solana_hash::Hash,
+    solana_program::message::{AccountKeys, SanitizedMessage},
+    solana_pubkey::Pubkey,
 };
 
 // Implement for the "reference" `SanitizedMessage` type.

diff --git a/svm-transaction/src/svm_message/sanitized_transaction.rs b/svm-transaction/src/svm_message/sanitized_transaction.rs
@@ -3,9 +3,10 @@ use {
         instruction::SVMInstruction, message_address_table_lookup::SVMMessageAddressTableLookup,
         svm_message::SVMMessage,
     },
-    solana_sdk::{
-        hash::Hash, message::AccountKeys, pubkey::Pubkey, transaction::SanitizedTransaction,
-    },
+    solana_hash::Hash,
+    solana_program::message::AccountKeys,
+    solana_pubkey::Pubkey,
+    solana_transaction::sanitized::SanitizedTransaction,
 };
 
 impl SVMMessage for SanitizedTransaction {

diff --git a/svm-transaction/src/svm_transaction.rs b/svm-transaction/src/svm_transaction.rs
@@ -1,4 +1,4 @@
-use {crate::svm_message::SVMMessage, solana_sdk::signature::Signature};
+use {crate::svm_message::SVMMessage, solana_signature::Signature};
 
 mod sanitized_transaction;
 

diff --git a/svm-transaction/src/svm_transaction/sanitized_transaction.rs b/svm-transaction/src/svm_transaction/sanitized_transaction.rs
@@ -1,6 +1,6 @@
 use {
-    crate::svm_transaction::SVMTransaction,
-    solana_sdk::{signature::Signature, transaction::SanitizedTransaction},
+    crate::svm_transaction::SVMTransaction, solana_signature::Signature,
+    solana_transaction::sanitized::SanitizedTransaction,
 };
 
 impl SVMTransaction for SanitizedTransaction {

diff --git a/svm-transaction/src/tests.rs b/svm-transaction/src/tests.rs
@@ -1,19 +1,19 @@
 #![cfg(test)]
 use {
     crate::svm_message::SVMMessage,
-    solana_sdk::{
-        hash::Hash,
+    solana_hash::Hash,
+    solana_program::{
         instruction::CompiledInstruction,
         message::{
             legacy,
             v0::{self, LoadedAddresses, MessageAddressTableLookup},
             MessageHeader, SanitizedMessage, SanitizedVersionedMessage, SimpleAddressLoader,
             VersionedMessage,
         },
-        pubkey::Pubkey,
         system_instruction::SystemInstruction,
-        system_program,
     },
+    solana_pubkey::Pubkey,
+    solana_sdk_ids::system_program,
     std::collections::HashSet,
 };
 

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