@layerzerolabs/framework-solana-anchor-trait 0.2.61 → 0.2.63

package/tests/snapshots.rs

@@ -12,6 +12,15 @@ mod tests {
         module: &syn::ItemMod,
         prelude: TokenStream,
         extra_mod_attrs: TokenStream,
+    ) -> String {
+        assemble_formatted_with_extend(module, prelude, extra_mod_attrs, None)
+    }
+
+    fn assemble_formatted_with_extend(
+        module: &syn::ItemMod,
+        prelude: TokenStream,
+        extra_mod_attrs: TokenStream,
+        extend_macro_name: Option<proc_macro2::Ident>,
     ) -> String {
         let overrides = collect_overrides(module);
         let instructions =
@@ -22,6 +31,7 @@ mod tests {
             instructions,
             extra_mod_attrs,
             source_mod: module.clone(),
+            extend_macro_name,
         };
         let output = assembly.assemble();
         let file = syn::parse2::<syn::File>(output).expect("assembly output should parse");
@@ -37,18 +47,18 @@ mod tests {
         let module: syn::ItemMod = syn::parse_quote! {
             pub mod my_program {
                 #[test_instruction]
-                pub fn lz_receive(ctx: Context<MyReceive>, params: LzReceiveParams) -> Result<()> {
+                pub fn lz_receive(ctx: &mut Context<MyReceive>, params: &LzReceiveParams) -> Result<()> {
                     Ok(())
                 }
             }
         };
 
-        let output = assemble_formatted(&module, quote! {}, quote! { #[program] });
+        let output = assemble_formatted(&module, quote! {}, quote! {});
         insta::assert_snapshot!(output);
     }
 
     // -----------------------------------------------------------------------
-    // Snapshot: handler override (custom handler, default accounts)
+    // Snapshot: override reusing default accounts
     // -----------------------------------------------------------------------
 
     #[test]
@@ -56,24 +66,24 @@ mod tests {
         let module: syn::ItemMod = syn::parse_quote! {
             pub mod my_program {
                 #[test_instruction]
-                pub fn set_peer(ctx: Context<StdSetPeer>, params: SetPeerParams) -> Result<()> {
+                pub fn set_peer(ctx: &mut Context<StdSetPeer>, params: &SetPeerParams) -> Result<()> {
                     msg!("custom set_peer logic");
                     Ok(())
                 }
 
                 #[test_instruction]
-                pub fn lz_receive(ctx: Context<MyReceive>, params: LzReceiveParams) -> Result<()> {
+                pub fn lz_receive(ctx: &mut Context<MyReceive>, params: &LzReceiveParams) -> Result<()> {
                     Ok(())
                 }
             }
         };
 
-        let output = assemble_formatted(&module, quote! {}, quote! { #[program] });
+        let output = assemble_formatted(&module, quote! {}, quote! {});
         insta::assert_snapshot!(output);
     }
 
     // -----------------------------------------------------------------------
-    // Snapshot: full override (custom handler + custom accounts)
+    // Snapshot: override with custom accounts
     // -----------------------------------------------------------------------
 
     #[test]
@@ -81,46 +91,46 @@ mod tests {
         let module: syn::ItemMod = syn::parse_quote! {
             pub mod my_program {
                 #[test_instruction]
-                pub fn set_peer(ctx: Context<MyCustomAccounts>, params: SetPeerParams) -> Result<()> {
+                pub fn set_peer(ctx: &mut Context<MyCustomAccounts>, params: &SetPeerParams) -> Result<()> {
                     msg!("fully custom set_peer");
                     Ok(())
                 }
 
                 #[test_instruction]
-                pub fn lz_receive(ctx: Context<MyReceive>, params: LzReceiveParams) -> Result<()> {
+                pub fn lz_receive(ctx: &mut Context<MyReceive>, params: &LzReceiveParams) -> Result<()> {
                     Ok(())
                 }
             }
         };
 
-        let output = assemble_formatted(&module, quote! {}, quote! { #[program] });
+        let output = assemble_formatted(&module, quote! {}, quote! {});
         insta::assert_snapshot!(output);
     }
 
     // -----------------------------------------------------------------------
-    // Snapshot: mixed (all override levels in one program)
+    // Snapshot: mixed (default + override in one program)
     // -----------------------------------------------------------------------
 
     #[test]
     fn snapshot_mixed_overrides() {
         let module: syn::ItemMod = syn::parse_quote! {
             pub mod my_program {
-                // Handler override — custom logic, default accounts
+                // Override — custom logic, reusing default accounts
                 #[test_instruction]
-                pub fn set_peer(ctx: Context<StdSetPeer>, params: SetPeerParams) -> Result<()> {
+                pub fn set_peer(ctx: &mut Context<StdSetPeer>, params: &SetPeerParams) -> Result<()> {
                     msg!("handler override set_peer");
                     Ok(())
                 }
 
-                // Full override — custom accounts + custom logic
+                // Override — custom accounts + custom logic
                 #[test_instruction]
-                pub fn get_peer(ctx: Context<MyCustomGetPeer>, params: GetPeerParams) -> Result<[u8; 32]> {
+                pub fn get_peer(ctx: &Context<MyCustomGetPeer>, params: &GetPeerParams) -> Result<[u8; 32]> {
                     Ok([0u8; 32])
                 }
 
                 // Required — must provide
                 #[test_instruction]
-                pub fn lz_receive(ctx: Context<MyReceive>, params: LzReceiveParams) -> Result<()> {
+                pub fn lz_receive(ctx: &mut Context<MyReceive>, params: &LzReceiveParams) -> Result<()> {
                     Ok(())
                 }
 
@@ -132,8 +142,31 @@ mod tests {
             }
         };
 
-        let output =
-            assemble_formatted(&module, quote! { struct PreludeMarker; }, quote! { #[program] });
+        let output = assemble_formatted(&module, quote! { struct PreludeMarker; }, quote! {});
+        insta::assert_snapshot!(output);
+    }
+
+    // -----------------------------------------------------------------------
+    // Snapshot: extend macro emitted alongside defaults
+    // -----------------------------------------------------------------------
+
+    #[test]
+    fn snapshot_with_extend_macro() {
+        let module: syn::ItemMod = syn::parse_quote! {
+            pub mod my_program {
+                #[test_instruction]
+                pub fn lz_receive(ctx: &mut Context<MyReceive>, params: &LzReceiveParams) -> Result<()> {
+                    Ok(())
+                }
+            }
+        };
+
+        let output = assemble_formatted_with_extend(
+            &module,
+            quote! {},
+            quote! {},
+            Some(quote::format_ident!("test_extend_accounts")),
+        );
         insta::assert_snapshot!(output);
     }
 }

package/examples/shapes/Anchor.toml

@@ -1,19 +0,0 @@
-[toolchain]
-anchor_version = "0.32.1"
-solana_version = "2.3.0"
-
-[features]
-seeds = false
-skip-lint = false
-resolution = false
-
-[programs.localnet]
-shapes_triangle = "Tri1111111111111111111111111111111111111111"
-shapes_ellipse = "ELp1111111111111111111111111111111111111111"
-
-[registry]
-url = "https://api.apr.dev"
-
-[provider]
-cluster = "Localnet"
-wallet = "~/.config/solana/id.json"

package/examples/shapes/programs/ellipse/src/state.rs

@@ -1,9 +0,0 @@
-use anchor_lang::prelude::*;
-
-#[account]
-#[derive(InitSpace)]
-pub struct ShapeState {
-    pub width: u64,
-    pub height: u64,
-    pub bump: u8,
-}

package/examples/shapes/programs/triangle/src/state.rs

@@ -1,9 +0,0 @@
-use anchor_lang::prelude::*;
-
-#[account]
-#[derive(InitSpace)]
-pub struct ShapeState {
-    pub width: u64,
-    pub height: u64,
-    pub bump: u8,
-}