remove solana-sdk from address-lookup-table-program

anza-xyz · Jan 4, 2025 · 01fc970 · 01fc970
1 parent c80196f
commit 01fc970
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/address-lookup-table/Cargo.toml b/programs/address-lookup-table/Cargo.toml
@@ -20,9 +20,15 @@ solana-program = { workspace = true }
 thiserror = { workspace = true }
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
+solana-bincode = { workspace = true }
+solana-clock = { workspace = true }
+solana-instruction = { workspace = true }
 solana-log-collector = { workspace = true }
+solana-packet = { workspace = true }
 solana-program-runtime = { workspace = true }
-solana-sdk = { workspace = true }
+solana-pubkey = { workspace = true }
+solana-system-interface = { workspace = true }
+solana-transaction-context = { workspace = true, features = ["bincode"] }
 
 [lib]
 crate-type = ["lib"]

diff --git a/programs/address-lookup-table/src/processor.rs b/programs/address-lookup-table/src/processor.rs
@@ -1,21 +1,19 @@
 use {
+    solana_bincode::limited_deserialize,
+    solana_clock::Slot,
+    solana_instruction::error::InstructionError,
     solana_log_collector::ic_msg,
-    solana_program_runtime::{declare_process_instruction, invoke_context::InvokeContext},
-    solana_sdk::{
-        address_lookup_table::{
-            instruction::ProgramInstruction,
-            program::{check_id, id},
-            state::{
-                AddressLookupTable, LookupTableMeta, LookupTableStatus, ProgramState,
-                LOOKUP_TABLE_MAX_ADDRESSES, LOOKUP_TABLE_META_SIZE,
-            },
+    solana_program::address_lookup_table::{
+        instruction::ProgramInstruction,
+        program::{check_id, id},
+        state::{
+            AddressLookupTable, LookupTableMeta, LookupTableStatus, ProgramState,
+            LOOKUP_TABLE_MAX_ADDRESSES, LOOKUP_TABLE_META_SIZE,
         },
-        clock::Slot,
-        instruction::InstructionError,
-        program_utils::limited_deserialize,
-        pubkey::{Pubkey, PUBKEY_BYTES},
-        system_instruction,
     },
+    solana_program_runtime::{declare_process_instruction, invoke_context::InvokeContext},
+    solana_pubkey::{Pubkey, PUBKEY_BYTES},
+    solana_system_interface::instruction as system_instruction,
     std::convert::TryFrom,
 };
 
@@ -25,7 +23,7 @@ declare_process_instruction!(Entrypoint, DEFAULT_COMPUTE_UNITS, |invoke_context|
     let transaction_context = &invoke_context.transaction_context;
     let instruction_context = transaction_context.get_current_instruction_context()?;
     let instruction_data = instruction_context.get_instruction_data();
-    match limited_deserialize(instruction_data)? {
+    match limited_deserialize(instruction_data, solana_packet::PACKET_DATA_SIZE as u64)? {
         ProgramInstruction::CreateLookupTable {
             recent_slot,
             bump_seed,

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