@layerzerolabs/framework-solana-anchor-trait 1.2.50 → 1.2.52

package/Cargo.toml

@@ -4,6 +4,24 @@ version = "0.1.0"
 edition = "2021"
 description = "Trait-like instruction interfaces for Anchor Solana programs with compile-time enforcement and default implementations"
 
+[workspace]
+resolver = "2"
+members = [
+    "examples/shapes/macros",
+    "examples/shapes/programs/ellipse",
+    "examples/shapes/programs/triangle",
+]
+
+[workspace.dependencies]
+anchor-lang = { version = "1.0.2" }
+anchor-trait = { path = "." }
+shapes-macros = { path = "examples/shapes/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"
+
 [features]
 idl-build = []
 

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

@@ -11,10 +11,8 @@ use proc_macro2::TokenStream;
 use quote::{format_ident, quote};
 use syn::ItemMod;
 
-const OVERRIDE_CONFIG: OverrideConfig = OverrideConfig {
-    attr_name: "shapes_instruction",
-    domain: "Shapes",
-};
+const OVERRIDE_CONFIG: OverrideConfig =
+    OverrideConfig { attr_name: "shapes_instruction", domain: "Shapes" };
 
 pub fn expand(_attr: TokenStream, item: TokenStream) -> syn::Result<TokenStream> {
     let module = syn::parse2::<ItemMod>(item)?;
@@ -23,9 +21,7 @@ pub fn expand(_attr: TokenStream, item: TokenStream) -> syn::Result<TokenStream>
     let overrides = InstructionOverrides::collect(&module, OVERRIDE_CONFIG)?;
 
     // 2. Generate instructions
-    let codegen_ctx = CodegenContext {
-        state_type: quote!(ShapeState),
-    };
+    let codegen_ctx = CodegenContext { state_type: quote!(ShapeState) };
     let instructions = generate_instructions::<ShapesInstructionSet>(&codegen_ctx, &overrides)?;
 
     // 3. Assemble output

package/examples/shapes/programs/ellipse/tests/ellipse/positive.rs

@@ -15,16 +15,10 @@ fn test_initialize_creates_shape_with_correct_dimensions() {
 
     mollusk.process_and_validate_instruction(
         &initialize_ix(&payer, &shape_key, 10, 6),
-        &[
-            (payer, payer_account()),
-            (shape_key, Account::default()),
-            sys_keyed(),
-        ],
+        &[(payer, payer_account()), (shape_key, Account::default()), sys_keyed()],
         &[
             Check::success(),
-            Check::account(&shape_key)
-                .data(&shape_data(10, 6, shape_bump))
-                .build(),
+            Check::account(&shape_key).data(&shape_data(10, 6, shape_bump)).build(),
         ],
     );
 }
@@ -65,10 +59,7 @@ fn test_get_dimension_returns_semi_axis_a_at_index_0() {
         &[Check::success()],
     );
 
-    assert_eq!(
-        u64::from_le_bytes(result.return_data[..8].try_into().unwrap()),
-        10
-    );
+    assert_eq!(u64::from_le_bytes(result.return_data[..8].try_into().unwrap()), 10);
 }
 
 #[test]
@@ -82,10 +73,7 @@ fn test_get_dimension_returns_semi_axis_b_at_index_1() {
         &[Check::success()],
     );
 
-    assert_eq!(
-        u64::from_le_bytes(result.return_data[..8].try_into().unwrap()),
-        6
-    );
+    assert_eq!(u64::from_le_bytes(result.return_data[..8].try_into().unwrap()), 6);
 }
 
 // ── clear ─────────────────────────────────────────────────────────────────────
@@ -102,12 +90,7 @@ fn test_clear_zeros_dimensions() {
             data: ix::Clear::DISCRIMINATOR.to_vec(),
         },
         &[(shape_key, shape_account(10, 6, shape_bump))],
-        &[
-            Check::success(),
-            Check::account(&shape_key)
-                .data(&shape_data(0, 0, shape_bump))
-                .build(),
-        ],
+        &[Check::success(), Check::account(&shape_key).data(&shape_data(0, 0, shape_bump)).build()],
     );
 }
 
@@ -130,10 +113,7 @@ fn test_compute_area_uses_ellipse_formula() {
     );
 
     // 314_159 * 10 * 6 / 400_000 = 47
-    assert_eq!(
-        u64::from_le_bytes(result.return_data[..8].try_into().unwrap()),
-        47
-    );
+    assert_eq!(u64::from_le_bytes(result.return_data[..8].try_into().unwrap()), 47);
 }
 
 // ── compute_perimeter ─────────────────────────────────────────────────────────
@@ -155,10 +135,7 @@ fn test_compute_perimeter_uses_ellipse_approximation() {
     );
 
     // 314_159 * (10 + 6) / 200_000 = 25
-    assert_eq!(
-        u64::from_le_bytes(result.return_data[..8].try_into().unwrap()),
-        25
-    );
+    assert_eq!(u64::from_le_bytes(result.return_data[..8].try_into().unwrap()), 25);
 }
 
 // ── scale ─────────────────────────────────────────────────────────────────────
@@ -178,9 +155,7 @@ fn test_scale_default_scales_both_axes() {
         &[(shape_key, shape_account(10, 6, shape_bump))],
         &[
             Check::success(),
-            Check::account(&shape_key)
-                .data(&shape_data(20, 12, shape_bump))
-                .build(),
+            Check::account(&shape_key).data(&shape_data(20, 12, shape_bump)).build(),
         ],
     );
 }
@@ -202,9 +177,7 @@ fn test_reset_restores_unit_circle() {
         &[(shape_key, shape_account(30, 5, shape_bump))],
         &[
             Check::success(),
-            Check::account(&shape_key)
-                .data(&shape_data(10, 10, shape_bump))
-                .build(),
+            Check::account(&shape_key).data(&shape_data(10, 10, shape_bump)).build(),
         ],
     );
 }

package/examples/shapes/programs/triangle/tests/triangle/positive.rs

@@ -15,17 +15,8 @@ fn test_initialize_creates_shape_with_correct_dimensions() {
 
     mollusk.process_and_validate_instruction(
         &initialize_ix(&payer, &shape_key, 6, 4),
-        &[
-            (payer, payer_account()),
-            (shape_key, Account::default()),
-            sys_keyed(),
-        ],
-        &[
-            Check::success(),
-            Check::account(&shape_key)
-                .data(&shape_data(6, 4, shape_bump))
-                .build(),
-        ],
+        &[(payer, payer_account()), (shape_key, Account::default()), sys_keyed()],
+        &[Check::success(), Check::account(&shape_key).data(&shape_data(6, 4, shape_bump)).build()],
     );
 }
 
@@ -96,12 +87,7 @@ fn test_clear_zeros_dimensions() {
             data: ix::Clear::DISCRIMINATOR.to_vec(),
         },
         &[(shape_key, shape_account(6, 4, shape_bump))],
-        &[
-            Check::success(),
-            Check::account(&shape_key)
-                .data(&shape_data(0, 0, shape_bump))
-                .build(),
-        ],
+        &[Check::success(), Check::account(&shape_key).data(&shape_data(0, 0, shape_bump)).build()],
     );
 }
 
@@ -123,10 +109,7 @@ fn test_compute_area_uses_triangle_formula() {
             ],
             data: ix_data(ix::ComputeArea::DISCRIMINATOR, ComputeParams {}),
         },
-        &[
-            (shape_key, shape_account(6, 4, shape_bump)),
-            (verifier, verifier_account()),
-        ],
+        &[(shape_key, shape_account(6, 4, shape_bump)), (verifier, verifier_account())],
         &[Check::success()],
     );
 
@@ -172,9 +155,7 @@ fn test_scale_only_changes_height_for_isoceles_triangle() {
         &[(shape_key, shape_account(6, 4, shape_bump))],
         &[
             Check::success(),
-            Check::account(&shape_key)
-                .data(&shape_data(6, 12, shape_bump))
-                .build(),
+            Check::account(&shape_key).data(&shape_data(6, 12, shape_bump)).build(),
         ],
     );
 }
@@ -194,12 +175,7 @@ fn test_reset_sets_both_dimensions_to_one() {
             data: ix::Reset::DISCRIMINATOR.to_vec(),
         },
         &[(shape_key, shape_account(6, 4, shape_bump))],
-        &[
-            Check::success(),
-            Check::account(&shape_key)
-                .data(&shape_data(1, 1, shape_bump))
-                .build(),
-        ],
+        &[Check::success(), Check::account(&shape_key).data(&shape_data(1, 1, shape_bump)).build()],
     );
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/framework-solana-anchor-trait",
-  "version": "1.2.50",
+  "version": "1.2.52",
   "private": false,
   "license": "MIT",
   "type": "module",
@@ -14,10 +14,10 @@
     "rustfmt.toml"
   ],
   "devDependencies": {
-    "@layerzerolabs/build-utils-solana": "1.2.50",
-    "@layerzerolabs/tsup-configuration": "1.2.50",
-    "@layerzerolabs/typescript-configuration": "1.2.50",
-    "@layerzerolabs/vm-tooling-solana": "1.2.50"
+    "@layerzerolabs/build-utils-solana": "1.2.52",
+    "@layerzerolabs/tsup-configuration": "1.2.52",
+    "@layerzerolabs/typescript-configuration": "1.2.52",
+    "@layerzerolabs/vm-tooling-solana": "1.2.52"
   },
   "publishConfig": {
     "access": "restricted",
@@ -30,7 +30,7 @@
     ]
   },
   "scripts": {
-    "allow-read-write": "[ -z \"$CI\" ] || sudo chmod -R a+rwx ./target ./examples/shapes/target",
+    "allow-read-write": "[ -z \"$CI\" ] || sudo chmod -R a+rwx ./target",
     "build": "pnpm build:lib && pnpm build:example && pnpm allow-read-write",
     "build:example": "pnpm exec lz-tool --script 'anchor build --no-idl --ignore-keys' anchor",
     "build:example:native": "pnpm exec lz-tool --docker-platform native --script 'anchor build --no-idl --ignore-keys' anchor",