Upgrade litesvm to 0.9, re-export InstructionDecoder derive macro

- Update litesvm workspace dep from 0.8 to 0.9, remove all pinned
  transitive agave/solana deps that are no longer needed
- Re-export InstructionDecoder derive macro from main crate so
  dependents don't need a separate light-instruction-decoder-derive dep
- Update tests for litesvm 0.9 API changes

Author: ananas-block

Cargo.lock

@@ -38,36 +38,13 @@ syn = { version = "2.0", features = ["visit", "visit-mut", "full"] }
 darling = "0.21"
 heck = "0.5"
 sha2 = "0.10"
-# LiteSVM from crates.io (patched locally to git fork via [patch.crates-io])
-litesvm = "0.8"
-# Pin litesvm transitive deps to =3.0.5 (litesvm not yet compatible with 3.1.x)
-agave-feature-set = "=3.0.5"
-agave-reserved-account-keys = "=3.0.5"
-agave-syscalls = "=3.0.5"
-solana-bpf-loader-program = "=3.0.5"
-solana-builtins = "=3.0.5"
-solana-builtins-default-costs = "=3.0.5"
-solana-compute-budget = "=3.0.5"
-solana-compute-budget-instruction = "=3.0.5"
-solana-compute-budget-program = "=3.0.5"
-solana-fee = "=3.0.5"
-solana-loader-v4-program = "=3.0.5"
-solana-program-runtime = "=3.0.5"
-solana-svm-callback = "=3.0.5"
-solana-svm-feature-set = "=3.0.5"
-solana-svm-log-collector = "=3.0.5"
-solana-svm-measure = "=3.0.5"
-solana-svm-timings = "=3.0.5"
-solana-svm-transaction = "=3.0.5"
-solana-svm-type-overrides = "=3.0.5"
-solana-system-program = "=3.0.5"
-solana-transaction-context = "=3.0.5"
-solana-vote-program = "=3.0.5"
+# LiteSVM (patched locally via [patch.crates-io])
+litesvm = "0.9"
 # Testing
 insta = { version = "1", features = ["json"] }
 # Internal
 light-instruction-decoder = { path = "light-instruction-decoder", version = "0.2.0" }
 light-instruction-decoder-derive = { path = "light-instruction-decoder-derive", version = "0.2.0" }
 
 [patch.crates-io]
-litesvm = { git = "https://github.com/Lightprotocol/litesvm.git", branch = "jorrit/feat-get-program-accounts-v3" }
+litesvm = { path = "../litesvm/crates/litesvm" }

Cargo.toml

@@ -19,8 +19,9 @@
 //! Note: Most functionality is only available off-chain (not on Solana targets).
 
 // Re-export solana types for use by dependent crates (available on all targets)
-// Re-export derive macro for #[instruction_decoder]
+// Re-export derive macros for #[derive(InstructionDecoder)] and #[instruction_decoder]
 pub use light_instruction_decoder_derive::instruction_decoder;
+pub use light_instruction_decoder_derive::InstructionDecoder;
 pub use solana_instruction;
 pub use solana_pubkey;
 pub use solana_signature;

light-instruction-decoder/src/lib.rs

@@ -23,29 +23,6 @@ solana-program-option = { workspace = true }
 zeroize = { workspace = true }
 counter = { path = "../examples/counter" }
 sha2 = { workspace = true }
-# Pin litesvm transitive deps to 3.0.x (litesvm source not yet compatible with 3.1.x)
-agave-feature-set = { workspace = true }
-agave-reserved-account-keys = { workspace = true }
-agave-syscalls = { workspace = true }
-solana-bpf-loader-program = { workspace = true }
-solana-builtins = { workspace = true }
-solana-builtins-default-costs = { workspace = true }
-solana-compute-budget = { workspace = true }
-solana-compute-budget-instruction = { workspace = true }
-solana-compute-budget-program = { workspace = true }
-solana-fee = { workspace = true }
-solana-loader-v4-program = { workspace = true }
-solana-program-runtime = { workspace = true }
-solana-svm-callback = { workspace = true }
-solana-svm-feature-set = { workspace = true }
-solana-svm-log-collector = { workspace = true }
-solana-svm-measure = { workspace = true }
-solana-svm-timings = { workspace = true }
-solana-svm-transaction = { workspace = true }
-solana-svm-type-overrides = { workspace = true }
-solana-system-program = { workspace = true }
-solana-transaction-context = { workspace = true }
-solana-vote-program = { workspace = true }
 
 [dev-dependencies]
 insta = { workspace = true }

tests/Cargo.toml

@@ -9,3 +9,6 @@ pub use light_instruction_decoder::litesvm::{
 
 pub use light_instruction_decoder::EnhancedLoggingConfig as Config;
 pub use litesvm::LiteSVM;
+
+pub const COUNTER_PROGRAM_PATH: &str = "target/deploy/counter.so";
+pub const COUNTER_PROGRAM_BYTES: &[u8] = include_bytes!("../../target/deploy/counter.so");

tests/src/lib.rs

@@ -1,6 +1,7 @@
 use instruction_decoder_tests::{
-    capture_account_states, decode_transaction, decode_transaction_snapshot, format_transaction,
-    strip_ansi_codes, LiteSVM,
+    capture_account_states, create_logging_callback, decode_transaction,
+    decode_transaction_snapshot, format_transaction, strip_ansi_codes, LiteSVM,
+    COUNTER_PROGRAM_BYTES,
 };
 use light_instruction_decoder::EnhancedLoggingConfig;
 use solana_keypair::{keypair_from_seed, Keypair};
@@ -17,13 +18,19 @@ fn deterministic_keypair(seed_byte: u8) -> Keypair {
     keypair_from_seed(&[seed_byte; 32]).unwrap()
 }
 
-fn setup() -> (LiteSVM, Keypair) {
-    let mut svm = LiteSVM::new();
-    let program_bytes = include_bytes!("../../target/deploy/counter.so");
-    let _ = svm.add_program(COUNTER_PROGRAM_ID, program_bytes);
+fn counter_config() -> EnhancedLoggingConfig {
+    EnhancedLoggingConfig::debug()
+        .with_decoders(vec![Box::new(counter::CounterInstructionDecoder)])
+}
+
+fn setup() -> (LiteSVM, Keypair, EnhancedLoggingConfig) {
+    let config = counter_config();
+    let mut svm = LiteSVM::new()
+        .with_transaction_callback(create_logging_callback(config.clone()));
+    let _ = svm.add_program(COUNTER_PROGRAM_ID, COUNTER_PROGRAM_BYTES);
     let payer = deterministic_keypair(10);
     svm.airdrop(&payer.pubkey(), 10 * LAMPORTS_PER_SOL).unwrap();
-    (svm, payer)
+    (svm, payer, config)
 }
 
 /// Build an Anchor instruction: 8-byte discriminator + borsh-serialized args
@@ -51,7 +58,7 @@ fn anchor_discriminator(name: &str) -> [u8; 8] {
 
 #[test]
 fn test_decode_initialize() {
-    let (mut svm, payer) = setup();
+    let (mut svm, payer, config) = setup();
     let counter = deterministic_keypair(11);
 
     let init_ix = anchor_ix(
@@ -76,8 +83,6 @@ fn test_decode_initialize() {
     let result = svm.send_transaction(versioned_tx.clone());
     let post_states = capture_account_states(&svm, &versioned_tx);
 
-    let config = EnhancedLoggingConfig::debug()
-        .with_decoders(vec![Box::new(counter::CounterInstructionDecoder)]);
     let snapshot =
         decode_transaction_snapshot(&versioned_tx, &result, &config, Some(&pre_states), Some(&post_states));
 
@@ -101,7 +106,7 @@ fn test_decode_initialize() {
 
 #[test]
 fn test_decode_increment_and_set() {
-    let (mut svm, payer) = setup();
+    let (mut svm, payer, config) = setup();
     let counter = deterministic_keypair(12);
 
     // Initialize
@@ -143,8 +148,6 @@ fn test_decode_increment_and_set() {
     let result = svm.send_transaction(versioned_tx.clone());
     let post_states = capture_account_states(&svm, &versioned_tx);
 
-    let config = EnhancedLoggingConfig::debug()
-        .with_decoders(vec![Box::new(counter::CounterInstructionDecoder)]);
     let snapshot =
         decode_transaction_snapshot(&versioned_tx, &result, &config, Some(&pre_states), Some(&post_states));
 
@@ -181,8 +184,6 @@ fn test_decode_increment_and_set() {
     let result = svm.send_transaction(versioned_tx.clone());
     let post_states = capture_account_states(&svm, &versioned_tx);
 
-    let config = EnhancedLoggingConfig::debug()
-        .with_decoders(vec![Box::new(counter::CounterInstructionDecoder)]);
     let snapshot =
         decode_transaction_snapshot(&versioned_tx, &result, &config, Some(&pre_states), Some(&post_states));
 
@@ -206,7 +207,7 @@ fn test_decode_increment_and_set() {
 
 #[test]
 fn test_decode_configure() {
-    let (mut svm, payer) = setup();
+    let (mut svm, payer, config) = setup();
     let counter = deterministic_keypair(13);
 
     // Initialize first
@@ -277,8 +278,6 @@ fn test_decode_configure() {
     let result = svm.send_transaction(versioned_tx.clone());
     let post_states = capture_account_states(&svm, &versioned_tx);
 
-    let config = EnhancedLoggingConfig::debug()
-        .with_decoders(vec![Box::new(counter::CounterInstructionDecoder)]);
     let snapshot =
         decode_transaction_snapshot(&versioned_tx, &result, &config, Some(&pre_states), Some(&post_states));
 

tests/tests/counter_program.rs

@@ -1,6 +1,6 @@
 use instruction_decoder_tests::{
-    capture_account_states, decode_transaction, format_transaction, strip_ansi_codes,
-    TransactionLogger, LiteSVM,
+    capture_account_states, create_logging_callback, decode_transaction, format_transaction,
+    strip_ansi_codes, LiteSVM,
 };
 use light_instruction_decoder::EnhancedLoggingConfig;
 use solana_keypair::{keypair_from_seed, Keypair};
@@ -14,33 +14,30 @@ fn deterministic_keypair(seed_byte: u8) -> Keypair {
     keypair_from_seed(&[seed_byte; 32]).unwrap()
 }
 
-fn setup() -> (LiteSVM, Keypair) {
-    let mut svm = LiteSVM::new();
+fn setup() -> (LiteSVM, Keypair, EnhancedLoggingConfig) {
+    let config = EnhancedLoggingConfig::debug();
+    let mut svm = LiteSVM::new()
+        .with_transaction_callback(create_logging_callback(config.clone()));
     let payer = deterministic_keypair(1);
     svm.airdrop(&payer.pubkey(), 10 * LAMPORTS_PER_SOL).unwrap();
-    (svm, payer)
+    (svm, payer, config)
 }
 
 #[test]
 fn test_transaction_logger_transfer() {
-    let (mut svm, payer) = setup();
+    let (mut svm, payer, config) = setup();
     let recipient = deterministic_keypair(2);
 
-    let config = EnhancedLoggingConfig::debug();
-    let logger = TransactionLogger::new(config.clone());
-
     let ix = system_instruction::transfer(&payer.pubkey(), &recipient.pubkey(), LAMPORTS_PER_SOL);
     let msg = Message::new(&[ix], Some(&payer.pubkey()));
     let tx = Transaction::new(&[&payer], msg, svm.latest_blockhash());
     let versioned_tx = solana_transaction::versioned::VersionedTransaction::from(tx);
 
-    // Manually capture states so we can also assert the formatted output
     let pre_states = capture_account_states(&svm, &versioned_tx);
-    let result = logger.send_transaction(&mut svm, versioned_tx.clone());
+    let result = svm.send_transaction(versioned_tx.clone());
     assert!(result.is_ok());
     let post_states = capture_account_states(&svm, &versioned_tx);
 
-    // Re-decode with captured states (logger already logged, but we need the output for snapshot)
     let log = decode_transaction(
         &versioned_tx,
         &result,
@@ -68,12 +65,9 @@ fn test_transaction_logger_transfer() {
 
 #[test]
 fn test_transaction_logger_multiple_transactions() {
-    let (mut svm, payer) = setup();
+    let (mut svm, payer, _config) = setup();
     let recipient = deterministic_keypair(2);
 
-    let config = EnhancedLoggingConfig::debug();
-    let logger = TransactionLogger::new(config.clone());
-
     // Send two transfers
     for i in 0..2 {
         let ix = system_instruction::transfer(
@@ -84,14 +78,14 @@ fn test_transaction_logger_multiple_transactions() {
         let msg = Message::new(&[ix], Some(&payer.pubkey()));
         let tx = Transaction::new(&[&payer], msg, svm.latest_blockhash());
         let versioned_tx = solana_transaction::versioned::VersionedTransaction::from(tx);
-        let result = logger.send_transaction(&mut svm, versioned_tx);
+        let result = svm.send_transaction(versioned_tx);
         assert!(result.is_ok());
     }
 }
 
 #[test]
 fn test_account_state_capture_shows_lamport_changes() {
-    let (mut svm, payer) = setup();
+    let (mut svm, payer, config) = setup();
     let recipient = deterministic_keypair(2);
     let transfer_amount = LAMPORTS_PER_SOL;
 
@@ -115,7 +109,6 @@ fn test_account_state_capture_shows_lamport_changes() {
     let recipient_post = post_states.get(&recipient.pubkey()).unwrap();
     assert_eq!(recipient_post.0 - recipient_pre.0, transfer_amount);
 
-    let config = EnhancedLoggingConfig::debug();
     let log = decode_transaction(
         &versioned_tx,
         &result,
@@ -142,29 +135,20 @@ fn test_account_state_capture_shows_lamport_changes() {
 
 #[test]
 fn test_log_file_is_written() {
-    let (mut svm, payer) = setup();
-    let recipient = deterministic_keypair(2);
-
     let config = EnhancedLoggingConfig::default();
+    let mut svm = LiteSVM::new()
+        .with_transaction_callback(create_logging_callback(config.clone()));
+    let payer = deterministic_keypair(1);
+    svm.airdrop(&payer.pubkey(), 10 * LAMPORTS_PER_SOL).unwrap();
+    let recipient = deterministic_keypair(2);
 
     let ix = system_instruction::transfer(&payer.pubkey(), &recipient.pubkey(), LAMPORTS_PER_SOL);
     let msg = Message::new(&[ix], Some(&payer.pubkey()));
     let tx = Transaction::new(&[&payer], msg, svm.latest_blockhash());
     let versioned_tx = solana_transaction::versioned::VersionedTransaction::from(tx);
 
-    let pre_states = capture_account_states(&svm, &versioned_tx);
     let result = svm.send_transaction(versioned_tx.clone());
-    let post_states = capture_account_states(&svm, &versioned_tx);
-
-    let log = decode_transaction(
-        &versioned_tx,
-        &result,
-        &config,
-        Some(&pre_states),
-        Some(&post_states),
-    );
-    let formatted = format_transaction(&log, &config, 1);
-    instruction_decoder_tests::write_to_log_file(&formatted);
+    assert!(result.is_ok());
 
     let log_content = std::fs::read_to_string("target/instruction_decoder.log")
         .expect("Log file should exist");

tests/tests/logging.rs

@@ -6,7 +6,7 @@ expression: snapshot
   "signature": "4DySUV8MPozC8yUfFqX9J7r5azJz7MRvhebUjqkQTgmcHHJiFhQptpABSkBe1emRF5odQHYCKU5wrwKMh4bkZrGB",
   "status": "Success",
   "fee": 10000,
-  "compute_used": 4413,
+  "compute_used": 4359,
   "instructions": [
     {
       "program_id": "Counter111111111111111111111111111111111111",

tests/tests/snapshots/counter_program__counter_initialize.snap

@@ -4,7 +4,7 @@ expression: stripped
 ---
 ┌──────────────────────────────────────────────────────────── Transaction #1 ─────────────────────────────────────────────────────────────┐
 │ Transaction: 4DySUV8MPozC8yUfFqX9J7r5azJz7MRvhebUjqkQTgmcHHJiFhQptpABSkBe1emRF5odQHYCKU5wrwKMh4bkZrGB | Slot: 0 | Status: Success
-│ Fee: 0.000010 SOL | Compute Used: 4413/1400000 CU
+│ Fee: 0.000010 SOL | Compute Used: 4359/1400000 CU
 │
 │ Instructions (1):
 │
@@ -37,6 +37,6 @@ expression: stripped
 │ Instruction: Initialize
 │ Program 11111111111111111111111111111111 invoke [2]
 │ Program 11111111111111111111111111111111 success
-│ Program Counter111111111111111111111111111111111111 consumed 4413 of 200000 compute units
+│ Program Counter111111111111111111111111111111111111 consumed 4359 of 200000 compute units
 │ Program Counter111111111111111111111111111111111111 success
 └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘