@layerzerolabs/framework-solana-anchor-trait 0.2.81 → 0.2.83

package/examples/shapes/Cargo.lock

@@ -89,9 +89,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "anchor-attribute-access-control"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b972f5fbd02524c92e4eb487c3c648904572702670f3d6fc81aef5f1751b1569"
+checksum = "fe55cad36a574c8a048bd4be3f24f438f1888d78098bc137370dab4f6e2173c6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -100,9 +100,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-account"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9acfcb07a92084bcfa9f6cc49a5c2e8e0e986f25f4b7caa184b7a2c9c9e561c2"
+checksum = "4624a1addfa17ef75c5d1eae33b724848420befba0f4f270562daba22704f933"
 dependencies = [
  "anchor-syn",
  "proc-macro2",
@@ -112,9 +112,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-constant"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f46cc38f819377f07663b8eb492a701427950065e79d2d7b622a782443deb7a"
+checksum = "4043728a3a9f9cd77165d1631d859f22536a5309545ea9803cdabf7eb541af50"
 dependencies = [
  "anchor-syn",
  "quote",
@@ -123,9 +123,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-error"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c34748789107c9838329e058ca7b253e67f37b39ceae5a0a6c8d99f5d1bf1fe"
+checksum = "082f60f03c2dd9c9df1997b9b83ce66e409a46ed701d3e17c157c69006f4058c"
 dependencies = [
  "anchor-syn",
  "quote",
@@ -134,9 +134,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-event"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a28a3e5eefa03d9c5ef02b2139198f652547d38dddafc9c5545152dfba54556"
+checksum = "f7d4cfbfea47ca95da8a7558dd058414e0db563cc56b609e8aa90d41d96c1509"
 dependencies = [
  "anchor-syn",
  "proc-macro2",
@@ -146,9 +146,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-program"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfaa03865053cb168bfc4debe5992be87f397aa027dd81b69a2e44f2e5bae1c5"
+checksum = "6050e980111673736783492b56da3833628ae9af123bc125d2b5f492f65b9ec8"
 dependencies = [
  "anchor-lang-idl",
  "anchor-syn",
@@ -161,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-derive-accounts"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eef330db08f9ceee45c18ef96b15b869883d280c0ab5c6ff5d2e2f6481da7911"
+checksum = "b85ae71b15fcd02c1527bca8bd088cc4cdf1c664fdebf0dad3f1d6d454a2eefa"
 dependencies = [
  "anchor-syn",
  "quote",
@@ -172,9 +172,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-derive-serde"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0e80ff4e3ddb8c85aafd37926335c28f820516311e7106e5b7482b42e798aaa"
+checksum = "826334d127a2ccaed18c1d74c69b8b00cb0e17f99f01b66c92ac108c4792e126"
 dependencies = [
  "anchor-syn",
  "proc-macro-crate",
@@ -185,9 +185,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-derive-space"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2672af0ef4dfd5f5b6199355867b580cd8b4048093ef5208dd2b441305c15b8b"
+checksum = "7b128347e1a8d8f8c14942467a1251e861095c56fe9b7d7f2af09b3f89f7c9a3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -196,9 +196,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-lang"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de9dce227fa0c08be20fef008c5b04681e1e0a15cb396e9619a9a1f800ff6cd"
+checksum = "df469a8bc353440c577504444fc8f53f9f139e61f03981897ecd3e818e8cb3ae"
 dependencies = [
  "anchor-attribute-access-control",
  "anchor-attribute-account",
@@ -266,9 +266,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-syn"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62f42cb7e348c033bd9bfba59979bcd66431c026ba23490af94045aa357a950"
+checksum = "3dba8b3c2a352142721a10745bcf1db94bc1dfdc9b313128b6ef5cac4f2be1b4"
 dependencies = [
  "anyhow",
  "bs58",

package/examples/shapes/Cargo.toml

@@ -3,7 +3,7 @@ members = ["programs/ellipse", "programs/triangle", "macros"]
 resolver = "2"
 
 [workspace.dependencies]
-anchor-lang = "1.0.0"
+anchor-lang = { version = "1.0.1" }
 anchor-trait = { path = "../.." }
 shapes-macros = { path = "macros" }
 mollusk-svm = { version = "0.8", features = ["inner-instructions"] }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/framework-solana-anchor-trait",
-  "version": "0.2.81",
+  "version": "0.2.83",
   "private": false,
   "license": "MIT",
   "type": "module",
@@ -14,10 +14,10 @@
     "rustfmt.toml"
   ],
   "devDependencies": {
-    "@layerzerolabs/build-utils-solana": "0.2.81",
-    "@layerzerolabs/tsup-configuration": "0.2.81",
-    "@layerzerolabs/typescript-configuration": "0.2.81",
-    "@layerzerolabs/vm-tooling-solana": "0.2.81"
+    "@layerzerolabs/build-utils-solana": "0.2.83",
+    "@layerzerolabs/tsup-configuration": "0.2.83",
+    "@layerzerolabs/typescript-configuration": "0.2.83",
+    "@layerzerolabs/vm-tooling-solana": "0.2.83"
   },
   "publishConfig": {
     "access": "restricted",

package/src/assembly.rs

@@ -2,7 +2,7 @@
 
 use proc_macro2::{Ident, TokenStream};
 use quote::quote;
-use syn::ItemMod;
+use syn::{AttrStyle, ItemMod};
 
 use crate::{generation::GeneratedInstructions, overrides::InstructionOverrides, InstructionSet};
 
@@ -38,10 +38,11 @@ impl<Ix: InstructionSet> Assembly<Ix> {
     /// wrapper_defs         // relocated override handler modules
     /// default_impls        // generated default accounts structs + handler impls
     /// extend_macro         // macro_rules! for extending default accounts (if configured)
-    /// #[original_mod_attrs]
+    /// #[outer_mod_attrs]   // outer attrs from the source module
     /// #[extra_mod_attrs]   // e.g. #[rbac(...)]
     /// #[program]           // always innermost — auto-managed by Assembly
     /// mod name {
+    ///     #![inner_mod_attrs]  // inner attrs from the source module (e.g. #![deny(...)])
     ///     filtered_items   // original items minus relocated handlers
     ///     entrypoints      // generated instruction entrypoints
     /// }
@@ -73,9 +74,11 @@ impl<Ix: InstructionSet> Assembly<Ix> {
 
         let ItemMod { attrs: mod_attrs, vis: mod_vis, ident: mod_ident, .. } = &source_mod;
 
-        // Filter out #[program] attribute if it is already present.
-        let mod_attrs: Vec<_> =
-            mod_attrs.iter().filter(|a| !a.path().is_ident("program")).collect();
+        // Inner attrs (`#![...]`, `//!`) must live inside the body — rustc rejects them outside.
+        let (inner_attrs, outer_attrs): (Vec<_>, Vec<_>) = mod_attrs
+            .iter()
+            .filter(|a| a.path().segments.last().is_none_or(|s| s.ident != "program"))
+            .partition(|a| matches!(a.style, AttrStyle::Inner(_)));
 
         quote! {
             #prelude
@@ -83,10 +86,11 @@ impl<Ix: InstructionSet> Assembly<Ix> {
             #default_impls
             #extend_macro
 
-            #(#mod_attrs)*
+            #(#outer_attrs)*
             #extra_mod_attrs
             #[program]
             #mod_vis mod #mod_ident {
+                #(#inner_attrs)*
                 use super::*;
                 #filtered_items
                 #entrypoints

package/src/overrides.rs

@@ -176,7 +176,7 @@ fn has_override_attr(fn_item: &ItemFn, cfg: OverrideConfig) -> bool {
 
 /// Returns `true` if `attr`'s last path segment matches the configured attribute name.
 fn is_override_attr(attr: &Attribute, cfg: OverrideConfig) -> bool {
-    attr.path().is_ident(cfg.attr_name)
+    attr.path().segments.last().is_some_and(|s| s.ident == cfg.attr_name)
 }
 
 /// Parses the override target from a function's override attribute.

package/tests/assembly.rs

@@ -161,6 +161,126 @@ mod tests {
         assert!(has_custom_attr, "original module attributes should be preserved");
     }
 
+    #[test]
+    fn inner_attrs_routed_into_module_body() {
+        // Inner attributes (#![...]) and inner doc comments (//!) on the source module
+        // must end up inside the generated mod's body, not outside, otherwise rustc
+        // rejects them with "an inner attribute is not permitted in this context".
+        let module: syn::ItemMod = syn::parse_quote! {
+            mod my_program {
+                #![deny(clippy::arithmetic_side_effects)]
+                #![allow(unused_variables)]
+                //! Module-level doc comment.
+
+                #[test_instruction]
+                pub fn lz_receive(ctx: &mut Context<MyReceive>, params: &LzReceiveParams) -> Result<()> {
+                    Ok(())
+                }
+            }
+        };
+        let file = assemble_ok(&module, quote! {}, quote! {});
+        let (_, m) = find_program_mod(&file).expect("module should exist");
+
+        let inner_attrs: Vec<_> =
+            m.attrs.iter().filter(|a| matches!(a.style, syn::AttrStyle::Inner(_))).collect();
+
+        let has_deny = inner_attrs
+            .iter()
+            .any(|a| a.path().segments.last().is_some_and(|seg| seg.ident == "deny"));
+        let has_allow = inner_attrs
+            .iter()
+            .any(|a| a.path().segments.last().is_some_and(|seg| seg.ident == "allow"));
+        let has_inner_doc = inner_attrs
+            .iter()
+            .any(|a| a.path().segments.last().is_some_and(|seg| seg.ident == "doc"));
+
+        assert!(
+            has_deny,
+            "#![deny(...)] should be preserved as an inner attr on the generated mod"
+        );
+        assert!(
+            has_allow,
+            "#![allow(...)] should be preserved as an inner attr on the generated mod"
+        );
+        assert!(
+            has_inner_doc,
+            "//! doc comment should be preserved as an inner attr on the generated mod"
+        );
+
+        // Sanity: no inner-style attribute should appear *before* the generated mod —
+        // that would be exactly the position rustc rejects.
+        let rendered = quote!(#file).to_string();
+        let mod_token = format!("mod {}", m.ident);
+        let prefix = rendered
+            .split(&mod_token)
+            .next()
+            .expect("rendered output should contain the module");
+        assert!(
+            !prefix.contains("# ! ["),
+            "no inner-style attribute (#![...]) should appear before the generated mod;\n\
+             prefix was:\n{prefix}"
+        );
+    }
+
+    #[test]
+    fn qualified_program_attr_is_deduplicated() {
+        // A previously-expanded macro may have placed a qualified #[program] on the
+        // source module (e.g. `#[anchor_lang::prelude::program]`). Assembly always
+        // re-emits a canonical `#[program]`, so the qualified form must be filtered
+        // out — otherwise the generated module carries two `#[program]` attributes
+        // and Anchor's program macro would expand twice.
+        let module: syn::ItemMod = syn::parse_quote! {
+            #[anchor_lang::prelude::program]
+            mod my_program {
+                #[test_instruction]
+                pub fn lz_receive(ctx: &mut Context<MyReceive>, params: &LzReceiveParams) -> Result<()> {
+                    Ok(())
+                }
+            }
+        };
+        let file = assemble_ok(&module, quote! {}, quote! {});
+        let (_, m) = find_program_mod(&file).expect("module should exist");
+
+        let program_attr_count = m
+            .attrs
+            .iter()
+            .filter(|a| a.path().segments.last().is_some_and(|s| s.ident == "program"))
+            .count();
+        assert_eq!(
+            program_attr_count, 1,
+            "exactly one #[program] attr should remain on the generated mod"
+        );
+    }
+
+    #[test]
+    fn outer_and_inner_attrs_partitioned_correctly() {
+        let module: syn::ItemMod = syn::parse_quote! {
+            #[some_outer_attr]
+            mod my_program {
+                #![deny(clippy::arithmetic_side_effects)]
+
+                #[test_instruction]
+                pub fn lz_receive(ctx: &mut Context<MyReceive>, params: &LzReceiveParams) -> Result<()> {
+                    Ok(())
+                }
+            }
+        };
+        let file = assemble_ok(&module, quote! {}, quote! {});
+        let (_, m) = find_program_mod(&file).expect("module should exist");
+
+        let has_outer = m.attrs.iter().any(|a| {
+            matches!(a.style, syn::AttrStyle::Outer)
+                && a.path().segments.last().is_some_and(|seg| seg.ident == "some_outer_attr")
+        });
+        let has_inner_deny = m.attrs.iter().any(|a| {
+            matches!(a.style, syn::AttrStyle::Inner(_))
+                && a.path().segments.last().is_some_and(|seg| seg.ident == "deny")
+        });
+
+        assert!(has_outer, "outer attribute should be preserved on the generated mod");
+        assert!(has_inner_deny, "inner attribute should be preserved on the generated mod");
+    }
+
     #[test]
     fn filtered_items_inside_module() {
         let module = module_with_override_and_extras();

package/tests/override.rs

@@ -121,6 +121,28 @@ mod tests {
         assert!(overrides.get(TestIx::LzReceive).is_none());
     }
 
+    #[test]
+    fn qualified_attribute_path_recognized_as_override() {
+        // A qualified attribute path like `#[crate::test_instruction]` should still
+        // register as an override. `Path::is_ident` is strict-1-segment and would
+        // silently miss this, leaving the function as a bare item and emitting the
+        // default entrypoint instead.
+        let module: syn::ItemMod = syn::parse_quote! {
+            mod my_program {
+                #[crate::test_instruction]
+                pub fn set_peer(ctx: &mut Context<MyAccounts>, params: &SetPeerParams) -> Result<()> {
+                    Ok(())
+                }
+            }
+        };
+        let overrides = collect_ok(&module);
+
+        assert!(
+            overrides.get(TestIx::SetPeer).is_some(),
+            "qualified #[crate::test_instruction] should register as a SetPeer override"
+        );
+    }
+
     #[test]
     fn multiple_unique_overrides() {
         let module: syn::ItemMod = syn::parse_quote! {