@layerzerolabs/protocol-stellar-v2 0.2.40 → 0.2.43

package/contracts/macro-integration-tests/tests/ui/oapp/fail/missing_auth_trait.stderr

@@ -0,0 +1,397 @@
+error[E0412]: cannot find type `MyOAppClient` in this scope
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:12:1
+   |
+12 | #[oapp]
+   | ^^^^^^^ not found in this scope
+   |
+   = note: this error originates in the attribute macro `soroban_sdk::contractclient` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0412]: cannot find type `MyOAppArgs` in this scope
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:12:1
+   |
+12 | #[oapp]
+   | ^^^^^^^ not found in this scope
+   |
+   = note: this error originates in the attribute macro `soroban_sdk::contractargs` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0412]: cannot find type `MyOAppClient` in this scope
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:12:1
+   |
+12 | #[oapp]
+   | ^^^^^^^ not found in this scope
+   |
+   = note: this error originates in the macro `soroban_sdk::contractimpl_trait_default_fns_not_overridden` which comes from the expansion of the attribute macro `oapp` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0412]: cannot find type `MyOAppArgs` in this scope
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:12:1
+   |
+12 | #[oapp]
+   | ^^^^^^^ not found in this scope
+   |
+   = note: this error originates in the macro `soroban_sdk::contractimpl_trait_default_fns_not_overridden` which comes from the expansion of the attribute macro `oapp` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0412]: cannot find type `MyOAppClient` in this scope
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:12:1
+   |
+12 | #[oapp]
+   | ^^^^^^^ not found in this scope
+   |
+   = note: this error originates in the macro `soroban_sdk::contractimpl_trait_default_fns_not_overridden` which comes from the expansion of the attribute macro `oapp` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0412]: cannot find type `MyOAppArgs` in this scope
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:12:1
+   |
+12 | #[oapp]
+   | ^^^^^^^ not found in this scope
+   |
+   = note: this error originates in the macro `soroban_sdk::contractimpl_trait_default_fns_not_overridden` which comes from the expansion of the attribute macro `oapp` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0412]: cannot find type `MyOAppClient` in this scope
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:12:1
+   |
+12 | #[oapp]
+   | ^^^^^^^ not found in this scope
+   |
+   = note: this error originates in the macro `soroban_sdk::contractimpl_trait_default_fns_not_overridden` which comes from the expansion of the attribute macro `oapp` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0412]: cannot find type `MyOAppArgs` in this scope
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:12:1
+   |
+12 | #[oapp]
+   | ^^^^^^^ not found in this scope
+   |
+   = note: this error originates in the macro `soroban_sdk::contractimpl_trait_default_fns_not_overridden` which comes from the expansion of the attribute macro `oapp` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0412]: cannot find type `MyOAppClient` in this scope
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:12:1
+   |
+12 | #[oapp]
+   | ^^^^^^^ not found in this scope
+   |
+   = note: this error originates in the macro `soroban_sdk::contractimpl_trait_default_fns_not_overridden` which comes from the expansion of the attribute macro `oapp` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0412]: cannot find type `MyOAppArgs` in this scope
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:12:1
+   |
+12 | #[oapp]
+   | ^^^^^^^ not found in this scope
+   |
+   = note: this error originates in the macro `soroban_sdk::contractimpl_trait_default_fns_not_overridden` which comes from the expansion of the attribute macro `oapp` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: the trait bound `MyOApp: Ownable` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `Ownable` is not implemented for `MyOApp`
+   |
+   = help: the trait `Ownable` is implemented for `EndpointV2`
+note: required by a bound in `OAppCore`
+  --> $WORKSPACE/contracts/oapps/oapp/src/oapp_core.rs
+   |
+   | pub trait OAppCore: Ownable + RoleBasedAccessControl {
+   |                     ^^^^^^^ required by this bound in `OAppCore`
+
+error[E0277]: the trait bound `MyOApp: utils::auth::Auth` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `utils::auth::Auth` is not implemented for `MyOApp`
+   |
+   = help: the trait `utils::auth::Auth` is implemented for `EndpointV2`
+note: required by a bound in `RoleBasedAccessControl`
+  --> $WORKSPACE/contracts/utils/src/rbac.rs
+   |
+   | pub trait RoleBasedAccessControl: Auth {
+   |                                   ^^^^ required by this bound in `RoleBasedAccessControl`
+
+error[E0277]: the trait bound `MyOApp: Ownable` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `Ownable` is not implemented for `MyOApp`
+   |
+   = help: the trait `Ownable` is implemented for `EndpointV2`
+   = note: required for `MyOApp` to implement `OAppCore`
+note: required by a bound in `OAppSenderInternal`
+  --> $WORKSPACE/contracts/oapps/oapp/src/oapp_sender.rs
+   |
+   | pub trait OAppSenderInternal: OAppCore {
+   |                               ^^^^^^^^ required by this bound in `OAppSenderInternal`
+
+error[E0277]: the trait bound `MyOApp: Ownable` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `Ownable` is not implemented for `MyOApp`
+   |
+   = help: the trait `Ownable` is implemented for `EndpointV2`
+   = note: required for `MyOApp` to implement `OAppCore`
+note: required by a bound in `OAppReceiver`
+  --> $WORKSPACE/contracts/oapps/oapp/src/oapp_receiver.rs
+   |
+   | pub trait OAppReceiver: OAppCore + LzReceiveInternal {
+   |                         ^^^^^^^^ required by this bound in `OAppReceiver`
+
+error[E0277]: the trait bound `MyOApp: utils::auth::Auth` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `utils::auth::Auth` is not implemented for `MyOApp`
+   |
+   = help: the trait `utils::auth::Auth` is implemented for `EndpointV2`
+   = note: required for `MyOApp` to implement `RoleBasedAccessControl`
+note: required by a bound in `OAppOptionsType3`
+  --> $WORKSPACE/contracts/oapps/oapp/src/oapp_options_type3.rs
+   |
+   | pub trait OAppOptionsType3: RoleBasedAccessControl {
+   |                             ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `OAppOptionsType3`
+
+error[E0277]: the trait bound `MyOApp: Ownable` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `Ownable` is not implemented for `MyOApp`
+   |
+   = help: the trait `Ownable` is implemented for `EndpointV2`
+note: required by a bound in `oapp_version`
+  --> $WORKSPACE/contracts/oapps/oapp/src/oapp_core.rs
+   |
+   | pub trait OAppCore: Ownable + RoleBasedAccessControl {
+   |                     ^^^^^^^ required by this bound in `OAppCore::oapp_version`
+...
+   |     fn oapp_version(_env: &soroban_sdk::Env) -> (u64, u64) {
+   |        ------------ required by a bound in this associated function
+
+error[E0277]: the trait bound `MyOApp: Ownable` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `Ownable` is not implemented for `MyOApp`
+   |
+   = help: the trait `Ownable` is implemented for `EndpointV2`
+note: required by a bound in `endpoint`
+  --> $WORKSPACE/contracts/oapps/oapp/src/oapp_core.rs
+   |
+   | pub trait OAppCore: Ownable + RoleBasedAccessControl {
+   |                     ^^^^^^^ required by this bound in `OAppCore::endpoint`
+...
+   |     fn endpoint(env: &soroban_sdk::Env) -> soroban_sdk::Address {
+   |        -------- required by a bound in this associated function
+
+error[E0277]: the trait bound `MyOApp: Ownable` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `Ownable` is not implemented for `MyOApp`
+   |
+   = help: the trait `Ownable` is implemented for `EndpointV2`
+note: required by a bound in `peer`
+  --> $WORKSPACE/contracts/oapps/oapp/src/oapp_core.rs
+   |
+   | pub trait OAppCore: Ownable + RoleBasedAccessControl {
+   |                     ^^^^^^^ required by this bound in `OAppCore::peer`
+...
+   |     fn peer(env: &soroban_sdk::Env, eid: u32) -> Option<soroban_sdk::BytesN<32>> {
+   |        ---- required by a bound in this associated function
+
+error[E0277]: the trait bound `MyOApp: Ownable` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `Ownable` is not implemented for `MyOApp`
+   |
+   = help: the trait `Ownable` is implemented for `EndpointV2`
+note: required by a bound in `set_peer`
+  --> $WORKSPACE/contracts/oapps/oapp/src/oapp_core.rs
+   |
+   | pub trait OAppCore: Ownable + RoleBasedAccessControl {
+   |                     ^^^^^^^ required by this bound in `OAppCore::set_peer`
+...
+   |     fn set_peer(
+   |        -------- required by a bound in this associated function
+
+error[E0277]: the trait bound `MyOApp: Ownable` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `Ownable` is not implemented for `MyOApp`
+   |
+   = help: the trait `Ownable` is implemented for `EndpointV2`
+note: required by a bound in `oapp::oapp_core::OAppCore::set_delegate`
+  --> $WORKSPACE/contracts/oapps/oapp/src/oapp_core.rs
+   |
+   | pub trait OAppCore: Ownable + RoleBasedAccessControl {
+   |                     ^^^^^^^ required by this bound in `OAppCore::set_delegate`
+...
+   |     fn set_delegate(env: &soroban_sdk::Env, delegate: &Option<soroban_sdk::Address>, operator: &soroban_sdk::Address) {
+   |        ------------ required by a bound in this associated function
+
+error[E0277]: the trait bound `MyOApp: ContractFunctionRegister` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `ContractFunctionRegister` is not implemented for `MyOApp`
+   |
+   = help: the following other types implement trait `ContractFunctionRegister`:
+             EndpointV2
+             MockAuthContract
+
+error[E0277]: the trait bound `MyOApp: utils::auth::Auth` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `utils::auth::Auth` is not implemented for `MyOApp`
+   |
+   = help: the trait `utils::auth::Auth` is implemented for `EndpointV2`
+note: required by a bound in `grant_role`
+  --> $WORKSPACE/contracts/utils/src/rbac.rs
+   |
+   | pub trait RoleBasedAccessControl: Auth {
+   |                                   ^^^^ required by this bound in `RoleBasedAccessControl::grant_role`
+...
+   |     fn grant_role(
+   |        ---------- required by a bound in this associated function
+
+error[E0277]: the trait bound `MyOApp: utils::auth::Auth` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `utils::auth::Auth` is not implemented for `MyOApp`
+   |
+   = help: the trait `utils::auth::Auth` is implemented for `EndpointV2`
+note: required by a bound in `revoke_role`
+  --> $WORKSPACE/contracts/utils/src/rbac.rs
+   |
+   | pub trait RoleBasedAccessControl: Auth {
+   |                                   ^^^^ required by this bound in `RoleBasedAccessControl::revoke_role`
+...
+   |     fn revoke_role(
+   |        ----------- required by a bound in this associated function
+
+error[E0277]: the trait bound `MyOApp: utils::auth::Auth` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `utils::auth::Auth` is not implemented for `MyOApp`
+   |
+   = help: the trait `utils::auth::Auth` is implemented for `EndpointV2`
+note: required by a bound in `renounce_role`
+  --> $WORKSPACE/contracts/utils/src/rbac.rs
+   |
+   | pub trait RoleBasedAccessControl: Auth {
+   |                                   ^^^^ required by this bound in `RoleBasedAccessControl::renounce_role`
+...
+   |     fn renounce_role(env: &soroban_sdk::Env, role: &soroban_sdk::Symbol, caller: &soroban_sdk::Address) {
+   |        ------------- required by a bound in this associated function
+
+error[E0277]: the trait bound `MyOApp: utils::auth::Auth` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `utils::auth::Auth` is not implemented for `MyOApp`
+   |
+   = help: the trait `utils::auth::Auth` is implemented for `EndpointV2`
+note: required by a bound in `set_role_admin`
+  --> $WORKSPACE/contracts/utils/src/rbac.rs
+   |
+   | pub trait RoleBasedAccessControl: Auth {
+   |                                   ^^^^ required by this bound in `RoleBasedAccessControl::set_role_admin`
+...
+   |     fn set_role_admin(env: &soroban_sdk::Env, role: &soroban_sdk::Symbol, admin_role: &soroban_sdk::Symbol) {
+   |        -------------- required by a bound in this associated function
+
+error[E0277]: the trait bound `MyOApp: utils::auth::Auth` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `utils::auth::Auth` is not implemented for `MyOApp`
+   |
+   = help: the trait `utils::auth::Auth` is implemented for `EndpointV2`
+note: required by a bound in `remove_role_admin`
+  --> $WORKSPACE/contracts/utils/src/rbac.rs
+   |
+   | pub trait RoleBasedAccessControl: Auth {
+   |                                   ^^^^ required by this bound in `RoleBasedAccessControl::remove_role_admin`
+...
+   |     fn remove_role_admin(env: &soroban_sdk::Env, role: &soroban_sdk::Symbol) {
+   |        ----------------- required by a bound in this associated function
+
+error[E0277]: the trait bound `MyOApp: utils::auth::Auth` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `utils::auth::Auth` is not implemented for `MyOApp`
+   |
+   = help: the trait `utils::auth::Auth` is implemented for `EndpointV2`
+note: required by a bound in `has_role`
+  --> $WORKSPACE/contracts/utils/src/rbac.rs
+   |
+   | pub trait RoleBasedAccessControl: Auth {
+   |                                   ^^^^ required by this bound in `RoleBasedAccessControl::has_role`
+...
+   |     fn has_role(env: &soroban_sdk::Env, account: &soroban_sdk::Address, role: &soroban_sdk::Symbol) -> Option<u32> {
+   |        -------- required by a bound in this associated function
+
+error[E0277]: the trait bound `MyOApp: utils::auth::Auth` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `utils::auth::Auth` is not implemented for `MyOApp`
+   |
+   = help: the trait `utils::auth::Auth` is implemented for `EndpointV2`
+note: required by a bound in `get_role_admin`
+  --> $WORKSPACE/contracts/utils/src/rbac.rs
+   |
+   | pub trait RoleBasedAccessControl: Auth {
+   |                                   ^^^^ required by this bound in `RoleBasedAccessControl::get_role_admin`
+...
+   |     fn get_role_admin(env: &soroban_sdk::Env, role: &soroban_sdk::Symbol) -> Option<soroban_sdk::Symbol> {
+   |        -------------- required by a bound in this associated function
+
+error[E0277]: the trait bound `MyOApp: utils::auth::Auth` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `utils::auth::Auth` is not implemented for `MyOApp`
+   |
+   = help: the trait `utils::auth::Auth` is implemented for `EndpointV2`
+note: required by a bound in `get_role_member_count`
+  --> $WORKSPACE/contracts/utils/src/rbac.rs
+   |
+   | pub trait RoleBasedAccessControl: Auth {
+   |                                   ^^^^ required by this bound in `RoleBasedAccessControl::get_role_member_count`
+...
+   |     fn get_role_member_count(env: &soroban_sdk::Env, role: &soroban_sdk::Symbol) -> u32 {
+   |        --------------------- required by a bound in this associated function
+
+error[E0277]: the trait bound `MyOApp: utils::auth::Auth` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `utils::auth::Auth` is not implemented for `MyOApp`
+   |
+   = help: the trait `utils::auth::Auth` is implemented for `EndpointV2`
+note: required by a bound in `get_role_member`
+  --> $WORKSPACE/contracts/utils/src/rbac.rs
+   |
+   | pub trait RoleBasedAccessControl: Auth {
+   |                                   ^^^^ required by this bound in `RoleBasedAccessControl::get_role_member`
+...
+   |     fn get_role_member(env: &soroban_sdk::Env, role: &soroban_sdk::Symbol, index: u32) -> soroban_sdk::Address {
+   |        --------------- required by a bound in this associated function
+
+error[E0277]: the trait bound `MyOApp: utils::auth::Auth` is not satisfied
+  --> tests/ui/oapp/fail/missing_auth_trait.rs:13:12
+   |
+13 | pub struct MyOApp;
+   |            ^^^^^^ the trait `utils::auth::Auth` is not implemented for `MyOApp`
+   |
+   = help: the trait `utils::auth::Auth` is implemented for `EndpointV2`
+note: required by a bound in `get_existing_roles`
+  --> $WORKSPACE/contracts/utils/src/rbac.rs
+   |
+   | pub trait RoleBasedAccessControl: Auth {
+   |                                   ^^^^ required by this bound in `RoleBasedAccessControl::get_existing_roles`
+...
+   |     fn get_existing_roles(env: &soroban_sdk::Env) -> soroban_sdk::Vec<soroban_sdk::Symbol> {
+   |        ------------------ required by a bound in this associated function

package/contracts/macro-integration-tests/tests/ui/oapp/fail/missing_lz_receive_internal.rs

@@ -3,6 +3,7 @@
 use oapp_macros::oapp;
 
 #[oapp]
+#[common_macros::lz_contract]
 pub struct MyOApp;
 
 fn main() {}

package/contracts/macro-integration-tests/tests/ui/oapp/fail/missing_lz_receive_internal.stderr

@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `MyOApp: LzReceiveInternal` is not satisfied
- --> tests/ui/oapp/fail/missing_lz_receive_internal.rs:6:12
+ --> tests/ui/oapp/fail/missing_lz_receive_internal.rs:7:12
   |
-6 | pub struct MyOApp;
+7 | pub struct MyOApp;
   |            ^^^^^^ the trait `LzReceiveInternal` is not implemented for `MyOApp`
   |
 note: required by a bound in `OAppReceiver`
@@ -11,9 +11,9 @@ note: required by a bound in `OAppReceiver`
   |                                    ^^^^^^^^^^^^^^^^^ required by this bound in `OAppReceiver`
 
 error[E0277]: the trait bound `MyOApp: LzReceiveInternal` is not satisfied
- --> tests/ui/oapp/fail/missing_lz_receive_internal.rs:6:12
+ --> tests/ui/oapp/fail/missing_lz_receive_internal.rs:7:12
   |
-6 | pub struct MyOApp;
+7 | pub struct MyOApp;
   |            ^^^^^^ the trait `LzReceiveInternal` is not implemented for `MyOApp`
   |
 note: required by a bound in `oapp::oapp_receiver::OAppReceiver::allow_initialize_path`
@@ -26,9 +26,9 @@ note: required by a bound in `oapp::oapp_receiver::OAppReceiver::allow_initializ
   |        --------------------- required by a bound in this associated function
 
 error[E0277]: the trait bound `MyOApp: LzReceiveInternal` is not satisfied
- --> tests/ui/oapp/fail/missing_lz_receive_internal.rs:6:12
+ --> tests/ui/oapp/fail/missing_lz_receive_internal.rs:7:12
   |
-6 | pub struct MyOApp;
+7 | pub struct MyOApp;
   |            ^^^^^^ the trait `LzReceiveInternal` is not implemented for `MyOApp`
   |
 note: required by a bound in `oapp::oapp_receiver::OAppReceiver::next_nonce`
@@ -41,9 +41,9 @@ note: required by a bound in `oapp::oapp_receiver::OAppReceiver::next_nonce`
   |        ---------- required by a bound in this associated function
 
 error[E0277]: the trait bound `MyOApp: LzReceiveInternal` is not satisfied
- --> tests/ui/oapp/fail/missing_lz_receive_internal.rs:6:12
+ --> tests/ui/oapp/fail/missing_lz_receive_internal.rs:7:12
   |
-6 | pub struct MyOApp;
+7 | pub struct MyOApp;
   |            ^^^^^^ the trait `LzReceiveInternal` is not implemented for `MyOApp`
   |
 note: required by a bound in `oapp::oapp_receiver::OAppReceiver::lz_receive`
@@ -56,9 +56,9 @@ note: required by a bound in `oapp::oapp_receiver::OAppReceiver::lz_receive`
   |        ---------- required by a bound in this associated function
 
 error[E0277]: the trait bound `MyOApp: LzReceiveInternal` is not satisfied
- --> tests/ui/oapp/fail/missing_lz_receive_internal.rs:6:12
+ --> tests/ui/oapp/fail/missing_lz_receive_internal.rs:7:12
   |
-6 | pub struct MyOApp;
+7 | pub struct MyOApp;
   |            ^^^^^^ the trait `LzReceiveInternal` is not implemented for `MyOApp`
   |
 note: required by a bound in `is_compose_msg_sender`

package/contracts/macro-integration-tests/tests/ui/oapp/pass/custom_all.rs

@@ -7,8 +7,10 @@ use oapp::oapp_receiver::{LzReceiveInternal, OAppReceiver};
 use oapp::oapp_sender::OAppSenderInternal;
 use oapp_macros::oapp;
 use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
+use utils::rbac::RoleBasedAccessControl;
 
 #[oapp(custom = [core, sender, receiver, options_type3])]
+#[common_macros::lz_contract]
 pub struct MyOApp;
 
 impl LzReceiveInternal for MyOApp {
@@ -24,6 +26,8 @@ impl LzReceiveInternal for MyOApp {
     }
 }
 
+impl RoleBasedAccessControl for MyOApp {}
+
 #[contractimpl(contracttrait)]
 impl OAppCore for MyOApp {}
 

package/contracts/macro-integration-tests/tests/ui/oapp/pass/custom_single_trait.rs

@@ -13,8 +13,10 @@ use oapp::oapp_receiver::{LzReceiveInternal, OAppReceiver};
 use oapp::oapp_sender::OAppSenderInternal;
 use oapp_macros::oapp;
 use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
+use utils::rbac::RoleBasedAccessControl;
 
 #[oapp(custom = [core])]
+#[common_macros::lz_contract]
 pub struct MyOAppCustomCore;
 
 impl LzReceiveInternal for MyOAppCustomCore {
@@ -30,6 +32,8 @@ impl LzReceiveInternal for MyOAppCustomCore {
     }
 }
 
+impl RoleBasedAccessControl for MyOAppCustomCore {}
+
 #[contractimpl(contracttrait)]
 impl OAppCore for MyOAppCustomCore {
     fn oapp_version(_env: &Env) -> (u64, u64) {
@@ -38,6 +42,7 @@ impl OAppCore for MyOAppCustomCore {
 }
 
 #[oapp(custom = [sender])]
+#[common_macros::lz_contract]
 pub struct MyOAppCustomSender;
 
 impl LzReceiveInternal for MyOAppCustomSender {
@@ -56,6 +61,7 @@ impl LzReceiveInternal for MyOAppCustomSender {
 impl OAppSenderInternal for MyOAppCustomSender {}
 
 #[oapp(custom = [receiver])]
+#[common_macros::lz_contract]
 pub struct MyOAppCustomReceiver;
 
 impl LzReceiveInternal for MyOAppCustomReceiver {
@@ -75,6 +81,7 @@ impl LzReceiveInternal for MyOAppCustomReceiver {
 impl OAppReceiver for MyOAppCustomReceiver {}
 
 #[oapp(custom = [options_type3])]
+#[common_macros::lz_contract]
 pub struct MyOAppCustomOptionsType3;
 
 impl LzReceiveInternal for MyOAppCustomOptionsType3 {

package/contracts/macro-integration-tests/tests/ui/oapp/pass/minimal_contract.rs

@@ -1,9 +1,8 @@
 // UI (trybuild) test: minimal `#[oapp]` usage compiles.
 //
 // Purpose:
-// - Verifies `#[oapp]` applies `#[common_macros::lz_contract]` and generates default
-//   contract-trait implementations for `OAppCore`, `OAppReceiver`, and `OAppOptionsType3`.
-// - Verifies the user must implement `LzReceiveInternal` and that the implementation is usable.
+// - Verifies `#[oapp]` generates default trait impls. User applies `#[lz_contract]` for contract + TTL + Auth.
+// - Verifies the user must implement `LzReceiveInternal`.
 
 use endpoint_v2::Origin;
 use oapp::oapp_receiver::LzReceiveInternal;
@@ -11,6 +10,7 @@ use oapp_macros::oapp;
 use soroban_sdk::{contractimpl, Address, Bytes, BytesN, Env};
 
 #[oapp]
+#[common_macros::lz_contract]
 pub struct MyOApp;
 
 impl LzReceiveInternal for MyOApp {
@@ -30,7 +30,7 @@ impl LzReceiveInternal for MyOApp {
 #[contractimpl]
 impl MyOApp {
     pub fn init(env: Env, owner: Address, endpoint: Address) {
-        // `lz_contract` (applied by `#[oapp]`) provides ownable helpers.
+        // `#[lz_contract]` (user-provided) provides init_owner and Auth.
         Self::init_owner(&env, &owner);
         oapp::oapp_core::OAppCoreStorage::set_endpoint(&env, &endpoint);
 
@@ -45,6 +45,7 @@ impl MyOApp {
 }
 
 #[oapp(custom = [])]
+#[common_macros::lz_contract]
 pub struct MyOAppCustomEmpty;
 
 impl LzReceiveInternal for MyOAppCustomEmpty {

package/contracts/macro-integration-tests/tests/ui/oapp/pass/struct_with_fields.rs

@@ -6,6 +6,7 @@ use oapp_macros::oapp;
 use soroban_sdk::{Address, Bytes, BytesN, Env};
 
 #[oapp]
+#[common_macros::lz_contract]
 #[derive(Clone, Debug)]
 pub struct MyOApp {
     pub x: u32,
@@ -25,6 +26,7 @@ impl LzReceiveInternal for MyOApp {
 }
 
 #[oapp]
+#[common_macros::lz_contract]
 pub struct MyOAppTuple(u32, bool);
 
 impl LzReceiveInternal for MyOAppTuple {

package/contracts/macro-integration-tests/tests/ui/ownable/pass/basic.rs

@@ -30,7 +30,7 @@ impl MyContract {
 
         // A couple key Ownable APIs type-check.
         <Self as utils::ownable::Ownable>::transfer_ownership(&env, &owner);
-        <Self as utils::ownable::Ownable>::propose_ownership_transfer(&env, &owner, 1);
+        <Self as utils::ownable::Ownable>::begin_ownership_transfer(&env, &owner, 1);
         <Self as utils::ownable::Ownable>::accept_ownership(&env);
         <Self as utils::ownable::Ownable>::renounce_ownership(&env);
     }

package/contracts/macro-integration-tests/tests/ui/upgradeable/fail/attr_args.stderr

@@ -4,7 +4,7 @@ error: custom attribute panicked
 7 | #[common_macros::upgradeable(not_migration)]
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
-  = help: message: failed to parse upgradeable config: expected `no_migration`
+  = help: message: failed to parse upgradeable config: expected `no_migration` or `rbac`
 
 error[E0433]: failed to resolve: could not find `MyContract` in the crate root
  --> tests/ui/upgradeable/fail/attr_args.rs:6:1

package/contracts/macro-integration-tests/tests/ui/upgradeable/fail/missing_auth_trait.stderr

@@ -16,7 +16,7 @@ error[E0277]: the trait bound `MyContract: utils::auth::Auth` is not satisfied
 12 | pub struct MyContract;
    |            ^^^^^^^^^^ the trait `utils::auth::Auth` is not implemented for `MyContract`
    |
-note: required by a bound in `upgrade`
+note: required by a bound in `utils::upgradeable::Upgradeable::upgrade`
   --> $WORKSPACE/contracts/utils/src/upgradeable.rs
    |
    | pub trait Upgradeable: UpgradeableInternal + Auth {
@@ -31,7 +31,7 @@ error[E0277]: the trait bound `MyContract: utils::auth::Auth` is not satisfied
 12 | pub struct MyContract;
    |            ^^^^^^^^^^ the trait `utils::auth::Auth` is not implemented for `MyContract`
    |
-note: required by a bound in `migrate`
+note: required by a bound in `utils::upgradeable::Upgradeable::migrate`
   --> $WORKSPACE/contracts/utils/src/upgradeable.rs
    |
    | pub trait Upgradeable: UpgradeableInternal + Auth {

package/contracts/macro-integration-tests/tests/ui/upgradeable/fail/missing_upgradeable_internal.stderr

@@ -24,7 +24,7 @@ error[E0277]: the trait bound `MyContract: UpgradeableInternal` is not satisfied
 8 | pub struct MyContract;
   |            ^^^^^^^^^^ the trait `UpgradeableInternal` is not implemented for `MyContract`
   |
-note: required by a bound in `upgrade`
+note: required by a bound in `utils::upgradeable::Upgradeable::upgrade`
  --> $WORKSPACE/contracts/utils/src/upgradeable.rs
   |
   | pub trait Upgradeable: UpgradeableInternal + Auth {
@@ -39,7 +39,7 @@ error[E0277]: the trait bound `MyContract: UpgradeableInternal` is not satisfied
 8 | pub struct MyContract;
   |            ^^^^^^^^^^ the trait `UpgradeableInternal` is not implemented for `MyContract`
   |
-note: required by a bound in `migrate`
+note: required by a bound in `utils::upgradeable::Upgradeable::migrate`
  --> $WORKSPACE/contracts/utils/src/upgradeable.rs
   |
   | pub trait Upgradeable: UpgradeableInternal + Auth {