@layerzerolabs/protocol-stellar-v2 0.2.15 → 0.2.18

package/contracts/utils/src/ownable.rs

@@ -1,7 +1,6 @@
-use crate::errors::OwnableError;
-use crate::option_ext::OptionExt;
-use common_macros::storage;
-use soroban_sdk::{assert_with_error, contractevent, contracttrait, Address, Env};
+use crate::{self as utils, auth::Auth, errors::OwnableError, option_ext::OptionExt};
+use common_macros::{contract_trait, storage};
+use soroban_sdk::{assert_with_error, contractevent, Address, Env};
 
 // ===========================================================================
 // Ownable events
@@ -38,22 +37,25 @@ pub enum OwnableStorage {
 // ===========================================================================
 
 /// Trait for contracts with single-owner access control.
-#[contracttrait]
-pub trait Ownable: Sized {
+///
+/// Extends `Auth` to provide owner-based authorization. The `Auth::authorizer()`
+/// implementation should return the owner address for Ownable contracts.
+#[contract_trait]
+pub trait Ownable: Sized + Auth {
     /// Returns the current owner address, or None if no owner is set.
-    fn owner(env: &soroban_sdk::Env) -> Option<soroban_sdk::Address> {
+    fn owner(env: &Env) -> Option<Address> {
         OwnableStorage::owner(env)
     }
 
     /// Transfers ownership to a new address. Requires current owner authorization.
-    fn transfer_ownership(env: &soroban_sdk::Env, new_owner: &soroban_sdk::Address) {
+    fn transfer_ownership(env: &Env, new_owner: &Address) {
         let old_owner = enforce_owner_auth::<Self>(env);
         OwnableStorage::set_owner(env, new_owner);
         OwnershipTransferred { old_owner, new_owner: new_owner.clone() }.publish(env);
     }
 
     /// Permanently renounces ownership. Requires current owner authorization.
-    fn renounce_ownership(env: &soroban_sdk::Env) {
+    fn renounce_ownership(env: &Env) {
         let old_owner = enforce_owner_auth::<Self>(env);
         OwnableStorage::remove_owner(env);
         OwnershipRenounced { old_owner }.publish(env);
@@ -62,7 +64,7 @@ pub trait Ownable: Sized {
 
 /// Trait for initializing the owner of the contract.
 pub trait OwnableInitializer {
-    fn init_owner(env: &soroban_sdk::Env, owner: &soroban_sdk::Address) {
+    fn init_owner(env: &Env, owner: &Address) {
         assert_with_error!(env, !OwnableStorage::has_owner(env), OwnableError::OwnerAlreadySet);
         OwnableStorage::set_owner(env, owner);
     }

package/contracts/utils/src/tests/buffer_reader.rs

@@ -1,11 +1,11 @@
+use crate::{
+    buffer_reader::BufferReader,
+    buffer_writer::BufferWriter,
+    bytes_ext::BytesExt,
+    tests::test_helper::{assert_address_payload_matches, assert_panics_contains},
+};
 use soroban_sdk::{address_payload::AddressPayload, testutils::Address as _, Address, Bytes, BytesN, Env};
 
-use crate::buffer_reader::BufferReader;
-use crate::buffer_writer::BufferWriter;
-use crate::bytes_ext::BytesExt;
-
-use crate::tests::test_helper::{assert_address_payload_matches, assert_panics_contains};
-
 type ReaderStep = fn(&mut BufferReader);
 
 fn assert_reader_panics_contains(case: &str, raw: &[u8], step: ReaderStep, expected_substring: &str) {

package/contracts/utils/src/tests/buffer_writer.rs

@@ -1,11 +1,11 @@
+use crate::{
+    buffer_reader::BufferReader,
+    buffer_writer::BufferWriter,
+    bytes_ext::BytesExt,
+    tests::test_helper::assert_address_payload_matches,
+};
 use soroban_sdk::{address_payload::AddressPayload, testutils::Address as _, Address, Bytes, BytesN, Env, U256};
 
-use crate::buffer_reader::BufferReader;
-use crate::buffer_writer::BufferWriter;
-use crate::bytes_ext::BytesExt;
-
-use crate::tests::test_helper::assert_address_payload_matches;
-
 /// Helper to test U256 write/read roundtrip
 fn test_u256_roundtrip(env: &Env, value: &soroban_sdk::U256) {
     let mut writer = BufferWriter::new(env);

package/contracts/utils/src/tests/bytes_ext.rs

@@ -1,15 +1,13 @@
+use crate::{bytes_ext::BytesExt, tests::test_helper::assert_panics_contains};
 use soroban_sdk::{Bytes, Env};
 
-use crate::bytes_ext::BytesExt;
-use crate::tests::test_helper::assert_panics_contains;
-
 // ============================================
 // Helper functions
 // ============================================
 
 /// Helper to assert that `to_array::<N>()` panics with BytesExtError::LengthMismatch (1400)
 fn assert_to_array_panics<const N: usize>(case: &str, raw: &[u8]) {
-    const EXPECTED: &str = "Error(Contract, #1400)";
+    const EXPECTED: &str = "Error(Contract, #1040)"; // LengthMismatch
     assert_panics_contains(case, EXPECTED, || {
         let env = Env::default();
         let bytes = Bytes::from_slice(&env, raw);

package/contracts/utils/src/tests/mod.rs

@@ -1,6 +1,7 @@
 mod buffer_reader;
 mod buffer_writer;
 mod bytes_ext;
+mod multisig;
 mod option_ext;
 mod ownable;
 mod test_helper;