From bf14dc39f60fe2654efdd55f1b39eaffb1907628 Mon Sep 17 00:00:00 2001
From: Noah Gundotra <ngundotra@users.noreply.github.com>
Date: Wed, 11 Jan 2023 10:08:46 -0600
Subject: [PATCH] Add more depth size pairs (#3972)

---
 account-compression/Cargo.lock                     |  2 +-
 .../programs/account-compression/src/lib.rs        | 10 ++++++++++
 account-compression/sdk/package.json               |  3 +--
 account-compression/sdk/src/constants/index.ts     | 14 ++++++++++++--
 account-compression/sdk/src/index.ts               |  1 +
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/account-compression/Cargo.lock b/account-compression/Cargo.lock
index a23ad005..07db8316 100644
--- a/account-compression/Cargo.lock
+++ b/account-compression/Cargo.lock
@@ -1200,7 +1200,7 @@ dependencies = [
 
 [[package]]
 name = "spl-account-compression"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
  "anchor-lang",
  "bytemuck",
diff --git a/account-compression/programs/account-compression/src/lib.rs b/account-compression/programs/account-compression/src/lib.rs
index 05702ea3..a365c80e 100644
--- a/account-compression/programs/account-compression/src/lib.rs
+++ b/account-compression/programs/account-compression/src/lib.rs
@@ -153,6 +153,11 @@ fn merkle_tree_get_size(header: &ConcurrentMerkleTreeHeader) -> Result<usize> {
         (14, 256) => Ok(size_of::<ConcurrentMerkleTree<14, 256>>()),
         (14, 1024) => Ok(size_of::<ConcurrentMerkleTree<14, 1024>>()),
         (14, 2048) => Ok(size_of::<ConcurrentMerkleTree<14, 2048>>()),
+        (15, 64) => Ok(size_of::<ConcurrentMerkleTree<15, 64>>()),
+        (16, 64) => Ok(size_of::<ConcurrentMerkleTree<16, 64>>()),
+        (17, 64) => Ok(size_of::<ConcurrentMerkleTree<17, 64>>()),
+        (18, 64) => Ok(size_of::<ConcurrentMerkleTree<18, 64>>()),
+        (19, 64) => Ok(size_of::<ConcurrentMerkleTree<19, 64>>()),
         (20, 64) => Ok(size_of::<ConcurrentMerkleTree<20, 64>>()),
         (20, 256) => Ok(size_of::<ConcurrentMerkleTree<20, 256>>()),
         (20, 1024) => Ok(size_of::<ConcurrentMerkleTree<20, 1024>>()),
@@ -192,6 +197,11 @@ macro_rules! merkle_tree_apply_fn {
             (14, 256) => merkle_tree_depth_size_apply_fn!(14, 256, $id, $bytes, $func, $($arg)*),
             (14, 1024) => merkle_tree_depth_size_apply_fn!(14, 1024, $id, $bytes, $func, $($arg)*),
             (14, 2048) => merkle_tree_depth_size_apply_fn!(14, 2048, $id, $bytes, $func, $($arg)*),
+            (15, 64) => merkle_tree_depth_size_apply_fn!(15, 64, $id, $bytes, $func, $($arg)*),
+            (16, 64) => merkle_tree_depth_size_apply_fn!(16, 64, $id, $bytes, $func, $($arg)*),
+            (17, 64) => merkle_tree_depth_size_apply_fn!(17, 64, $id, $bytes, $func, $($arg)*),
+            (18, 64) => merkle_tree_depth_size_apply_fn!(18, 64, $id, $bytes, $func, $($arg)*),
+            (19, 64) => merkle_tree_depth_size_apply_fn!(19, 64, $id, $bytes, $func, $($arg)*),
             (20, 64) => merkle_tree_depth_size_apply_fn!(20, 64, $id, $bytes, $func, $($arg)*),
             (20, 256) => merkle_tree_depth_size_apply_fn!(20, 256, $id, $bytes, $func, $($arg)*),
             (20, 1024) => merkle_tree_depth_size_apply_fn!(20, 1024, $id, $bytes, $func, $($arg)*),
diff --git a/account-compression/sdk/package.json b/account-compression/sdk/package.json
index ab001514..f9c09a03 100644
--- a/account-compression/sdk/package.json
+++ b/account-compression/sdk/package.json
@@ -30,8 +30,7 @@
       "import": "./dist/esm/index.js",
       "types": "./dist/types/index.d.ts"
     },
-    "./idl/spl_account_compression.json": "./idl/spl_account_compression.json",
-    "./src/merkle-tree": "./src/merkle-tree/index.ts"
+    "./idl/spl_account_compression.json": "./idl/spl_account_compression.json"
   },
   "scripts": {
     "build": "rm -rf dist/ && tsc && tsc -p tsconfig.cjs.json",
diff --git a/account-compression/sdk/src/constants/index.ts b/account-compression/sdk/src/constants/index.ts
index 63fd200f..f9e023f4 100644
--- a/account-compression/sdk/src/constants/index.ts
+++ b/account-compression/sdk/src/constants/index.ts
@@ -1,6 +1,6 @@
-import { PublicKey } from '@solana/web3.js';
+import { PublicKey } from "@solana/web3.js";
 
-export const SPL_NOOP_ADDRESS = 'noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV';
+export const SPL_NOOP_ADDRESS = "noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV";
 export const SPL_NOOP_PROGRAM_ID = new PublicKey(SPL_NOOP_ADDRESS);
 
 /**
@@ -20,6 +20,11 @@ const allPairs: number[][] = [
   [14, 256],
   [14, 1024],
   [14, 2048],
+  [15, 64],
+  [16, 64],
+  [17, 64],
+  [18, 64],
+  [19, 64],
   [20, 64],
   [20, 256],
   [20, 1024],
@@ -56,6 +61,11 @@ export type ValidDepthSizePair =
   | { maxDepth: 14; maxBufferSize: 256 }
   | { maxDepth: 14; maxBufferSize: 1024 }
   | { maxDepth: 14; maxBufferSize: 2048 }
+  | { maxDepth: 15; maxBufferSize: 64 }
+  | { maxDepth: 16; maxBufferSize: 64 }
+  | { maxDepth: 17; maxBufferSize: 64 }
+  | { maxDepth: 18; maxBufferSize: 64 }
+  | { maxDepth: 19; maxBufferSize: 64 }
   | { maxDepth: 20; maxBufferSize: 64 }
   | { maxDepth: 20; maxBufferSize: 256 }
   | { maxDepth: 20; maxBufferSize: 1024 }
diff --git a/account-compression/sdk/src/index.ts b/account-compression/sdk/src/index.ts
index 4306dc12..d82cc7ad 100644
--- a/account-compression/sdk/src/index.ts
+++ b/account-compression/sdk/src/index.ts
@@ -8,4 +8,5 @@ export * from './accounts';
 export * from './events';
 export * from './constants';
 export * from './types';
+export * from './merkle-tree';
 export type { ChangeLogEventV1 } from './types';