@layerzerolabs/protocol-stellar-v2 0.2.13 → 0.2.15

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

@@ -0,0 +1,288 @@
+use crate::upgradeable::{self, Upgradeable, UpgradeableInternal, UpgradeableStorage};
+use soroban_sdk::{contract, contractimpl, Bytes, BytesN, Env, Symbol};
+
+// #![no_std]
+
+// use soroban_sdk::{contract, contractimpl, BytesN, Env, Symbol};
+// use utils::upgradeable::{self, Upgradeable, UpgradeableInternal};
+
+// #[contract]
+// pub struct DummyContract;
+
+// impl UpgradeableInternal for DummyContract {
+//     type MigrationData = ();
+
+//     fn _migrate(env: &Env, _migration_data: &Self::MigrationData) {
+//         // Store the migration data to verify it was called
+//         env.storage().instance().set(&Symbol::new(env, "migrated"), &true);
+//     }
+// }
+
+// #[contractimpl]
+// impl Upgradeable for DummyContract {
+//     fn upgrade(env: &Env, new_wasm_hash: BytesN<32>) {
+//         upgradeable::upgrade(env, new_wasm_hash);
+//     }
+
+//     fn migrate(env: &Env, migration_data: &()) {
+//         upgradeable::migrate::<Self>(env, migration_data);
+//     }
+// }
+
+// Hardcoded test WASM bytes for upgrade testing
+// This is the compiled above dummy_contract WASM
+const TEST_WASM: &[u8] = &[
+    0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x29, 0x08, 0x60, 0x01, 0x7e, 0x01, 0x7e, 0x60, 0x02, 0x7e,
+    0x7e, 0x01, 0x7e, 0x60, 0x03, 0x7e, 0x7e, 0x7e, 0x01, 0x7e, 0x60, 0x01, 0x7f, 0x00, 0x60, 0x00, 0x01, 0x7e, 0x60,
+    0x00, 0x00, 0x60, 0x03, 0x7f, 0x7f, 0x7f, 0x00, 0x60, 0x02, 0x7e, 0x7e, 0x00, 0x02, 0x31, 0x08, 0x01, 0x62, 0x01,
+    0x38, 0x00, 0x00, 0x01, 0x6c, 0x01, 0x36, 0x00, 0x00, 0x01, 0x6c, 0x01, 0x30, 0x00, 0x01, 0x01, 0x6c, 0x01, 0x31,
+    0x00, 0x01, 0x01, 0x62, 0x01, 0x6a, 0x00, 0x01, 0x01, 0x78, 0x01, 0x35, 0x00, 0x00, 0x01, 0x6c, 0x01, 0x5f, 0x00,
+    0x02, 0x01, 0x76, 0x01, 0x67, 0x00, 0x01, 0x03, 0x08, 0x07, 0x00, 0x03, 0x00, 0x04, 0x05, 0x06, 0x07, 0x05, 0x03,
+    0x01, 0x00, 0x11, 0x06, 0x21, 0x04, 0x7f, 0x01, 0x41, 0x80, 0x80, 0xc0, 0x00, 0x0b, 0x7f, 0x00, 0x41, 0x88, 0x80,
+    0xc0, 0x00, 0x0b, 0x7f, 0x00, 0x41, 0x91, 0x80, 0xc0, 0x00, 0x0b, 0x7f, 0x00, 0x41, 0xa0, 0x80, 0xc0, 0x00, 0x0b,
+    0x07, 0x3d, 0x06, 0x06, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x02, 0x00, 0x07, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64,
+    0x65, 0x00, 0x08, 0x07, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x65, 0x00, 0x0a, 0x01, 0x5f, 0x03, 0x01, 0x0a, 0x5f,
+    0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x65, 0x6e, 0x64, 0x03, 0x02, 0x0b, 0x5f, 0x5f, 0x68, 0x65, 0x61, 0x70, 0x5f,
+    0x62, 0x61, 0x73, 0x65, 0x03, 0x03, 0x0a, 0x80, 0x05, 0x07, 0x41, 0x00, 0x02, 0x40, 0x02, 0x40, 0x20, 0x00, 0x42,
+    0xff, 0x01, 0x83, 0x42, 0xc8, 0x00, 0x52, 0x0d, 0x00, 0x20, 0x00, 0x10, 0x80, 0x80, 0x80, 0x80, 0x00, 0x42, 0x80,
+    0x80, 0x80, 0x80, 0x70, 0x83, 0x42, 0x80, 0x80, 0x80, 0x80, 0x80, 0x04, 0x51, 0x0d, 0x01, 0x0b, 0x00, 0x0b, 0x41,
+    0x01, 0x10, 0x89, 0x80, 0x80, 0x80, 0x00, 0x20, 0x00, 0x10, 0x81, 0x80, 0x80, 0x80, 0x00, 0x1a, 0x42, 0x02, 0x0b,
+    0x15, 0x00, 0x10, 0x8b, 0x80, 0x80, 0x80, 0x00, 0x20, 0x00, 0xad, 0x42, 0xff, 0x01, 0x83, 0x10, 0x8e, 0x80, 0x80,
+    0x80, 0x00, 0x0b, 0x97, 0x01, 0x01, 0x01, 0x7f, 0x23, 0x80, 0x80, 0x80, 0x80, 0x00, 0x41, 0x10, 0x6b, 0x22, 0x01,
+    0x24, 0x80, 0x80, 0x80, 0x80, 0x00, 0x02, 0x40, 0x20, 0x00, 0x42, 0xff, 0x01, 0x83, 0x42, 0x02, 0x52, 0x0d, 0x00,
+    0x02, 0x40, 0x02, 0x40, 0x10, 0x8b, 0x80, 0x80, 0x80, 0x00, 0x22, 0x00, 0x42, 0x02, 0x10, 0x82, 0x80, 0x80, 0x80,
+    0x00, 0x42, 0x01, 0x52, 0x0d, 0x00, 0x20, 0x00, 0x42, 0x02, 0x10, 0x83, 0x80, 0x80, 0x80, 0x00, 0xa7, 0x41, 0xff,
+    0x01, 0x71, 0x0e, 0x02, 0x00, 0x01, 0x02, 0x0b, 0x10, 0x8c, 0x80, 0x80, 0x80, 0x00, 0x00, 0x0b, 0x41, 0x00, 0x10,
+    0x89, 0x80, 0x80, 0x80, 0x00, 0x20, 0x01, 0x41, 0x80, 0x80, 0xc0, 0x80, 0x00, 0x41, 0x08, 0x10, 0x8d, 0x80, 0x80,
+    0x80, 0x00, 0x20, 0x01, 0x28, 0x02, 0x00, 0x41, 0x01, 0x46, 0x0d, 0x00, 0x20, 0x01, 0x29, 0x03, 0x08, 0x42, 0x01,
+    0x10, 0x8e, 0x80, 0x80, 0x80, 0x00, 0x20, 0x01, 0x41, 0x10, 0x6a, 0x24, 0x80, 0x80, 0x80, 0x80, 0x00, 0x42, 0x02,
+    0x0f, 0x0b, 0x00, 0x0b, 0x63, 0x02, 0x01, 0x7f, 0x01, 0x7e, 0x23, 0x80, 0x80, 0x80, 0x80, 0x00, 0x41, 0x10, 0x6b,
+    0x22, 0x00, 0x24, 0x80, 0x80, 0x80, 0x80, 0x00, 0x20, 0x00, 0x41, 0x88, 0x80, 0xc0, 0x80, 0x00, 0x41, 0x09, 0x10,
+    0x8d, 0x80, 0x80, 0x80, 0x00, 0x02, 0x40, 0x20, 0x00, 0x28, 0x02, 0x00, 0x41, 0x01, 0x47, 0x0d, 0x00, 0x00, 0x0b,
+    0x20, 0x00, 0x20, 0x00, 0x29, 0x03, 0x08, 0x37, 0x03, 0x00, 0x20, 0x00, 0xad, 0x42, 0x20, 0x86, 0x42, 0x04, 0x84,
+    0x42, 0x84, 0x80, 0x80, 0x80, 0x10, 0x10, 0x87, 0x80, 0x80, 0x80, 0x00, 0x21, 0x01, 0x20, 0x00, 0x41, 0x10, 0x6a,
+    0x24, 0x80, 0x80, 0x80, 0x80, 0x00, 0x20, 0x01, 0x0b, 0x11, 0x00, 0x42, 0x83, 0x80, 0x80, 0x80, 0xc0, 0xbb, 0x01,
+    0x10, 0x85, 0x80, 0x80, 0x80, 0x00, 0x1a, 0x0b, 0x86, 0x02, 0x03, 0x01, 0x7f, 0x01, 0x7e, 0x04, 0x7f, 0x23, 0x80,
+    0x80, 0x80, 0x80, 0x00, 0x41, 0x10, 0x6b, 0x22, 0x03, 0x24, 0x80, 0x80, 0x80, 0x80, 0x00, 0x42, 0x00, 0x21, 0x04,
+    0x20, 0x02, 0x21, 0x05, 0x20, 0x01, 0x21, 0x06, 0x02, 0x40, 0x02, 0x40, 0x03, 0x40, 0x20, 0x05, 0x45, 0x0d, 0x01,
+    0x41, 0x01, 0x21, 0x07, 0x02, 0x40, 0x02, 0x40, 0x20, 0x06, 0x2d, 0x00, 0x00, 0x22, 0x08, 0x41, 0xdf, 0x00, 0x46,
+    0x0d, 0x00, 0x02, 0x40, 0x20, 0x08, 0x41, 0x50, 0x6a, 0x41, 0xff, 0x01, 0x71, 0x41, 0x0a, 0x49, 0x0d, 0x00, 0x02,
+    0x40, 0x20, 0x08, 0x41, 0xbf, 0x7f, 0x6a, 0x41, 0xff, 0x01, 0x71, 0x41, 0x1a, 0x49, 0x0d, 0x00, 0x20, 0x08, 0x41,
+    0x9f, 0x7f, 0x6a, 0x41, 0xff, 0x01, 0x71, 0x41, 0x19, 0x4b, 0x0d, 0x03, 0x20, 0x08, 0x41, 0x45, 0x6a, 0x21, 0x07,
+    0x0c, 0x02, 0x0b, 0x20, 0x08, 0x41, 0x4b, 0x6a, 0x21, 0x07, 0x0c, 0x01, 0x0b, 0x20, 0x08, 0x41, 0x52, 0x6a, 0x21,
+    0x07, 0x0b, 0x20, 0x04, 0x42, 0x06, 0x86, 0x20, 0x07, 0xad, 0x42, 0xff, 0x01, 0x83, 0x84, 0x21, 0x04, 0x20, 0x05,
+    0x41, 0x7f, 0x6a, 0x21, 0x05, 0x20, 0x06, 0x41, 0x01, 0x6a, 0x21, 0x06, 0x0c, 0x01, 0x0b, 0x0b, 0x20, 0x03, 0x20,
+    0x08, 0xad, 0x42, 0x08, 0x86, 0x42, 0x01, 0x84, 0x37, 0x03, 0x00, 0x20, 0x01, 0xad, 0x42, 0x20, 0x86, 0x42, 0x04,
+    0x84, 0x20, 0x02, 0xad, 0x42, 0x20, 0x86, 0x42, 0x04, 0x84, 0x10, 0x84, 0x80, 0x80, 0x80, 0x00, 0x21, 0x04, 0x0c,
+    0x01, 0x0b, 0x20, 0x03, 0x20, 0x04, 0x42, 0x08, 0x86, 0x42, 0x0e, 0x84, 0x22, 0x04, 0x37, 0x02, 0x04, 0x0b, 0x20,
+    0x00, 0x42, 0x00, 0x37, 0x03, 0x00, 0x20, 0x00, 0x20, 0x04, 0x37, 0x03, 0x08, 0x20, 0x03, 0x41, 0x10, 0x6a, 0x24,
+    0x80, 0x80, 0x80, 0x80, 0x00, 0x0b, 0x0f, 0x00, 0x20, 0x00, 0x20, 0x01, 0x42, 0x02, 0x10, 0x86, 0x80, 0x80, 0x80,
+    0x00, 0x1a, 0x0b, 0x0b, 0x1a, 0x01, 0x00, 0x41, 0x80, 0x80, 0xc0, 0x00, 0x0b, 0x11, 0x6d, 0x69, 0x67, 0x72, 0x61,
+    0x74, 0x65, 0x64, 0x4d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x00, 0xdf, 0x0d, 0x0e, 0x63, 0x6f, 0x6e,
+    0x74, 0x72, 0x61, 0x63, 0x74, 0x73, 0x70, 0x65, 0x63, 0x76, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x07, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x0d, 0x6e, 0x65, 0x77, 0x5f, 0x77, 0x61, 0x73, 0x6d, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0xee, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x65, 0x00, 0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x64,
+    0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x00, 0x03, 0xed, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x42, 0x75, 0x66, 0x66, 0x65,
+    0x72, 0x52, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x4c, 0x65, 0x6e, 0x67,
+    0x74, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xe8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x6e,
+    0x76, 0x61, 0x6c, 0x69, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xe9, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x11, 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x57, 0x72, 0x69, 0x74, 0x65, 0x72, 0x45, 0x72, 0x72,
+    0x6f, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x6e,
+    0x76, 0x61, 0x6c, 0x69, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x4c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x08, 0x54, 0x74, 0x6c, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x10, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x54, 0x74, 0x6c, 0x43, 0x6f, 0x6e, 0x66,
+    0x69, 0x67, 0x00, 0x00, 0x04, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x54, 0x74, 0x6c, 0x43, 0x6f,
+    0x6e, 0x66, 0x69, 0x67, 0x46, 0x72, 0x6f, 0x7a, 0x65, 0x6e, 0x00, 0x00, 0x00, 0x04, 0xb1, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x16, 0x54, 0x74, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64,
+    0x79, 0x46, 0x72, 0x6f, 0x7a, 0x65, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x04, 0xb2, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x4f, 0x77, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x72,
+    0x72, 0x6f, 0x72, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x4f, 0x77, 0x6e, 0x65,
+    0x72, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x53, 0x65, 0x74, 0x00, 0x00, 0x00, 0x05, 0x14, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x0b, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x53, 0x65, 0x74, 0x00, 0x00, 0x00,
+    0x05, 0x15, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x42,
+    0x79, 0x74, 0x65, 0x73, 0x45, 0x78, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x4d, 0x69, 0x73, 0x6d, 0x61,
+    0x74, 0x63, 0x68, 0x00, 0x00, 0x00, 0x00, 0x05, 0x78, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x72,
+    0x72, 0x6f, 0x72, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4d, 0x69, 0x67, 0x72,
+    0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x74, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x00, 0x00, 0x00, 0x05,
+    0xdc, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x2c, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x20, 0x65, 0x6d, 0x69, 0x74,
+    0x74, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x73, 0x68, 0x69, 0x70, 0x20,
+    0x69, 0x73, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x2e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x14, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x73, 0x68, 0x69, 0x70, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66,
+    0x65, 0x72, 0x72, 0x65, 0x64, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x14, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x73,
+    0x68, 0x69, 0x70, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x00, 0x00, 0x00, 0x02, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x6f, 0x6c, 0x64, 0x5f, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x6e, 0x65, 0x77,
+    0x5f, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x02, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x2a, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x20, 0x65, 0x6d, 0x69,
+    0x74, 0x74, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x73, 0x68, 0x69, 0x70,
+    0x20, 0x69, 0x73, 0x20, 0x72, 0x65, 0x6e, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x64, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x12, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x6e, 0x6f, 0x75,
+    0x6e, 0x63, 0x65, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x12, 0x4f, 0x77, 0x6e, 0x65, 0x72,
+    0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x6e, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x6f, 0x6c, 0x64, 0x5f, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x4f, 0x77,
+    0x6e, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x57, 0x41, 0x20, 0x70, 0x61, 0x69, 0x72, 0x20, 0x6f, 0x66, 0x20,
+    0x54, 0x54, 0x4c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x3a, 0x20, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f,
+    0x6c, 0x64, 0x20, 0x28, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
+    0x20, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x29, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x65, 0x78, 0x74,
+    0x65, 0x6e, 0x64, 0x5f, 0x74, 0x6f, 0x20, 0x28, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x20, 0x54, 0x54, 0x4c, 0x29,
+    0x2e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x54, 0x74, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x28, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x20, 0x54,
+    0x54, 0x4c, 0x20, 0x61, 0x66, 0x74, 0x65, 0x72, 0x20, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x20,
+    0x28, 0x69, 0x6e, 0x20, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x73, 0x29, 0x2e, 0x00, 0x00, 0x00, 0x09, 0x65, 0x78,
+    0x74, 0x65, 0x6e, 0x64, 0x5f, 0x74, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x33, 0x54,
+    0x54, 0x4c, 0x20, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x74,
+    0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x73, 0x20, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x28,
+    0x69, 0x6e, 0x20, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x73, 0x29, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x09, 0x74, 0x68,
+    0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x02, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x54, 0x74, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+    0x67, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x06, 0x46, 0x72, 0x6f, 0x7a, 0x65, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x50, 0x65, 0x72, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x27, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x20, 0x65, 0x6d, 0x69, 0x74, 0x74,
+    0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x54, 0x54, 0x4c, 0x20, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73,
+    0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x65, 0x74, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x54,
+    0x74, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x53, 0x65, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x0d, 0x54, 0x74, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x53, 0x65, 0x74, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+    0x63, 0x65, 0x00, 0x00, 0x03, 0xe8, 0x00, 0x00, 0x07, 0xd0, 0x00, 0x00, 0x00, 0x09, 0x54, 0x74, 0x6c, 0x43, 0x6f,
+    0x6e, 0x66, 0x69, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,
+    0x70, 0x65, 0x72, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x03, 0xe8, 0x00, 0x00, 0x07,
+    0xd0, 0x00, 0x00, 0x00, 0x09, 0x54, 0x74, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x2a, 0x45, 0x76, 0x65, 0x6e, 0x74,
+    0x20, 0x65, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x54, 0x54, 0x4c, 0x20, 0x63,
+    0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x66, 0x72, 0x6f, 0x7a, 0x65, 0x6e, 0x2e, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x54, 0x74, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73,
+    0x46, 0x72, 0x6f, 0x7a, 0x65, 0x6e, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x54, 0x74, 0x6c, 0x43, 0x6f,
+    0x6e, 0x66, 0x69, 0x67, 0x73, 0x46, 0x72, 0x6f, 0x7a, 0x65, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
+    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x55, 0x70, 0x67,
+    0x72, 0x61, 0x64, 0x65, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4d, 0x69, 0x67, 0x72, 0x61,
+    0x74, 0x69, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x11, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x65,
+    0x6e, 0x76, 0x6d, 0x65, 0x74, 0x61, 0x76, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x6f, 0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6d, 0x65, 0x74, 0x61, 0x76, 0x30, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x72, 0x73, 0x76, 0x65, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
+    0x31, 0x2e, 0x39, 0x30, 0x2e, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x72, 0x73, 0x73,
+    0x64, 0x6b, 0x76, 0x65, 0x72, 0x00, 0x00, 0x00, 0x2f, 0x32, 0x33, 0x2e, 0x34, 0x2e, 0x30, 0x23, 0x36, 0x37, 0x33,
+    0x64, 0x36, 0x63, 0x34, 0x66, 0x32, 0x33, 0x36, 0x38, 0x64, 0x32, 0x38, 0x32, 0x64, 0x32, 0x35, 0x64, 0x61, 0x32,
+    0x39, 0x62, 0x64, 0x61, 0x35, 0x35, 0x63, 0x32, 0x31, 0x62, 0x38, 0x62, 0x65, 0x36, 0x39, 0x63, 0x61, 0x36, 0x00,
+    0x00, 0x2b, 0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6d, 0x65, 0x74, 0x61, 0x76, 0x30, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x63, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x32,
+    0x33, 0x2e, 0x33, 0x2e, 0x30, 0x23, 0x00,
+];
+
+// ============================================
+// Dummy Contract for Testing
+// ============================================
+
+#[contract]
+pub struct DummyContract;
+
+// Regular trait implementation (not a contract implementation)
+impl UpgradeableInternal for DummyContract {
+    type MigrationData = ();
+
+    fn __migrate(env: &Env, _migration_data: &Self::MigrationData) {
+        // Store the migration data to verify it was called
+        env.storage().instance().set(&Symbol::new(env, "migrated"), &0_u32);
+    }
+}
+
+#[contractimpl]
+impl Upgradeable for DummyContract {
+    fn upgrade(env: &Env, new_wasm_hash: BytesN<32>) {
+        upgradeable::upgrade(env, new_wasm_hash);
+    }
+
+    fn migrate(env: &Env, migration_data: &()) {
+        upgradeable::migrate::<Self>(env, migration_data);
+    }
+}
+
+#[test]
+fn test_upgrade_success() {
+    let env = Env::default();
+    let contract_id = env.register(DummyContract, ());
+
+    // Upload valid contract WASM to get a valid hash
+    let wasm_hash = env.deployer().upload_contract_wasm(Bytes::from_slice(&env, TEST_WASM));
+
+    env.as_contract(&contract_id, || {
+        // Initially, migrating flag should not be set
+        assert_eq!(UpgradeableStorage::migrating(&env), None);
+    });
+
+    // Call the actual upgrade function with valid WASM hash
+    let client = DummyContractClient::new(&env, &contract_id);
+    client.upgrade(&wasm_hash);
+
+    env.as_contract(&contract_id, || {
+        // Verify the flag is set by upgrade()
+        assert_eq!(UpgradeableStorage::migrating(&env), Some(true));
+    });
+}
+
+#[test]
+fn test_migrate_success() {
+    let env = Env::default();
+    let contract_id = env.register(DummyContract, ());
+    let client = DummyContractClient::new(&env, &contract_id);
+
+    let wasm_hash = env.deployer().upload_contract_wasm(Bytes::from_slice(&env, TEST_WASM));
+    client.upgrade(&wasm_hash);
+    client.migrate(&());
+
+    env.as_contract(&contract_id, || {
+        // Verify migration flag was cleared
+        assert_eq!(UpgradeableStorage::migrating(&env), Some(false));
+
+        // Verify migration data was stored (proving _migrate was called)
+        let stored_value: Option<bool> = env.storage().instance().get(&Symbol::new(&env, "migrated"));
+        assert_eq!(stored_value, Some(true));
+    });
+}
+
+#[test]
+#[should_panic(expected = "Error(Contract, #1500)")]
+fn test_migrate_fail_without_upgrade() {
+    let env = Env::default();
+    let contract_id = env.register(DummyContract, ());
+    let client = DummyContractClient::new(&env, &contract_id);
+
+    // Try to migrate without setting migrating flag first
+    // Should panic with MigrationNotAllowed
+    client.migrate(&());
+}
+
+// ============================================
+// Integration test: upgrade then migrate
+// ============================================
+
+#[test]
+#[should_panic(expected = "Error(Contract, #1500)")]
+fn test_cannot_migrate_twice_without_upgrade() {
+    let env = Env::default();
+    let contract_id = env.register(DummyContract, ());
+    let client = DummyContractClient::new(&env, &contract_id);
+
+    // First upgrade and migrate with valid WASM
+    let wasm_hash = env.deployer().upload_contract_wasm(Bytes::from_slice(&env, TEST_WASM));
+    client.upgrade(&wasm_hash);
+    client.migrate(&());
+
+    // Try to migrate again without upgrade - should panic
+    client.migrate(&());
+}

package/contracts/utils/src/{ttl.rs → ttl_configurable.rs}

@@ -1,7 +1,10 @@
-use crate::errors::TtlError;
-use soroban_sdk::{assert_with_error, contractclient, contractevent, contracttype, Env};
+use crate::{
+    errors::TtlConfigurableError,
+    ownable::{require_owner_auth, Ownable},
+};
+use soroban_sdk::{assert_with_error, contractevent, contracttrait, contracttype, Env};
 
-/// Number of ledgers per day (~5 second ledger close time).
+/// Ledgers per day (~5 second close time).
 pub const LEDGERS_PER_DAY: u32 = (24 * 3600) / 5;
 
 /// Maximum TTL (1 year) allowed by the protocol.
@@ -11,12 +14,7 @@ pub const LEDGERS_PER_DAY: u32 = (24 * 3600) / 5;
 /// extend_to value.
 pub const MAX_TTL: u32 = 365 * LEDGERS_PER_DAY;
 
-/// Default TTL for instance storage (30 days, extends at 29 days remaining).
-pub const DEFAULT_INSTANCE_TTL: TtlConfig = TtlConfig::new(29 * LEDGERS_PER_DAY, 30 * LEDGERS_PER_DAY);
-/// Default TTL for persistent storage (30 days, extends at 29 days remaining).
-pub const DEFAULT_PERSISTENT_TTL: TtlConfig = TtlConfig::new(29 * LEDGERS_PER_DAY, 30 * LEDGERS_PER_DAY);
-
-/// A pair of TTL values: threshold (when to trigger extension) and extend_to (target TTL).
+/// TTL configuration: threshold (when to extend) and extend_to (target TTL).
 #[contracttype]
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct TtlConfig {
@@ -38,11 +36,32 @@ impl TtlConfig {
     }
 }
 
+// =============================================================================
+// Events
+// =============================================================================
+
+/// Event emitted when TTL configs are set.
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct TtlConfigsSet {
+    pub instance: Option<TtlConfig>,
+    pub persistent: Option<TtlConfig>,
+}
+
+/// Event emitted when TTL configs are frozen.
+#[contractevent]
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct TtlConfigsFrozen {}
+
+// =============================================================================
+// Storage for default implementation
+// =============================================================================
+
 /// Storage keys for TTL configuration.
 ///
-/// Note: These instance storage entries do NOT have automatic TTL extension enabled to avoid
-/// infinite recursion--extending TTL config storage would require reading the TTL config,
-/// which would trigger another extension, creating a deep loop.
+/// Note: Auto-TTL extension is disabled for these instance storage entries to avoid infinite
+/// recursion. Extending TTL config storage would require reading the TTL config, which would
+/// trigger another extension, creating a deep loop.
 #[common_macros::storage]
 pub enum TtlConfigStorage {
     #[instance(bool)]
@@ -56,32 +75,34 @@ pub enum TtlConfigStorage {
     Persistent,
 }
 
-/// Trait for contracts that allow TTL configuration management.
-#[contractclient(name = "TtlConfigurableClient")]
-pub trait TtlConfigurable {
-    /// Sets TTL configs. None values remove the config.
-    fn set_ttl_configs(env: &Env, instance: &Option<TtlConfig>, persistent: &Option<TtlConfig>);
-
-    /// Returns current TTL configs (instance, persistent).
-    fn ttl_configs(env: &Env) -> (Option<TtlConfig>, Option<TtlConfig>);
-
-    /// Permanently freezes TTL configs, preventing further changes.
-    fn freeze_ttl_configs(env: &Env);
-
-    /// Returns whether TTL configs are frozen.
-    fn is_ttl_configs_frozen(env: &Env) -> bool;
-}
-
-/// Default implementation of TtlConfigurable.
-pub struct DefaultTtlConfigurable;
-
-impl TtlConfigurable for DefaultTtlConfigurable {
+/// Trait for contracts that support configurable TTL (Time-To-Live) management.
+///
+/// Allows the contract owner to configure how long instance and persistent storage entries
+/// remain alive on Stellar.
+///
+/// The owner can also permanently freeze the configuration to prevent future changes,
+/// providing immutability guarantees to users.
+#[contracttrait]
+pub trait TtlConfigurable: Ownable {
+    /// Sets TTL configs for instance and persistent storage.
+    ///
+    /// - `None` values remove the corresponding config (disables auto-extension for that type)
+    /// - Validates that `threshold <= extend_to <= MAX_TTL`
+    ///
+    /// # Arguments
+    /// - `instance` - TTL config for instance storage
+    /// - `persistent` - TTL config for persistent storage
+    ///
+    /// # Panics
+    /// - `TtlConfigFrozen` if configs are frozen
+    /// - `InvalidTtlConfig` if validation fails
     fn set_ttl_configs(env: &Env, instance: &Option<TtlConfig>, persistent: &Option<TtlConfig>) {
-        assert_with_error!(env, !Self::is_ttl_configs_frozen(env), TtlError::TtlConfigFrozen);
+        require_owner_auth::<Self>(env);
+        assert_with_error!(env, !Self::is_ttl_configs_frozen(env), TtlConfigurableError::TtlConfigFrozen);
 
         let max_ttl = u32::min(MAX_TTL, env.storage().max_ttl());
         let all_valid = [instance, persistent].iter().all(|c| c.is_none_or(|cfg| cfg.is_valid(max_ttl)));
-        assert_with_error!(env, all_valid, TtlError::InvalidTtlConfig);
+        assert_with_error!(env, all_valid, TtlConfigurableError::InvalidTtlConfig);
 
         TtlConfigStorage::set_or_remove_instance(env, instance);
         TtlConfigStorage::set_or_remove_persistent(env, persistent);
@@ -89,35 +110,29 @@ impl TtlConfigurable for DefaultTtlConfigurable {
         TtlConfigsSet { instance: *instance, persistent: *persistent }.publish(env);
     }
 
+    /// Returns the current TTL configs as (instance_config, persistent_config).
     fn ttl_configs(env: &Env) -> (Option<TtlConfig>, Option<TtlConfig>) {
         (TtlConfigStorage::instance(env), TtlConfigStorage::persistent(env))
     }
 
+    /// Permanently freezes TTL configs, preventing any future modifications.
+    ///
+    /// This is irreversible and provides immutability guarantees to users.
+    /// Emits `TtlConfigsFrozen` event.
+    ///
+    /// # Panics
+    /// - `TtlConfigAlreadyFrozen` if already frozen
     fn freeze_ttl_configs(env: &Env) {
-        assert_with_error!(env, !Self::is_ttl_configs_frozen(env), TtlError::TtlConfigAlreadyFrozen);
+        require_owner_auth::<Self>(env);
+        assert_with_error!(env, !Self::is_ttl_configs_frozen(env), TtlConfigurableError::TtlConfigAlreadyFrozen);
+
         TtlConfigStorage::set_frozen(env, &true);
 
         TtlConfigsFrozen {}.publish(env);
     }
 
+    /// Returns whether TTL configs are frozen.
     fn is_ttl_configs_frozen(env: &Env) -> bool {
         TtlConfigStorage::frozen(env)
     }
 }
-
-// ============================================
-// Events
-// ============================================
-
-/// Event emitted when TTL configs are set.
-#[contractevent]
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct TtlConfigsSet {
-    pub instance: Option<TtlConfig>,
-    pub persistent: Option<TtlConfig>,
-}
-
-/// Event emitted when TTL configs are frozen.
-#[contractevent]
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct TtlConfigsFrozen {}

package/contracts/utils/src/upgradeable.rs

@@ -0,0 +1,54 @@
+use crate::errors::UpgradeableError;
+use common_macros::storage;
+use soroban_sdk::{assert_with_error, BytesN, Env, FromVal, Val};
+
+// ============================================
+// Upgradeable Interface
+// ============================================
+
+/// Trait for contracts with upgrade and migration support.
+pub trait Upgradeable: UpgradeableInternal {
+    /// Upgrades the contract to new WASM bytecode.
+    /// Sets a migration flag that must be cleared by calling `migrate`.
+    fn upgrade(env: &Env, new_wasm_hash: BytesN<32>);
+
+    /// Runs migration logic after an upgrade.
+    /// Can only be called when the migration flag is set by a previous `upgrade` call.
+    fn migrate(env: &Env, migration_data: &Self::MigrationData);
+}
+
+/// Trait for defining contract-specific migration logic.
+/// Contracts using `#[upgradeable]` must implement this trait.
+pub trait UpgradeableInternal {
+    /// The type of data required for migration.
+    /// This is the type used as the `migration_data` parameter in `Upgradeable::migrate` for this contract.
+    type MigrationData: FromVal<Env, Val>;
+
+    /// Internal migration logic to be implemented by the contract.
+    fn __migrate(env: &Env, migration_data: &Self::MigrationData);
+}
+
+// ============================================
+// Storage and Helper Functions
+// ============================================
+
+/// Storage keys for upgrade migration state.
+#[storage]
+pub enum UpgradeableStorage {
+    #[instance(bool)]
+    Migrating,
+}
+
+/// Upgrades the contract to new WASM bytecode and sets the migration flag.
+pub fn upgrade(env: &Env, new_wasm_hash: BytesN<32>) {
+    UpgradeableStorage::set_migrating(env, &true);
+    env.deployer().update_current_contract_wasm(new_wasm_hash);
+}
+
+/// Runs migration logic after an upgrade.
+/// Can only be called when the migration flag is set by a previous `upgrade` call.
+pub fn migrate<T: UpgradeableInternal>(env: &Env, migration_data: &T::MigrationData) {
+    assert_with_error!(env, UpgradeableStorage::migrating(env).unwrap_or(false), UpgradeableError::MigrationNotAllowed);
+    UpgradeableStorage::set_migrating(env, &false);
+    T::__migrate(env, migration_data);
+}

package/contracts/workers/dvn/Cargo.toml

@@ -20,7 +20,7 @@ worker = { workspace = true }
 message-lib-common = { workspace = true }
 utils = { workspace = true }
 common-macros = { workspace = true }
-endpoint-v2 = { workspace = true }
+endpoint-v2 = { workspace = true, features = ["library"] }
 
 [dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }

package/contracts/workers/dvn/src/auth.rs

@@ -65,16 +65,14 @@ impl CustomAccountInterface for LzDVN {
             return Err(DvnError::AuthDataExpired);
         }
 
-        // 2. Admin verification (skip for quorum_change_admin)
-        if !Self::is_invoking_quorum_change_admin(&env, &auth_contexts) {
-            let Sender::Admin(public_key, signature) = sender else {
-                return Err(DvnError::OnlyAdmin);
-            };
-            Self::verify_admin_signature(&env, &public_key, &signature, &signature_payload)?;
+        // 2. Admin verification (quorum_change_admin bypasses this - allows quorum-only admin changes)
+        let requires_admin = !Self::is_invoking_quorum_change_admin(&env, &auth_contexts);
+        if requires_admin {
+            Self::verify_admin_signature(&env, &sender, &signature_payload)?;
         }
 
         // 3. Replay protection
-        let calls = Self::extract_execution_calls(&env, &auth_contexts)?;
+        let calls = Self::collect_contract_calls(&env, &auth_contexts)?;
         let hash = Self::hash_call_data(&env, vid, expiration, &calls);
         if DvnStorage::used_hash(&env, &hash) {
             return Err(DvnError::HashAlreadyUsed);
@@ -93,21 +91,15 @@ impl CustomAccountInterface for LzDVN {
 // ============================================================================
 
 impl LzDVN {
-    /// Verifies that the admin signature is valid and from a registered admin.
-    ///
-    /// # Arguments
-    /// * `public_key` - The admin's Ed25519 public key (32 bytes)
-    /// * `signature` - The admin's signature over the signature payload (64 bytes)
-    /// * `signature_payload` - The payload that was signed
+    /// Verifies that the sender is an admin with a valid signature.
     ///
     /// # Errors
-    /// Returns `DvnError::OnlyAdmin` if the signer is not a registered admin.
-    fn verify_admin_signature(
-        env: &Env,
-        public_key: &BytesN<32>,
-        signature: &BytesN<64>,
-        signature_payload: &Hash<32>,
-    ) -> Result<(), DvnError> {
+    /// - `DvnError::OnlyAdmin` if sender is not `Sender::Admin` or not a registered admin.
+    fn verify_admin_signature(env: &Env, sender: &Sender, signature_payload: &Hash<32>) -> Result<(), DvnError> {
+        let Sender::Admin(public_key, signature) = sender else {
+            return Err(DvnError::OnlyAdmin);
+        };
+
         let admin_address = Address::from_payload(env, AddressPayload::AccountIdPublicKeyEd25519(public_key.clone()));
         if !Self::is_admin(env, &admin_address) {
             return Err(DvnError::OnlyAdmin);
@@ -118,8 +110,8 @@ impl LzDVN {
         Ok(())
     }
 
-    /// Extracts the execution calls from the auth contexts.
-    fn extract_execution_calls(env: &Env, auth_contexts: &Vec<Context>) -> Result<Vec<Call>, DvnError> {
+    /// Collects contract calls from the auth contexts.
+    fn collect_contract_calls(env: &Env, auth_contexts: &Vec<Context>) -> Result<Vec<Call>, DvnError> {
         auth_contexts.iter().try_fold(vec![env], |mut calls, context| {
             let Context::Contract(ctx) = context else {
                 return Err(DvnError::NonContractInvoke);
@@ -129,16 +121,13 @@ impl LzDVN {
         })
     }
 
-    /// Checks if the auth context is for `quorum_change_admin` on this contract.
-    /// This function doesn't require admin verification (quorum-only).
+    /// Checks if the first auth context is a call to `quorum_change_admin` on this contract.
+    ///
+    /// Used to allow quorum-only admin changes without requiring existing admin authorization.
     fn is_invoking_quorum_change_admin(env: &Env, auth_contexts: &Vec<Context>) -> bool {
-        // Must be exactly one call (no bundling with other operations)
-        if auth_contexts.len() != 1 {
-            return false;
-        }
-        let Context::Contract(ctx) = auth_contexts.first().unwrap() else {
-            return false;
-        };
-        ctx.contract == env.current_contract_address() && ctx.fn_name == Symbol::new(env, "quorum_change_admin")
+        auth_contexts.first().is_some_and(|ctx| {
+            let Context::Contract(c) = ctx else { return false };
+            c.contract == env.current_contract_address() && c.fn_name == Symbol::new(env, "quorum_change_admin")
+        })
     }
 }