@layerzerolabs/protocol-stellar-v2 0.2.121 → 0.2.122

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

@@ -1,166 +0,0 @@
-//! # OApp Procedural Macros
-//!
-//! This crate provides the `#[oapp]` procedural macro for implementing LayerZero OApp
-//! (Omnichain Application) functionality on Soroban smart contracts.
-//!
-//! ## Overview
-//!
-//! The OApp framework provides full bidirectional cross-chain communication:
-//!
-//! - **OAppCore**: Foundation for all OApp functionality (peer management, endpoint access)
-//! - **OAppSenderInternal**: Enables sending cross-chain messages through LayerZero
-//! - **LzReceiveInternal**: Internal trait for message handling logic
-//! - **OAppReceiver**: Handles incoming cross-chain messages (has default `lz_receive` impl)
-//! - **OAppOptionsType3**: Manages enforced options for message execution parameters
-//!
-//! ## Usage
-//!
-//! ### `#[oapp]`
-//! The main macro that provides Core + Sender + Receiver + OptionsType3 functionality.
-//! This is the only macro you need for cross-chain communication.
-//!
-//! ### Custom Implementations
-//!
-//! By default, `#[oapp]` generates default trait implementations. Use `#[oapp(custom = [...])]`
-//! to provide your own custom implementations for specific traits:
-//!
-//! Supported options:
-//! - `core` - Custom implement `OAppCore`
-//! - `sender` - Custom implement `OAppSenderInternal`
-//! - `receiver` - Custom implement `OAppReceiver` (useful for custom `next_nonce`, etc.)
-//! - `options_type3` - Custom implement `OAppOptionsType3`
-//!
-//! ## Examples
-//!
-//! ### Full OApp with Default Implementations
-//!
-//! ```ignore
-//! use oapp::oapp_receiver::LzReceiveInternal;
-//! use oapp_macros::oapp;
-//!
-//! #[oapp]
-//! #[common_macros::lz_contract]
-//! struct MyOApp;
-//!
-//! // Implement LzReceiveInternal to handle incoming messages
-//! impl LzReceiveInternal for MyOApp {
-//!     fn __lz_receive(
-//!         env: &Env,
-//!         origin: &Origin,
-//!         guid: &BytesN<32>,
-//!         message: &Bytes,
-//!         extra_data: &Bytes,
-//!         executor: &Address,
-//!         value: i128,
-//!     ) {
-//!         // Your message handling logic (clear_payload_and_transfer already called)
-//!     }
-//! }
-//! ```
-//!
-//! ### OApp with Custom Core Version
-//!
-//! ```ignore
-//! use oapp::oapp_receiver::LzReceiveInternal;
-//! use utils::rbac::RoleBasedAccessControl;
-//!
-//! #[oapp(custom = [core])]
-//! #[common_macros::lz_contract]
-//! struct MyOApp;
-//!
-//! // Required: `custom = [core]` skips generating both OAppCore and RoleBasedAccessControl impls
-//! impl RoleBasedAccessControl for MyOApp {}
-//!
-//! #[contractimpl(contracttrait)]
-//! impl OAppCore for MyOApp {
-//!     fn oapp_version(_env: &Env) -> (u64, u64) {
-//!         (1, 1) // Custom version
-//!     }
-//! }
-//!
-//! impl LzReceiveInternal for MyOApp {
-//!     fn __lz_receive(...) { /* ... */ }
-//! }
-//! ```
-//!
-//! ### OApp with Custom Receiver (e.g., ordered delivery)
-//!
-//! ```ignore
-//! use oapp::oapp_receiver::{LzReceiveInternal, OAppReceiver};
-//!
-//! #[oapp(custom = [receiver])]
-//! #[common_macros::lz_contract]
-//! struct MyOrderedOApp;
-//!
-//! impl LzReceiveInternal for MyOrderedOApp {
-//!     fn __lz_receive(env: &Env, origin: &Origin, guid: &BytesN<32>, ...) {
-//!         // Your message handling logic
-//!     }
-//! }
-//!
-//! #[contractimpl(contracttrait)]
-//! impl OAppReceiver for MyOrderedOApp {
-//!     fn next_nonce(env: &Env, src_eid: u32, sender: &BytesN<32>) -> u64 {
-//!         // Custom nonce logic for ordered delivery
-//!         Storage::max_received_nonce(env, src_eid, sender) + 1
-//!     }
-//!     // lz_receive uses default impl which calls clear_payload_and_transfer then __lz_receive
-//! }
-//! ```
-//!
-//! ### OApp with Multiple Custom Implementations
-//!
-//! ```ignore
-//! use oapp::oapp_receiver::LzReceiveInternal;
-//! use utils::rbac::RoleBasedAccessControl;
-//!
-//! #[oapp(custom = [core, sender, options_type3])]
-//! #[common_macros::lz_contract]
-//! struct MyCustomOApp;
-//!
-//! // Required: `custom = [core]` skips generating both OAppCore and RoleBasedAccessControl impls
-//! impl RoleBasedAccessControl for MyCustomOApp {}
-//!
-//! #[contractimpl(contracttrait)]
-//! impl OAppCore for MyCustomOApp { /* ... */ }
-//! impl OAppSenderInternal for MyCustomOApp { /* ... */ }
-//! #[contractimpl(contracttrait)]
-//! impl OAppOptionsType3 for MyCustomOApp { /* ... */ }
-//!
-//! impl LzReceiveInternal for MyCustomOApp {
-//!     fn __lz_receive(...) { /* ... */ }
-//! }
-//! ```
-
-mod generators;
-
-use proc_macro::TokenStream;
-
-/// Derives OApp trait implementations. Apply `#[lz_contract]` (or similar) for contract + TTL + Auth.
-///
-/// ## Usage
-///
-/// ```ignore
-/// // Default: generates all trait implementations
-/// #[oapp]
-/// struct MyOApp;
-///
-/// // Provide custom implementations for specific traits
-/// #[oapp(custom = [core, receiver])]
-/// struct MyCustomOApp;
-/// ```
-///
-/// ## Custom Options
-/// - `core` - Manually implement `OAppCore`
-/// - `sender` - Manually implement `OAppSenderInternal`
-/// - `receiver` - Manually implement `OAppReceiver`
-/// - `options_type3` - Manually implement `OAppOptionsType3`
-///
-/// You must implement `LzReceiveInternal` for your struct. See module docs for examples.
-#[proc_macro_attribute]
-pub fn oapp(attr: TokenStream, item: TokenStream) -> TokenStream {
-    generators::generate_oapp(attr.into(), item.into()).into()
-}
-
-#[cfg(test)]
-mod tests;

package/contracts/oapps/oapp-macros/src/tests/mod.rs

@@ -1,2 +0,0 @@
-mod oapp;
-mod parse_custom_impls;

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

@@ -1,74 +0,0 @@
-use quote::quote;
-
-// ============================================
-// Snapshot Tests: OApp Code Generation
-// ============================================
-
-#[test]
-fn snapshot_generate_oapp() {
-    let struct_input = quote! {
-        pub struct MyOApp;
-    };
-
-    let all_defaults = {
-        let result = crate::generators::generate_oapp(quote! {}, struct_input.clone());
-        prettyplease::unparse(&syn::parse2::<syn::File>(result).expect("failed to parse generated code"))
-    };
-
-    let custom_core_only = {
-        let result = crate::generators::generate_oapp(quote! { custom = [core] }, struct_input.clone());
-        prettyplease::unparse(&syn::parse2::<syn::File>(result).expect("failed to parse generated code"))
-    };
-
-    let custom_sender_only = {
-        let result = crate::generators::generate_oapp(quote! { custom = [sender] }, struct_input.clone());
-        prettyplease::unparse(&syn::parse2::<syn::File>(result).expect("failed to parse generated code"))
-    };
-
-    let custom_receiver_only = {
-        let result = crate::generators::generate_oapp(quote! { custom = [receiver] }, struct_input.clone());
-        prettyplease::unparse(&syn::parse2::<syn::File>(result).expect("failed to parse generated code"))
-    };
-
-    let custom_options_type3_only = {
-        let result = crate::generators::generate_oapp(quote! { custom = [options_type3] }, struct_input.clone());
-        prettyplease::unparse(&syn::parse2::<syn::File>(result).expect("failed to parse generated code"))
-    };
-
-    let custom_all = {
-        let result = crate::generators::generate_oapp(
-            quote! { custom = [core, sender, receiver, options_type3] },
-            struct_input.clone(),
-        );
-        prettyplease::unparse(&syn::parse2::<syn::File>(result).expect("failed to parse generated code"))
-    };
-
-    let preserves_struct_attributes_and_fields = {
-        let fancy_input = quote! {
-            #[derive(Clone, Debug)]
-            pub struct FancyOApp {
-                pub x: u32,
-            }
-        };
-        let result = crate::generators::generate_oapp(quote! {}, fancy_input);
-        prettyplease::unparse(&syn::parse2::<syn::File>(result).expect("failed to parse generated code"))
-    };
-
-    let combined = format!(
-        "// === Default (no custom impls) ===\n\n{}\n\n\
-// === custom = [core] ===\n\n{}\n\n\
-// === custom = [sender] ===\n\n{}\n\n\
-// === custom = [receiver] ===\n\n{}\n\n\
-// === custom = [options_type3] ===\n\n{}\n\n\
-// === custom = [core, sender, receiver, options_type3] ===\n\n{}\n\n\
-// === Struct attributes + fields are preserved ===\n\n{}",
-        all_defaults,
-        custom_core_only,
-        custom_sender_only,
-        custom_receiver_only,
-        custom_options_type3_only,
-        custom_all,
-        preserves_struct_attributes_and_fields
-    );
-    insta::assert_snapshot!(combined);
-}

package/contracts/oapps/oapp-macros/src/tests/parse_custom_impls.rs

@@ -1,90 +0,0 @@
-use quote::quote;
-
-// ============================================
-// Unit Tests: #[oapp(custom = [...])] parsing
-// ============================================
-
-#[test]
-fn test_custom_impls_parse_empty_is_default() {
-    let parsed: crate::generators::CustomImpls = syn::parse2(quote! {}).expect("failed to parse empty attrs");
-    assert!(!parsed.core);
-    assert!(!parsed.sender);
-    assert!(!parsed.receiver);
-    assert!(!parsed.options_type3);
-}
-
-#[test]
-fn test_custom_impls_parse_valid_all_list() {
-    let parsed: crate::generators::CustomImpls =
-        syn::parse2(quote! { custom = [core, sender, receiver, options_type3] }).expect("failed to parse attrs");
-    assert!(parsed.core);
-    assert!(parsed.sender);
-    assert!(parsed.receiver);
-    assert!(parsed.options_type3);
-}
-
-#[test]
-fn test_custom_impls_parse_empty_custom_list_is_default() {
-    let parsed: crate::generators::CustomImpls = syn::parse2(quote! { custom = [] }).expect("failed to parse attrs");
-    assert!(!parsed.core);
-    assert!(!parsed.sender);
-    assert!(!parsed.receiver);
-    assert!(!parsed.options_type3);
-}
-
-#[test]
-fn test_custom_impls_allows_trailing_comma() {
-    let parsed: crate::generators::CustomImpls =
-        syn::parse2(quote! { custom = [core,] }).expect("failed to parse attrs");
-    assert!(parsed.core);
-    assert!(!parsed.sender);
-    assert!(!parsed.receiver);
-    assert!(!parsed.options_type3);
-}
-
-#[test]
-fn test_custom_impls_allows_duplicates() {
-    // Duplicates are harmless and should not cause parsing to fail.
-    let parsed: crate::generators::CustomImpls =
-        syn::parse2(quote! { custom = [core, core, receiver, receiver] }).expect("failed to parse attrs");
-    assert!(parsed.core);
-    assert!(!parsed.sender);
-    assert!(parsed.receiver);
-    assert!(!parsed.options_type3);
-}
-
-#[test]
-fn test_custom_impls_rejects_wrong_key() {
-    let err =
-        syn::parse2::<crate::generators::CustomImpls>(quote! { nope = [core] }).expect_err("expected parse failure");
-    assert!(err.to_string().contains("expected `custom`"), "unexpected error: {err}");
-}
-
-#[test]
-fn test_custom_impls_rejects_unknown_ident() {
-    let err = syn::parse2::<crate::generators::CustomImpls>(quote! { custom = [core, not_a_real_option] })
-        .expect_err("expected failure");
-    assert!(
-        err.to_string().contains("expected one of `core`, `sender`, `receiver`, `options_type3`"),
-        "unexpected error: {err}"
-    );
-}
-
-#[test]
-fn test_custom_impls_rejects_trailing_tokens_after_list() {
-    // `syn::parse2` expects the parser to consume the full stream.
-    syn::parse2::<crate::generators::CustomImpls>(quote! { custom = [core] extra })
-        .expect_err("expected parse failure due to trailing tokens");
-}
-
-#[test]
-fn test_custom_impls_rejects_missing_equals() {
-    syn::parse2::<crate::generators::CustomImpls>(quote! { custom [core] })
-        .expect_err("expected parse failure (missing `=`)");
-}
-
-#[test]
-fn test_custom_impls_rejects_non_bracketed_list() {
-    syn::parse2::<crate::generators::CustomImpls>(quote! { custom = (core) })
-        .expect_err("expected parse failure (not `[...]`)");
-}

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

@@ -1,111 +0,0 @@
----
-source: contracts/oapps/oapp-macros/src/tests/oapp.rs
-assertion_line: 87
-expression: combined
----
-// === Default (no custom impls) ===
-
-pub struct MyOApp;
-use oapp::oapp_core::OAppCore as _;
-use utils::rbac::RoleBasedAccessControl as _;
-#[soroban_sdk::contractimpl(contracttrait)]
-impl oapp::oapp_core::OAppCore for MyOApp {}
-#[soroban_sdk::contractimpl(contracttrait)]
-impl utils::rbac::RoleBasedAccessControl for MyOApp {}
-use oapp::oapp_sender::OAppSenderInternal as _;
-impl oapp::oapp_sender::OAppSenderInternal for MyOApp {}
-use oapp::oapp_receiver::OAppReceiver as _;
-#[soroban_sdk::contractimpl(contracttrait)]
-impl oapp::oapp_receiver::OAppReceiver for MyOApp {}
-use oapp::oapp_options_type3::OAppOptionsType3 as _;
-#[soroban_sdk::contractimpl(contracttrait)]
-impl oapp::oapp_options_type3::OAppOptionsType3 for MyOApp {}
-
-
-// === custom = [core] ===
-
-pub struct MyOApp;
-use oapp::oapp_sender::OAppSenderInternal as _;
-impl oapp::oapp_sender::OAppSenderInternal for MyOApp {}
-use oapp::oapp_receiver::OAppReceiver as _;
-#[soroban_sdk::contractimpl(contracttrait)]
-impl oapp::oapp_receiver::OAppReceiver for MyOApp {}
-use oapp::oapp_options_type3::OAppOptionsType3 as _;
-#[soroban_sdk::contractimpl(contracttrait)]
-impl oapp::oapp_options_type3::OAppOptionsType3 for MyOApp {}
-
-
-// === custom = [sender] ===
-
-pub struct MyOApp;
-use oapp::oapp_core::OAppCore as _;
-use utils::rbac::RoleBasedAccessControl as _;
-#[soroban_sdk::contractimpl(contracttrait)]
-impl oapp::oapp_core::OAppCore for MyOApp {}
-#[soroban_sdk::contractimpl(contracttrait)]
-impl utils::rbac::RoleBasedAccessControl for MyOApp {}
-use oapp::oapp_receiver::OAppReceiver as _;
-#[soroban_sdk::contractimpl(contracttrait)]
-impl oapp::oapp_receiver::OAppReceiver for MyOApp {}
-use oapp::oapp_options_type3::OAppOptionsType3 as _;
-#[soroban_sdk::contractimpl(contracttrait)]
-impl oapp::oapp_options_type3::OAppOptionsType3 for MyOApp {}
-
-
-// === custom = [receiver] ===
-
-pub struct MyOApp;
-use oapp::oapp_core::OAppCore as _;
-use utils::rbac::RoleBasedAccessControl as _;
-#[soroban_sdk::contractimpl(contracttrait)]
-impl oapp::oapp_core::OAppCore for MyOApp {}
-#[soroban_sdk::contractimpl(contracttrait)]
-impl utils::rbac::RoleBasedAccessControl for MyOApp {}
-use oapp::oapp_sender::OAppSenderInternal as _;
-impl oapp::oapp_sender::OAppSenderInternal for MyOApp {}
-use oapp::oapp_options_type3::OAppOptionsType3 as _;
-#[soroban_sdk::contractimpl(contracttrait)]
-impl oapp::oapp_options_type3::OAppOptionsType3 for MyOApp {}
-
-
-// === custom = [options_type3] ===
-
-pub struct MyOApp;
-use oapp::oapp_core::OAppCore as _;
-use utils::rbac::RoleBasedAccessControl as _;
-#[soroban_sdk::contractimpl(contracttrait)]
-impl oapp::oapp_core::OAppCore for MyOApp {}
-#[soroban_sdk::contractimpl(contracttrait)]
-impl utils::rbac::RoleBasedAccessControl for MyOApp {}
-use oapp::oapp_sender::OAppSenderInternal as _;
-impl oapp::oapp_sender::OAppSenderInternal for MyOApp {}
-use oapp::oapp_receiver::OAppReceiver as _;
-#[soroban_sdk::contractimpl(contracttrait)]
-impl oapp::oapp_receiver::OAppReceiver for MyOApp {}
-
-
-// === custom = [core, sender, receiver, options_type3] ===
-
-pub struct MyOApp;
-
-
-// === Struct attributes + fields are preserved ===
-
-#[derive(Clone, Debug)]
-pub struct FancyOApp {
-    pub x: u32,
-}
-use oapp::oapp_core::OAppCore as _;
-use utils::rbac::RoleBasedAccessControl as _;
-#[soroban_sdk::contractimpl(contracttrait)]
-impl oapp::oapp_core::OAppCore for FancyOApp {}
-#[soroban_sdk::contractimpl(contracttrait)]
-impl utils::rbac::RoleBasedAccessControl for FancyOApp {}
-use oapp::oapp_sender::OAppSenderInternal as _;
-impl oapp::oapp_sender::OAppSenderInternal for FancyOApp {}
-use oapp::oapp_receiver::OAppReceiver as _;
-#[soroban_sdk::contractimpl(contracttrait)]
-impl oapp::oapp_receiver::OAppReceiver for FancyOApp {}
-use oapp::oapp_options_type3::OAppOptionsType3 as _;
-#[soroban_sdk::contractimpl(contracttrait)]
-impl oapp::oapp_options_type3::OAppOptionsType3 for FancyOApp {}

package/contracts/oapps/oft/Cargo.toml

@@ -1,30 +0,0 @@
-[package]
-name = "oft"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-doctest = false
-
-[features]
-library = []
-testutils = []
-
-[dependencies]
-soroban-sdk = { workspace = true }
-cfg-if = { workspace = true }
-utils = { workspace = true }
-common-macros = { workspace = true }
-endpoint-v2 = { workspace = true, features = ["library"] }
-oapp = { workspace = true }
-oapp-macros = { workspace = true }
-oft-core = { workspace = true }
-
-[dev-dependencies]
-soroban-sdk = { workspace = true, features = ["testutils"] }
-simple-message-lib = { workspace = true, features = ["testutils"] }
-message-lib-common = { workspace = true, features = ["testutils"] }
-endpoint-v2 = { workspace = true, features = ["testutils"] }
-utils = { workspace = true, features = ["testutils"] }

package/contracts/oapps/oft/integration-tests/extensions/mod.rs

@@ -1,3 +0,0 @@
-mod test_oft_fee;
-mod test_pausable;
-mod test_rate_limiter;

package/contracts/oapps/oft/integration-tests/extensions/test_oft_fee.rs

@@ -1,172 +0,0 @@
-//! OFT Fee extension e2e tests for OFT-STD.
-//!
-//! Tests verify that the OFTFee extension properly collects fees on cross-chain transfers.
-//! Key behavior: at debit_view, apply fee first then remove dust.
-//! - If fee is zero: amount_sent_ld == amount_received_ld
-//! - If fee is non-zero: amount_sent_ld is unchanged (original amount)
-
-use crate::integration_tests::{
-    setup::{create_recipient_address, decode_packet, setup, wire_endpoint, wire_oft, TestSetup},
-    utils::{
-        address_to_peer_bytes32, create_send_param, lz_receive, mint_oft_token_to, mint_to, quote_oft, quote_send,
-        scan_packet_sent_event, send, send_with_fee, set_default_fee_bps, set_fee_bps, set_fee_deposit_address,
-        token_balance, validate_packet,
-    },
-};
-use soroban_sdk::{testutils::Address as _, token::TokenClient, Address};
-
-/// Test e2e cross-chain transfer with zero fee (default)
-#[test]
-fn test_cross_chain_with_zero_fee() {
-    let TestSetup { env, chain_a, chain_b } = setup();
-    wire_endpoint(&env, &[&chain_a, &chain_b]);
-    wire_oft(&env, &[&chain_a, &chain_b]);
-
-    let sender = Address::generate(&env);
-    let receiver = create_recipient_address(&env);
-    let executor = Address::generate(&env);
-
-    mint_oft_token_to(&env, &chain_a, &sender, 10_000_000);
-    mint_to(&env, &chain_a.owner, &chain_a.native_token, &sender, 10_000_000_000);
-
-    // Default fee state on both OFTs
-    assert_eq!(chain_a.oft.default_fee_bps(), None);
-    assert_eq!(chain_a.oft.fee_deposit_address(), None);
-    assert_eq!(chain_a.oft.effective_fee_bps(&chain_b.eid), 0);
-    assert_eq!(chain_b.oft.default_fee_bps(), None);
-    assert_eq!(chain_b.oft.fee_deposit_address(), None);
-    assert_eq!(chain_b.oft.effective_fee_bps(&chain_a.eid), 0);
-
-    let to = address_to_peer_bytes32(&receiver);
-    let send_param = create_send_param(&env, chain_b.eid, 1_000_000, 0, &to);
-    let (_, _, oft_receipt) = quote_oft(&chain_a, &sender, &send_param);
-
-    // With zero fee, amount_sent_ld == amount_received_ld (after dust removal)
-    assert_eq!(oft_receipt.amount_sent_ld, oft_receipt.amount_received_ld);
-
-    let fee = quote_send(&env, &chain_a, &sender, &send_param, false);
-    send(&env, &chain_a, &sender, &send_param, &fee, &sender, &oft_receipt);
-
-    let packet_event = scan_packet_sent_event(&env, &chain_a.endpoint.address).unwrap();
-    validate_packet(&env, &chain_b, &packet_event);
-    let packet = decode_packet(&env, &packet_event.0);
-
-    lz_receive(&env, &chain_b, &executor, &packet, &receiver, 0);
-
-    // Verify receiver got full amount (no fee)
-    let receiver_balance = TokenClient::new(&env, &chain_b.oft_token).balance(&receiver);
-    assert_eq!(receiver_balance, oft_receipt.amount_received_ld);
-}
-
-/// Test e2e cross-chain transfer with fee enabled
-#[test]
-fn test_cross_chain_with_fee() {
-    let TestSetup { env, chain_a, chain_b } = setup();
-    wire_endpoint(&env, &[&chain_a, &chain_b]);
-    wire_oft(&env, &[&chain_a, &chain_b]);
-
-    let sender = Address::generate(&env);
-    let receiver = create_recipient_address(&env);
-    let executor = Address::generate(&env);
-
-    mint_oft_token_to(&env, &chain_a, &sender, 10_000_000);
-    mint_to(&env, &chain_a.owner, &chain_a.native_token, &sender, 10_000_000_000);
-
-    // Enable 1% fee (100 bps)
-    set_fee_deposit_address(&env, &chain_a, &chain_a.fee_collector);
-    set_default_fee_bps(&env, &chain_a, 100);
-    assert_eq!(chain_a.oft.default_fee_bps(), Some(100));
-    assert_eq!(chain_a.oft.fee_deposit_address(), Some(chain_a.fee_collector.clone()));
-    assert_eq!(chain_a.oft.effective_fee_bps(&chain_b.eid), 100);
-    assert_eq!(chain_b.oft.default_fee_bps(), None);
-    assert_eq!(chain_b.oft.fee_deposit_address(), None);
-    assert_eq!(chain_b.oft.effective_fee_bps(&chain_a.eid), 0);
-
-    let to = address_to_peer_bytes32(&receiver);
-    let amount_ld = 1_000_000i128;
-    let send_param = create_send_param(&env, chain_b.eid, amount_ld, 0, &to);
-    let (_, _, oft_receipt) = quote_oft(&chain_a, &sender, &send_param);
-
-    // With fee, amount_sent_ld stays original, amount_received_ld is reduced
-    assert_eq!(oft_receipt.amount_sent_ld, amount_ld);
-    assert!(oft_receipt.amount_received_ld < amount_ld);
-
-    // Expected fee: 1% of 1,000,000 = 10,000
-    let expected_fee = 10_000i128;
-    let actual_fee = oft_receipt.amount_sent_ld - oft_receipt.amount_received_ld;
-    assert_eq!(actual_fee, expected_fee);
-
-    let fee = quote_send(&env, &chain_a, &sender, &send_param, false);
-    send_with_fee(&env, &chain_a, &sender, &send_param, &fee, &sender, &oft_receipt, &chain_a.fee_collector);
-
-    // IMPORTANT: Scan events immediately after send, before any other operations
-    let packet_event = scan_packet_sent_event(&env, &chain_a.endpoint.address).unwrap();
-    validate_packet(&env, &chain_b, &packet_event);
-    let packet = decode_packet(&env, &packet_event.0);
-
-    // Verify fee was collected on source chain
-    let fee_collector_balance = token_balance(&env, &chain_a.oft_token, &chain_a.fee_collector);
-    assert_eq!(fee_collector_balance, expected_fee);
-
-    lz_receive(&env, &chain_b, &executor, &packet, &receiver, 0);
-
-    // Verify receiver got amount after fee
-    let receiver_balance = TokenClient::new(&env, &chain_b.oft_token).balance(&receiver);
-    assert_eq!(receiver_balance, oft_receipt.amount_received_ld);
-}
-
-/// Test e2e cross-chain transfer with destination-specific fee
-#[test]
-fn test_cross_chain_with_destination_specific_fee() {
-    let TestSetup { env, chain_a, chain_b } = setup();
-    wire_endpoint(&env, &[&chain_a, &chain_b]);
-    wire_oft(&env, &[&chain_a, &chain_b]);
-
-    let sender = Address::generate(&env);
-    let receiver = create_recipient_address(&env);
-    let executor = Address::generate(&env);
-
-    mint_oft_token_to(&env, &chain_a, &sender, 10_000_000);
-    mint_to(&env, &chain_a.owner, &chain_a.native_token, &sender, 10_000_000_000);
-
-    // Set default fee 1% and destination-specific fee 2% for chain_b
-    set_fee_deposit_address(&env, &chain_a, &chain_a.fee_collector);
-    set_default_fee_bps(&env, &chain_a, 100); // 1%
-    set_fee_bps(&env, &chain_a, chain_b.eid, 200); // 2% for chain_b
-    assert_eq!(chain_a.oft.default_fee_bps(), Some(100));
-    assert_eq!(chain_a.oft.fee_bps(&chain_b.eid), Some(200));
-    assert_eq!(chain_a.oft.fee_deposit_address(), Some(chain_a.fee_collector.clone()));
-    assert_eq!(chain_a.oft.effective_fee_bps(&chain_b.eid), 200);
-    assert_eq!(chain_b.oft.default_fee_bps(), None);
-    assert_eq!(chain_b.oft.fee_bps(&chain_a.eid), None);
-    assert_eq!(chain_b.oft.fee_deposit_address(), None);
-    assert_eq!(chain_b.oft.effective_fee_bps(&chain_a.eid), 0);
-
-    let to = address_to_peer_bytes32(&receiver);
-    let amount_ld = 1_000_000i128;
-    let send_param = create_send_param(&env, chain_b.eid, amount_ld, 0, &to);
-    let (_, _, oft_receipt) = quote_oft(&chain_a, &sender, &send_param);
-
-    // 2% fee on 1,000,000 = 20,000
-    let expected_fee = 20_000i128;
-    let actual_fee = oft_receipt.amount_sent_ld - oft_receipt.amount_received_ld;
-    assert_eq!(actual_fee, expected_fee);
-
-    let fee = quote_send(&env, &chain_a, &sender, &send_param, false);
-    send_with_fee(&env, &chain_a, &sender, &send_param, &fee, &sender, &oft_receipt, &chain_a.fee_collector);
-
-    // IMPORTANT: Scan events immediately after send, before any other operations
-    let packet_event = scan_packet_sent_event(&env, &chain_a.endpoint.address).unwrap();
-    validate_packet(&env, &chain_b, &packet_event);
-    let packet = decode_packet(&env, &packet_event.0);
-
-    // Verify fee was collected
-    let fee_collector_balance = token_balance(&env, &chain_a.oft_token, &chain_a.fee_collector);
-    assert_eq!(fee_collector_balance, expected_fee);
-
-    lz_receive(&env, &chain_b, &executor, &packet, &receiver, 0);
-
-    // Verify receiver got correct amount
-    let receiver_balance = TokenClient::new(&env, &chain_b.oft_token).balance(&receiver);
-    assert_eq!(receiver_balance, oft_receipt.amount_received_ld);
-}