@layerzerolabs/protocol-stellar-v2 0.2.10 → 0.2.12

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

@@ -43,23 +43,15 @@
 // inside this crate and in external crates implementing the OFT trait.
 extern crate self as oft;
 
-use crate::{
-    codec::{oft_compose_msg_codec::OFTComposeMsg, oft_msg_codec::OFTMessage},
-    constants,
-    errors::OFTError,
-    events::{self, OFTSent},
-    storage::OFTStorage,
-    types::OFTReceipt,
-    utils::{address_to_bytes32, remove_dust, resolve_address, to_ld, to_sd},
-};
-use endpoint_v2::{MessagingComposerClient, Origin};
+use crate::{errors::OFTError, storage::OFTStorage, types::OFTReceipt};
+use endpoint_v2::Origin;
 use oapp::{
     oapp_core::{oapp_initialize, OAppCore},
     oapp_options_type3::OAppOptionsType3,
     oapp_receiver::OAppReceiver,
     oapp_sender::OAppSender,
 };
-use soroban_sdk::{assert_with_error, contracttrait, token::TokenClient, vec, Address, Bytes, BytesN, Env};
+use soroban_sdk::{assert_with_error, contracttrait, token::TokenClient, Address, Bytes, BytesN, Env};
 use utils::ownable::OwnableInitializer;
 
 // =====================================================
@@ -74,12 +66,12 @@ pub fn oft_initialize<T: OFT + OwnableInitializer>(
     token: &Address,
     endpoint: &Address,
     delegate: &Option<Address>,
+    shared_decimals: u32,
 ) {
     // Initialize OApp (includes owner initialization)
     oapp_initialize::<T>(env, owner, endpoint, delegate);
 
     let local_decimals = TokenClient::new(env, token).decimals();
-    let shared_decimals = T::shared_decimals(env);
     assert_with_error!(env, local_decimals >= shared_decimals, OFTError::InvalidLocalDecimals);
 
     // Initialize OFT storage
@@ -142,14 +134,8 @@ pub trait OFTInner: OAppCore {
     // =========================================================================
 
     /// Calculates debit amounts without executing (view function).
-    fn __debit_view(env: &Env, amount_ld: i128, min_amount_ld: i128, _dst_eid: u32) -> OFTReceipt {
-        let conversion_rate = OFTStorage::decimal_conversion_rate(env).unwrap();
-        let amount_sent_ld = remove_dust(amount_ld, conversion_rate);
-        let amount_received_ld = amount_sent_ld;
-
-        assert_with_error!(env, amount_received_ld >= min_amount_ld, OFTError::SlippageExceeded);
-
-        OFTReceipt { amount_sent_ld, amount_received_ld }
+    fn __debit_view(env: &Env, amount_ld: i128, min_amount_ld: i128, dst_eid: u32) -> OFTReceipt {
+        crate::default_oft_impl::default_debit_view(env, amount_ld, min_amount_ld, dst_eid)
     }
 
     /// Builds OFT message and combines options for cross-chain transfer.
@@ -162,18 +148,7 @@ pub trait OFTInner: OAppCore {
     where
         Self: OAppOptionsType3,
     {
-        let has_compose = !send_param.compose_msg.is_empty();
-        let conversion_rate = OFTStorage::decimal_conversion_rate(env).unwrap();
-        let msg = OFTMessage {
-            send_to: send_param.to.clone(),
-            amount_sd: to_sd(env, amount_ld, conversion_rate),
-            compose_from: if has_compose { Some(address_to_bytes32(sender)) } else { None },
-            compose_msg: if has_compose { Some(send_param.compose_msg.clone()) } else { None },
-        };
-        let (msg, _) = msg.encode(env);
-        let msg_type = if has_compose { constants::SEND_AND_CALL } else { constants::SEND };
-
-        (msg, Self::combine_options(env, send_param.dst_eid, msg_type, &send_param.extra_options))
+        crate::default_oft_impl::default_build_msg_and_options::<Self>(env, sender, send_param, amount_ld)
     }
 
     /// Handles OFT receive logic.
@@ -186,29 +161,7 @@ pub trait OFTInner: OAppCore {
         _extra_data: &Bytes,
         _value: i128,
     ) {
-        let oft_msg = OFTMessage::decode(message);
-        let send_to = resolve_address(env, &oft_msg.send_to);
-
-        let conversion_rate = OFTStorage::decimal_conversion_rate(env).unwrap();
-        let amount_received_ld =
-            Self::__credit(env, &send_to, to_ld(oft_msg.amount_sd, conversion_rate), origin.src_eid);
-
-        if oft_msg.is_composed() {
-            let compose_msg = OFTComposeMsg {
-                nonce: origin.nonce,
-                src_eid: origin.src_eid,
-                amount_ld: amount_received_ld,
-                compose_from: oft_msg.compose_from.unwrap(),
-                compose_msg: oft_msg.compose_msg.unwrap(),
-            }
-            .encode(env);
-
-            let endpoint = MessagingComposerClient::new(env, &Self::endpoint(env));
-            endpoint.send_compose(&env.current_contract_address(), &send_to, guid, &0, &compose_msg);
-        }
-
-        events::OFTReceived { guid: guid.clone(), src_eid: origin.src_eid, to: send_to, amount_received_ld }
-            .publish(env);
+        crate::default_oft_impl::default_lz_receive::<Self>(env, _executor, origin, guid, message, _extra_data, _value)
     }
 }
 
@@ -236,8 +189,11 @@ pub trait OFT: OFTInner + OAppReceiver + OAppSender + OAppOptionsType3 {
     }
 
     /// Retrieves the shared decimals used for cross-chain normalization.
-    fn shared_decimals(_env: &Env) -> u32 {
-        6
+    fn shared_decimals(env: &Env) -> u32 {
+        let token = Self::token(env);
+        let local_decimals = soroban_sdk::token::TokenClient::new(env, &token).decimals();
+        let conversion_rate = Self::decimal_conversion_rate(env);
+        local_decimals - conversion_rate.ilog10()
     }
 
     /// Retrieves the decimal conversion rate used for cross-chain normalization.
@@ -264,8 +220,7 @@ pub trait OFT: OFTInner + OAppReceiver + OAppSender + OAppOptionsType3 {
         env: &Env,
         send_param: &oft::types::SendParam,
     ) -> (oft::types::OFTLimit, soroban_sdk::Vec<oft::types::OFTFeeDetail>, oft::types::OFTReceipt) {
-        let oft_receipt = Self::__debit_view(env, send_param.amount_ld, send_param.min_amount_ld, send_param.dst_eid);
-        (oft::types::OFTLimit { min_amount_ld: 0, max_amount_ld: i128::MAX }, vec![env], oft_receipt)
+        crate::default_oft_impl::default_quote_oft::<Self>(env, send_param)
     }
 
     /// Quotes a send operation including LayerZero messaging fees.
@@ -275,11 +230,7 @@ pub trait OFT: OFTInner + OAppReceiver + OAppSender + OAppOptionsType3 {
         send_param: &oft::types::SendParam,
         pay_in_zro: bool,
     ) -> endpoint_v2::MessagingFee {
-        let oft::types::OFTReceipt { amount_received_ld, .. } =
-            Self::__debit_view(env, send_param.amount_ld, send_param.min_amount_ld, send_param.dst_eid);
-
-        let (msg, options) = Self::__build_msg_and_options(env, sender, send_param, amount_received_ld);
-        Self::lz_quote(env, send_param.dst_eid, &msg, &options, pay_in_zro)
+        crate::default_oft_impl::default_quote_send::<Self>(env, sender, send_param, pay_in_zro)
     }
 
     /// Sends tokens cross-chain to another endpoint.
@@ -295,26 +246,6 @@ pub trait OFT: OFTInner + OAppReceiver + OAppSender + OAppOptionsType3 {
         fee: &endpoint_v2::MessagingFee,
         refund_address: &Address,
     ) -> (endpoint_v2::MessagingReceipt, oft::types::OFTReceipt) {
-        sender.require_auth();
-
-        let oft_receipt =
-            Self::__debit(env, sender, send_param.amount_ld, send_param.min_amount_ld, send_param.dst_eid);
-
-        let (msg, options) = Self::__build_msg_and_options(env, sender, send_param, oft_receipt.amount_received_ld);
-        let msg_receipt = Self::lz_send(env, sender, send_param.dst_eid, &msg, &options, fee, refund_address);
-
-        OFTSent {
-            guid: msg_receipt.guid.clone(),
-            dst_eid: send_param.dst_eid,
-            from: sender.clone(),
-            amount_sent_ld: oft_receipt.amount_sent_ld,
-            amount_received_ld: oft_receipt.amount_received_ld,
-        }
-        .publish(env);
-
-        (msg_receipt, oft_receipt)
+        crate::default_oft_impl::default_send::<Self>(env, sender, send_param, fee, refund_address)
     }
-
-    // NOTE: `next_nonce`, `lz_receive`, etc. are inherited from OAppReceiver supertrait.
-    // Do NOT redefine them here to avoid method conflicts.
 }

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

@@ -22,7 +22,7 @@ use crate::types::OFTReceipt;
 /// `OFTReceipt` containing the amount sent and amount received
 pub fn debit<T: OFT>(env: &Env, sender: &Address, amount_ld: i128, min_amount_ld: i128, dst_eid: u32) -> OFTReceipt {
     let receipt = T::__debit_view(env, amount_ld, min_amount_ld, dst_eid);
-    MintBurnTokenClient::new(env, &T::token(env)).burn(sender, &receipt.amount_sent_ld);
+    MintBurnTokenClient::new(env, &T::token(env)).burn(sender, &receipt.amount_received_ld);
     receipt
 }
 

package/contracts/oapps/oft/src/tests/extensions/mod.rs

@@ -0,0 +1,11 @@
+//! Extension tests module.
+//!
+//! This module contains tests for OFT extensions (pausable, oft_fee, rate_limiter).
+
+pub mod setup;
+pub mod test_oft_fee;
+pub mod test_pausable;
+pub mod test_rate_limiter;
+
+// Re-export commonly used items for convenience
+pub use setup::{ExtensiveOFT, ExtensiveOFTClient, ExtensiveOFTTestSetup};