refactor: address cr and reference published crates for plerkle_seria…

…lization and blockbuster

Cargo.toml

@@ -31,7 +31,7 @@ anyhow = "1.0.75"
 async-std = "1.0.0"
 async-trait = "0.1.60"
 backon = "0.4.1"
-blockbuster = "1.1.0"
+blockbuster = "2.0.0"
 borsh = "~0.10.3"
 borsh-derive = "~0.10.3"
 bs58 = "0.4.0"
@@ -118,10 +118,6 @@ clone_on_ref_ptr = "deny"
 missing_const_for_fn = "deny"
 trivially_copy_pass_by_ref = "deny"
 
-[patch.crates-io]
-blockbuster = { git = "https://github.com/rpcpool/blockbuster.git", branch = "rm-plerkle-101" }
-plerkle_serialization = { git = "https://github.com/rpcpool/digital-asset-validator-plugin.git", branch = "espi/plerkle-solana-parsers" }
-
 [profile.release]
 codegen-units = 1
 lto = true

nft_ingester/src/plerkle.rs

@@ -57,11 +57,12 @@ impl<'a> TryFrom<PlerkleTransactionInfo<'a>> for TransactionInfo {
         .try_into()?;
         let compiled = tx_info.compiled_inner_instructions();
         let inner = tx_info.inner_instructions();
-        let meta_inner_instructions = compiled
-            .map(|c| PlerkleCompiledInnerInstructionVector(c).try_into())
-            .or_else(|| inner.map(|i| PlerkleInnerInstructionsVector(i).try_into()))
-            .transpose()?
-            .unwrap_or_default();
+        let meta_inner_instructions = if let Some(c) = compiled {
+            PlerkleCompiledInnerInstructionVector(c).try_into()
+        } else {
+            PlerkleInnerInstructionsVector(inner.ok_or(PlerkleDeserializerError::NotFound)?)
+                .try_into()
+        }?;
 
         Ok(Self {
             slot,