Merge branch 'master' into feature-set-transfer-fee

Author: Hrushi20

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "spl-account-compression"
-version = "0.3.0"
+version = "0.3.1"
 description = "Solana Program Library Account Compression Program"
 authors = ["Solana Labs Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana-program-library"
@@ -21,9 +21,7 @@ default = []
 anchor-lang = "0.29.0"
 bytemuck = "1.13"
 solana-program = ">=1.18.11,<=2"
-spl-concurrent-merkle-tree = { version = "0.3.0", path = "../../../libraries/concurrent-merkle-tree", features = [
-    "sol-log",
-] }
+spl-concurrent-merkle-tree = { version = "0.3.0", path = "../../../libraries/concurrent-merkle-tree" }
 spl-noop = { version = "0.2.0", path = "../noop", features = ["no-entrypoint"] }
 
 [profile.release]

account-compression/programs/account-compression/Cargo.toml

@@ -4,10 +4,8 @@
   </a>
 </p>
 
-# SPL Account Compression Rust SDK (Beta)
+# SPL Account Compression Rust SDK
 
 More information about account compression can be found in [the solana-program-library repo](https://github.com/solana-labs/solana-program-library/tree/master/account-compression).
 
-The [Solana Program Examples repo](https://github.com/solana-developers/program-examples) will eventually include examples of how to use this program.
-
-`spl-account-compression` and this crate's implementation are targeted towards supporting [Metaplex Compressed NFTs](https://github.com/metaplex-foundation/metaplex-program-library/tree/master/bubblegum) and may be subject to change.
+`spl-account-compression` and this crate's implementation are targeted towards supporting [Metaplex Compressed NFTs](https://github.com/metaplex-foundation/mpl-bubblegum) and may be subject to change.

account-compression/programs/account-compression/README.md

@@ -28,6 +28,16 @@ use {
     anchor_lang::prelude::*,
 };
 
+#[inline(never)]
+pub fn merkle_tree_initialize_empty(
+    header: &ConcurrentMerkleTreeHeader,
+    tree_id: Pubkey,
+    tree_bytes: &mut [u8],
+) -> Result<Box<ChangeLogEvent>> {
+    merkle_tree_apply_fn_mut!(header, tree_id, tree_bytes, initialize,)
+}
+
+#[inline(never)]
 pub fn merkle_tree_initialize_with_root(
     header: &ConcurrentMerkleTreeHeader,
     tree_id: Pubkey,
@@ -37,6 +47,7 @@ pub fn merkle_tree_initialize_with_root(
     merkle_tree_apply_fn_mut!(header, tree_id, tree_bytes, initialize_with_root, args)
 }
 
+#[inline(never)]
 pub fn merkle_tree_set_leaf(
     header: &ConcurrentMerkleTreeHeader,
     tree_id: Pubkey,
@@ -46,6 +57,7 @@ pub fn merkle_tree_set_leaf(
     merkle_tree_apply_fn_mut!(header, tree_id, tree_bytes, set_leaf, args)
 }
 
+#[inline(never)]
 pub fn merkle_tree_fill_empty_or_append(
     header: &ConcurrentMerkleTreeHeader,
     tree_id: Pubkey,
@@ -55,6 +67,7 @@ pub fn merkle_tree_fill_empty_or_append(
     merkle_tree_apply_fn_mut!(header, tree_id, tree_bytes, fill_empty_or_append, args)
 }
 
+#[inline(never)]
 pub fn merkle_tree_prove_leaf(
     header: &ConcurrentMerkleTreeHeader,
     tree_id: Pubkey,
@@ -63,3 +76,13 @@ pub fn merkle_tree_prove_leaf(
 ) -> Result<Box<ChangeLogEvent>> {
     merkle_tree_apply_fn!(header, tree_id, tree_bytes, prove_leaf, args)
 }
+
+#[inline(never)]
+pub fn merkle_tree_append_leaf(
+    header: &ConcurrentMerkleTreeHeader,
+    tree_id: Pubkey,
+    tree_bytes: &mut [u8],
+    args: &[u8; 32],
+) -> Result<Box<ChangeLogEvent>> {
+    merkle_tree_apply_fn_mut!(header, tree_id, tree_bytes, append, *args)
+}