Added minor state changes to the gummyroll contract (solana-labs#106)

* Added minor state changes to the gummyroll contract * client fixes
ngundotra · Jun 16, 2022 · 04b15d0 · 04b15d0
1 parent 5baa9ed
commit 04b15d0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/contracts/Anchor.toml b/contracts/Anchor.toml
@@ -28,4 +28,4 @@ cluster = "localnet"
 wallet = "~/.config/solana/id.json"
 
 [scripts]
-test = "yarn run ts-mocha -t 1000000 tests/**/bubblegum-test.ts"
+test = "yarn run ts-mocha -t 1000000 tests/**/*-test.ts"
diff --git a/contracts/programs/gummyroll/src/lib.rs b/contracts/programs/gummyroll/src/lib.rs
@@ -1,4 +1,8 @@
-use anchor_lang::{emit, prelude::*, solana_program::sysvar::rent::Rent};
+use anchor_lang::{
+    emit,
+    prelude::*,
+    solana_program::sysvar::{clock::Clock, rent::Rent},
+};
 use borsh::{BorshDeserialize, BorshSerialize};
 use std::mem::size_of;
 
@@ -156,6 +160,7 @@ pub mod gummyroll {
             max_buffer_size,
             &ctx.accounts.authority.key(),
             &ctx.accounts.append_authority.key(),
+            Clock::get()?.slot,
         );
         header.serialize(&mut header_bytes)?;
         let id = ctx.accounts.merkle_roll.key();
@@ -189,6 +194,7 @@ pub mod gummyroll {
             max_buffer_size,
             &ctx.accounts.authority.key(),
             &ctx.accounts.append_authority.key(),
+            Clock::get()?.slot,
         );
         header.serialize(&mut header_bytes)?;
 

diff --git a/contracts/programs/gummyroll/src/state/mod.rs b/contracts/programs/gummyroll/src/state/mod.rs
@@ -30,15 +30,15 @@ pub struct ChangeLogEvent {
     pub id: Pubkey,
     /// Nodes of off-chain merkle tree
     pub path: Vec<PathNode>,
-    pub seq: u128,
+    pub seq: u64,
     /// Bitmap of node parity (used when hashing)
     pub index: u32,
 }
 //  ChangeLog<MAX_DEPTH>
-impl<const MAX_DEPTH: usize> From<(Box<ChangeLog<MAX_DEPTH>>, Pubkey, u128)>
+impl<const MAX_DEPTH: usize> From<(Box<ChangeLog<MAX_DEPTH>>, Pubkey, u64)>
     for Box<ChangeLogEvent>
 {
-    fn from(log_info: (Box<ChangeLog<MAX_DEPTH>>, Pubkey, u128)) -> Self {
+    fn from(log_info: (Box<ChangeLog<MAX_DEPTH>>, Pubkey, u64)) -> Self {
         let (changelog, tree_id, seq) = log_info;
         let path_len = changelog.path.len() as u32;
         let mut path: Vec<PathNode> = changelog
@@ -69,6 +69,7 @@ pub struct MerkleRollHeader {
     pub max_depth: u32,
     pub authority: Pubkey,
     pub append_authority: Pubkey,
+    pub creation_slot: u64,
 }
 
 impl MerkleRollHeader {
@@ -78,6 +79,7 @@ impl MerkleRollHeader {
         max_buffer_size: u32,
         authority: &Pubkey,
         append_authority: &Pubkey,
+        creation_slot: u64, 
     ) {
         // Check header is empty
         assert_eq!(self.max_buffer_size, 0);
@@ -86,5 +88,6 @@ impl MerkleRollHeader {
         self.max_depth = max_depth;
         self.authority = *authority;
         self.append_authority = *append_authority;
+        self.creation_slot = creation_slot;
     }
 }
diff --git a/contracts/sdk/gummyroll/accounts/index.ts b/contracts/sdk/gummyroll/accounts/index.ts
@@ -46,6 +46,7 @@ type MerkleRollHeader = {
   maxBufferSize: number; // u32
   authority: PublicKey;
   appendAuthority: PublicKey;
+  creationSlot: BN;
 };
 
 type MerkleRoll = {
@@ -83,10 +84,11 @@ export function decodeMerkleRoll(buffer: Buffer): OnChainMerkleRoll {
     maxDepth: reader.readU32(),
     authority: readPublicKey(reader),
     appendAuthority: readPublicKey(reader),
+    creationSlot: reader.readU64(),
   };
 
   // Decode MerkleRoll
-  let sequenceNumber = reader.readU128();
+  let sequenceNumber = reader.readU64();
   let activeIndex = reader.readU64().toNumber();
   let bufferSize = reader.readU64().toNumber();