Merge pull request solana-labs#117 from jarry-xiao/api-refactor

api init refactor to real api
ngundotra · Jun 29, 2022 · 32e4f89 · 32e4f89
2 parents 1d02d76 + ef5aef0
commit 32e4f89
Show file tree

Hide file tree

Showing 6 changed files with 526 additions and 10 deletions.
diff --git a/contracts/programs/bubblegum/src/lib.rs b/contracts/programs/bubblegum/src/lib.rs
@@ -10,7 +10,7 @@ use {
         Nonce, Voucher,
         metaplex_adapter::{MetadataArgs, TokenProgramVersion},
         NewNFTEvent,
-        NFTDecompressionEvent
+        NFTDecompressionEvent,
     },
     gummyroll::{program::Gummyroll, Node},
     crate::error::BubblegumError,
@@ -226,8 +226,9 @@ pub struct DecompressV1<'info> {
     #[account(
     mut,
     seeds = [
-    voucher.leaf_schema.id().as_ref(),
-    token_program.key().as_ref()
+    ASSET_PREFIX.as_ref(),
+    voucher.merkle_slab.as_ref(),
+    voucher.leaf_schema.nonce().to_le_bytes().as_ref()
     ],
     bump
     )]
@@ -603,7 +604,7 @@ pub mod bubblegum {
                     version: Version::V1,
                     tree_id: ctx.accounts.voucher.merkle_slab.key(),
                     id: get_asset_id(&ctx.accounts.voucher.merkle_slab.key(), nonce),
-                    nonce: nonce
+                    nonce: nonce,
                 })
             }
             _ => Err(BubblegumError::UnsupportedSchemaVersion)
@@ -626,8 +627,9 @@ pub mod bubblegum {
                             ctx.accounts.system_program.to_account_info(),
                         ],
                         &[&[
-                            voucher.leaf_schema.id().as_ref(),
-                            spl_token::id().as_ref(),
+                            ASSET_PREFIX.as_bytes(),
+                            voucher.merkle_slab.key().as_ref(),
+                            voucher.leaf_schema.nonce().to_le_bytes().as_ref(),
                             &[*ctx.bumps.get("mint").unwrap()],
                         ]],
                     )?;

diff --git a/contracts/programs/bubblegum/src/state/leaf_schema.rs b/contracts/programs/bubblegum/src/state/leaf_schema.rs
@@ -95,7 +95,6 @@ impl LeafSchema {
             LeafSchema::V1 { data_hash, .. } => *data_hash,
         }
     }
-
 
     pub fn to_event(&self) -> LeafSchemaEvent {
         LeafSchemaEvent {

diff --git a/contracts/sdk/indexer/indexer.ts b/contracts/sdk/indexer/indexer.ts
@@ -40,12 +40,13 @@ async function main() {
     (logs, ctx) => handleLogsAtomic(db, logs, ctx, { Gummyroll, Bubblegum }),
     "confirmed"
   );
+  let maxSeq = 0;
   while (true) {
     try {
       const trees = await db.getTrees();
       for (const [treeId, depth] of trees) {
         console.log("Scanning for gaps");
-        let maxSeq = await fetchAndPlugGaps(connection, db, 0, treeId, {
+        maxSeq = await fetchAndPlugGaps(connection, db, maxSeq, treeId, {
           Gummyroll,
           Bubblegum,
         });

diff --git a/contracts/sdk/indexer/indexer/bubblegum.ts b/contracts/sdk/indexer/indexer/bubblegum.ts
@@ -171,6 +171,8 @@ export async function parseBubblegumMint(
   await db.updateChangeLogs(changeLog, optionalInfo.txId, slot, treeId);
 }
 
+
+
 export async function parseReplaceLeaf(
   db: NFTDatabaseConnection,
   logs: (string | ParsedLog)[],
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,7 +95,6 @@ impl LeafSchema { @@
                 LeafSchema::V1 { data_hash, .. } => *data_hash,
             }
         }
         pub fn to_event(&self) -> LeafSchemaEvent {
             LeafSchemaEvent {
@@ Expand Down @@