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

package/examples/shapes/Cargo.toml

@@ -0,0 +1,16 @@
+[workspace]
+members = ["programs/ellipse", "programs/triangle", "macros"]
+resolver = "2"
+
+[workspace.dependencies]
+anchor-lang = "0.32.1"
+anchor-trait = { path = "../.." }
+shapes-macros = { path = "macros" }
+mollusk-svm = { version = "0.8", features = ["inner-instructions"] }
+solana-account = "3.4"
+solana-instruction = "3.2"
+solana-pubkey = "4.1"
+solana-program-error = "3.0"
+
+[profile.release]
+overflow-checks = true

package/examples/shapes/macros/src/audit.rs

@@ -0,0 +1,15 @@
+use proc_macro2::TokenStream;
+use quote::quote;
+use syn::ItemMod;
+
+pub fn expand(_attr: TokenStream, item: TokenStream) -> syn::Result<TokenStream> {
+    let mut module = syn::parse2::<ItemMod>(item)?;
+
+    if let Some((_, ref mut items)) = module.content {
+        items.push(syn::parse_quote! {
+            pub const SHAPES_AUDIT_ENABLED: bool = true;
+        });
+    }
+
+    Ok(quote! { #module })
+}

package/examples/shapes/macros/src/instructions/clear.rs

@@ -0,0 +1,19 @@
+//! Code generator for the `clear` instruction.
+//!
+//! Required instruction with no params. Zeros all mutable state.
+//! Demonstrates a **required + mutable + no-params** instruction — every shape
+//! must implement this since each shape's zero-state may differ.
+
+use anchor_trait::InstructionSpec;
+use quote::quote;
+
+use super::CodegenContext;
+
+pub(super) fn spec() -> InstructionSpec<CodegenContext> {
+    InstructionSpec {
+        params_type: None,
+        return_type: quote!(()),
+        is_view: false,
+        default_impl: None, // Required — implementor MUST provide
+    }
+}

package/examples/shapes/macros/src/instructions/compute_area.rs

@@ -2,9 +2,9 @@
 //!
 //! Provided instruction with default handler: width * height (rectangle area).
 
-use anchor_trait::{DefaultImpl, InstructionSpec};
-use proc_macro2::TokenStream;
+use anchor_trait::{DefaultAccounts, DefaultImpl, InstructionSpec};
 use quote::{format_ident, quote};
+use syn::parse_quote;
 
 use super::CodegenContext;
 
@@ -14,7 +14,6 @@ pub(super) fn spec(_ctx: &CodegenContext) -> InstructionSpec<CodegenContext> {
         return_type: quote!(u64),
         is_view: true,
         default_impl: Some(DefaultImpl {
-            accounts_ident: format_ident!("StdComputeArea"),
             handler_ident: format_ident!("apply"),
             generator: generate_default_context,
         }),
@@ -24,27 +23,26 @@ pub(super) fn spec(_ctx: &CodegenContext) -> InstructionSpec<CodegenContext> {
 fn generate_default_context(
     ctx: &CodegenContext,
     spec: &InstructionSpec<CodegenContext>,
-) -> TokenStream {
+) -> DefaultAccounts {
     let state_type = &ctx.state_type;
-
     let params_type = spec.params_type.as_ref().unwrap();
     let return_type = &spec.return_type;
-    let default_impl = spec.default_impl.as_ref().unwrap();
-
-    let default_accounts_ident = &default_impl.accounts_ident;
-    let handler_ident = &default_impl.handler_ident;
+    let handler_ident = &spec.default_impl.as_ref().unwrap().handler_ident;
 
-    quote! {
-        #[derive(Accounts)]
-        pub struct #default_accounts_ident<'info> {
-            pub shape: Account<'info, #state_type>,
-        }
-
-        impl #default_accounts_ident<'_> {
-            pub fn #handler_ident(ctx: &Context<Self>, _params: &#params_type) -> Result<#return_type> {
-                let s = &ctx.accounts.shape;
-                Ok(s.width * s.height)
+    DefaultAccounts {
+        struct_type: parse_quote! {
+            #[derive(Accounts)]
+            pub struct StdComputeArea<'info> {
+                pub shape: Account<'info, #state_type>,
+            }
+        },
+        impl_block: parse_quote! {
+            impl StdComputeArea<'_> {
+                pub fn #handler_ident(ctx: &Context<Self>, _params: &#params_type) -> Result<#return_type> {
+                    let s = &ctx.accounts.shape;
+                    Ok(s.width * s.height)
+                }
             }
-        }
+        },
     }
 }

package/examples/shapes/macros/src/instructions/compute_perimeter.rs

@@ -2,9 +2,9 @@
 //!
 //! Provided instruction with default handler: 2 * (width + height) (rectangle perimeter).
 
-use anchor_trait::{DefaultImpl, InstructionSpec};
-use proc_macro2::TokenStream;
+use anchor_trait::{DefaultAccounts, DefaultImpl, InstructionSpec};
 use quote::{format_ident, quote};
+use syn::parse_quote;
 
 use super::CodegenContext;
 
@@ -14,7 +14,6 @@ pub(super) fn spec(_ctx: &CodegenContext) -> InstructionSpec<CodegenContext> {
         return_type: quote!(u64),
         is_view: true,
         default_impl: Some(DefaultImpl {
-            accounts_ident: format_ident!("StdComputePerimeter"),
             handler_ident: format_ident!("apply"),
             generator: generate_default_context,
         }),
@@ -24,27 +23,26 @@ pub(super) fn spec(_ctx: &CodegenContext) -> InstructionSpec<CodegenContext> {
 fn generate_default_context(
     ctx: &CodegenContext,
     spec: &InstructionSpec<CodegenContext>,
-) -> TokenStream {
+) -> DefaultAccounts {
     let state_type = &ctx.state_type;
-
     let params_type = spec.params_type.as_ref().unwrap();
     let return_type = &spec.return_type;
-    let default_impl = spec.default_impl.as_ref().unwrap();
-
-    let default_accounts_ident = &default_impl.accounts_ident;
-    let handler_ident = &default_impl.handler_ident;
+    let handler_ident = &spec.default_impl.as_ref().unwrap().handler_ident;
 
-    quote! {
-        #[derive(Accounts)]
-        pub struct #default_accounts_ident<'info> {
-            pub shape: Account<'info, #state_type>,
-        }
-
-        impl #default_accounts_ident<'_> {
-            pub fn #handler_ident(ctx: &Context<Self>, _params: &#params_type) -> Result<#return_type> {
-                let s = &ctx.accounts.shape;
-                Ok(2 * (s.width + s.height))
+    DefaultAccounts {
+        struct_type: parse_quote! {
+            #[derive(Accounts)]
+            pub struct StdComputePerimeter<'info> {
+                pub shape: Account<'info, #state_type>,
+            }
+        },
+        impl_block: parse_quote! {
+            impl StdComputePerimeter<'_> {
+                pub fn #handler_ident(ctx: &Context<Self>, _params: &#params_type) -> Result<#return_type> {
+                    let s = &ctx.accounts.shape;
+                    Ok(2 * (s.width + s.height))
+                }
             }
-        }
+        },
     }
 }

package/examples/shapes/macros/src/instructions/get_dimension.rs

@@ -0,0 +1,19 @@
+//! Code generator for the `get_dimension` instruction.
+//!
+//! Required instruction with params. Returns one dimension by index (0=width, 1=height).
+//! Demonstrates a **required + view + params** instruction — every shape must implement
+//! this since there is no sensible universal default for dimension indexing.
+
+use anchor_trait::InstructionSpec;
+use quote::quote;
+
+use super::CodegenContext;
+
+pub(super) fn spec() -> InstructionSpec<CodegenContext> {
+    InstructionSpec {
+        params_type: Some(quote!(DimensionParams)),
+        return_type: quote!(u64),
+        is_view: true,
+        default_impl: None, // Required — implementor MUST provide
+    }
+}

package/examples/shapes/macros/src/instructions/get_dimension_count.rs

@@ -2,9 +2,9 @@
 //!
 //! Provided instruction with no params. Default returns 2 (all shapes are 2D).
 
-use anchor_trait::{DefaultImpl, InstructionSpec};
-use proc_macro2::TokenStream;
+use anchor_trait::{DefaultAccounts, DefaultImpl, InstructionSpec};
 use quote::{format_ident, quote};
+use syn::parse_quote;
 
 use super::CodegenContext;
 
@@ -14,7 +14,6 @@ pub(super) fn spec(_ctx: &CodegenContext) -> InstructionSpec<CodegenContext> {
         return_type: quote!(u8),
         is_view: true,
         default_impl: Some(DefaultImpl {
-            accounts_ident: format_ident!("StdGetDimensionCount"),
             handler_ident: format_ident!("apply"),
             generator: generate_default_context,
         }),
@@ -22,23 +21,26 @@ pub(super) fn spec(_ctx: &CodegenContext) -> InstructionSpec<CodegenContext> {
 }
 
 fn generate_default_context(
-    _ctx: &CodegenContext,
+    ctx: &CodegenContext,
     spec: &InstructionSpec<CodegenContext>,
-) -> TokenStream {
+) -> DefaultAccounts {
+    let state_type = &ctx.state_type;
     let return_type = &spec.return_type;
-    let default_impl = spec.default_impl.as_ref().unwrap();
+    let handler_ident = &spec.default_impl.as_ref().unwrap().handler_ident;
 
-    let default_accounts_ident = &default_impl.accounts_ident;
-    let handler_ident = &default_impl.handler_ident;
-
-    quote! {
-        #[derive(Accounts)]
-        pub struct #default_accounts_ident {}
-
-        impl #default_accounts_ident {
-            pub fn #handler_ident(_ctx: &Context<Self>) -> Result<#return_type> {
-                Ok(2) // All shapes in this domain are 2D
+    DefaultAccounts {
+        struct_type: parse_quote! {
+            #[derive(Accounts)]
+            pub struct StdGetDimensionCount<'info> {
+                pub shape: Account<'info, #state_type>,
+            }
+        },
+        impl_block: parse_quote! {
+            impl StdGetDimensionCount<'_> {
+                pub fn #handler_ident(_ctx: &Context<Self>) -> Result<#return_type> {
+                    Ok(2)
+                }
             }
-        }
+        },
     }
 }

package/examples/shapes/macros/src/instructions/mod.rs

@@ -1,10 +1,14 @@
 //! Shapes instruction definitions and code generation.
 
+mod clear;
 mod compute_area;
 mod compute_perimeter;
+mod get_dimension;
 mod get_dimension_count;
 mod get_name;
 mod initialize;
+mod reset;
+mod scale;
 
 use anchor_trait::declare_instructions;
 use proc_macro2::TokenStream;
@@ -20,7 +24,11 @@ declare_instructions! {
 
     Initialize       => initialize,
     GetName          => get_name,
+    GetDimension     => get_dimension,
+    Clear            => clear,
     ComputeArea      => compute_area(ctx),
     ComputePerimeter => compute_perimeter(ctx),
     GetDimensionCount => get_dimension_count(ctx),
+    Scale            => scale(ctx),
+    Reset            => reset(ctx),
 }

package/examples/shapes/macros/src/instructions/reset.rs

@@ -0,0 +1,50 @@
+//! Code generator for the `reset` instruction.
+//!
+//! Provided instruction with no params. Default resets both dimensions to 1.
+//! Demonstrates a **provided + mutable + no-params** instruction.
+
+use anchor_trait::{DefaultAccounts, DefaultImpl, InstructionSpec};
+use quote::{format_ident, quote};
+use syn::parse_quote;
+
+use super::CodegenContext;
+
+pub(super) fn spec(_ctx: &CodegenContext) -> InstructionSpec<CodegenContext> {
+    InstructionSpec {
+        params_type: None,
+        return_type: quote!(()),
+        is_view: false,
+        default_impl: Some(DefaultImpl {
+            handler_ident: format_ident!("apply"),
+            generator: generate_default_context,
+        }),
+    }
+}
+
+fn generate_default_context(
+    ctx: &CodegenContext,
+    _spec: &InstructionSpec<CodegenContext>,
+) -> DefaultAccounts {
+    let state_type = &ctx.state_type;
+    let handler_ident = format_ident!("apply");
+
+    DefaultAccounts {
+        struct_type: parse_quote! {
+            #[derive(Accounts)]
+            pub struct StdReset<'info> {
+                #[account(mut)]
+                pub shape: Account<'info, #state_type>,
+            }
+        },
+        impl_block: parse_quote! {
+            impl StdReset<'_> {
+                pub fn #handler_ident(ctx: &mut Context<Self>) -> Result<()> {
+                    let s = &mut ctx.accounts.shape;
+                    s.width = 1;
+                    s.height = 1;
+                    Ok(())
+                }
+            }
+        },
+    }
+}

package/examples/shapes/macros/src/instructions/scale.rs

@@ -0,0 +1,52 @@
+//! Code generator for the `scale` instruction.
+//!
+//! Provided instruction with default handler: multiply both dimensions by a factor.
+//! Demonstrates a **provided + mutable** instruction (the only combination not covered
+//! by the other five instructions, which are all view or required).
+
+use anchor_trait::{DefaultAccounts, DefaultImpl, InstructionSpec};
+use quote::{format_ident, quote};
+use syn::parse_quote;
+
+use super::CodegenContext;
+
+pub(super) fn spec(_ctx: &CodegenContext) -> InstructionSpec<CodegenContext> {
+    InstructionSpec {
+        params_type: Some(quote!(ScaleParams)),
+        return_type: quote!(()),
+        is_view: false,
+        default_impl: Some(DefaultImpl {
+            handler_ident: format_ident!("apply"),
+            generator: generate_default_context,
+        }),
+    }
+}
+
+fn generate_default_context(
+    ctx: &CodegenContext,
+    spec: &InstructionSpec<CodegenContext>,
+) -> DefaultAccounts {
+    let state_type = &ctx.state_type;
+    let params_type = spec.params_type.as_ref().unwrap();
+    let handler_ident = &spec.default_impl.as_ref().unwrap().handler_ident;
+
+    DefaultAccounts {
+        struct_type: parse_quote! {
+            #[derive(Accounts)]
+            pub struct StdScale<'info> {
+                #[account(mut)]
+                pub shape: Account<'info, #state_type>,
+            }
+        },
+        impl_block: parse_quote! {
+            impl StdScale<'_> {
+                pub fn #handler_ident(ctx: &mut Context<Self>, params: &#params_type) -> Result<()> {
+                    let s = &mut ctx.accounts.shape;
+                    s.width = s.width.saturating_mul(params.factor);
+                    s.height = s.height.saturating_mul(params.factor);
+                    Ok(())
+                }
+            }
+        },
+    }
+}

package/examples/shapes/macros/src/lib.rs

@@ -3,30 +3,26 @@
 //! Provides `#[shapes]` and `#[shapes_instruction]` attribute macros
 //! demonstrating the anchor-trait instruction trait system.
 
+mod audit;
 mod instructions;
 mod shapes;
+mod state_types;
 
 use proc_macro::TokenStream;
 
 /// Program-level macro that auto-generates shape instruction entrypoints.
 ///
+/// Generates `ShapeState` in the module prelude.
+///
 /// ## Usage
 ///
 /// ```ignore
-/// #[shapes_macros::shapes(state = ShapeState)]
+/// #[shapes_macros::shapes]
 /// pub mod shapes_program {
-///     use super::*;
-///
-///     // Required: must provide initialize (no default)
-///     pub fn initialize(ctx: Context<Initialize>, params: InitParams) -> Result<()> { ... }
-///
-///     // Optional overrides for compute_area, compute_perimeter, get_dimension_count
+///     // Required: must provide initialize, get_name, get_dimension, clear
+///     // Optional: override compute_area, compute_perimeter, scale, reset, get_dimension_count
 /// }
 /// ```
-///
-/// ## Attributes
-///
-/// - `state = TypeName`: The program state account type (required)
 #[proc_macro_attribute]
 pub fn shapes(attr: TokenStream, item: TokenStream) -> TokenStream {
     shapes::expand(attr.into(), item.into())
@@ -34,6 +30,13 @@ pub fn shapes(attr: TokenStream, item: TokenStream) -> TokenStream {
         .into()
 }
 
+#[proc_macro_attribute]
+pub fn shapes_audit(attr: TokenStream, item: TokenStream) -> TokenStream {
+    audit::expand(attr.into(), item.into())
+        .unwrap_or_else(|err| err.to_compile_error())
+        .into()
+}
+
 /// Marks a function as an override for a shapes instruction.
 ///
 /// ## Usage

package/examples/shapes/macros/src/shapes.rs

@@ -2,55 +2,50 @@
 //!
 //! Flow: parse inputs and resolve domain types, then collect -> generate -> assemble.
 
-use crate::instructions::{CodegenContext, ShapesInstructionSet};
+use crate::{
+    instructions::{CodegenContext, ShapesInstructionSet},
+    state_types,
+};
 use anchor_trait::{generate_instructions, Assembly, InstructionOverrides, OverrideConfig};
-use darling::{ast::NestedMeta, FromMeta};
 use proc_macro2::TokenStream;
-use quote::quote;
-use syn::{ItemMod, Path};
-
-// ---------------------------------------------------------------------------
-// Attribute parsing
-// ---------------------------------------------------------------------------
-
-#[derive(FromMeta)]
-struct ShapesAttr {
-    state: Path,
-}
+use quote::{format_ident, quote};
+use syn::ItemMod;
 
 const OVERRIDE_CONFIG: OverrideConfig = OverrideConfig {
     attr_name: "shapes_instruction",
     domain: "Shapes",
 };
 
-// ---------------------------------------------------------------------------
-// Entry point
-// ---------------------------------------------------------------------------
-
-pub fn expand(attr: TokenStream, item: TokenStream) -> syn::Result<TokenStream> {
-    // Parse inputs
-    let attr_args = NestedMeta::parse_meta_list(attr)?;
-    let attrs = ShapesAttr::from_list(&attr_args)?;
+pub fn expand(_attr: TokenStream, item: TokenStream) -> syn::Result<TokenStream> {
     let module = syn::parse2::<ItemMod>(item)?;
 
-    let state = &attrs.state;
-
     // 1. Collect overrides
     let overrides = InstructionOverrides::collect(&module, OVERRIDE_CONFIG)?;
 
     // 2. Generate instructions
     let codegen_ctx = CodegenContext {
-        state_type: quote!(#state),
+        state_type: quote!(ShapeState),
     };
     let instructions = generate_instructions::<ShapesInstructionSet>(&codegen_ctx, &overrides)?;
 
     // 3. Assemble output
+    let prelude = {
+        let shape_state = state_types::generate_shape_state();
+        quote! {
+            #shape_state
+        }
+    };
+    let extra_mod_attrs = quote! {
+        #[shapes_macros::shapes_audit]
+    };
+
     Ok(Assembly {
-        prelude: TokenStream::new(),
+        prelude,
         overrides,
         instructions,
-        extra_mod_attrs: quote!(#[program]),
+        extra_mod_attrs,
         source_mod: module,
+        extend_macro_name: Some(format_ident!("shapes_extend_accounts")),
     }
     .assemble())
 }

package/examples/shapes/macros/src/state_types.rs

@@ -0,0 +1,14 @@
+use proc_macro2::TokenStream;
+use quote::quote;
+
+pub fn generate_shape_state() -> TokenStream {
+    quote! {
+        #[account]
+        #[derive(InitSpace)]
+        pub struct ShapeState {
+            pub width: u64,
+            pub height: u64,
+            pub bump: u8,
+        }
+    }
+}

package/examples/shapes/programs/ellipse/Cargo.toml

@@ -28,3 +28,10 @@ unexpected_cfgs = { level = "allow", check-cfg = [
 [dependencies]
 anchor-lang = { workspace = true }
 shapes-macros = { workspace = true }
+
+[dev-dependencies]
+mollusk-svm = { workspace = true }
+solana-account = { workspace = true }
+solana-instruction = { workspace = true }
+solana-program-error = { workspace = true }
+solana-pubkey = { workspace = true }