feat: batch mint indexing

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 members = [
-  "blockbuster",
+  "blockbuster/blockbuster",
   "core",
   "das_api",
   "digital_asset_types",
@@ -32,7 +32,7 @@ anyhow = "1.0.75"
 async-std = "1.0.0"
 async-trait = "0.1.60"
 backon = "0.4.1"
-blockbuster = {path = "blockbuster"}
+blockbuster = {path = "blockbuster/blockbuster"}
 borsh = "~0.10.3"
 borsh-derive = "~0.10.3"
 bs58 = "0.4.0"
@@ -67,8 +67,8 @@ log = "0.4.17"
 metrics = "0.20.1"
 migration = {path = "migration"}
 mime_guess = "2.0.4"
-mpl-bubblegum = "1.2.0"
-mpl-core = {version = "0.7.0", features = ["serde"]}
+mpl-bubblegum = { path = "blockbuster/mpl-bubblegum/clients/rust", features = ["serde"] }
+mpl-core = { git = "https://github.com/RequescoS/mpl-core.git", features = ["serde"] }
 mpl-token-metadata = "4.1.1"
 nft_ingester = {path = "nft_ingester"}
 num-derive = "0.3.3"
@@ -77,7 +77,7 @@ once_cell = "1.19.0"
 open-rpc-derive = "0.0.4"
 open-rpc-schema = "0.0.4"
 plerkle_messenger = "1.6.0"
-plerkle_serialization = "1.8.0"
+plerkle_serialization = { git = "https://github.com/n00m4d/digital-asset-validator-plugin.git" }
 program_transformers = {path = "program_transformers"}
 prometheus = "0.13.3"
 proxy-wasm = "0.2.0"
@@ -93,17 +93,17 @@ sea-query = "0.28.1"
 serde = "1.0.137"
 serde_json = "1.0.81"
 serial_test = "2.0.0"
-solana-account-decoder = "~1.17"
-solana-client = "~1.17"
-solana-geyser-plugin-interface = "~1.17"
-solana-program = "~1.17"
-solana-sdk = "~1.17"
-solana-transaction-status = "~1.17"
+solana-account-decoder = "1.18.11"
+solana-client = "1.18.11"
+solana-geyser-plugin-interface = "1.18.11"
+solana-program = "1.18.11"
+solana-sdk = "1.18.11"
+solana-transaction-status = "1.18.11"
 solana-zk-token-sdk = "1.17.16"
-spl-account-compression = "0.3.0"
+spl-account-compression = { path = "blockbuster/mpl-bubblegum/solana-program-library/account-compression/programs/account-compression", features = ["no-entrypoint"] }
 spl-associated-token-account = ">= 1.1.3, < 3.0"
-spl-concurrent-merkle-tree = "0.2.0"
-spl-noop = "0.2.0"
+spl-concurrent-merkle-tree = { path = "blockbuster/mpl-bubblegum/solana-program-library/libraries/concurrent-merkle-tree"}
+spl-noop =  { path = "blockbuster/mpl-bubblegum/solana-program-library/account-compression/programs/noop", features = ["no-entrypoint"] }
 spl-pod = {version = "0.1.0", features = ["serde-traits"]}
 spl-token = ">= 3.5.0, < 5.0"
 spl-token-2022 = {version = "1.0", features = ["no-entrypoint"]}
@@ -122,6 +122,14 @@ txn_forwarder = {path = "tools/txn_forwarder"}
 url = "2.3.1"
 wasi = "0.7.0"
 wasm-bindgen = "0.2.83"
+triomphe = "=0.1.9"
+paste = "1"
+serde_derive = "1.0.190"
+mockall = "0.11.4"
+xxhash-rust = { version = "0.8.10", features = ["xxh3"] }
+serde_with = "3.8.1"
+bincode = "1.3.3"
+tempfile = "3.10.1"
 
 [workspace.lints.clippy]
 clone_on_ref_ptr = "deny"

blockbuster/.gitmodules

@@ -0,0 +1,4 @@
+[submodule "mpl-bubblegum"]
+	path = mpl-bubblegum
+	url = [email protected]:n00m4d/mpl-bubblegum.git
+	branch = feat/rollup

blockbuster/blockbuster/Cargo.toml

@@ -0,0 +1,43 @@
+[package]
+name = "blockbuster"
+description = "Metaplex canonical program parsers, for indexing, analytics etc...."
+version = "2.3.0"
+authors = ["Metaplex Developers <[email protected]>"]
+repository = "https://github.com/metaplex-foundation/blockbuster"
+license = "AGPL-3.0"
+edition = "2021"
+readme = "../README.md"
+
+[dependencies]
+bytemuck = { version = "1.14.0", features = ["derive"] }
+spl-token-2022 = { version = "1.0", features = ["no-entrypoint"] }
+spl-account-compression = { path = "../mpl-bubblegum/solana-program-library/account-compression/programs/account-compression", features = ["no-entrypoint"] }
+spl-noop = { path = "../mpl-bubblegum/solana-program-library/account-compression/programs/noop", features = ["no-entrypoint"] }
+mpl-bubblegum = { path = "../mpl-bubblegum/clients/rust" }
+mpl-core = { git = "https://github.com/RequescoS/mpl-core.git", features = ["serde"] }
+mpl-token-metadata = { version = "4.1.1", features = ["serde"] }
+spl-token = { version = "4.0.0", features = ["no-entrypoint"] }
+async-trait = "0.1.57"
+bs58 = "0.4.0"
+lazy_static = "1.4.0"
+borsh = "~0.10.3"
+thiserror = "1.0.32"
+log = "0.4.17"
+solana-sdk = "~1.18.11"
+solana-transaction-status = "~1.18.11"
+spl-token-metadata-interface = "0.2.0"
+spl-token-group-interface = "0.1.0"
+spl-pod = { version = "0.1.0", features = ["serde-traits"] }
+serde = "1.0.140"
+solana-zk-token-sdk = "~1.18.11"
+anchor-lang = { version = "0.29.0" }
+triomphe = { workspace = true }
+
+[dev-dependencies]
+flatbuffers = "23.1.21"
+plerkle_serialization = { git = "https://github.com/n00m4d/digital-asset-validator-plugin.git" }
+rand = "0.8.5"
+serde_json = "1.0.89"
+solana-client = "~1.18.11"
+solana-geyser-plugin-interface = "~1.18.11"
+spl-concurrent-merkle-tree = "0.2.0"

blockbuster/blockbuster/rustfmt.toml

@@ -0,0 +1,3 @@
+edition = "2021"
+imports_granularity="Crate"
+reorder_imports = true

blockbuster/src/instruction.rs → blockbuster/blockbuster/src/instruction.rs

@@ -39,9 +39,7 @@ pub fn order_instructions<'a>(
     for (outer_instruction_index, message_instruction) in message_instructions.iter().enumerate() {
         let non_hoisted_inner_instruction = meta_inner_instructions
             .iter()
-            .filter_map(|ix| {
-                (ix.index == outer_instruction_index as u8).then_some(&ix.instructions)
-            })
+            .filter_map(|ix| (ix.index == outer_instruction_index as u8).then(|| &ix.instructions))
             .flatten()
             .map(|inner_ix| {
                 let cix = &inner_ix.instruction;
@@ -75,15 +73,16 @@ fn hoist_known_programs<'a>(
     ix_pairs
         .iter()
         .enumerate()
-        .filter(|&(_index, &(pid, _ci))| programs.contains(&pid))
-        .map(|(index, &(pid, ci))| {
-            let inner_copy = ix_pairs
-                .iter()
-                .skip(index + 1)
-                .take_while(|&&(inner_pid, _)| inner_pid != pid)
-                .cloned()
-                .collect::<Vec<IxPair<'a>>>();
-            ((pid, ci), Some(inner_copy))
+        .filter_map(|(index, &(pid, ci))| {
+            programs.contains(&pid).then(|| {
+                let inner_copy = ix_pairs
+                    .iter()
+                    .skip(index + 1)
+                    .take_while(|&&(inner_pid, _)| inner_pid != pid)
+                    .cloned()
+                    .collect::<Vec<IxPair<'a>>>();
+                ((pid, ci), Some(inner_copy))
+            })
         })
         .collect()
 }

blockbuster/src/programs/bubblegum/mod.rs → blockbuster/blockbuster/src/programs/bubblegum/mod.rs

@@ -9,7 +9,8 @@ use log::warn;
 use mpl_bubblegum::{
     get_instruction_type,
     instructions::{
-        UnverifyCreatorInstructionArgs, UpdateMetadataInstructionArgs, VerifyCreatorInstructionArgs,
+        FinalizeTreeWithRootInstructionArgs, UnverifyCreatorInstructionArgs,
+        UpdateMetadataInstructionArgs, VerifyCreatorInstructionArgs,
     },
     types::{BubblegumEventType, MetadataArgs, UpdateArgs},
 };
@@ -53,6 +54,10 @@ pub enum Payload {
         update_args: UpdateArgs,
         tree_id: Pubkey,
     },
+    CreateTreeWithRoot {
+        args: FinalizeTreeWithRootInstructionArgs,
+        tree_id: Pubkey,
+    },
 }
 //TODO add more of the parsing here to minimize program transformer code
 pub struct BubblegumInstruction {
@@ -206,6 +211,9 @@ impl ProgramParser for BubblegumParser {
                     InstructionName::UpdateMetadata => {
                         b_inst.payload = Some(build_update_metadata_payload(keys, ix_data)?);
                     }
+                    InstructionName::CreateTreeWithRoot => {
+                        b_inst.payload = Some(build_create_tree_with_root_payload(keys, ix_data)?);
+                    }
                     _ => {}
                 };
             }
@@ -299,3 +307,18 @@ fn build_update_metadata_payload(
         tree_id,
     })
 }
+
+// See Bubblegum for offsets and positions:
+// https://github.com/metaplex-foundation/mpl-bubblegum/blob/main/programs/bubblegum/README.md
+fn build_create_tree_with_root_payload(
+    keys: &[Pubkey],
+    ix_data: &[u8],
+) -> Result<Payload, BlockbusterError> {
+    let args = FinalizeTreeWithRootInstructionArgs::try_from_slice(ix_data)?;
+
+    let tree_id = *keys
+        .get(1)
+        .ok_or(BlockbusterError::InstructionParsingError)?;
+
+    Ok(Payload::CreateTreeWithRoot { args, tree_id })
+}

blockbuster/src/programs/token_extensions/extension.rs → blockbuster/blockbuster/src/programs/token_extensions/extension.rs

@@ -287,8 +287,8 @@ impl<'de> Visitor<'de> for ShadowAeCiphertextVisitor {
         A: SeqAccess<'de>,
     {
         let mut arr = [0u8; AE_CIPHERTEXT_LEN];
-        for (i, item) in arr.iter_mut().enumerate().take(AE_CIPHERTEXT_LEN) {
-            *item = seq
+        for i in 0..AE_CIPHERTEXT_LEN {
+            arr[i] = seq
                 .next_element()?
                 .ok_or(de::Error::invalid_length(i, &self))?;
         }
@@ -498,19 +498,24 @@ impl From<ConfidentialTransferMint> for ShadowConfidentialTransferMint {
 impl From<ConfidentialTransferAccount> for ShadowConfidentialTransferAccount {
     fn from(original: ConfidentialTransferAccount) -> Self {
         ShadowConfidentialTransferAccount {
-            approved: original.approved,
+            approved: original.approved.into(),
             elgamal_pubkey: original.elgamal_pubkey.into(),
             pending_balance_lo: original.pending_balance_lo.into(),
             pending_balance_hi: original.pending_balance_hi.into(),
             available_balance: original.available_balance.into(),
             decryptable_available_balance: original.decryptable_available_balance.into(),
-            allow_confidential_credits: original.allow_confidential_credits,
-            allow_non_confidential_credits: original.allow_non_confidential_credits,
-            pending_balance_credit_counter: original.pending_balance_credit_counter,
-            maximum_pending_balance_credit_counter: original.maximum_pending_balance_credit_counter,
+            allow_confidential_credits: original.allow_confidential_credits.into(),
+            allow_non_confidential_credits: original.allow_non_confidential_credits.into(),
+            pending_balance_credit_counter: original.pending_balance_credit_counter.into(),
+            maximum_pending_balance_credit_counter: original
+                .maximum_pending_balance_credit_counter
+                .into(),
             expected_pending_balance_credit_counter: original
-                .expected_pending_balance_credit_counter,
-            actual_pending_balance_credit_counter: original.actual_pending_balance_credit_counter,
+                .expected_pending_balance_credit_counter
+                .into(),
+            actual_pending_balance_credit_counter: original
+                .actual_pending_balance_credit_counter
+                .into(),
         }
     }
 }