CMT: Subtree Append

contracts/programs/gummyroll/src/error.rs

@@ -24,6 +24,15 @@ pub enum GummyrollError {
     /// When using Canopy, the stored byte length should a multiple of the node's byte length (32 bytes)
     #[msg("Expected a different byte length for the merkle roll canopy")]
     CanopyLengthMismatch,
+
+    /// Error modify pre-subtree-append data structure. 
+    /// Your tree may have been modified during your initialization process, your proof may be invalid or out of date. Please reset the account.
+    #[msg("Merkle Roll Pre Append Processing Error")]
+    MerkleTreePreAppendProcessingError,
+
+    /// An issue was detected with loading the provided account data for the PreAppend data structure.
+    #[msg("Issue zero copying concurrent merkle tree append structure")]
+    PreAppendZeroCopyError,
 }
 
 impl From<&CMTError> for GummyrollError {

contracts/programs/gummyroll/src/state/mod.rs

@@ -2,7 +2,7 @@
 //!
 use anchor_lang::prelude::*;
 use borsh::{BorshDeserialize, BorshSerialize};
-use concurrent_merkle_tree::state::{ChangeLog, Node};
+use concurrent_merkle_tree::state::{ChangeLog, ChangeLogInterface, Node, Path};
 
 #[derive(AnchorDeserialize, AnchorSerialize, Clone, Copy, Debug)]
 pub struct PathNode {
@@ -41,30 +41,30 @@ pub struct ChangeLogEvent {
     /// Bitmap of node parity (used when hashing)
     pub index: u32,
 }
-//  ChangeLog<MAX_DEPTH>
-impl<const MAX_DEPTH: usize> From<(Box<ChangeLog<MAX_DEPTH>>, Pubkey, u64)>
+
+impl From<(Box<dyn ChangeLogInterface>, Pubkey, u64)>
     for Box<ChangeLogEvent>
 {
-    fn from(log_info: (Box<ChangeLog<MAX_DEPTH>>, Pubkey, u64)) -> Self {
+    fn from(log_info: (Box<dyn ChangeLogInterface>, Pubkey, u64)) -> Self {
         let (changelog, tree_id, seq) = log_info;
-        let path_len = changelog.path.len() as u32;
+        let path_len = changelog.get_path_as_vec().len() as u32;
         let mut path: Vec<PathNode> = changelog
-            .path
+            .get_path_as_vec()
             .iter()
             .enumerate()
             .map(|(lvl, n)| {
                 PathNode::new(
                     *n,
-                    (1 << (path_len - lvl as u32)) + (changelog.index >> lvl),
+                    (1 << (path_len - lvl as u32)) + (changelog.get_index() >> lvl),
                 )
             })
             .collect();
-        path.push(PathNode::new(changelog.root, 1));
+        path.push(PathNode::new(changelog.get_root(), 1));
         Box::new(ChangeLogEvent {
             id: tree_id,
             path,
             seq,
-            index: changelog.index,
+            index: changelog.get_index(),
         })
     }
 }

contracts/programs/gummyroll/src/utils.rs

@@ -6,7 +6,7 @@ use anchor_lang::{
     solana_program::{msg, program::invoke, program_error::ProgramError},
 };
 use bytemuck::{Pod, PodCastError};
-use concurrent_merkle_tree::merkle_roll::MerkleRoll;
+use concurrent_merkle_tree::merkle_roll::{MerkleRoll, MerkleRollPreAppend};
 use std::any::type_name;
 use std::mem::size_of;
 
@@ -37,6 +37,11 @@ impl<const MAX_DEPTH: usize, const MAX_BUFFER_SIZE: usize> ZeroCopy
 {
 }
 
+impl<const NUM_PARTITIONS: usize> ZeroCopy
+    for MerkleRollPreAppend<NUM_PARTITIONS>
+{
+}
+
 pub fn error_msg<T>(data_len: usize) -> impl Fn(PodCastError) -> ProgramError {
     move |_: PodCastError| -> ProgramError {
         msg!(

lib/concurrent-merkle-tree/src/error.rs

@@ -35,4 +35,12 @@ pub enum CMTError {
         "Valid proof was passed to a leaf, but it's value has changed since the proof was issued"
     )]
     LeafContentsModified,
+
+    /// Attempted to append subtree of invalid size for the current state of the tree
+    #[error("Cannot append subtree with invalid size")]
+    SubtreeInvalidSize,
+
+    /// Attempted to index into proof beyond rightmost bound
+    #[error("Invalid index into rightmost_proof")]
+    InvalidProofAccessOrWrite,
 }