@layerzerolabs/protocol-stellar-v2 0.2.12 → 0.2.15

package/contracts/common-macros/src/tests/snapshots/common_macros__tests__storage__snapshot_generated_storage_code.snap

@@ -58,7 +58,7 @@ impl StorageKeys {
         let key = StorageKeys::Message(sender.clone());
         let value = env.storage().persistent().get::<_, String>(&key);
         if value.is_some() {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -69,7 +69,7 @@ impl StorageKeys {
     pub fn set_message(env: &soroban_sdk::Env, sender: &Address, value: &String) {
         let key = StorageKeys::Message(sender.clone());
         env.storage().persistent().set(&key, value);
-        if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+        if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
             env,
         ) {
             env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -93,7 +93,7 @@ impl StorageKeys {
         let key = StorageKeys::Message(sender.clone());
         let exists = env.storage().persistent().has(&key);
         if exists {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -150,7 +150,7 @@ impl StorageKeys {
         let key = StorageKeys::Data(id, name.clone());
         let value = env.storage().persistent().get::<_, Vec<u8>>(&key);
         if value.is_some() {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -161,7 +161,7 @@ impl StorageKeys {
     pub fn set_data(env: &soroban_sdk::Env, id: u64, name: &String, value: &Vec<u8>) {
         let key = StorageKeys::Data(id, name.clone());
         env.storage().persistent().set(&key, value);
-        if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+        if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
             env,
         ) {
             env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -186,7 +186,7 @@ impl StorageKeys {
         let key = StorageKeys::Data(id, name.clone());
         let exists = env.storage().persistent().has(&key);
         if exists {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -208,7 +208,7 @@ impl StorageKeys {
         let key = StorageKeys::Owner;
         let value = env.storage().persistent().get::<_, Address>(&key);
         if value.is_some() {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -219,7 +219,7 @@ impl StorageKeys {
     pub fn set_owner(env: &soroban_sdk::Env, value: &Address) {
         let key = StorageKeys::Owner;
         env.storage().persistent().set(&key, value);
-        if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+        if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
             env,
         ) {
             env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -239,7 +239,7 @@ impl StorageKeys {
         let key = StorageKeys::Owner;
         let exists = env.storage().persistent().has(&key);
         if exists {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -258,7 +258,7 @@ impl StorageKeys {
         let key = StorageKeys::OptionalData(key.clone());
         let value = env.storage().persistent().get::<_, Option<Address>>(&key);
         if value.is_some() {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -273,7 +273,7 @@ impl StorageKeys {
     ) {
         let key = StorageKeys::OptionalData(key.clone());
         env.storage().persistent().set(&key, value);
-        if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+        if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
             env,
         ) {
             env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -297,7 +297,7 @@ impl StorageKeys {
         let key = StorageKeys::OptionalData(key.clone());
         let exists = env.storage().persistent().has(&key);
         if exists {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -345,7 +345,7 @@ impl StorageKeys {
         let key = StorageKeys::UserBalance(user.clone());
         let value = env.storage().persistent().get::<_, u32>(&key);
         if value.is_some() {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -356,7 +356,7 @@ impl StorageKeys {
     pub fn set_user_balance(env: &soroban_sdk::Env, user: &Address, value: &u32) {
         let key = StorageKeys::UserBalance(user.clone());
         env.storage().persistent().set(&key, value);
-        if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+        if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
             env,
         ) {
             env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -380,7 +380,7 @@ impl StorageKeys {
         let key = StorageKeys::UserBalance(user.clone());
         let exists = env.storage().persistent().has(&key);
         if exists {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -401,7 +401,7 @@ impl StorageKeys {
         let key = StorageKeys::AnotherVariant(key.clone());
         let value = env.storage().persistent().get::<_, u32>(&key);
         if value.is_some() {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -412,7 +412,7 @@ impl StorageKeys {
     pub fn set_custom(env: &soroban_sdk::Env, key: &Address, value: &u32) {
         let key = StorageKeys::AnotherVariant(key.clone());
         env.storage().persistent().set(&key, value);
-        if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+        if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
             env,
         ) {
             env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -436,7 +436,7 @@ impl StorageKeys {
         let key = StorageKeys::AnotherVariant(key.clone());
         let exists = env.storage().persistent().has(&key);
         if exists {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -457,7 +457,7 @@ impl StorageKeys {
         let key = StorageKeys::U32Value(key);
         let value = env.storage().persistent().get::<_, u32>(&key);
         if value.is_some() {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -468,7 +468,7 @@ impl StorageKeys {
     pub fn set_u32_value(env: &soroban_sdk::Env, key: u32, value: &u32) {
         let key = StorageKeys::U32Value(key);
         env.storage().persistent().set(&key, value);
-        if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+        if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
             env,
         ) {
             env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -492,7 +492,7 @@ impl StorageKeys {
         let key = StorageKeys::U32Value(key);
         let exists = env.storage().persistent().has(&key);
         if exists {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -513,7 +513,7 @@ impl StorageKeys {
         let key = StorageKeys::I64Value(key);
         let value = env.storage().persistent().get::<_, i64>(&key);
         if value.is_some() {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -524,7 +524,7 @@ impl StorageKeys {
     pub fn set_i64_value(env: &soroban_sdk::Env, key: i64, value: &i64) {
         let key = StorageKeys::I64Value(key);
         env.storage().persistent().set(&key, value);
-        if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+        if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
             env,
         ) {
             env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -548,7 +548,7 @@ impl StorageKeys {
         let key = StorageKeys::I64Value(key);
         let exists = env.storage().persistent().has(&key);
         if exists {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -569,7 +569,7 @@ impl StorageKeys {
         let key = StorageKeys::BoolValue(key);
         let value = env.storage().persistent().get::<_, bool>(&key);
         if value.is_some() {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -580,7 +580,7 @@ impl StorageKeys {
     pub fn set_bool_value(env: &soroban_sdk::Env, key: bool, value: &bool) {
         let key = StorageKeys::BoolValue(key);
         env.storage().persistent().set(&key, value);
-        if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+        if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
             env,
         ) {
             env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -604,7 +604,7 @@ impl StorageKeys {
         let key = StorageKeys::BoolValue(key);
         let exists = env.storage().persistent().has(&key);
         if exists {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -625,7 +625,7 @@ impl StorageKeys {
         let key = StorageKeys::U8Value(key.clone());
         let value = env.storage().persistent().get::<_, u32>(&key);
         if value.is_some() {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -636,7 +636,7 @@ impl StorageKeys {
     pub fn set_u8_value(env: &soroban_sdk::Env, key: &u8, value: &u32) {
         let key = StorageKeys::U8Value(key.clone());
         env.storage().persistent().set(&key, value);
-        if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+        if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
             env,
         ) {
             env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -660,7 +660,7 @@ impl StorageKeys {
         let key = StorageKeys::U8Value(key.clone());
         let exists = env.storage().persistent().has(&key);
         if exists {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -681,7 +681,7 @@ impl StorageKeys {
         let key = StorageKeys::UsizeValue(key.clone());
         let value = env.storage().persistent().get::<_, u32>(&key);
         if value.is_some() {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -692,7 +692,7 @@ impl StorageKeys {
     pub fn set_usize_value(env: &soroban_sdk::Env, key: &usize, value: &u32) {
         let key = StorageKeys::UsizeValue(key.clone());
         env.storage().persistent().set(&key, value);
-        if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+        if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
             env,
         ) {
             env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -716,7 +716,7 @@ impl StorageKeys {
         let key = StorageKeys::UsizeValue(key.clone());
         let exists = env.storage().persistent().has(&key);
         if exists {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -737,7 +737,7 @@ impl StorageKeys {
         let key = StorageKeys::StringValue(key.clone());
         let value = env.storage().persistent().get::<_, String>(&key);
         if value.is_some() {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -748,7 +748,7 @@ impl StorageKeys {
     pub fn set_string_value(env: &soroban_sdk::Env, key: &String, value: &String) {
         let key = StorageKeys::StringValue(key.clone());
         env.storage().persistent().set(&key, value);
-        if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+        if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
             env,
         ) {
             env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -772,7 +772,7 @@ impl StorageKeys {
         let key = StorageKeys::StringValue(key.clone());
         let exists = env.storage().persistent().has(&key);
         if exists {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -793,7 +793,7 @@ impl StorageKeys {
         let key = StorageKeys::VecValue(key.clone());
         let value = env.storage().persistent().get::<_, Vec<u32>>(&key);
         if value.is_some() {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -804,7 +804,7 @@ impl StorageKeys {
     pub fn set_vec_value(env: &soroban_sdk::Env, key: &Vec<u32>, value: &Vec<u32>) {
         let key = StorageKeys::VecValue(key.clone());
         env.storage().persistent().set(&key, value);
-        if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+        if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
             env,
         ) {
             env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -828,7 +828,7 @@ impl StorageKeys {
         let key = StorageKeys::VecValue(key.clone());
         let exists = env.storage().persistent().has(&key);
         if exists {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -849,7 +849,7 @@ impl StorageKeys {
         let key = StorageKeys::AddressValue(key.clone());
         let value = env.storage().persistent().get::<_, Address>(&key);
         if value.is_some() {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -860,7 +860,7 @@ impl StorageKeys {
     pub fn set_address_value(env: &soroban_sdk::Env, key: &Address, value: &Address) {
         let key = StorageKeys::AddressValue(key.clone());
         env.storage().persistent().set(&key, value);
-        if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+        if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
             env,
         ) {
             env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -884,7 +884,7 @@ impl StorageKeys {
         let key = StorageKeys::AddressValue(key.clone());
         let exists = env.storage().persistent().has(&key);
         if exists {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -905,7 +905,7 @@ impl StorageKeys {
         let key = StorageKeys::UnitVariant;
         let value = env.storage().persistent().get::<_, u32>(&key);
         if value.is_some() {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -916,7 +916,7 @@ impl StorageKeys {
     pub fn set_unit_variant(env: &soroban_sdk::Env, value: &u32) {
         let key = StorageKeys::UnitVariant;
         env.storage().persistent().set(&key, value);
-        if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+        if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
             env,
         ) {
             env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -936,7 +936,7 @@ impl StorageKeys {
         let key = StorageKeys::UnitVariant;
         let exists = env.storage().persistent().has(&key);
         if exists {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -961,7 +961,7 @@ impl StorageKeys {
         let key = StorageKeys::NamedVariant(first, second.clone(), third.clone());
         let value = env.storage().persistent().get::<_, u32>(&key);
         if value.is_some() {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -978,7 +978,7 @@ impl StorageKeys {
     ) {
         let key = StorageKeys::NamedVariant(first, second.clone(), third.clone());
         env.storage().persistent().set(&key, value);
-        if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+        if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
             env,
         ) {
             env.storage().persistent().extend_ttl(&key, threshold, extend_to);
@@ -1014,7 +1014,7 @@ impl StorageKeys {
         let key = StorageKeys::NamedVariant(first, second.clone(), third.clone());
         let exists = env.storage().persistent().has(&key);
         if exists {
-            if let Some(utils::ttl::TtlConfig { threshold, extend_to }) = utils::ttl::TtlConfigStorage::persistent(
+            if let Some(utils::ttl_configurable::TtlConfig { threshold, extend_to }) = utils::ttl_configurable::TtlConfigStorage::persistent(
                 env,
             ) {
                 env.storage().persistent().extend_ttl(&key, threshold, extend_to);

package/contracts/common-macros/src/tests/snapshots/common_macros__tests__ttl_configurable__snapshot_generated_ttl_configurable_code.snap

@@ -3,34 +3,14 @@ source: contracts/common-macros/src/tests/ttl_configurable.rs
 assertion_line: 20
 expression: formatted
 ---
-#[common_macros::ownable]
 pub struct MyContract {
     some_field: u32,
 }
-use utils::ttl::TtlConfigurable as _;
-#[common_macros::contract_impl]
-impl utils::ttl::TtlConfigurable for MyContract {
-    #[common_macros::only_owner]
-    fn set_ttl_configs(
-        env: &soroban_sdk::Env,
-        instance: &Option<utils::ttl::TtlConfig>,
-        persistent: &Option<utils::ttl::TtlConfig>,
-    ) {
-        utils::ttl::DefaultTtlConfigurable::set_ttl_configs(env, instance, persistent);
-    }
-    fn ttl_configs(
-        env: &soroban_sdk::Env,
-    ) -> (Option<utils::ttl::TtlConfig>, Option<utils::ttl::TtlConfig>) {
-        utils::ttl::DefaultTtlConfigurable::ttl_configs(env)
-    }
-    #[common_macros::only_owner]
-    fn freeze_ttl_configs(env: &soroban_sdk::Env) {
-        utils::ttl::DefaultTtlConfigurable::freeze_ttl_configs(env);
-    }
-    fn is_ttl_configs_frozen(env: &soroban_sdk::Env) -> bool {
-        utils::ttl::DefaultTtlConfigurable::is_ttl_configs_frozen(env)
-    }
-}
+use utils::ttl_configurable::{TtlConfig, TtlConfigurable};
+use utils::ownable::Ownable as _;
+/// Implement the `TtlConfigurable` trait for the contract with default implementations.
+#[common_macros::contract_impl(contracttrait)]
+impl TtlConfigurable for MyContract {}
 /// Uses `soroban_sdk::contractimpl` directly instead of `common_macros::contract_impl`
 /// because `contract_impl` automatically extends TTL on every invocation. Since this
 /// impl block provides manual TTL extension control, auto-extension would be redundant

package/contracts/common-macros/src/tests/snapshots/common_macros__tests__upgradeable__snapshot_generated_upgradeable_code.snap

@@ -0,0 +1,21 @@
+---
+source: contracts/common-macros/src/tests/upgradeable.rs
+assertion_line: 17
+expression: formatted
+---
+pub struct MyContract;
+use utils::upgradeable::Upgradeable as _;
+soroban_sdk::contractmeta!(key = "binver", val = "0.0.1");
+type MigrationData = <MyContract as utils::upgradeable::UpgradeableInternal>::MigrationData;
+/// Implement the Upgradeable trait for the contract.
+#[common_macros::contract_impl]
+impl utils::upgradeable::Upgradeable for MyContract {
+    #[common_macros::only_owner]
+    fn upgrade(env: &soroban_sdk::Env, new_wasm_hash: soroban_sdk::BytesN<32>) {
+        utils::upgradeable::upgrade(env, new_wasm_hash)
+    }
+    #[common_macros::only_owner]
+    fn migrate(env: &soroban_sdk::Env, migration_data: &MigrationData) {
+        utils::upgradeable::migrate::<Self>(env, migration_data)
+    }
+}

package/contracts/common-macros/src/tests/upgradeable.rs

@@ -0,0 +1,31 @@
+use quote::quote;
+
+use crate::tests::test_helpers::{assert_panics_contains, non_struct_item_inputs};
+
+// ============================================
+// Snapshot Test: Upgradeable Code Generation
+// ============================================
+
+#[test]
+fn snapshot_generated_upgradeable_code() {
+    let input = quote! {
+        pub struct MyContract;
+    };
+    let result = crate::upgradeable::generate_upgradeable_impl(input);
+    let formatted = prettyplease::unparse(&syn::parse2::<syn::File>(result).expect("failed to parse generated code"));
+
+    insta::assert_snapshot!(formatted);
+}
+
+// ============================================
+// Error Cases: upgradeable macro non-struct input
+// ============================================
+
+#[test]
+fn test_upgradeable_rejects_non_struct_inputs() {
+    for (case, input) in non_struct_item_inputs() {
+        assert_panics_contains(case, "failed to parse struct", || {
+            crate::upgradeable::generate_upgradeable_impl(input.clone());
+        });
+    }
+}

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

@@ -1,54 +1,26 @@
-//! Default implementation macro for Stellar smart contracts.
-//!
-//! Generates a complete contract setup with:
-//! - `#[contract]` attribute
-//! - Ownable trait implementation
-//! - TtlConfigurable trait implementation with owner auth checks
+//! TtlConfigurable macro for Stellar smart contracts.
 
 use proc_macro2::TokenStream;
 use quote::quote;
 
-/// Generates the TtlConfigurable trait implementation for a contract.
+/// Generates the `TtlConfigurable` trait implementation for a contract.
 ///
-/// The implementation delegates to `DefaultTtlConfigurable` and adds
-/// owner authentication checks for mutating functions.
+/// This macro:
+/// - Implements `TtlConfigurable` using the trait's default methods (which include owner auth)
+/// - Adds an `extend_instance_ttl` helper for manual TTL extension
+///
+/// The contract must also implement `Ownable` (typically via `#[ownable]`).
 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 _;
-
-        #[common_macros::contract_impl]
-        impl utils::ttl::TtlConfigurable for #name {
-
-            #[common_macros::only_owner]
-            fn set_ttl_configs(
-                env: &soroban_sdk::Env,
-                instance: &Option<utils::ttl::TtlConfig>,
-                persistent: &Option<utils::ttl::TtlConfig>,
-            ) {
-                utils::ttl::DefaultTtlConfigurable::set_ttl_configs(env, instance, persistent);
-            }
-
-            fn ttl_configs(
-                env: &soroban_sdk::Env,
-            ) -> (
-                Option<utils::ttl::TtlConfig>,
-                Option<utils::ttl::TtlConfig>,
-            ) {
-                utils::ttl::DefaultTtlConfigurable::ttl_configs(env)
-            }
+    let trait_impl = quote! {
+        use utils::ttl_configurable::{TtlConfig, TtlConfigurable};
+        use utils::ownable::Ownable as _;
 
-            #[common_macros::only_owner]
-            fn freeze_ttl_configs(env: &soroban_sdk::Env) {
-                utils::ttl::DefaultTtlConfigurable::freeze_ttl_configs(env);
-            }
-
-            fn is_ttl_configs_frozen(env: &soroban_sdk::Env) -> bool {
-                utils::ttl::DefaultTtlConfigurable::is_ttl_configs_frozen(env)
-            }
-        }
+        /// Implement the `TtlConfigurable` trait for the contract with default implementations.
+        #[common_macros::contract_impl(contracttrait)]
+        impl TtlConfigurable for #name {}
     };
 
     let inherent_impl = quote! {
@@ -71,10 +43,8 @@ pub fn generate_ttl_configurable_impl(input: TokenStream) -> TokenStream {
     };
 
     quote! {
-        #[common_macros::ownable]
         #item_struct
-
-        #expanded
+        #trait_impl
         #inherent_impl
     }
 }