@layerzerolabs/protocol-stellar-v2 0.2.41 → 0.2.44

package/contracts/oapps/oapp/src/tests/oapp_sender.rs

@@ -64,6 +64,7 @@ impl MockEndpoint {
 }
 
 #[oapp_macros::oapp]
+#[common_macros::lz_contract]
 pub struct DummyOAppSender;
 
 impl LzReceiveInternal for DummyOAppSender {
@@ -83,7 +84,7 @@ impl LzReceiveInternal for DummyOAppSender {
 #[contractimpl]
 impl DummyOAppSender {
     pub fn __constructor(env: &Env, owner: &Address, endpoint: &Address) {
-        oapp::oapp_core::initialize_oapp::<Self>(env, owner, endpoint, owner);
+        oapp::oapp_core::init_ownable_oapp::<Self>(env, owner, endpoint, owner);
     }
 
     pub fn quote(env: &Env, dst_eid: u32, message: &Bytes, options: &Bytes, pay_in_zro: bool) -> MessagingFee {

package/contracts/oapps/oapp/src/tests/test_macros.rs

@@ -10,6 +10,7 @@ mod test_full_default {
     use soroban_sdk::{Address, Bytes, BytesN, Env};
 
     #[oapp]
+    #[common_macros::lz_contract]
     struct TestFullDefault;
 
     impl LzReceiveInternal for TestFullDefault {
@@ -40,6 +41,7 @@ mod test_full_manual_core {
     use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
 
     #[oapp(custom = [core])]
+    #[common_macros::lz_contract]
     struct TestFullManualCore;
 
     #[soroban_sdk::contractimpl(contracttrait)]
@@ -80,6 +82,7 @@ mod test_full_manual_sender {
     use soroban_sdk::{Address, Bytes, BytesN, Env};
 
     #[oapp(custom = [sender])]
+    #[common_macros::lz_contract]
     struct TestFullManualSender;
 
     impl OAppSenderInternal for TestFullManualSender {
@@ -113,6 +116,7 @@ mod test_full_manual_receiver {
     use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
 
     #[oapp(custom = [receiver])]
+    #[common_macros::lz_contract]
     struct TestFullManualReceiver;
 
     impl LzReceiveInternal for TestFullManualReceiver {
@@ -158,6 +162,7 @@ mod test_full_manual_options {
     use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
 
     #[oapp(custom = [options_type3])]
+    #[common_macros::lz_contract]
     struct TestFullManualOptions;
 
     impl LzReceiveInternal for TestFullManualOptions {
@@ -192,6 +197,7 @@ mod test_full_manual_core_sender {
     use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
 
     #[oapp(custom = [core, sender])]
+    #[common_macros::lz_contract]
     struct TestFullManualCoreSender;
 
     #[soroban_sdk::contractimpl(contracttrait)]
@@ -238,6 +244,7 @@ mod test_full_manual_core_receiver {
     use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
 
     #[oapp(custom = [core, receiver])]
+    #[common_macros::lz_contract]
     struct TestFullManualCoreReceiver;
 
     #[soroban_sdk::contractimpl(contracttrait)]
@@ -283,6 +290,7 @@ mod test_full_manual_sender_receiver {
     use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
 
     #[oapp(custom = [sender, receiver])]
+    #[common_macros::lz_contract]
     struct TestFullManualSenderReceiver;
 
     impl OAppSenderInternal for TestFullManualSenderReceiver {
@@ -323,6 +331,7 @@ mod test_full_manual_all_except_options {
     use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
 
     #[oapp(custom = [core, sender, receiver])]
+    #[common_macros::lz_contract]
     struct TestFullManualAllExceptOptions;
 
     #[soroban_sdk::contractimpl(contracttrait)]
@@ -374,6 +383,7 @@ mod test_full_manual_all {
     use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
 
     #[oapp(custom = [core, sender, receiver, options_type3])]
+    #[common_macros::lz_contract]
     struct TestFullManualAll;
 
     #[soroban_sdk::contractimpl(contracttrait)]

package/contracts/oapps/oapp-macros/src/generators.rs

@@ -65,15 +65,13 @@ impl Parse for CustomImpls {
     }
 }
 
-/// Generates a complete OApp implementation with contract attributes and trait implementations.
+/// Generates OApp trait implementations only. No contract-level attributes are applied.
 ///
-/// This function creates:
-/// - `#[common_macros::lz_contract]` - Wrapper macro that combines:
-///   - `#[soroban_sdk::contract]` - Makes the struct a Soroban contract
-///   - `#[common_macros::ttl_configurable]` - Adds TTL configuration with auth
-///   - `#[common_macros::ttl_extendable]` - Adds manual TTL extension support
-///   - `#[common_macros::ownable]` - Adds single-owner access control
-/// - OAppCore, OAppSenderInternal, OAppReceiver, and OAppOptionsType3 trait implementations
+/// This function creates OAppCore, OAppSenderInternal, OAppReceiver, and OAppOptionsType3 trait implementations.
+///
+/// **The user must apply a contract macro** such as `#[common_macros::lz_contract]` or
+/// `#[soroban_sdk::contract]` to the struct. `#[lz_contract]` provides contract, TTL, and Auth
+/// (via `#[ownable]` or `#[multisig]`) in one place.
 ///
 /// The `custom` parameter controls which trait implementations are generated vs.
 /// expected to be provided by the user.
@@ -86,7 +84,6 @@ pub fn generate_oapp(attr: TokenStream, input: TokenStream) -> TokenStream {
     let receiver_impl = (!custom.receiver).then(|| generate_oapp_receiver(&item_struct.ident));
     let options_type3_impl = (!custom.options_type3).then(|| generate_oapp_options_type3(&item_struct.ident));
     quote! {
-        #[common_macros::lz_contract]
         #item_struct
 
         #core_impl

package/contracts/oapps/oapp-macros/src/lib.rs

@@ -126,7 +126,7 @@ mod generators;
 
 use proc_macro::TokenStream;
 
-/// Derives a complete OApp: `#[contract]` + `#[ownable]` + Core + Sender + Receiver + OptionsType3.
+/// Derives OApp trait implementations. Apply `#[lz_contract]` (or similar) for contract + TTL + Auth.
 ///
 /// ## Usage
 ///

package/contracts/oapps/oapp-macros/src/tests/snapshots/oapp_macros__tests__oapp__snapshot_generate_oapp.snap

@@ -5,7 +5,6 @@ expression: combined
 ---
 // === Default (no custom impls) ===
 
-#[common_macros::lz_contract]
 pub struct MyOApp;
 use oapp::oapp_core::OAppCore as _;
 use utils::rbac::RoleBasedAccessControl as _;
@@ -25,7 +24,6 @@ impl oapp::oapp_options_type3::OAppOptionsType3 for MyOApp {}
 
 // === custom = [core] ===
 
-#[common_macros::lz_contract]
 pub struct MyOApp;
 use oapp::oapp_sender::OAppSenderInternal as _;
 impl oapp::oapp_sender::OAppSenderInternal for MyOApp {}
@@ -39,7 +37,6 @@ impl oapp::oapp_options_type3::OAppOptionsType3 for MyOApp {}
 
 // === custom = [sender] ===
 
-#[common_macros::lz_contract]
 pub struct MyOApp;
 use oapp::oapp_core::OAppCore as _;
 use utils::rbac::RoleBasedAccessControl as _;
@@ -57,7 +54,6 @@ impl oapp::oapp_options_type3::OAppOptionsType3 for MyOApp {}
 
 // === custom = [receiver] ===
 
-#[common_macros::lz_contract]
 pub struct MyOApp;
 use oapp::oapp_core::OAppCore as _;
 use utils::rbac::RoleBasedAccessControl as _;
@@ -74,7 +70,6 @@ impl oapp::oapp_options_type3::OAppOptionsType3 for MyOApp {}
 
 // === custom = [options_type3] ===
 
-#[common_macros::lz_contract]
 pub struct MyOApp;
 use oapp::oapp_core::OAppCore as _;
 use utils::rbac::RoleBasedAccessControl as _;
@@ -91,13 +86,11 @@ impl oapp::oapp_receiver::OAppReceiver for MyOApp {}
 
 // === custom = [core, sender, receiver, options_type3] ===
 
-#[common_macros::lz_contract]
 pub struct MyOApp;
 
 
 // === Struct attributes + fields are preserved ===
 
-#[common_macros::lz_contract]
 #[derive(Clone, Debug)]
 pub struct FancyOApp {
     pub x: u32,

package/contracts/oapps/oft/src/oft.rs

@@ -7,7 +7,7 @@ use crate::{
     },
     oft_types::{lock_unlock, mint_burn, OftType},
 };
-use common_macros::{contract_impl, storage};
+use common_macros::{contract_impl, lz_contract, storage};
 use oapp_macros::oapp;
 use oft_core::{
     impl_oft_lz_receive, utils as oft_utils, OFTCore, OFTError, OFTFeeDetail, OFTInternal, OFTLimit, OFTReceipt,
@@ -29,6 +29,7 @@ enum OFTStorage {
 // OFT Contract
 // =========================================================================
 
+#[lz_contract]
 #[oapp]
 pub struct OFT;
 

package/contracts/oapps/oft/src/tests/oft_types/lock_unlock.rs

@@ -40,6 +40,7 @@ impl DummyEndpoint {
 // ============================================================================
 
 #[oapp_macros::oapp(custom = [receiver])]
+#[common_macros::lz_contract]
 pub struct LockUnlockHarnessOFT;
 
 #[contractimpl]

package/contracts/oapps/oft-core/integration-tests/setup.rs

@@ -28,6 +28,7 @@ use utils::rbac::grant_role_no_auth;
 // ============================================================================
 
 #[oapp_macros::oapp]
+#[common_macros::lz_contract]
 pub struct TestOFT;
 
 impl LzReceiveInternal for TestOFT {

package/contracts/oapps/oft-core/src/oft_core.rs

@@ -58,7 +58,7 @@ use crate::{
 use common_macros::{contract_trait, only_role};
 use endpoint_v2::{MessagingComposerClient, MessagingFee, MessagingReceipt};
 use oapp::{
-    oapp_core::{initialize_oapp, OAPP_ADMIN_ROLE},
+    oapp_core::{init_ownable_oapp, OAPP_ADMIN_ROLE},
     oapp_options_type3::OAppOptionsType3,
     oapp_receiver::OAppReceiver,
     oapp_sender::{FeePayer, OAppSenderInternal},
@@ -116,7 +116,7 @@ pub trait OFTInternal: OAppReceiver + OAppSenderInternal + OAppOptionsType3 + Ow
         delegate: &Address,
     ) {
         // Initialize OApp (includes owner initialization)
-        initialize_oapp::<Self>(env, owner, endpoint, delegate);
+        init_ownable_oapp::<Self>(env, owner, endpoint, delegate);
 
         let local_decimals = TokenClient::new(env, token).decimals();
         assert_with_error!(env, local_decimals >= shared_decimals, OFTError::InvalidLocalDecimals);

package/contracts/oapps/oft-core/src/tests/test_utils.rs

@@ -133,6 +133,7 @@ mod test_mint_burn_oft {
     }
 
     #[oapp_macros::oapp]
+    #[common_macros::lz_contract]
     pub struct TestMintBurnOFT;
 
     #[contractimpl]
@@ -193,6 +194,7 @@ mod test_lock_unlock_oft {
     use soroban_sdk::{contractimpl, token::TokenClient, Address, Bytes, BytesN, Env};
 
     #[oapp_macros::oapp(custom = [receiver])]
+    #[common_macros::lz_contract]
     pub struct TestLockUnlockOFT;
 
     #[contractimpl]

package/docs/oapp-guide.md

@@ -20,6 +20,7 @@ The `#[oapp]` macro provides the simplest way to create an OApp:
 use oapp::oapp_receiver::LzReceiveInternal;
 use oapp_macros::oapp;
 
+#[lz_contract]
 #[oapp]
 pub struct MyOApp;
 
@@ -38,13 +39,16 @@ impl LzReceiveInternal for MyOApp {
 }
 ```
 
-The macro automatically generates:
+The macro generates only OApp trait implementations. You must apply a contract macro such as
+`#[common_macros::lz_contract]` to the struct. `#[lz_contract]` provides:
+
+- `#[soroban_sdk::contract]` — makes the struct a Soroban contract
+- `#[common_macros::ownable]` or `#[common_macros::multisig]` — Auth (use `#[lz_contract(multisig)]` for multisig)
+- `#[common_macros::ttl_configurable]` — adds TTL configuration with auth
+- `#[common_macros::ttl_extendable]` — adds manual TTL extension support
+
+The `#[oapp]` macro generates:
 
-- `#[common_macros::lz_contract]` attribute, which combines:
-    - `#[soroban_sdk::contract]` — makes the struct a Soroban contract
-    - `#[common_macros::ownable]` — adds single-owner access control
-    - `#[common_macros::ttl_configurable]` — adds TTL configuration with auth
-    - `#[common_macros::ttl_extendable]` — adds manual TTL extension support
 - `OAppCore` implementation
 - `OAppSenderInternal` implementation
 - `OAppReceiver` implementation
@@ -55,17 +59,17 @@ The macro automatically generates:
 Initialize your OApp in the constructor:
 
 ```rust
-use oapp::oapp_core::initialize_oapp;
+use oapp::oapp_core::init_ownable_oapp;
 
 #[contract_impl]
 impl MyOApp {
     pub fn __constructor(env: &Env, owner: &Address, endpoint: &Address, delegate: &Address) {
-        initialize_oapp::<Self>(env, owner, endpoint, delegate);
+        init_ownable_oapp::<Self>(env, owner, endpoint, delegate);
     }
 }
 ```
 
-The `initialize_oapp` function:
+The `init_ownable_oapp` function:
 
 1. Sets the contract owner
 2. Stores the LayerZero endpoint address
@@ -158,6 +162,7 @@ Use `#[oapp(custom = [...])]` to override default behavior:
 ### Custom receiver (ordered delivery)
 
 ```rust
+#[common_macros::lz_contract]
 #[oapp(custom = [receiver])]
 pub struct MyOrderedOApp;
 

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@layerzerolabs/protocol-stellar-v2",
-  "version": "0.2.41",
+  "version": "0.2.44",
   "private": false,
   "devDependencies": {
     "@types/node": "^22.18.6",
     "tsx": "^4.19.3",
     "typescript": "^5.8.2",
-    "@layerzerolabs/common-node-utils": "0.2.41",
-    "@layerzerolabs/vm-tooling-stellar": "0.2.41"
+    "@layerzerolabs/common-node-utils": "0.2.44",
+    "@layerzerolabs/stellar-ts-bindings-gen": "0.2.44",
+    "@layerzerolabs/vm-tooling-stellar": "0.2.44"
   },
   "publishConfig": {
     "access": "restricted",
@@ -22,7 +23,7 @@
     "build": "pnpm build:contracts && pnpm generate:sdk",
     "build:contracts": "pnpm exec lz-tool stellar contract build",
     "format": "pnpm exec lz-tool --script \"cargo fmt\" stellar",
-    "generate:sdk": "pnpm exec lz-tool --script \"cargo run -p ts-bindings-gen\" stellar",
+    "generate:sdk": "stellar-ts-bindings-gen --config ts-bindings-gen.toml",
     "lint": "pnpm exec lz-tool --script \"cargo clippy -- -D warnings\" stellar",
     "lint:fix": "pnpm exec lz-tool --script \"cargo clippy --fix --allow-dirty --allow-staged && cargo fmt\" stellar",
     "test": "pnpm exec lz-tool --script \"cargo nextest run\" stellar"