1.16.14

.env

@@ -1 +1 @@
-versions_for_test="1.16.13"
+versions_for_test="1.16.14"

Cargo.toml

@@ -12,16 +12,16 @@ keywords = ["solana", "geyser", "plugin", "solana-geyser-plugin"]
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-solana-geyser-plugin-interface = { version = "=1.16.13" }
-solana-logger = { version = "=1.16.13" }
+solana-geyser-plugin-interface = { version = "=1.16.14" }
+solana-logger = { version = "=1.16.14" }
 log = "0.4.17"
 bs58 = "0.4.0"
 flatbuffers = "23.1.21"
 parking_lot = "0.12.0"
-solana-sdk = { version = "=1.16.13" }
-solana-transaction-status = { version = "=1.16.13" }
-solana-program = { version = "=1.16.13" }
-solana-metrics = { version = "=1.16.13" }
+solana-sdk = { version = "=1.16.14" }
+solana-transaction-status = { version = "=1.16.14" }
+solana-program = { version = "=1.16.14" }
+solana-metrics = { version = "=1.16.14" }
 serde = { version = "1.0.133" }
 serde_json = "1.0.75"
 anyhow = "1.0.52"

src/flatbuffer/extractors.rs

@@ -2,15 +2,15 @@ use crate::errors::GeyserError;
 use crate::flatbuffer::common_generated::common::{Reward, RewardArgs, RewardType};
 use crate::flatbuffer::transaction_info_generated;
 use crate::flatbuffer::transaction_info_generated::transaction_info::{
-    CompiledInstruction, CompiledInstructionArgs, InnerByte, InnerByteArgs, InstructionError,
+    CompiledInstruction, CompiledInstructionArgs, InnerByte, InnerByteArgs, InnerInstructionV2,
+    InnerInstructionV2Args, InnerInstructionsV2, InnerInstructionsV2Args, InstructionError,
     InstructionErrorArgs, InstructionErrorData, InstructionErrorDataArgs,
     InstructionErrorInnerData, InstructionErrorType, LoadedAddressesString,
-    LoadedAddressesStringArgs, NewInnerInstruction, NewInnerInstructionArgs, NewInnerInstructions,
-    NewInnerInstructionsArgs, StringValue, StringValueArgs, TransactionError, TransactionErrorArgs,
-    TransactionErrorData, TransactionErrorType, TransactionReturnData, TransactionReturnDataArgs,
-    TransactionStatusMeta, TransactionStatusMetaArgs, TransactionTokenBalance,
-    TransactionTokenBalanceArgs, UiTokenAmount, UiTokenAmountArgs, UiTokenAmountPtr,
-    UiTokenAmountPtrArgs, Uint32Value, Uint32ValueArgs,
+    LoadedAddressesStringArgs, StringValue, StringValueArgs, TransactionError,
+    TransactionErrorArgs, TransactionErrorData, TransactionErrorType, TransactionReturnData,
+    TransactionReturnDataArgs, TransactionStatusMeta, TransactionStatusMetaArgs,
+    TransactionTokenBalance, TransactionTokenBalanceArgs, UiTokenAmount, UiTokenAmountArgs,
+    UiTokenAmountPtr, UiTokenAmountPtrArgs, Uint32Value, Uint32ValueArgs,
 };
 use flatbuffers::{FlatBufferBuilder, ForwardsUOffset, Vector, WIPOffset};
 use solana_transaction_status::{Rewards, UiReturnDataEncoding, UiTransactionReturnData};
@@ -28,8 +28,7 @@ pub struct TxMetaArgs<'a> {
         Option<WIPOffset<Vector<'a, ForwardsUOffset<UiTokenAmountPtr<'a>>>>>,
     pub post_token_balances_ptr:
         Option<WIPOffset<Vector<'a, ForwardsUOffset<UiTokenAmountPtr<'a>>>>>,
-    pub inner_instructions:
-        Option<WIPOffset<Vector<'a, ForwardsUOffset<NewInnerInstructions<'a>>>>>,
+    pub inner_instructions: Option<WIPOffset<Vector<'a, ForwardsUOffset<InnerInstructionsV2<'a>>>>>,
     pub return_data: Option<WIPOffset<TransactionReturnData<'a>>>,
 }
 
@@ -158,7 +157,7 @@ fn extract_meta<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>(
 fn extract_inner_instructions<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>(
     inner_instructions: &'args Option<Vec<solana_transaction_status::InnerInstructions>>,
     builder: &'mut_bldr mut FlatBufferBuilder<'bldr>,
-) -> Option<WIPOffset<Vector<'bldr, ForwardsUOffset<NewInnerInstructions<'bldr>>>>> {
+) -> Option<WIPOffset<Vector<'bldr, ForwardsUOffset<InnerInstructionsV2<'bldr>>>>> {
     if inner_instructions.is_none() {
         return None;
     }
@@ -181,19 +180,19 @@ fn extract_inner_instructions<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>(
                 },
             );
 
-            inner_instruction_vec.push(NewInnerInstruction::create(
+            inner_instruction_vec.push(InnerInstructionV2::create(
                 builder,
-                &NewInnerInstructionArgs {
+                &InnerInstructionV2Args {
                     instruction: Some(compiled_instruction),
                     stack_height: instruction.stack_height,
                 },
             ))
         }
         let instructions = Some(builder.create_vector(inner_instruction_vec.as_ref()));
 
-        inner_instructions_vec.push(NewInnerInstructions::create(
+        inner_instructions_vec.push(InnerInstructionsV2::create(
             builder,
-            &NewInnerInstructionsArgs {
+            &InnerInstructionsV2Args {
                 index: inner_instruction.index,
                 instructions,
             },
@@ -1240,5 +1239,15 @@ fn extract_tx_status<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>(
                 },
             ))
         }
+        solana_sdk::transaction::TransactionError::UnbalancedTransaction => {
+            Some(TransactionError::create(
+                builder,
+                &TransactionErrorArgs {
+                    err_type: TransactionErrorType::UnbalancedTransaction,
+                    err_data_type: Default::default(),
+                    err_data: None,
+                },
+            ))
+        }
     }
 }

src/flatbuffer/transaction_info.fbs

@@ -19,7 +19,7 @@ table TransactionInfo {
   loaded_addresses_string: LoadedAddressesString;
   pre_token_balances_ptr: [UiTokenAmountPtr];
   post_token_balances_ptr: [UiTokenAmountPtr];
-  inner_instructions: [NewInnerInstructions];
+  inner_instructions: [InnerInstructionsV2];
 }
 
 table LoadedAddresses {
@@ -73,7 +73,8 @@ enum TransactionErrorType: uint8 {
     InsufficientFundsForRent,
     MaxLoadedAccountsDataSizeExceeded,
     InvalidLoadedAccountsDataSizeLimit,
-    ResanitizationNeeded
+    ResanitizationNeeded,
+    UnbalancedTransaction
 }
 
 enum InstructionErrorType: uint8 {
@@ -192,12 +193,12 @@ table TransactionStatusMeta {
     rewards: [Common.Reward];
 }
 
-table NewInnerInstructions {
+table InnerInstructionsV2 {
     index: uint8;
-    instructions: [NewInnerInstruction];
+    instructions: [InnerInstructionV2];
 }
 
-table NewInnerInstruction {
+table InnerInstructionV2 {
     instruction: CompiledInstruction;
     stack_height: uint32 = null;
 }