update gumdrop for bubblegum version parameter

jarry-xiao · Jun 2, 2022 · 2f84c27 · 2f84c27
1 parent 2be0bf7
commit 2f84c27
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,13 +3,6 @@ members = [
     "plerkle",
     "nft_api",
     "nft_ingester",
-<<<<<<< HEAD
-=======
-    "programs/bubblegum",
-    "programs/gumdrop",
-    "programs/gummyroll",
-    "programs/gummyroll_crud",
->>>>>>> c8404ec (add gumdrop for batchminting)
     "messenger"
 ]
 exclude = [

diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock
diff --git a/contracts/Cargo.toml b/contracts/Cargo.toml
@@ -2,5 +2,6 @@
 members = [
     "programs/gummyroll",
     "programs/gummyroll_crud",
-    "programs/bubblegum"
+    "programs/bubblegum",
+    "programs/gumdrop"
 ]
diff --git a/contracts/programs/bubblegum/src/lib.rs b/contracts/programs/bubblegum/src/lib.rs
@@ -359,6 +359,7 @@ pub mod bubblegum {
         );
         emit!(leaf.to_event());
         nonce.count = nonce.count.saturating_add(1);
+        msg!("yeehaw");
         append_leaf(
             &merkle_slab.key(),
             *ctx.bumps.get("authority").unwrap(),

diff --git a/contracts/programs/gumdrop/Cargo.toml b/contracts/programs/gumdrop/Cargo.toml
@@ -21,8 +21,8 @@ cpi = ["no-entrypoint"]
 default = []
 
 [dependencies]
-anchor-lang = { path="../../deps/anchor/lang" }
-anchor-spl = { path="../../deps/anchor/spl" }
+anchor-lang = { path="../../../deps/anchor/lang" }
+anchor-spl = { path="../../../deps/anchor/spl" }
 solana-program = "1.10.10"
 spl-token = "3.3.0"
 spl-associated-token-account = { version = "=1.0.5", features = [ "no-entrypoint" ] }

diff --git a/contracts/programs/gumdrop/src/lib.rs b/contracts/programs/gumdrop/src/lib.rs
@@ -707,7 +707,10 @@ pub mod gumdrop {
         );
 
         // This user is whitelisted to mint at most `amount` NFTs from the candy machine
-        require!(claim_count.count < (amount as u64), GumdropError::DropAlreadyClaimed);
+        require!(
+            claim_count.count < (amount as u64),
+            GumdropError::DropAlreadyClaimed
+        );
 
         // Mark it claimed
         claim_count.count = claim_count
@@ -723,6 +726,7 @@ pub mod gumdrop {
             &ctx.accounts.bubblegum_tree_authority,
             &ctx.accounts.bubblegum_program,
             &ctx.accounts.gummyroll_program,
+            0,
             nft_metadata,
         )?;
 
@@ -852,7 +856,7 @@ fn create_new_compressed_tree<'info>(
         // merkle slab
         merkle_slab.clone(),
     ];
-    
+
     msg!("Invoking cpi to bubblegum");
     invoke_signed(
         &Instruction {
@@ -878,6 +882,7 @@ fn issue_compressed_nft<'info>(
     merkle_tree_auth: &AccountInfo<'info>,
     bubblegum_program: &AccountInfo<'info>,
     gummyroll_program: &AccountInfo<'info>,
+    version: u8,
     metadata_data: Vec<u8>,
 ) -> Result<()> {
     verify_bubblegum(&bubblegum_program.key())?;
@@ -888,6 +893,7 @@ fn issue_compressed_nft<'info>(
     // Prepend mint discriminant to metadata
     // TODO(ngundotra): global::mint_compressed_nft ix
     let mut ix_data = vec![51, 57, 225, 47, 182, 146, 137, 166];
+    ix_data.push(version);
     ix_data.extend(metadata_data.iter());
 
     let distributor_seeds = [
@@ -1812,4 +1818,4 @@ pub struct CandyMachineData {
     pub price: u64,
     pub items_available: u64,
     pub go_live_date: Option<i64>,
-}
+}