blockworks-foundation
/
solana-program-library
mirror of https://github.com/blockworks-foundation/solana-program-library.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add more depth size pairs (#3972)

This commit is contained in:
Noah Gundotra 2023-01-11 10:08:46 -06:00 committed by GitHub
parent 9853e0a4f0
commit bf14dc39f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
account-compression/Cargo.lock generated
View File

@ -1200,7 +1200,7 @@ dependencies = [
[[package]] [[package]]
name = "spl-account-compression" name = "spl-account-compression"
version = "0.1.5" version = "0.1.6"
dependencies = [ dependencies = [
"anchor-lang", "anchor-lang",
"bytemuck", "bytemuck",

10
account-compression/programs/account-compression/src/lib.rs
View File

@ -153,6 +153,11 @@ fn merkle_tree_get_size(header: &ConcurrentMerkleTreeHeader) -> Result<usize> {
(14, 256) => Ok(size_of::<ConcurrentMerkleTree<14, 256>>()), (14, 256) => Ok(size_of::<ConcurrentMerkleTree<14, 256>>()),
(14, 1024) => Ok(size_of::<ConcurrentMerkleTree<14, 1024>>()), (14, 1024) => Ok(size_of::<ConcurrentMerkleTree<14, 1024>>()),
(14, 2048) => Ok(size_of::<ConcurrentMerkleTree<14, 2048>>()), (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, 64) => Ok(size_of::<ConcurrentMerkleTree<20, 64>>()),
(20, 256) => Ok(size_of::<ConcurrentMerkleTree<20, 256>>()), (20, 256) => Ok(size_of::<ConcurrentMerkleTree<20, 256>>()),
(20, 1024) => Ok(size_of::<ConcurrentMerkleTree<20, 1024>>()), (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, 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, 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)*), (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, 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, 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)*), (20, 1024) => merkle_tree_depth_size_apply_fn!(20, 1024, $id, $bytes, $func, $($arg)*),

3
account-compression/sdk/package.json
View File

@ -30,8 +30,7 @@
"import": "./dist/esm/index.js", "import": "./dist/esm/index.js",
"types": "./dist/types/index.d.ts" "types": "./dist/types/index.d.ts"
}, },
"./idl/spl_account_compression.json": "./idl/spl_account_compression.json", "./idl/spl_account_compression.json": "./idl/spl_account_compression.json"
"./src/merkle-tree": "./src/merkle-tree/index.ts"
}, },
"scripts": { "scripts": {
"build": "rm -rf dist/ && tsc && tsc -p tsconfig.cjs.json", "build": "rm -rf dist/ && tsc && tsc -p tsconfig.cjs.json",

14
account-compression/sdk/src/constants/index.ts
View File

@ -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); export const SPL_NOOP_PROGRAM_ID = new PublicKey(SPL_NOOP_ADDRESS);
/** /**
@ -20,6 +20,11 @@ const allPairs: number[][] = [
[14, 256], [14, 256],
[14, 1024], [14, 1024],
[14, 2048], [14, 2048],
[15, 64],
[16, 64],
[17, 64],
[18, 64],
[19, 64],
[20, 64], [20, 64],
[20, 256], [20, 256],
[20, 1024], [20, 1024],
@ -56,6 +61,11 @@ export type ValidDepthSizePair =
| { maxDepth: 14; maxBufferSize: 256 } | { maxDepth: 14; maxBufferSize: 256 }
| { maxDepth: 14; maxBufferSize: 1024 } | { maxDepth: 14; maxBufferSize: 1024 }
| { maxDepth: 14; maxBufferSize: 2048 } | { 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: 64 }
| { maxDepth: 20; maxBufferSize: 256 } | { maxDepth: 20; maxBufferSize: 256 }
| { maxDepth: 20; maxBufferSize: 1024 } | { maxDepth: 20; maxBufferSize: 1024 }

1
account-compression/sdk/src/index.ts
View File

@ -8,4 +8,5 @@ export * from './accounts';
export * from './events'; export * from './events';
export * from './constants'; export * from './constants';
export * from './types'; export * from './types';
export * from './merkle-tree';
export type { ChangeLogEventV1 } from './types'; export type { ChangeLogEventV1 } from './types';