@layerzerolabs/framework-solana-anchor-trait 0.2.84 → 0.2.86

package/examples/shapes/Cargo.lock

@@ -89,9 +89,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "anchor-attribute-access-control"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe55cad36a574c8a048bd4be3f24f438f1888d78098bc137370dab4f6e2173c6"
+checksum = "0b8cd233e382ea499e3c1e51bf4f0cb367abb37bb64e9e3667a5d618af3fe265"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -100,9 +100,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-account"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4624a1addfa17ef75c5d1eae33b724848420befba0f4f270562daba22704f933"
+checksum = "2e12171382e24c5cda6b0f7236a4f6bb9b657da997780c88a0ef794a419298bf"
 dependencies = [
  "anchor-syn",
  "proc-macro2",
@@ -112,9 +112,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-constant"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4043728a3a9f9cd77165d1631d859f22536a5309545ea9803cdabf7eb541af50"
+checksum = "510f8db71375446405dfabdaf157fb7d3fbf33470c98ed75fad4c467e8ca0080"
 dependencies = [
  "anchor-syn",
  "quote",
@@ -123,9 +123,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-error"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "082f60f03c2dd9c9df1997b9b83ce66e409a46ed701d3e17c157c69006f4058c"
+checksum = "72b203169a49ea74da7782281e740ea8e21017c85f8f3b1ab452712c9796d28f"
 dependencies = [
  "anchor-syn",
  "quote",
@@ -134,9 +134,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-event"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d4cfbfea47ca95da8a7558dd058414e0db563cc56b609e8aa90d41d96c1509"
+checksum = "c50a462651e573ec6cc632e8f607e8b1e11f620f6fc26badaeff04fd49f45cc1"
 dependencies = [
  "anchor-syn",
  "proc-macro2",
@@ -146,9 +146,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-program"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6050e980111673736783492b56da3833628ae9af123bc125d2b5f492f65b9ec8"
+checksum = "84704ee25a7e788afd9d846945cba536cfdcd53b463e8a337cf237cd897ca4d9"
 dependencies = [
  "anchor-lang-idl",
  "anchor-syn",
@@ -161,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-derive-accounts"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b85ae71b15fcd02c1527bca8bd088cc4cdf1c664fdebf0dad3f1d6d454a2eefa"
+checksum = "98bf49664527c7bb0ebca04e9b5bfb618d6ceb849ef44a8149241d244bbfb0f6"
 dependencies = [
  "anchor-syn",
  "quote",
@@ -172,9 +172,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-derive-serde"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "826334d127a2ccaed18c1d74c69b8b00cb0e17f99f01b66c92ac108c4792e126"
+checksum = "8140a40827bdfd74720f1f3084778fa081262f2f43bd4bdbc350f98ce1b341c6"
 dependencies = [
  "anchor-syn",
  "proc-macro-crate",
@@ -185,9 +185,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-derive-space"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b128347e1a8d8f8c14942467a1251e861095c56fe9b7d7f2af09b3f89f7c9a3"
+checksum = "1ee5b6fa5dde037399d3e0bb322a1c7360ad8adc6b6afdd797d19566c039dcfb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -196,9 +196,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-lang"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df469a8bc353440c577504444fc8f53f9f139e61f03981897ecd3e818e8cb3ae"
+checksum = "1bac4de7c9a9a69180798af701e22302cc0ebf2ef683b843706a1b7809454735"
 dependencies = [
  "anchor-attribute-access-control",
  "anchor-attribute-account",
@@ -266,9 +266,9 @@ dependencies = [
 
 [[package]]
 name = "anchor-syn"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dba8b3c2a352142721a10745bcf1db94bc1dfdc9b313128b6ef5cac4f2be1b4"
+checksum = "6940253e80acf0f8e83b1ebd9c4772c496aedcce6ad19aa85ce75d0b6b188298"
 dependencies = [
  "anyhow",
  "bs58",

package/examples/shapes/Cargo.toml

@@ -3,7 +3,7 @@ members = ["programs/ellipse", "programs/triangle", "macros"]
 resolver = "2"
 
 [workspace.dependencies]
-anchor-lang = { version = "1.0.1" }
+anchor-lang = { version = "1.0.2" }
 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.84",
+  "version": "0.2.86",
   "private": false,
   "license": "MIT",
   "type": "module",
@@ -14,10 +14,10 @@
     "rustfmt.toml"
   ],
   "devDependencies": {
-    "@layerzerolabs/build-utils-solana": "0.2.84",
-    "@layerzerolabs/typescript-configuration": "0.2.84",
-    "@layerzerolabs/vm-tooling-solana": "0.2.84",
-    "@layerzerolabs/tsup-configuration": "0.2.84"
+    "@layerzerolabs/tsup-configuration": "0.2.86",
+    "@layerzerolabs/build-utils-solana": "0.2.86",
+    "@layerzerolabs/typescript-configuration": "0.2.86",
+    "@layerzerolabs/vm-tooling-solana": "0.2.86"
   },
   "publishConfig": {
     "access": "restricted",

package/src/assembly.rs

@@ -35,7 +35,6 @@ impl<Ix: InstructionSet> Assembly<Ix> {
     ///
     /// ```text
     /// prelude              // domain-specific definitions (state types, events, etc.)
-    /// wrapper_defs         // relocated override handler modules
     /// default_impls        // generated default accounts structs + handler impls
     /// extend_macro         // macro_rules! for extending default accounts (if configured)
     /// #[outer_mod_attrs]   // outer attrs from the source module
@@ -44,6 +43,8 @@ impl<Ix: InstructionSet> Assembly<Ix> {
     /// mod name {
     ///     #![inner_mod_attrs]  // inner attrs from the source module (e.g. #![deny(...)])
     ///     filtered_items   // original items minus relocated handlers
+    ///     wrapper_defs     // relocated override handler modules — kept inside so handlers
+    ///                      //   can reach the user's nested same-module helpers
     ///     entrypoints      // generated instruction entrypoints
     /// }
     /// ```
@@ -82,7 +83,6 @@ impl<Ix: InstructionSet> Assembly<Ix> {
 
         quote! {
             #prelude
-            #wrapper_defs
             #default_impls
             #extend_macro
 
@@ -93,6 +93,7 @@ impl<Ix: InstructionSet> Assembly<Ix> {
                 #(#inner_attrs)*
                 use super::*;
                 #filtered_items
+                #wrapper_defs
                 #entrypoints
             }
         }

package/src/lib.rs

@@ -13,7 +13,7 @@
 //!   (making it available for composition or reference), but the entrypoint delegates to the custom
 //!   handler using whatever context type it declares.
 //!
-//! See [`spec.md`](../spec.md) for the full specification.
+//! See [`README.md`](../README.md) for the full specification.
 //!
 //! ## Integration steps for a new macro crate
 //!

package/tests/assembly.rs

@@ -104,22 +104,24 @@ mod tests {
     }
 
     #[test]
-    fn wrapper_defs_and_default_impls_outside_module() {
+    fn wrappers_inside_module_and_default_impls_outside() {
         let module = module_with_override_and_extras();
         let file = assemble_ok(&module, quote! {}, quote! {});
-        let (mod_pos, _) = find_program_mod(&file).expect("module should exist");
+        let (mod_pos, m) = find_program_mod(&file).expect("module should exist");
 
-        let wrapper_pos = file
-            .items
-            .iter()
-            .position(|item| {
-                matches!(item, syn::Item::Mod(m) if m.ident.to_string().contains("__test_instruction__"))
-            })
-            .expect("wrapper module should exist");
-        assert!(
-            wrapper_pos < mod_pos,
-            "wrapper defs (pos {wrapper_pos}) should come before module (pos {mod_pos})"
-        );
+        // Wrapper modules are placed inside the program module so override handlers
+        // can reach nested same-module helpers (e.g. `mod utils { ... }`).
+        let inner = mod_items(m);
+        let has_wrapper_inside = inner.iter().any(|item| {
+            matches!(item, syn::Item::Mod(m) if m.ident.to_string().contains("__test_instruction__"))
+        });
+        assert!(has_wrapper_inside, "wrapper defs should live inside the program module");
+
+        // Wrapper modules must NOT appear at outer scope.
+        let has_wrapper_outside = file.items.iter().any(|item| {
+            matches!(item, syn::Item::Mod(m) if m.ident.to_string().contains("__test_instruction__"))
+        });
+        assert!(!has_wrapper_outside, "wrapper defs should not appear outside the program module");
 
         // Default structs are always emitted for provided instructions, even when overridden.
         let has_default_impl_outside = file.items[..mod_pos].iter().any(|item| {
@@ -345,9 +347,9 @@ mod tests {
     fn wrapper_defs_contain_override_handlers() {
         let module = module_with_override_and_extras();
         let file = assemble_ok(&module, quote! {}, quote! {});
+        let (_, program_mod) = find_program_mod(&file).expect("module should exist");
 
-        let wrapper = file
-            .items
+        let wrapper = mod_items(program_mod)
             .iter()
             .find_map(|item| match item {
                 syn::Item::Mod(m)
@@ -357,7 +359,7 @@ mod tests {
                 },
                 _ => None,
             })
-            .expect("wrapper module for set_peer should exist in assembled output");
+            .expect("wrapper module for set_peer should exist inside the program module");
 
         let wrapper_items = mod_items(wrapper);
         let has_handler = wrapper_items
@@ -541,21 +543,14 @@ mod tests {
         let module = module_with_override_and_extras();
         let file = assemble_ok(&module, quote! { struct PreludeMarker; }, quote! {});
 
-        // Verify complete ordering: prelude → wrapper → default impls → module
+        // Verify outer-scope ordering: prelude → default impls → module
+        // (wrapper modules now live inside the program module — see assertion below).
         let prelude_pos = file
             .items
             .iter()
             .position(|item| matches!(item, syn::Item::Struct(s) if s.ident == "PreludeMarker"))
             .expect("prelude should exist");
 
-        let wrapper_pos = file
-            .items
-            .iter()
-            .position(|item| {
-                matches!(item, syn::Item::Mod(m) if m.ident.to_string().contains("__test_instruction__"))
-            })
-            .expect("wrapper should exist");
-
         let context_pos = file
             .items
             .iter()
@@ -566,17 +561,27 @@ mod tests {
 
         let (mod_pos, m) = find_program_mod(&file).expect("module should exist");
 
-        assert!(prelude_pos < wrapper_pos, "prelude before wrapper");
-        assert!(wrapper_pos < context_pos, "wrapper before default impls");
+        assert!(prelude_pos < context_pos, "prelude before default impls");
         assert!(context_pos < mod_pos, "default impls before module");
 
+        // Wrapper modules must sit inside the program module, not at outer scope.
+        let has_wrapper_outside = file.items.iter().any(|item| {
+            matches!(item, syn::Item::Mod(m) if m.ident.to_string().contains("__test_instruction__"))
+        });
+        assert!(!has_wrapper_outside, "wrapper modules should not appear at outer scope");
+
+        let items = mod_items(m);
+        let has_wrapper_inside = items.iter().any(|item| {
+            matches!(item, syn::Item::Mod(m) if m.ident.to_string().contains("__test_instruction__"))
+        });
+        assert!(has_wrapper_inside, "wrapper modules should sit inside the program module");
+
         let has_program = m
             .attrs
             .iter()
             .any(|attr| attr.path().segments.last().is_some_and(|seg| seg.ident == "program"));
         assert!(has_program, "module should have #[program]");
 
-        let items = mod_items(m);
         let fn_names: Vec<_> = items
             .iter()
             .filter_map(|item| match item {

package/tests/snapshots/snapshots__tests__snapshot_all_defaults.snap

@@ -2,15 +2,6 @@
 source: crates/anchor-trait/tests/snapshots.rs
 expression: output
 ---
-mod __test_instruction__lz_receive_handler {
-    use super::*;
-    pub fn lz_receive(
-        ctx: &mut Context<MyReceive>,
-        params: &LzReceiveParams,
-    ) -> Result<()> {
-        Ok(())
-    }
-}
 #[derive(Accounts)]
 pub struct StdSetPeer<'info> {
     pub placeholder: UncheckedAccount<'info>,
@@ -41,6 +32,15 @@ impl StdToken<'_> {
 #[program]
 pub mod my_program {
     use super::*;
+    mod __test_instruction__lz_receive_handler {
+        use super::*;
+        pub fn lz_receive(
+            ctx: &mut Context<MyReceive>,
+            params: &LzReceiveParams,
+        ) -> Result<()> {
+            Ok(())
+        }
+    }
     pub fn set_peer(mut ctx: Context<StdSetPeer>, params: SetPeerParams) -> Result<()> {
         StdSetPeer::apply(&mut ctx, &params)
     }

package/tests/snapshots/snapshots__tests__snapshot_full_override.snap

@@ -2,25 +2,6 @@
 source: crates/anchor-trait/tests/snapshots.rs
 expression: output
 ---
-mod __test_instruction__set_peer_handler {
-    use super::*;
-    pub fn set_peer(
-        ctx: &mut Context<MyCustomAccounts>,
-        params: &SetPeerParams,
-    ) -> Result<()> {
-        msg!("fully custom set_peer");
-        Ok(())
-    }
-}
-mod __test_instruction__lz_receive_handler {
-    use super::*;
-    pub fn lz_receive(
-        ctx: &mut Context<MyReceive>,
-        params: &LzReceiveParams,
-    ) -> Result<()> {
-        Ok(())
-    }
-}
 #[derive(Accounts)]
 pub struct StdSetPeer<'info> {
     pub placeholder: UncheckedAccount<'info>,
@@ -51,6 +32,25 @@ impl StdToken<'_> {
 #[program]
 pub mod my_program {
     use super::*;
+    mod __test_instruction__set_peer_handler {
+        use super::*;
+        pub fn set_peer(
+            ctx: &mut Context<MyCustomAccounts>,
+            params: &SetPeerParams,
+        ) -> Result<()> {
+            msg!("fully custom set_peer");
+            Ok(())
+        }
+    }
+    mod __test_instruction__lz_receive_handler {
+        use super::*;
+        pub fn lz_receive(
+            ctx: &mut Context<MyReceive>,
+            params: &LzReceiveParams,
+        ) -> Result<()> {
+            Ok(())
+        }
+    }
     pub fn set_peer(
         mut ctx: Context<MyCustomAccounts>,
         params: SetPeerParams,

package/tests/snapshots/snapshots__tests__snapshot_handler_override.snap

@@ -2,25 +2,6 @@
 source: crates/anchor-trait/tests/snapshots.rs
 expression: output
 ---
-mod __test_instruction__set_peer_handler {
-    use super::*;
-    pub fn set_peer(
-        ctx: &mut Context<StdSetPeer>,
-        params: &SetPeerParams,
-    ) -> Result<()> {
-        msg!("custom set_peer logic");
-        Ok(())
-    }
-}
-mod __test_instruction__lz_receive_handler {
-    use super::*;
-    pub fn lz_receive(
-        ctx: &mut Context<MyReceive>,
-        params: &LzReceiveParams,
-    ) -> Result<()> {
-        Ok(())
-    }
-}
 #[derive(Accounts)]
 pub struct StdSetPeer<'info> {
     pub placeholder: UncheckedAccount<'info>,
@@ -51,6 +32,25 @@ impl StdToken<'_> {
 #[program]
 pub mod my_program {
     use super::*;
+    mod __test_instruction__set_peer_handler {
+        use super::*;
+        pub fn set_peer(
+            ctx: &mut Context<StdSetPeer>,
+            params: &SetPeerParams,
+        ) -> Result<()> {
+            msg!("custom set_peer logic");
+            Ok(())
+        }
+    }
+    mod __test_instruction__lz_receive_handler {
+        use super::*;
+        pub fn lz_receive(
+            ctx: &mut Context<MyReceive>,
+            params: &LzReceiveParams,
+        ) -> Result<()> {
+            Ok(())
+        }
+    }
     pub fn set_peer(mut ctx: Context<StdSetPeer>, params: SetPeerParams) -> Result<()> {
         __test_instruction__set_peer_handler::set_peer(&mut ctx, &params)
     }

package/tests/snapshots/snapshots__tests__snapshot_mixed_overrides.snap

@@ -3,34 +3,6 @@ source: crates/anchor-trait/tests/snapshots.rs
 expression: output
 ---
 struct PreludeMarker;
-mod __test_instruction__set_peer_handler {
-    use super::*;
-    pub fn set_peer(
-        ctx: &mut Context<StdSetPeer>,
-        params: &SetPeerParams,
-    ) -> Result<()> {
-        msg!("handler override set_peer");
-        Ok(())
-    }
-}
-mod __test_instruction__get_peer_handler {
-    use super::*;
-    pub fn get_peer(
-        ctx: &Context<MyCustomGetPeer>,
-        params: &GetPeerParams,
-    ) -> Result<[u8; 32]> {
-        Ok([0u8; 32])
-    }
-}
-mod __test_instruction__lz_receive_handler {
-    use super::*;
-    pub fn lz_receive(
-        ctx: &mut Context<MyReceive>,
-        params: &LzReceiveParams,
-    ) -> Result<()> {
-        Ok(())
-    }
-}
 #[derive(Accounts)]
 pub struct StdSetPeer<'info> {
     pub placeholder: UncheckedAccount<'info>,
@@ -67,6 +39,34 @@ pub mod my_program {
     struct MyState {
         value: u64,
     }
+    mod __test_instruction__set_peer_handler {
+        use super::*;
+        pub fn set_peer(
+            ctx: &mut Context<StdSetPeer>,
+            params: &SetPeerParams,
+        ) -> Result<()> {
+            msg!("handler override set_peer");
+            Ok(())
+        }
+    }
+    mod __test_instruction__get_peer_handler {
+        use super::*;
+        pub fn get_peer(
+            ctx: &Context<MyCustomGetPeer>,
+            params: &GetPeerParams,
+        ) -> Result<[u8; 32]> {
+            Ok([0u8; 32])
+        }
+    }
+    mod __test_instruction__lz_receive_handler {
+        use super::*;
+        pub fn lz_receive(
+            ctx: &mut Context<MyReceive>,
+            params: &LzReceiveParams,
+        ) -> Result<()> {
+            Ok(())
+        }
+    }
     pub fn set_peer(mut ctx: Context<StdSetPeer>, params: SetPeerParams) -> Result<()> {
         __test_instruction__set_peer_handler::set_peer(&mut ctx, &params)
     }

package/tests/snapshots/snapshots__tests__snapshot_with_extend_macro.snap

@@ -2,15 +2,6 @@
 source: crates/anchor-trait/tests/snapshots.rs
 expression: output
 ---
-mod __test_instruction__lz_receive_handler {
-    use super::*;
-    pub fn lz_receive(
-        ctx: &mut Context<MyReceive>,
-        params: &LzReceiveParams,
-    ) -> Result<()> {
-        Ok(())
-    }
-}
 #[derive(Accounts)]
 pub struct StdSetPeer<'info> {
     pub placeholder: UncheckedAccount<'info>,
@@ -61,6 +52,15 @@ macro_rules! test_extend_accounts {
 #[program]
 pub mod my_program {
     use super::*;
+    mod __test_instruction__lz_receive_handler {
+        use super::*;
+        pub fn lz_receive(
+            ctx: &mut Context<MyReceive>,
+            params: &LzReceiveParams,
+        ) -> Result<()> {
+            Ok(())
+        }
+    }
     pub fn set_peer(mut ctx: Context<StdSetPeer>, params: SetPeerParams) -> Result<()> {
         StdSetPeer::apply(&mut ctx, &params)
     }