@layerzerolabs/protocol-stellar-v2 0.2.15 → 0.2.18

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

@@ -239,7 +239,7 @@ fn test_pay_zro_fees_multiple_recipients_zero_amounts_skipped_and_refunded() {
 
 // ZRO prerequisites / edge cases
 #[test]
-#[should_panic(expected = "Error(Contract, #24)")] // EndpointError::ZROUnavailable
+#[should_panic(expected = "Error(Contract, #25)")] // EndpointError::ZROUnavailable
 fn test_panic_pay_in_zro_without_zro_configured() {
     let context = setup();
     let env = &context.env;
@@ -252,7 +252,7 @@ fn test_panic_pay_in_zro_without_zro_configured() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #23)")] // EndpointError::ZeroZROFee
+#[should_panic(expected = "Error(Contract, #24)")] // EndpointError::ZeroZROFee
 fn test_panic_pay_in_zro_with_zero_zro_balance() {
     let context = setup();
     let env = &context.env;
@@ -312,7 +312,7 @@ fn test_pay_in_zro_with_all_zero_zro_recipients_refunds_all_zro() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #7)")] // EndpointError::InsufficientZROFee
+#[should_panic(expected = "Error(Contract, #7)")] // EndpointError::InsufficientZroFee
 fn test_panic_pay_zro_fees_insufficient_balance() {
     let context = setup();
     let env = &context.env;

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

@@ -120,7 +120,7 @@ fn test_quote_zro_unavailable_when_pay_in_zro() {
     let params = default_params(env, dst_eid, true);
 
     let result = endpoint_client.try_quote(&sender, &params);
-    assert_eq!(result.err().unwrap().ok().unwrap(), EndpointError::ZROUnavailable.into());
+    assert_eq!(result.err().unwrap().ok().unwrap(), EndpointError::ZroUnavailable.into());
 }
 
 #[test]

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

@@ -20,7 +20,7 @@ use crate::{tests::endpoint_setup::setup, EndpointV2};
 
 // Unauthorized caller is rejected
 #[test]
-#[should_panic(expected = "Error(Contract, #21)")] // EndpointError::Unauthorized
+#[should_panic(expected = "Error(Contract, #22)")] // EndpointError::Unauthorized
 fn test_require_oapp_auth_unauthorized() {
     let context = setup();
     let env = &context.env;
@@ -36,7 +36,7 @@ fn test_require_oapp_auth_unauthorized() {
 
 // Wrong delegate is rejected
 #[test]
-#[should_panic(expected = "Error(Contract, #21)")] // EndpointError::Unauthorized
+#[should_panic(expected = "Error(Contract, #22)")] // EndpointError::Unauthorized
 fn test_require_oapp_auth_wrong_delegate() {
     let context = setup();
     let env = &context.env;

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

@@ -238,7 +238,7 @@ fn test_send_zro_unavailable_when_pay_in_zro() {
     let params = default_params(env, 998u32, true);
     context.mock_auth(&sender, "send", (&sender, &params, &refund_address));
     let result = endpoint_client.try_send(&sender, &params, &refund_address);
-    assert_eq!(result.err().unwrap().ok().unwrap(), EndpointError::ZROUnavailable.into());
+    assert_eq!(result.err().unwrap().ok().unwrap(), EndpointError::ZroUnavailable.into());
 }
 
 #[test]
@@ -260,7 +260,7 @@ fn test_send_zero_zro_fee_when_pay_in_zro_true() {
     let params = default_params(env, dst_eid, true);
     context.mock_auth(&sender, "send", (&sender, &params, &refund_address));
     let result = endpoint_client.try_send(&sender, &params, &refund_address);
-    assert_eq!(result.err().unwrap().ok().unwrap(), EndpointError::ZeroZROFee.into());
+    assert_eq!(result.err().unwrap().ok().unwrap(), EndpointError::ZeroZroFee.into());
 }
 
 #[test]
@@ -285,7 +285,7 @@ fn test_send_insufficient_zro_fee() {
     let params = default_params(env, dst_eid, true);
     context.mock_auth(&sender, "send", (&sender, &params, &refund_address));
     let result = endpoint_client.try_send(&sender, &params, &refund_address);
-    assert_eq!(result.err().unwrap().ok().unwrap(), EndpointError::InsufficientZROFee.into());
+    assert_eq!(result.err().unwrap().ok().unwrap(), EndpointError::InsufficientZroFee.into());
 }
 
 // Nonce Management

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

@@ -1,7 +1,7 @@
 use soroban_sdk::{testutils::Address as _, Address};
 use utils::testing_utils::assert_event;
 
-use crate::{events::ZROSet, tests::endpoint_setup::setup, tests::endpoint_setup::TestSetup};
+use crate::{events::ZroSet, tests::endpoint_setup::setup, tests::endpoint_setup::TestSetup};
 
 // Helpers
 fn set_zro_with_auth(context: &TestSetup, zro: &Address) {
@@ -23,7 +23,7 @@ fn test_set_zro() {
     set_zro_with_auth(&context, &context.zro_token_client.address);
 
     // Verify event emission.
-    assert_event(env, &endpoint_client.address, ZROSet { zro: context.zro_token_client.address.clone() });
+    assert_event(env, &endpoint_client.address, ZroSet { zro: context.zro_token_client.address.clone() });
 
     // Verify state update via public interface.
     let zro_token = endpoint_client.zro();
@@ -43,12 +43,12 @@ fn test_set_zro_overwrites_existing_zro() {
 
     // Set ZRO to the first address.
     set_zro_with_auth(&context, &context.zro_token_client.address);
-    assert_event(env, &endpoint_client.address, ZROSet { zro: context.zro_token_client.address.clone() });
+    assert_event(env, &endpoint_client.address, ZroSet { zro: context.zro_token_client.address.clone() });
     assert_eq!(endpoint_client.zro(), Some(context.zro_token_client.address.clone()));
 
     // Overwrite ZRO with the second address.
     set_zro_with_auth(&context, &zro_addr_2);
-    assert_event(env, &endpoint_client.address, ZROSet { zro: zro_addr_2.clone() });
+    assert_event(env, &endpoint_client.address, ZroSet { zro: zro_addr_2.clone() });
     assert_eq!(endpoint_client.zro(), Some(zro_addr_2));
 }
 

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

@@ -4,7 +4,7 @@ use crate::{tests::endpoint_setup::setup, EndpointV2, MessageLibType};
 
 // The require_receive_lib_for_eid internal validation (registered + type + supported_eid)
 #[test]
-#[should_panic(expected = "Error(Contract, #15)")] // EndpointError::OnlyRegisteredLib
+#[should_panic(expected = "Error(Contract, #16)")] // EndpointError::OnlyRegisteredLib
 fn test_require_receive_lib_for_eid_unregistered_lib() {
     let context = setup();
     let env = &context.env;
@@ -15,7 +15,7 @@ fn test_require_receive_lib_for_eid_unregistered_lib() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #14)")] // EndpointError::OnlyReceiveLib
+#[should_panic(expected = "Error(Contract, #15)")] // EndpointError::OnlyReceiveLib
 fn test_require_receive_lib_for_eid_wrong_lib_type() {
     let context = setup();
     let env = &context.env;
@@ -28,7 +28,7 @@ fn test_require_receive_lib_for_eid_wrong_lib_type() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #22)")] // EndpointError::UnsupportedEid
+#[should_panic(expected = "Error(Contract, #23)")] // EndpointError::UnsupportedEid
 fn test_require_receive_lib_for_eid_unsupported_eid() {
     let context = setup();
     let env = &context.env;

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

@@ -8,7 +8,7 @@ use crate::{
 // Unit tests for require functions
 
 #[test]
-#[should_panic(expected = "Error(Contract, #15)")] // EndpointError::OnlyRegisteredLib
+#[should_panic(expected = "Error(Contract, #16)")] // EndpointError::OnlyRegisteredLib
 fn test_require_registered_with_unregistered_lib() {
     let context = setup();
     let env = &context.env;

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

@@ -4,7 +4,7 @@ use crate::{tests::endpoint_setup::setup, EndpointV2, MessageLibType};
 
 // The require_send_lib_for_eid internal validation (registered + type + supported_eid)
 #[test]
-#[should_panic(expected = "Error(Contract, #15)")] // EndpointError::OnlyRegisteredLib
+#[should_panic(expected = "Error(Contract, #16)")] // EndpointError::OnlyRegisteredLib
 fn test_require_send_lib_for_eid_unregistered_lib() {
     let context = setup();
     let env = &context.env;
@@ -15,7 +15,7 @@ fn test_require_send_lib_for_eid_unregistered_lib() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #16)")] // EndpointError::OnlySendLib
+#[should_panic(expected = "Error(Contract, #17)")] // EndpointError::OnlySendLib
 fn test_require_send_lib_for_eid_wrong_lib_type() {
     let context = setup();
     let env = &context.env;
@@ -28,7 +28,7 @@ fn test_require_send_lib_for_eid_wrong_lib_type() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #22)")] // EndpointError::UnsupportedEid
+#[should_panic(expected = "Error(Contract, #23)")] // EndpointError::UnsupportedEid
 fn test_require_send_lib_for_eid_unsupported_eid() {
     let context = setup();
     let env = &context.env;

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

@@ -15,7 +15,7 @@ fn test_require_supported_eid_with_supported() {
 
 // The require_supported_eid rejects when the library does not support the EID
 #[test]
-#[should_panic(expected = "Error(Contract, #22)")] // EndpointError::UnsupportedEid
+#[should_panic(expected = "Error(Contract, #23)")] // EndpointError::UnsupportedEid
 fn test_require_supported_eid_with_unsupported() {
     let context = setup();
     let env = &context.env;

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

@@ -119,7 +119,7 @@ fn test_clear_payload_does_not_update_lazy_nonce_when_nonce_is_not_greater() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #19)")] // EndpointError::PayloadHashNotFound
+#[should_panic(expected = "Error(Contract, #20)")] // EndpointError::PayloadHashNotFound
 fn test_clear_payload_payload_hash_not_found_when_nonce_is_checkpointed_but_missing() {
     let context = setup();
     let env = &context.env;
@@ -143,7 +143,7 @@ fn test_clear_payload_payload_hash_not_found_when_nonce_is_checkpointed_but_miss
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #19)")] // EndpointError::PayloadHashNotFound
+#[should_panic(expected = "Error(Contract, #20)")] // EndpointError::PayloadHashNotFound
 fn test_clear_payload_wrong_payload() {
     let context = setup();
     let env = &context.env;
@@ -164,7 +164,7 @@ fn test_clear_payload_wrong_payload() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #10)")] // EndpointError::InvalidNonce
+#[should_panic(expected = "Error(Contract, #11)")] // EndpointError::InvalidNonce
 fn test_clear_payload_not_stored() {
     let context = setup();
     let env = &context.env;
@@ -179,7 +179,7 @@ fn test_clear_payload_not_stored() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #10)")] // EndpointError::InvalidNonce
+#[should_panic(expected = "Error(Contract, #11)")] // EndpointError::InvalidNonce
 fn test_clear_payload_missing_intermediate_nonce() {
     let context = setup();
     let env = &context.env;

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

@@ -76,7 +76,7 @@ fn test_inbound_overwrites_same_nonce() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #11)")] // EndpointError::InvalidPayloadHash
+#[should_panic(expected = "Error(Contract, #12)")] // EndpointError::InvalidPayloadHash
 fn test_inbound_rejects_empty_payload_hash() {
     let context = setup();
     let env = &context.env;

package/contracts/layerzero-views/src/layerzero_view.rs

@@ -9,17 +9,14 @@ use crate::{
     types::{empty_payload_hash, nil_payload_hash, ExecutionState, VerificationState},
     LayerZeroViewError,
 };
-use common_macros::{contract_impl, ownable, ttl_configurable, upgradeable};
+use common_macros::{contract_impl, lz_contract};
 use endpoint_v2::{LayerZeroEndpointV2Client, MessageLibManagerClient, MessagingChannelClient, Origin};
 use message_lib_common::packet_codec_v1::{decode_packet_header, PacketHeader};
-use soroban_sdk::{address_payload::AddressPayload, assert_with_error, contract, Address, Bytes, BytesN, Env};
+use soroban_sdk::{address_payload::AddressPayload, assert_with_error, Address, Bytes, BytesN, Env};
 use uln302::ReceiveUln302Client;
 use utils::upgradeable::UpgradeableInternal;
 
-#[contract]
-#[ttl_configurable]
-#[upgradeable]
-#[ownable]
+#[lz_contract(upgradeable)]
 pub struct LayerZeroView;
 
 #[contract_impl]

package/contracts/macro-integration-tests/tests/runtime/ownable/mod.rs

@@ -1,7 +1,7 @@
 use soroban_sdk::{contract, contractimpl, Address, Env};
 
 mod initialization;
-mod only_owner_guard;
+mod only_auth_guard;
 mod ownership_transfer;
 
 /// Shared contract used by ownable runtime tests.
@@ -15,7 +15,7 @@ impl TestContract {
         Self::init_owner(&env, &owner);
     }
 
-    #[common_macros::only_owner]
+    #[common_macros::only_auth]
     pub fn guarded(env: &Env) {
         let _ = env;
     }

package/contracts/macro-integration-tests/tests/runtime/ownable/{only_owner_guard.rs → only_auth_guard.rs}

@@ -1,4 +1,4 @@
-// Runtime tests: `#[only_owner]` guard behavior.
+// Runtime tests: `#[only_auth]` guard behavior.
 //
 // Tests covered:
 // - Guard enforces owner authorization (unauthorized fails, authorized succeeds).

package/contracts/macro-integration-tests/tests/runtime/ttl_configurable/configuration.rs

@@ -12,7 +12,7 @@ use soroban_sdk::{
     xdr::{ScErrorCode, ScErrorType},
     Address, Env, Error, IntoVal,
 };
-use utils::errors::TtlConfigurableError;
+use utils::{errors::TtlConfigurableError, ttl_configurable::TtlConfig};
 
 #[contract]
 #[ttl_configurable]

package/contracts/macro-integration-tests/tests/runtime/ttl_configurable/freeze.rs

@@ -12,7 +12,7 @@ use soroban_sdk::{
     xdr::{ScErrorCode, ScErrorType},
     Address, Env, Error, IntoVal,
 };
-use utils::errors::TtlConfigurableError;
+use utils::{errors::TtlConfigurableError, ttl_configurable::TtlConfig};
 
 #[contract]
 #[ttl_configurable]

package/contracts/macro-integration-tests/tests/runtime/ttl_configurable/mod.rs

@@ -1,3 +1,2 @@
 mod configuration;
-mod extend_instance_ttl;
 mod freeze;

package/contracts/macro-integration-tests/tests/ui/ownable/fail/{only_owner_missing_env.rs → only_auth_missing_env.rs}

@@ -1,10 +1,10 @@
-// UI (trybuild) negative test: `#[only_owner]` requires an `Env` parameter.
+// UI (trybuild) negative test: `#[only_auth]` requires an `Env` parameter.
 //
 // Purpose:
 // - Ensures the macro fails compilation when applied to a function that does not accept `Env`.
 // - Validates the downstream UX: macro misuse should surface as a compile-time error.
 
-use soroban_sdk::{contract, contractimpl};
+use soroban_sdk::{contract, contractimpl, Address};
 
 #[contract]
 #[common_macros::ownable]
@@ -13,7 +13,7 @@ pub struct MyContract;
 #[contractimpl]
 impl MyContract {
     // Intentionally missing `Env`: should fail during macro expansion.
-    #[common_macros::only_owner]
+    #[common_macros::only_auth]
     pub fn bad(x: u32) {
         let _ = x;
     }

package/contracts/macro-integration-tests/tests/ui/ownable/fail/{only_owner_missing_env.stderr → only_auth_missing_env.stderr}

@@ -1,13 +1,13 @@
 error: custom attribute panicked
-  --> tests/ui/ownable/fail/only_owner_missing_env.rs:16:5
+  --> tests/ui/ownable/fail/only_auth_missing_env.rs:16:5
    |
-16 |     #[common_macros::only_owner]
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+16 |     #[common_macros::only_auth]
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: message: function must have an Env argument
 
 error[E0599]: no function or associated item named `bad` found for struct `MyContract` in the current scope
-  --> tests/ui/ownable/fail/only_owner_missing_env.rs:17:12
+  --> tests/ui/ownable/fail/only_auth_missing_env.rs:17:12
    |
 11 | pub struct MyContract;
    | --------------------- function or associated item `bad` not found for this struct

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

@@ -1,11 +1,10 @@
-// UI (trybuild) test: macro expansion does not rely on downstream imports.
+// UI (trybuild) test: macro expansion works with fully-qualified trait paths.
 //
 // Purpose:
 // - Ensures a downstream crate can use the generated `Ownable` trait impl via a fully-qualified path
 //   without importing `utils::ownable::Ownable` into scope.
-// - Catches regressions where the macro-generated code would require extra `use` statements.
 
-use soroban_sdk::{contract, contractimpl, Env};
+use soroban_sdk::{contract, contractimpl, Address, Env};
 
 #[contract]
 #[common_macros::ownable]

package/contracts/macro-integration-tests/tests/ui/ownable/pass/{only_owner_env_param_variants.rs → only_auth_env_param_variants.rs}

@@ -1,11 +1,11 @@
-// UI (trybuild) test: `#[only_owner]` supports different `Env` parameter placements.
+// UI (trybuild) test: `#[only_auth]` supports different `Env` parameter placements.
 //
 // Purpose:
-// - Verifies `#[common_macros::only_owner]` can locate an `Env` argument in the function signature,
+// - Verifies `#[common_macros::only_auth]` can locate an `Env` argument in the function signature,
 //   even when `Env` is not the first parameter.
-// - Uses `&Env` forms to match the most common `require_owner_auth` signature shape.
+// - Uses `&Env` forms to match the most common `require_auth` signature shape.
 
-use soroban_sdk::{contract, Env};
+use soroban_sdk::{contract, Address, Env};
 
 #[contract]
 #[common_macros::ownable]
@@ -13,31 +13,31 @@ pub struct MyContract;
 
 impl MyContract {
     // `Env` as the first argument, by reference.
-    #[common_macros::only_owner]
+    #[common_macros::only_auth]
     pub fn f1(env: &Env) {
         let _ = env;
     }
 
     // `Env` not in the first position.
-    #[common_macros::only_owner]
+    #[common_macros::only_auth]
     pub fn f2(x: u32, env: &Env) {
         let _ = (x, env);
     }
 
     // `Env` using a fully-qualified type path.
-    #[common_macros::only_owner]
+    #[common_macros::only_auth]
     pub fn f3(env: &soroban_sdk::Env) {
         let _ = env;
     }
 
     // Env by value
-    #[common_macros::only_owner]
+    #[common_macros::only_auth]
     pub fn f4(env: Env) {
         let _ = env;
     }
 
     // Qualified Env by value, not first param
-    #[common_macros::only_owner]
+    #[common_macros::only_auth]
     pub fn f5(x: u32, env: soroban_sdk::Env) {
         let _ = (x, env);
     }

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

@@ -1,17 +1,18 @@
-// UI (trybuild) test: `#[ttl_configurable]` on a minimal contract compiles.
+// UI (trybuild) test: `#[ttl_configurable]` and `#[ttl_extendable]` on a minimal contract compiles.
 //
 // Purpose:
 // - Ensures `#[common_macros::ttl_configurable]` can be applied to a contract struct in a downstream crate.
 // - Validates the macro-generated `utils::ttl::TtlConfigurable` trait impl exists and is callable.
-// - Validates `#[ttl_configurable]` also injects `#[ownable]` (so init_owner exists) without requiring
-//   downstream imports or special setup.
+// - Validates `#[ttl_extendable]` generates the `extend_instance_ttl` function.
 // - Avoids snapshotting token output; compilation success + type-checking is the integration contract.
 
-use common_macros::{ownable, ttl_configurable};
+use common_macros::{ownable, ttl_configurable, ttl_extendable};
 use soroban_sdk::{contract, contractimpl, Address, Env};
+use utils::ttl_configurable::TtlConfig;
 
 #[contract]
 #[ttl_configurable]
+#[ttl_extendable]
 #[ownable]
 pub struct MyContract;
 
@@ -19,7 +20,6 @@ pub struct MyContract;
 impl MyContract {
     // Provide a small init entry to type-check the injected ownable helper exists.
     pub fn init(env: Env, owner: Address) {
-        // `init_owner` should exist because `#[ttl_configurable]` injects `#[ownable]`.
         Self::init_owner(&env, &owner);
     }
 
@@ -36,7 +36,7 @@ impl MyContract {
         Self::set_ttl_configs(&env, &none, &none);
         Self::freeze_ttl_configs(&env);
 
-        // Type-check the inherent manual instance TTL extender exists.
+        // Type-check the manual instance TTL extender from #[ttl_extendable].
         Self::extend_instance_ttl(&env, 1, 2);
     }
 }

package/contracts/message-libs/message-lib-common/src/errors.rs

@@ -1,14 +1,19 @@
 use common_macros::contract_error;
 
+// Message Lib Common error codes: 1100-1199
+// See ERROR_SPEC.md for allocation rules
+
+/// PacketCodecV1Error: 1100-1109
 #[contract_error]
 pub enum PacketCodecV1Error {
-    InvalidPacketHeader = 1001,
+    InvalidPacketHeader = 1100,
     InvalidPacketVersion,
 }
 
+/// WorkerOptionsError: 1110-1119
 #[contract_error]
 pub enum WorkerOptionsError {
-    InvalidBytesLength = 1101,
+    InvalidBytesLength = 1110,
     InvalidLegacyOptionsType1,
     InvalidLegacyOptionsType2,
     InvalidOptionType,

package/contracts/message-libs/message-lib-common/src/tests/packet_codec_v1/decode_packet_header.rs

@@ -3,7 +3,7 @@ use crate::packet_codec_v1::{decode_packet_header, HEADER_LENGTH, PACKET_VERSION
 use soroban_sdk::{Bytes, BytesN, Env};
 
 #[test]
-#[should_panic(expected = "Error(Contract, #1001)")] // PacketCodecV1Error::InvalidPacketHeader
+#[should_panic(expected = "Error(Contract, #1100)")] // PacketCodecV1Error::InvalidPacketHeader
 fn test_decode_packet_header_rejects_invalid_length() {
     let env = Env::default();
     // Only 3 bytes instead of HEADER_LENGTH.
@@ -12,7 +12,7 @@ fn test_decode_packet_header_rejects_invalid_length() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #1002)")] // PacketCodecV1Error::InvalidPacketVersion
+#[should_panic(expected = "Error(Contract, #1101)")] // PacketCodecV1Error::InvalidPacketVersion
 fn test_decode_packet_header_rejects_invalid_version() {
     let env = Env::default();
     // Correct length, wrong version.
@@ -23,7 +23,7 @@ fn test_decode_packet_header_rejects_invalid_version() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #1001)")] // PacketCodecV1Error::InvalidPacketHeader
+#[should_panic(expected = "Error(Contract, #1100)")] // PacketCodecV1Error::InvalidPacketHeader
 fn test_decode_packet_header_rejects_too_long_length() {
     let env = Env::default();
     // HEADER_LENGTH + 1 bytes should still be rejected (length must be exactly HEADER_LENGTH).

package/contracts/message-libs/message-lib-common/src/tests/worker_options/append_lz_receive_option.rs

@@ -1,5 +1,4 @@
-use crate::worker_options::test;
-use crate::worker_options::*;
+use crate::worker_options::{test, *};
 use hex_literal::hex;
 use soroban_sdk::{Bytes, Env};
 use utils::buffer_reader::BufferReader;

package/contracts/message-libs/message-lib-common/src/tests/worker_options/append_native_drop_option.rs

@@ -1,5 +1,4 @@
-use crate::worker_options::test;
-use crate::worker_options::*;
+use crate::worker_options::{test, *};
 use hex_literal::hex;
 use soroban_sdk::{Bytes, BytesN, Env};
 use utils::buffer_reader::BufferReader;

package/contracts/message-libs/message-lib-common/src/tests/worker_options/convert_legacy_options.rs

@@ -183,7 +183,7 @@ fn test_convert_legacy_options_type2_allows_u128_max_gas_and_amount() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #1107)")] // WorkerOptionsError::LegacyOptionsType1GasOverflow
+#[should_panic(expected = "Error(Contract, #1116)")] // WorkerOptionsError::LegacyOptionsType1GasOverflow
 fn test_convert_legacy_options_type1_rejects_gas_overflow() {
     let env = Env::default();
     // Minimal overflow value: u128::MAX + 1 == 2^128
@@ -194,7 +194,7 @@ fn test_convert_legacy_options_type1_rejects_gas_overflow() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #1109)")] // WorkerOptionsError::LegacyOptionsType2GasOverflow
+#[should_panic(expected = "Error(Contract, #1118)")] // WorkerOptionsError::LegacyOptionsType2GasOverflow
 fn test_convert_legacy_options_type2_rejects_gas_overflow() {
     let env = Env::default();
     let legacy_options = Bytes::from_slice(
@@ -209,7 +209,7 @@ fn test_convert_legacy_options_type2_rejects_gas_overflow() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #1108)")] // WorkerOptionsError::LegacyOptionsType2AmountOverflow
+#[should_panic(expected = "Error(Contract, #1117)")] // WorkerOptionsError::LegacyOptionsType2AmountOverflow
 fn test_convert_legacy_options_type2_rejects_amount_overflow() {
     let env = Env::default();
     let legacy_options = Bytes::from_slice(
@@ -224,7 +224,7 @@ fn test_convert_legacy_options_type2_rejects_amount_overflow() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #1103)")] // WorkerOptionsError::InvalidLegacyOptionsType2
+#[should_panic(expected = "Error(Contract, #1112)")] // WorkerOptionsError::InvalidLegacyOptionsType2
 fn test_convert_legacy_options_type2_rejects_receiver_longer_than_32_bytes() {
     let env = Env::default();
 
@@ -239,7 +239,7 @@ fn test_convert_legacy_options_type2_rejects_receiver_longer_than_32_bytes() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #1104)")] // WorkerOptionsError::InvalidOptionType
+#[should_panic(expected = "Error(Contract, #1113)")] // WorkerOptionsError::InvalidOptionType
 fn test_convert_legacy_options_rejects_unknown_legacy_type() {
     let env = Env::default();
     let legacy_options = Bytes::from_slice(&env, &[0u8; 32]);
@@ -247,7 +247,7 @@ fn test_convert_legacy_options_rejects_unknown_legacy_type() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #1102)")] // WorkerOptionsError::InvalidLegacyOptionsType1
+#[should_panic(expected = "Error(Contract, #1111)")] // WorkerOptionsError::InvalidLegacyOptionsType1
 fn test_convert_legacy_options_type1_rejects_invalid_size_too_short() {
     let env = Env::default();
     let legacy_options = Bytes::from_slice(&env, &[0u8; 31]); // 31 bytes
@@ -255,7 +255,7 @@ fn test_convert_legacy_options_type1_rejects_invalid_size_too_short() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #1102)")] // WorkerOptionsError::InvalidLegacyOptionsType1
+#[should_panic(expected = "Error(Contract, #1111)")] // WorkerOptionsError::InvalidLegacyOptionsType1
 fn test_convert_legacy_options_type1_rejects_invalid_size_too_long() {
     let env = Env::default();
     let legacy_options = Bytes::from_slice(&env, &[0u8; 33]); // 33 bytes
@@ -263,7 +263,7 @@ fn test_convert_legacy_options_type1_rejects_invalid_size_too_long() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #1103)")] // WorkerOptionsError::InvalidLegacyOptionsType2
+#[should_panic(expected = "Error(Contract, #1112)")] // WorkerOptionsError::InvalidLegacyOptionsType2
 fn test_convert_legacy_options_type2_rejects_invalid_size_too_short() {
     let env = Env::default();
     // 64 bytes (no receiver)
@@ -272,7 +272,7 @@ fn test_convert_legacy_options_type2_rejects_invalid_size_too_short() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #1103)")] // WorkerOptionsError::InvalidLegacyOptionsType2
+#[should_panic(expected = "Error(Contract, #1112)")] // WorkerOptionsError::InvalidLegacyOptionsType2
 fn test_convert_legacy_options_type2_rejects_invalid_size_too_long() {
     let env = Env::default();
     let legacy_options = Bytes::from_slice(&env, &[0u8; 97]); // 97 bytes

package/contracts/message-libs/message-lib-common/src/tests/worker_options/extract_type_3_options.rs

@@ -116,7 +116,7 @@ fn test_extract_type_3_options_interleaved_executor_and_dvn_keeps_executor_order
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #1106)")] // WorkerOptionsError::InvalidWorkerId
+#[should_panic(expected = "Error(Contract, #1115)")] // WorkerOptionsError::InvalidWorkerId
 fn test_extract_type_3_options_rejects_unknown_worker_id() {
     let env = Env::default();
     // worker_id = 0 (invalid) + option_size = 5 + 5 bytes of dummy data

package/contracts/message-libs/message-lib-common/src/tests/worker_options/left_pad_to_bytes32.rs

@@ -20,7 +20,7 @@ fn test_left_pad_to_bytes32_pads_left_with_zeros() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #1101)")] // WorkerOptionsError::InvalidBytesLength
+#[should_panic(expected = "Error(Contract, #1110)")] // WorkerOptionsError::InvalidBytesLength
 fn test_left_pad_to_bytes32_rejects_len_greater_than_32() {
     let env = Env::default();
     let too_long = Bytes::from_slice(&env, &[0u8; 33]);

package/contracts/message-libs/message-lib-common/src/tests/worker_options/split_worker_options.rs

@@ -122,7 +122,7 @@ fn test_split_worker_options_legacy_type2_converts_to_executor_options() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #1105)")] // WorkerOptionsError::InvalidOptions
+#[should_panic(expected = "Error(Contract, #1114)")] // WorkerOptionsError::InvalidOptions
 fn test_split_worker_options_rejects_too_short_options() {
     let env = Env::default();
     let mut options = Bytes::new(&env);
@@ -131,7 +131,7 @@ fn test_split_worker_options_rejects_too_short_options() {
 }
 
 #[test]
-#[should_panic(expected = "Error(Contract, #1105)")] // WorkerOptionsError::InvalidOptions
+#[should_panic(expected = "Error(Contract, #1114)")] // WorkerOptionsError::InvalidOptions
 fn test_split_worker_options_rejects_empty_options() {
     let env = Env::default();
     let options = Bytes::new(&env);