Merge pull request #5 from samuelvanderwaal/febo/dependencies

Update solana dependencies

Author: byteassemble

Cargo.toml

@@ -10,9 +10,9 @@ license = "Apache-2.0"
 rayon = "1.5.3"
 retry = "1.3.1"
 serde = "1.0.139"
-solana-client = "=1.10.38"
-solana-program = "=1.10.38"
-solana-sdk = "=1.10.38"
-solana-transaction-status = "=1.10.38"
+solana-client = "~1.14.14"
+solana-program = "~1.14.14"
+solana-sdk = "~1.14.14"
+solana-transaction-status = "~1.14.14"
 thiserror = "1.0.31"
 tokio = "1.14"

src/crawler.rs

@@ -3,8 +3,8 @@ use retry::{delay::Fixed, retry};
 use solana_client::rpc_client::{GetConfirmedSignaturesForAddress2Config, RpcClient};
 use solana_sdk::{commitment_config::CommitmentConfig, pubkey::Pubkey, signature::Signature};
 use solana_transaction_status::{
-    EncodedConfirmedTransactionWithStatusMeta, EncodedTransaction, UiInstruction, UiMessage,
-    UiParsedInstruction, UiTransactionEncoding,
+    option_serializer::OptionSerializer, EncodedConfirmedTransactionWithStatusMeta,
+    EncodedTransaction, UiInstruction, UiMessage, UiParsedInstruction, UiTransactionEncoding,
 };
 use std::{
     collections::{HashMap, HashSet},
@@ -156,7 +156,11 @@ impl Crawler {
 
             // Get all inner instructions and add them to the instructions list.
             if let Some(meta) = &tx.transaction.meta {
-                if let Some(inner_instructions) = &meta.inner_instructions {
+                let inner_instructions = match &meta.inner_instructions {
+                    OptionSerializer::Some(item) => Some(item),
+                    _ => None,
+                };
+                if let Some(inner_instructions) = inner_instructions {
                     let mut parsed_ixs = inner_instructions
                         .iter()
                         .flat_map(|ix| &ix.instructions)

src/filters/tx.rs

@@ -1,3 +1,5 @@
+use solana_transaction_status::option_serializer::OptionSerializer;
+
 use super::*;
 
 /// This filter passes through all successful transactions, rejecting any with errors.
@@ -21,7 +23,11 @@ impl TxFilter for CmV2BotTaxTxFilter {
         // Filter out bot tax transactions, pass through everything else.
         match &tx.transaction.meta {
             Some(meta) => {
-                if let Some(messages) = &meta.log_messages {
+                let log_messages = match &meta.log_messages {
+                    OptionSerializer::Some(item) => Some(item),
+                    _ => None,
+                };
+                if let Some(messages) = log_messages {
                     !messages
                         .iter()
                         .any(|m| m.contains(&CMV2_BOT_TAX_MSG.to_string()))