@layerzerolabs/protocol-stellar-v2 0.2.8 → 0.2.10

package/contracts/common-macros/src/ttl_configurable.rs

@@ -5,56 +5,73 @@
 //! - Ownable trait implementation
 //! - TtlConfigurable trait implementation with owner auth checks
 
-use proc_macro2::TokenStream as TokenStream2;
+use proc_macro2::TokenStream;
 use quote::quote;
 
 /// Generates the TtlConfigurable trait implementation for a contract.
 ///
 /// The implementation delegates to `DefaultTtlConfigurable` and adds
 /// owner authentication checks for mutating functions.
-pub fn generate_ttl_configurable_impl(input: &syn::ItemStruct) -> TokenStream2 {
-    let name = &input.ident;
+pub fn generate_ttl_configurable_impl(input: TokenStream) -> TokenStream {
+    let item_struct: syn::ItemStruct = syn::parse2(input).unwrap_or_else(|e| panic!("failed to parse struct: {}", e));
+    let name = &item_struct.ident;
+
     let expanded = quote! {
         use utils::ttl::TtlConfigurable as _;
 
+        // TODO: should use custom contract_impl macro instead of soroban_sdk::contractimpl
         #[soroban_sdk::contractimpl]
         impl utils::ttl::TtlConfigurable for #name {
 
             #[common_macros::only_owner]
-            fn set_ttl_config(
+            fn set_ttl_configs(
                 env: &soroban_sdk::Env,
                 instance: &Option<utils::ttl::TtlConfig>,
                 persistent: &Option<utils::ttl::TtlConfig>,
-                temporary: &Option<utils::ttl::TtlConfig>,
             ) {
-                utils::ttl::DefaultTtlConfigurable::set_ttl_config(env, instance, persistent, temporary);
+                utils::ttl::DefaultTtlConfigurable::set_ttl_configs(env, instance, persistent);
             }
 
-            fn ttl_config(
+            fn ttl_configs(
                 env: &soroban_sdk::Env,
             ) -> (
                 Option<utils::ttl::TtlConfig>,
                 Option<utils::ttl::TtlConfig>,
-                Option<utils::ttl::TtlConfig>,
             ) {
-                utils::ttl::DefaultTtlConfigurable::ttl_config(env)
+                utils::ttl::DefaultTtlConfigurable::ttl_configs(env)
             }
 
             #[common_macros::only_owner]
-            fn freeze_ttl_config(env: &soroban_sdk::Env) {
-                utils::ttl::DefaultTtlConfigurable::freeze_ttl_config(env);
+            fn freeze_ttl_configs(env: &soroban_sdk::Env) {
+                utils::ttl::DefaultTtlConfigurable::freeze_ttl_configs(env);
             }
 
-            fn is_ttl_config_frozen(env: &soroban_sdk::Env) -> bool {
-                utils::ttl::DefaultTtlConfigurable::is_ttl_config_frozen(env)
+            fn is_ttl_configs_frozen(env: &soroban_sdk::Env) -> bool {
+                utils::ttl::DefaultTtlConfigurable::is_ttl_configs_frozen(env)
             }
         }
     };
 
+    let inherent_impl = quote! {
+        #[soroban_sdk::contractimpl]
+            impl #name {
+                /// Extends the instance TTL.
+                ///
+                /// # Arguments
+                ///
+                /// * `threshold` - The threshold to extend the TTL.
+                /// * `extend_to` - The TTL to extend to.
+                pub fn extend_instance_ttl(env: &soroban_sdk::Env, threshold: u32, extend_to: u32) {
+                    env.storage().instance().extend_ttl(threshold, extend_to);
+                }
+        }
+    };
+
     quote! {
         #[common_macros::ownable]
-        #input
+        #item_struct
 
         #expanded
+        #inherent_impl
     }
 }

package/contracts/common-macros/src/utils.rs

@@ -0,0 +1,27 @@
+use syn::{punctuated::Punctuated, token::Comma, FnArg, Ident, Pat, Type, TypePath};
+
+/// Finds the `Env` argument identifier in a function signature.
+pub fn find_env_ident(args: &Punctuated<FnArg, Comma>) -> Option<&Ident> {
+    args.iter().find_map(|arg| {
+        let FnArg::Typed(pat_type) = arg else { return None };
+        if !is_env_type(&pat_type.ty) {
+            return None;
+        }
+        let Pat::Ident(pat) = pat_type.pat.as_ref() else { return None };
+        Some(&pat.ident)
+    })
+}
+
+/// Expects the `Env` argument identifier in a function signature.
+pub fn expect_env_ident(args: &Punctuated<FnArg, Comma>) -> &Ident {
+    find_env_ident(args).expect("function must have an Env argument")
+}
+
+/// Checks if a type is an `Env` type.
+pub fn is_env_type(ty: &Type) -> bool {
+    match ty {
+        Type::Path(TypePath { path, .. }) => path.segments.last().is_some_and(|seg| seg.ident == "Env"),
+        Type::Reference(r) => is_env_type(&r.elem),
+        _ => false,
+    }
+}

package/contracts/endpoint-v2/ARCHITECTURE.md

@@ -95,7 +95,7 @@ The main Soroban contract that implements all interfaces and delegates to intern
 #[contract]
 pub struct EndpointV2;
 
-#[contractimpl]
+#[contract_impl]
 impl EndpointV2 {
     pub fn __constructor(env: &Env, eid: u32, native_token: &Address, owner: &Address) {
         storage::EndpointData::set_eid(env, eid);
@@ -103,13 +103,13 @@ impl EndpointV2 {
         ownable::set_owner(env, owner);
     }
 
-    pub fn set_ttl_config(env: &Env, ...) {
+    pub fn set_ttl_configs(env: &Env, ...) {
         ownable::require_owner_auth(env);
         // Configure TTL settings for storage
     }
 }
 
-#[contractimpl]
+#[contract_impl]
 impl ILayerZeroEndpointV2 for EndpointV2 {
     fn send(env: &Env, sender: &Address, params: &MessagingParams, ...) -> MessagingReceipt {
         sender.require_auth();
@@ -123,7 +123,7 @@ impl ILayerZeroEndpointV2 for EndpointV2 {
     }
 }
 
-#[contractimpl]
+#[contract_impl]
 impl Ownable for EndpointV2 {
     // Ownership management
 }

package/contracts/endpoint-v2/src/endpoint_v2.rs

@@ -16,20 +16,18 @@ use crate::{
     FeeRecipient, FeesAndPacket, IMessagingComposer, LayerZeroReceiverClient, MessageLibClient, MessageLibType,
     MessagingParams, OutboundPacket, ResolvedLibrary, SendLibClient, SetConfigParam, Timeout,
 };
-use common_macros::{only_owner, ttl_configurable};
-use soroban_sdk::{
-    assert_with_error, contract, contractimpl, token::TokenClient, vec, Address, Bytes, BytesN, Env, Vec,
-};
+use common_macros::{contract_impl, only_owner, ttl_configurable};
+use soroban_sdk::{assert_with_error, contract, token::TokenClient, vec, Address, Bytes, BytesN, Env, Vec};
 use utils::option_ext::OptionExt;
 
 #[contract]
 #[ttl_configurable]
 pub struct EndpointV2;
 
-#[contractimpl]
+#[contract_impl]
 impl EndpointV2 {
     pub fn __constructor(env: &Env, owner: &Address) {
-        Self::__init_owner(env, owner);
+        Self::init_owner(env, owner);
     }
 
     /// Recovers tokens sent to this contract by mistake.
@@ -48,7 +46,7 @@ impl EndpointV2 {
 // ILayerZeroEndpointV2 Implementation
 // ============================================================================
 
-#[contractimpl]
+#[contract_impl]
 impl ILayerZeroEndpointV2 for EndpointV2 {
     /// Quotes the messaging fee for sending a cross-chain message.
     fn quote(env: &Env, sender: &Address, params: &MessagingParams) -> MessagingFee {
@@ -161,7 +159,9 @@ impl ILayerZeroEndpointV2 for EndpointV2 {
         DelegateSet { oapp: oapp.clone(), delegate: new_delegate.clone() }.publish(env);
     }
 
-    // === View Functions ===
+    // ============================================================================================
+    // View Functions
+    // ============================================================================================
 
     /// Returns the endpoint ID.
     fn eid(_env: &Env) -> u32 {
@@ -197,9 +197,9 @@ impl ILayerZeroEndpointV2 for EndpointV2 {
     }
 }
 
-// ============================================================================
+// ============================================================================================
 // Internal Functions
-// ============================================================================
+// ============================================================================================
 
 impl EndpointV2 {
     /// Builds an outbound packet with the given parameters.
@@ -259,7 +259,7 @@ impl EndpointV2 {
         let mut native_fee_supplied = native_token_client.balance(&this_contract);
         native_fee_recipients.iter().filter(|r| r.amount > 0).for_each(|r| {
             assert_with_error!(env, native_fee_supplied >= r.amount, EndpointError::InsufficientNativeFee);
-            native_token_client.transfer(&this_contract, &r.address, &r.amount);
+            native_token_client.transfer(&this_contract, &r.to, &r.amount);
             native_fee_supplied -= r.amount;
             fee_paid.native_fee += r.amount;
         });
@@ -282,7 +282,7 @@ impl EndpointV2 {
 
             zro_fee_recipients.iter().filter(|r| r.amount > 0).for_each(|r| {
                 assert_with_error!(env, zro_fee_supplied >= r.amount, EndpointError::InsufficientZROFee);
-                zro_client.transfer(&this_contract, &r.address, &r.amount);
+                zro_client.transfer(&this_contract, &r.to, &r.amount);
                 zro_fee_supplied -= r.amount;
                 fee_paid.zro_fee += r.amount;
             });
@@ -300,6 +300,9 @@ impl EndpointV2 {
 // Include Modules
 // ============================================================================
 
-include!("message_lib_manager.rs");
-include!("messaging_channel.rs");
-include!("messaging_composer.rs");
+#[path = "message_lib_manager.rs"]
+mod message_lib_manager;
+#[path = "messaging_channel.rs"]
+mod messaging_channel;
+#[path = "messaging_composer.rs"]
+mod messaging_composer;

package/contracts/endpoint-v2/src/interfaces/message_lib.rs

@@ -1,6 +1,5 @@
-use soroban_sdk::{contractclient, contracttype, Address, Bytes, Env, Vec};
-
 use crate::SetConfigParam;
+use soroban_sdk::{contracttrait, contracttype, Address, Bytes, Env, Vec};
 
 /// Type of message library indicating supported operations.
 #[contracttype]
@@ -31,7 +30,7 @@ pub struct MessageLibVersion {
 }
 
 /// Interface for message libraries that handle cross-chain message verification and delivery.
-#[contractclient(name = "MessageLibClient")]
+#[contracttrait(client_name = "MessageLibClient")]
 pub trait IMessageLib {
     /// Sets the configuration for an OApp by the Endpoint.
     ///

package/contracts/endpoint-v2/src/interfaces/message_lib_manager.rs

@@ -1,4 +1,4 @@
-use soroban_sdk::{contractclient, contracttype, Address, Bytes, Env, Vec};
+use soroban_sdk::{contracttrait, contracttype, Address, Bytes, Env, Vec};
 
 /// Timeout configuration for receive library transitions.
 #[contracttype]
@@ -45,7 +45,7 @@ pub struct ResolvedLibrary {
 }
 
 /// EndpointV2's Interface for managing message libraries.
-#[contractclient(name = "MessageLibManagerClient")]
+#[contracttrait(client_name = "MessageLibManagerClient")]
 pub trait IMessageLibManager {
     /// Registers a new message library with the endpoint.
     ///
@@ -136,7 +136,9 @@ pub trait IMessageLibManager {
     /// * `lib` - The library address to check
     fn is_valid_receive_library(env: &Env, receiver: &Address, src_eid: u32, lib: &Address) -> bool;
 
-    // === OApp Control Functions ===
+    // ============================================================================================
+    // OApp Control Functions
+    // ============================================================================================
 
     /// Sets or removes a custom send library for an OApp.
     ///

package/contracts/endpoint-v2/src/interfaces/messaging_channel.rs

@@ -1,7 +1,7 @@
-use soroban_sdk::{contractclient, Address, BytesN, Env};
+use soroban_sdk::{contracttrait, Address, BytesN, Env};
 
 /// EndpointV2's Interface for managing messaging channels, nonces, and payload hashes.
-#[contractclient(name = "MessagingChannelClient")]
+#[contracttrait(client_name = "MessagingChannelClient")]
 pub trait IMessagingChannel {
     /// Skips the next expected inbound nonce without verifying.
     ///

package/contracts/endpoint-v2/src/interfaces/messaging_composer.rs

@@ -1,7 +1,7 @@
-use soroban_sdk::{contractclient, Address, Bytes, BytesN, Env};
+use soroban_sdk::{contracttrait, Address, Bytes, BytesN, Env};
 
 /// EndpointV2's Interface for managing composed messages between OApps and composers.
-#[contractclient(name = "MessagingComposerClient")]
+#[contracttrait(client_name = "MessagingComposerClient")]
 pub trait IMessagingComposer {
     /// Sends a composed message from an OApp to a composer.
     /// The OApp can send compose to multiple composers with the same GUID.

package/contracts/endpoint-v2/src/interfaces/send_lib.rs

@@ -1,5 +1,5 @@
 use super::{IMessageLib, MessagingFee};
-use soroban_sdk::{contractclient, contracttype, Address, Bytes, BytesN, Env, Vec};
+use soroban_sdk::{contracttrait, contracttype, Address, Bytes, BytesN, Env, Vec};
 
 /// Outbound packet containing all information for cross-chain transmission.
 #[contracttype]
@@ -25,8 +25,8 @@ pub struct OutboundPacket {
 #[contracttype]
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct FeeRecipient {
-    /// Address to receive the fee.
-    pub address: Address,
+    /// The address to send the fee to.
+    pub to: Address,
     /// Amount of fee to pay.
     pub amount: i128,
 }
@@ -44,7 +44,7 @@ pub struct FeesAndPacket {
 }
 
 /// Interface for send libraries that handle outbound message encoding and fee calculation.
-#[contractclient(name = "SendLibClient")]
+#[contracttrait(client_name = "SendLibClient")]
 pub trait ISendLib: IMessageLib {
     /// Quotes the fee for sending a packet without actually sending.
     ///

package/contracts/endpoint-v2/src/lib.rs

@@ -1,19 +1,20 @@
 #![no_std]
 
+pub mod constants;
+mod errors;
+pub mod events;
 mod interfaces;
+pub mod util;
 
+pub use errors::*;
 pub use interfaces::*;
-pub mod util;
 
 cfg_if::cfg_if! {
     // Include implementation when NOT in library mode, OR when testutils is enabled (for tests)
     if #[cfg(any(not(feature = "library"), feature = "testutils"))] {
         mod endpoint_v2;
-        mod errors;
-        mod events;
         mod storage;
-        mod constants;
-
+        // Export the contract and client for testing purposes
         pub use endpoint_v2::{EndpointV2, EndpointV2Client};
     }
 }

package/contracts/endpoint-v2/src/message_lib_manager.rs

@@ -1,4 +1,6 @@
-#[contractimpl]
+use super::*;
+
+#[contract_impl(contracttrait)]
 impl IMessageLibManager for EndpointV2 {
     /// Registers a new message library with the endpoint.
     #[only_owner]
@@ -71,7 +73,9 @@ impl IMessageLibManager for EndpointV2 {
         DefaultReceiveLibraryTimeoutSet { src_eid, timeout: timeout.clone() }.publish(env);
     }
 
-    // === OApp Control Functions ===
+    // ============================================================================================
+    // OApp Control Functions
+    // ============================================================================================
 
     /// Sets or removes a custom send library for an OApp to a specific destination endpoint.
     fn set_send_library(env: &Env, caller: &Address, sender: &Address, dst_eid: u32, new_lib: &Option<Address>) {
@@ -164,7 +168,9 @@ impl IMessageLibManager for EndpointV2 {
         MessageLibClient::new(env, lib).set_config(oapp, params);
     }
 
-    // === View Functions ===
+    // ============================================================================================
+    // View Functions
+    // ============================================================================================
 
     /// Checks if a message library is registered.
     fn is_registered_library(env: &Env, lib: &Address) -> bool {
@@ -215,7 +221,9 @@ impl IMessageLibManager for EndpointV2 {
         EndpointStorage::default_receive_library_timeout(env, src_eid)
     }
 
-    // === OApp View Functions ===
+    // ============================================================================================
+    // OApp View Functions
+    // ============================================================================================
 
     /// Returns the effective send library for an OApp and destination endpoint.
     fn get_send_library(env: &Env, sender: &Address, dst_eid: u32) -> ResolvedLibrary {
@@ -269,9 +277,9 @@ impl IMessageLibManager for EndpointV2 {
     }
 }
 
-// ============================================================================
+// ============================================================================================
 // Internal Functions
-// ============================================================================
+// ============================================================================================
 
 impl EndpointV2 {
     /// Requires a message library to be registered.

package/contracts/endpoint-v2/src/messaging_channel.rs

@@ -1,4 +1,6 @@
-#[contractimpl]
+use super::*;
+
+#[contract_impl(contracttrait)]
 impl IMessagingChannel for EndpointV2 {
     /// Skips the next expected inbound nonce without verifying.
     ///
@@ -77,7 +79,9 @@ impl IMessagingChannel for EndpointV2 {
         .publish(env);
     }
 
-    // === View Functions ===
+    // ============================================================================================
+    // View Functions
+    // ============================================================================================
 
     /// Generates the next GUID for an outbound packet.
     fn next_guid(env: &Env, sender: &Address, dst_eid: u32, receiver: &BytesN<32>) -> BytesN<32> {

package/contracts/endpoint-v2/src/messaging_composer.rs

@@ -1,4 +1,6 @@
-#[contractimpl]
+use super::*;
+
+#[contract_impl(contracttrait)]
 impl IMessagingComposer for EndpointV2 {
     /// Sends a composed message from an OApp to a composer.
     ///
@@ -67,7 +69,9 @@ impl IMessagingComposer for EndpointV2 {
         .publish(env);
     }
 
-    // === View Functions ===
+    // ============================================================================================
+    // View Functions
+    // ============================================================================================
 
     /// Returns the stored hash for a composed message, or `None` if not queued.
     fn compose_queue(env: &Env, from: &Address, to: &Address, guid: &BytesN<32>, index: u32) -> Option<BytesN<32>> {

package/contracts/endpoint-v2/src/storage.rs

@@ -1,9 +1,8 @@
 use crate::Timeout;
 use common_macros::storage;
 use soroban_sdk::{Address, BytesN};
-use utils::ttl::DefaultTtlConfigProvider;
 
-#[storage(DefaultTtlConfigProvider)]
+#[storage]
 pub enum EndpointStorage {
     /// The ZRO token address
     #[instance(Address)]
@@ -13,7 +12,9 @@ pub enum EndpointStorage {
     #[persistent(Address)]
     Delegate { oapp: Address },
 
-    /// === Messaging Channel ===
+    /// ============================================================================================
+    /// Messaging Channel
+    /// ============================================================================================
 
     /// The lazy inbound nonce for a receiver
     #[persistent(u64)]
@@ -22,7 +23,6 @@ pub enum EndpointStorage {
 
     /// The inbound payload hash for a receiver
     #[persistent(BytesN<32>)]
-    #[no_auto_ttl_extension]
     InboundPayloadHash { receiver: Address, src_eid: u32, sender: BytesN<32>, nonce: u64 },
 
     /// The outbound nonce for a sender
@@ -30,7 +30,9 @@ pub enum EndpointStorage {
     #[default(0)]
     OutboundNonce { sender: Address, dst_eid: u32, receiver: BytesN<32> },
 
-    /// === Message Lib Manager ===
+    /// ============================================================================================
+    /// Message Lib Manager
+    /// ============================================================================================
 
     /// The number of registered libraries
     #[instance(u32)]
@@ -69,10 +71,11 @@ pub enum EndpointStorage {
     #[persistent(Timeout)]
     ReceiveLibraryTimeout { receiver: Address, src_eid: u32 },
 
-    /// === Messaging Composer ===
+    /// ============================================================================================
+    /// Messaging Composer
+    /// ============================================================================================
 
     /// The compose queue for a sender and receiver
     #[persistent(BytesN<32>)]
-    #[no_auto_ttl_extension]
     ComposeQueue { from: Address, to: Address, guid: BytesN<32>, index: u32 },
 }

package/contracts/endpoint-v2/src/tests/endpoint_v2/pay_messaging_fees.rs

@@ -13,7 +13,7 @@ fn test_pay_native_fees_exact_amount() {
     context.mint_native(&endpoint_client.address, 100);
 
     let mut native_fee_recipients = Vec::new(env);
-    native_fee_recipients.push_back(FeeRecipient { address: recipient.clone(), amount: 100 });
+    native_fee_recipients.push_back(FeeRecipient { to: recipient.clone(), amount: 100 });
     let send_result =
         FeesAndPacket { native_fee_recipients, zro_fee_recipients: Vec::new(env), encoded_packet: Bytes::new(env) };
 
@@ -50,7 +50,7 @@ fn test_pay_native_fees_with_refund() {
     context.mint_native(&endpoint_client.address, 200);
 
     let mut native_fee_recipients = Vec::new(env);
-    native_fee_recipients.push_back(FeeRecipient { address: recipient.clone(), amount: 100 });
+    native_fee_recipients.push_back(FeeRecipient { to: recipient.clone(), amount: 100 });
     let send_result =
         FeesAndPacket { native_fee_recipients, zro_fee_recipients: Vec::new(env), encoded_packet: Bytes::new(env) };
 
@@ -91,7 +91,7 @@ fn test_pay_zro_fees_exact_amount() {
     context.mint_zro(&endpoint_client.address, 50);
 
     let mut zro_fee_recipients = Vec::new(env);
-    zro_fee_recipients.push_back(FeeRecipient { address: recipient.clone(), amount: 50 });
+    zro_fee_recipients.push_back(FeeRecipient { to: recipient.clone(), amount: 50 });
     let send_result =
         FeesAndPacket { native_fee_recipients: Vec::new(env), zro_fee_recipients, encoded_packet: Bytes::new(env) };
 
@@ -132,7 +132,7 @@ fn test_pay_zro_fees_with_refund() {
     context.mint_zro(&endpoint_client.address, 100);
 
     let mut zro_fee_recipients = Vec::new(env);
-    zro_fee_recipients.push_back(FeeRecipient { address: recipient.clone(), amount: 50 });
+    zro_fee_recipients.push_back(FeeRecipient { to: recipient.clone(), amount: 50 });
     let send_result =
         FeesAndPacket { native_fee_recipients: Vec::new(env), zro_fee_recipients, encoded_packet: Bytes::new(env) };
 
@@ -175,9 +175,9 @@ fn test_pay_mixed_native_and_zro_fees() {
     context.mint_zro(&endpoint_client.address, 50);
 
     let mut native_fee_recipients = Vec::new(env);
-    native_fee_recipients.push_back(FeeRecipient { address: native_recipient.clone(), amount: 100 });
+    native_fee_recipients.push_back(FeeRecipient { to: native_recipient.clone(), amount: 100 });
     let mut zro_fee_recipients = Vec::new(env);
-    zro_fee_recipients.push_back(FeeRecipient { address: zro_recipient.clone(), amount: 50 });
+    zro_fee_recipients.push_back(FeeRecipient { to: zro_recipient.clone(), amount: 50 });
     let send_result = FeesAndPacket { native_fee_recipients, zro_fee_recipients, encoded_packet: Bytes::new(env) };
 
     let fee = env.as_contract(&endpoint_client.address, || {
@@ -217,9 +217,9 @@ fn test_pay_multiple_recipients_same_token() {
     context.mint_native(&endpoint_client.address, 300);
 
     let mut native_fee_recipients = Vec::new(env);
-    native_fee_recipients.push_back(FeeRecipient { address: recipient1.clone(), amount: 100 });
-    native_fee_recipients.push_back(FeeRecipient { address: recipient2.clone(), amount: 150 });
-    native_fee_recipients.push_back(FeeRecipient { address: recipient3.clone(), amount: 50 });
+    native_fee_recipients.push_back(FeeRecipient { to: recipient1.clone(), amount: 100 });
+    native_fee_recipients.push_back(FeeRecipient { to: recipient2.clone(), amount: 150 });
+    native_fee_recipients.push_back(FeeRecipient { to: recipient3.clone(), amount: 50 });
     let send_result =
         FeesAndPacket { native_fee_recipients, zro_fee_recipients: Vec::new(env), encoded_packet: Bytes::new(env) };
 
@@ -259,8 +259,8 @@ fn test_pay_fees_with_zero_amounts_skipped() {
     context.mint_native(&endpoint_client.address, 100);
 
     let mut native_fee_recipients = Vec::new(env);
-    native_fee_recipients.push_back(FeeRecipient { address: recipient1.clone(), amount: 100 });
-    native_fee_recipients.push_back(FeeRecipient { address: recipient2.clone(), amount: 0 }); // Zero amount
+    native_fee_recipients.push_back(FeeRecipient { to: recipient1.clone(), amount: 100 });
+    native_fee_recipients.push_back(FeeRecipient { to: recipient2.clone(), amount: 0 }); // Zero amount
     let send_result =
         FeesAndPacket { native_fee_recipients, zro_fee_recipients: Vec::new(env), encoded_packet: Bytes::new(env) };
 
@@ -293,7 +293,7 @@ fn test_panic_pay_native_fees_insufficient_balance() {
     context.mint_native(&endpoint_client.address, 50);
 
     let mut native_fee_recipients = Vec::new(env);
-    native_fee_recipients.push_back(FeeRecipient { address: recipient.clone(), amount: 100 });
+    native_fee_recipients.push_back(FeeRecipient { to: recipient.clone(), amount: 100 });
     let send_result =
         FeesAndPacket { native_fee_recipients, zro_fee_recipients: Vec::new(env), encoded_packet: Bytes::new(env) };
 
@@ -326,7 +326,7 @@ fn test_panic_pay_zro_fees_insufficient_balance() {
     context.mint_zro(&endpoint_client.address, 25);
 
     let mut zro_fee_recipients = Vec::new(env);
-    zro_fee_recipients.push_back(FeeRecipient { address: recipient.clone(), amount: 50 });
+    zro_fee_recipients.push_back(FeeRecipient { to: recipient.clone(), amount: 50 });
     let send_result =
         FeesAndPacket { native_fee_recipients: Vec::new(env), zro_fee_recipients, encoded_packet: Bytes::new(env) };
 
@@ -393,10 +393,10 @@ fn test_pay_fees_with_mixed_zero_and_nonzero_amounts() {
     context.mint_zro(&endpoint_client.address, 75);
 
     let mut native_fee_recipients = Vec::new(env);
-    native_fee_recipients.push_back(FeeRecipient { address: recipient1.clone(), amount: 100 });
+    native_fee_recipients.push_back(FeeRecipient { to: recipient1.clone(), amount: 100 });
     let mut zro_fee_recipients = Vec::new(env);
-    zro_fee_recipients.push_back(FeeRecipient { address: recipient2.clone(), amount: 0 }); // Zero ZRO
-    zro_fee_recipients.push_back(FeeRecipient { address: recipient3.clone(), amount: 50 });
+    zro_fee_recipients.push_back(FeeRecipient { to: recipient2.clone(), amount: 0 }); // Zero ZRO
+    zro_fee_recipients.push_back(FeeRecipient { to: recipient3.clone(), amount: 50 });
     let send_result = FeesAndPacket { native_fee_recipients, zro_fee_recipients, encoded_packet: Bytes::new(env) };
 
     let fee = env.as_contract(&endpoint_client.address, || {