refactor: extract shared admin and TTL utilities into a new mergefi-c…

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
+    "contracts/common",
     "contracts/escrow",
     "contracts/milestones",
     "contracts/maintenance-pool",

contracts/common/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "mergefi-common"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+publish.workspace = true
+
+[lib]
+crate-type = ["rlib"]
+
+[dependencies]
+soroban-sdk = { workspace = true }

contracts/common/src/lib.rs

@@ -0,0 +1,22 @@
+#![no_std]
+
+use soroban_sdk::{Address, Env, IntoVal, Val};
+
+/// Trait to identify the Admin key for a contract's DataKey enum
+pub trait AdminKey {
+    fn admin_key() -> Self;
+}
+
+pub fn require_admin<K>(env: &Env) -> Option<Address>
+where
+    K: AdminKey + IntoVal<Env, Val>,
+{
+    env.storage().instance().get(&K::admin_key())
+}
+
+pub fn extend_ttl<K>(env: &Env, key: &K)
+where
+    K: IntoVal<Env, Val>,
+{
+    env.storage().persistent().extend_ttl(key, 100_000, 500_000);
+}

contracts/escrow/Cargo.toml

@@ -10,6 +10,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 soroban-sdk = { workspace = true }
+mergefi-common = { path = "../common" }
 
 [dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }

contracts/escrow/src/lib.rs

@@ -320,15 +320,12 @@ pub(crate) fn compute_split(
 }
 
 pub(crate) fn require_admin(env: &Env) -> Result<Address, Error> {
-    env.storage()
-        .instance()
-        .get(&DataKey::Admin)
-        .ok_or(Error::NotInitialized)
+    mergefi_common::require_admin::<DataKey>(env).ok_or(Error::NotInitialized)
 }
 
 /// Extends the TTL of a persistent entry so escrow records aren't archived
 /// while still active. Threshold/extend values are conservative defaults
 /// suitable for a multi-month bounty lifecycle.
 pub(crate) fn extend_ttl(env: &Env, key: &DataKey) {
-    env.storage().persistent().extend_ttl(key, 100_000, 500_000);
+    mergefi_common::extend_ttl(env, key);
 }

contracts/escrow/src/types.rs

@@ -27,3 +27,9 @@ pub enum DataKey {
     FeeBps,
     Escrow(u64),
 }
+
+impl mergefi_common::AdminKey for DataKey {
+    fn admin_key() -> Self {
+        DataKey::Admin
+    }
+}

contracts/maintenance-pool/Cargo.toml

@@ -10,6 +10,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 soroban-sdk = { workspace = true }
+mergefi-common = { path = "../common" }
 
 [dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }

contracts/maintenance-pool/src/lib.rs

@@ -172,12 +172,9 @@ impl MaintenancePoolContract {
 }
 
 fn require_admin(env: &Env) -> Result<Address, Error> {
-    env.storage()
-        .instance()
-        .get(&DataKey::Admin)
-        .ok_or(Error::NotInitialized)
+    mergefi_common::require_admin::<DataKey>(env).ok_or(Error::NotInitialized)
 }
 
 fn extend_ttl(env: &Env, key: &DataKey) {
-    env.storage().persistent().extend_ttl(key, 100_000, 500_000);
+    mergefi_common::extend_ttl(env, key);
 }

contracts/maintenance-pool/src/types.rs

@@ -33,3 +33,9 @@ pub enum DataKey {
     Pool(u64),
     Deposit(u64, u32), // (pool_id, deposit_index)
 }
+
+impl mergefi_common::AdminKey for DataKey {
+    fn admin_key() -> Self {
+        DataKey::Admin
+    }
+}

contracts/milestones/Cargo.toml

@@ -10,6 +10,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 soroban-sdk = { workspace = true }
+mergefi-common = { path = "../common" }
 
 [dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }

contracts/milestones/src/lib.rs

@@ -304,12 +304,9 @@ fn compute_split(
 }
 
 fn require_admin(env: &Env) -> Result<Address, Error> {
-    env.storage()
-        .instance()
-        .get(&DataKey::Admin)
-        .ok_or(Error::NotInitialized)
+    mergefi_common::require_admin::<DataKey>(env).ok_or(Error::NotInitialized)
 }
 
 fn extend_ttl(env: &Env, key: &DataKey) {
-    env.storage().persistent().extend_ttl(key, 100_000, 500_000);
+    mergefi_common::extend_ttl(env, key);
 }

contracts/milestones/src/types.rs

@@ -34,3 +34,9 @@ pub enum DataKey {
     Milestone(u64),
     IssueStatus(u64, u64), // (milestone_id, issue_id)
 }
+
+impl mergefi_common::AdminKey for DataKey {
+    fn admin_key() -> Self {
+        DataKey::Admin
+    }
+}