Merge pull request Emeka000#1070 from ussyalfaks/fix/lifebank-soroban-cleanup

fix(lifebank-soroban): resolve issues

Author: Emeka000

lifebank-soroban/contracts/analytics/src/lib.rs

@@ -9,7 +9,12 @@ mod test;
 pub use error::AnalyticsError;
 pub use types::{AnalyticsConfig, DataKey, MetricsSnapshot, PeriodType, ReportingPeriod};
 
-use soroban_sdk::{contract, contractimpl, symbol_short, Address, Env};
+use soroban_sdk::{contract, contractevent, contractimpl, Address, Env};
+
+#[contractevent(topics = ["anlytcs", "init"], data_format = "single-value")]
+pub struct AnalyticsInitialized {
+    pub admin: Address,
+}
 
 // ── Constants ─────────────────────────────────────────────────────────────────
 
@@ -142,14 +147,7 @@ impl AnalyticsContract {
             .set(&DataKey::TotalPaymentsReleased, &0u64);
         env.storage().persistent().set(&DataKey::TotalVolume, &0i128);
 
-        env.events().publish(
-            (
-                symbol_short!("anlytcs"),
-                symbol_short!("init"),
-                symbol_short!("v1"),
-            ),
-            admin,
-        );
+        AnalyticsInitialized { admin }.publish(&env);
 
         Ok(())
     }

lifebank-soroban/contracts/coordinator/src/lib.rs

@@ -18,7 +18,7 @@ mod test;
 pub use error::CoordinatorError;
 pub use types::{DataKey, ExcursionSummary, WorkflowRecord, WorkflowStatus};
 
-use soroban_sdk::{contract, contractimpl, contracttype, symbol_short, Address, Env, String, Vec};
+use soroban_sdk::{contract, contractevent, contractimpl, contracttype, Address, Env, String, Vec};
 
 /// Default workflow expiry window: 6 hours expressed in seconds.
 /// After `allocate_units` is called, if `confirm_delivery` is never invoked
@@ -122,6 +122,7 @@ mod request_client {
     use soroban_sdk::{contractclient, Address, Env};
 
     #[contractclient(name = "RequestContractClient")]
+    #[allow(dead_code)]
     pub trait RequestContractInterface {
         fn get_request(env: Env, request_id: u64) -> BloodRequest;
     }
@@ -132,6 +133,7 @@ mod inventory_client {
     use soroban_sdk::{contractclient, Address, Env, String};
 
     #[contractclient(name = "InventoryContractClient")]
+    #[allow(dead_code)]
     pub trait InventoryContractInterface {
         fn get_blood_unit(env: Env, blood_unit_id: u64) -> BloodUnit;
         fn update_status(
@@ -168,6 +170,7 @@ mod payment_client {
     }
 
     #[contractclient(name = "PaymentContractClient")]
+    #[allow(dead_code)]
     pub trait PaymentContractInterface {
         fn get_payment(env: Env, payment_id: u64) -> Payment;
         fn update_status(env: Env, payment_id: u64, status: PaymentStatus);
@@ -179,6 +182,54 @@ use inventory_client::InventoryContractClient;
 use payment_client::PaymentContractClient;
 use request_client::RequestContractClient;
 
+// ── Contract events ───────────────────────────────────────────────────────────
+
+#[contractevent(topics = ["coord", "init"], data_format = "single-value")]
+pub struct CoordInitialized {
+    pub admin: Address,
+}
+
+#[contractevent(topics = ["coord", "emrghlt"], data_format = "single-value")]
+pub struct CoordEmergencyHalt {
+    pub admin: Address,
+}
+
+#[contractevent(topics = ["coord", "alloc"], data_format = "vec")]
+pub struct CoordAllocated {
+    pub request_id: u64,
+    pub unit_ids: Vec<u64>,
+    pub unit_count: u32,
+}
+
+#[contractevent(topics = ["coord", "dlvrd"], data_format = "vec")]
+pub struct CoordDelivered {
+    pub request_id: u64,
+    pub location: String,
+}
+
+#[contractevent(topics = ["coord", "settld"], data_format = "vec")]
+pub struct CoordSettled {
+    pub request_id: u64,
+    pub payment_id: u64,
+}
+
+#[contractevent(topics = ["coord", "rollbk"], data_format = "single-value")]
+pub struct CoordRolledBack {
+    pub request_id: u64,
+}
+
+#[contractevent(topics = ["coord", "expired"], data_format = "single-value")]
+pub struct CoordExpired {
+    pub request_id: u64,
+}
+
+#[contractevent(topics = ["coord", "tmp_brch"], data_format = "vec")]
+pub struct CoordTemperatureBreach {
+    pub payment_id: u64,
+    pub unit_id: u64,
+    pub timestamp: u64,
+}
+
 // ── Storage helpers ────────────────────────────────────────────────────────────
 
 fn get_admin(env: &Env) -> Result<Address, CoordinatorError> {
@@ -250,14 +301,7 @@ impl CoordinatorContract {
         env.storage()
             .instance()
             .set(&DataKey::PaymentContract, &payment_contract);
-        env.events().publish(
-            (
-                symbol_short!("coord"),
-                symbol_short!("init"),
-                symbol_short!("v1"),
-            ),
-            admin,
-        );
+        CoordInitialized { admin }.publish(&env);
         Ok(())
     }
 
@@ -341,14 +385,7 @@ impl CoordinatorContract {
             return Err(CoordinatorError::Unauthorized);
         }
         env.storage().instance().set(&DataKey::EmergencyHalt, &true);
-        env.events().publish(
-            (
-                symbol_short!("coord"),
-                symbol_short!("emrghlt"),
-                symbol_short!("v1"),
-            ),
-            admin,
-        );
+        CoordEmergencyHalt { admin }.publish(&env);
         Ok(())
     }
 
@@ -440,14 +477,7 @@ impl CoordinatorContract {
                 .map_err(|_| CoordinatorError::InventoryUpdateFailed)?;
         }
 
-        env.events().publish(
-            (
-                symbol_short!("coord"),
-                symbol_short!("alloc"),
-                symbol_short!("v1"),
-            ),
-            (request_id, unit_ids.clone(), unit_ids.len()),
-        );
+        CoordAllocated { request_id, unit_ids: unit_ids.clone(), unit_count: unit_ids.len() }.publish(&env);
 
         save_workflow(
             &env,
@@ -514,14 +544,7 @@ impl CoordinatorContract {
         wf.delivery_location = Some(location.clone());
         save_workflow(&env, &wf);
 
-        env.events().publish(
-            (
-                symbol_short!("coord"),
-                symbol_short!("dlvrd"),
-                symbol_short!("v1"),
-            ),
-            (request_id, location),
-        );
+        CoordDelivered { request_id, location }.publish(&env);
 
         Ok(())
     }
@@ -567,14 +590,7 @@ impl CoordinatorContract {
         wf.status = WorkflowStatus::Settled;
         save_workflow(&env, &wf);
 
-        env.events().publish(
-            (
-                symbol_short!("coord"),
-                symbol_short!("settld"),
-                symbol_short!("v1"),
-            ),
-            (request_id, wf.payment_id),
-        );
+        CoordSettled { request_id, payment_id: wf.payment_id }.publish(&env);
 
         Ok(())
     }
@@ -628,14 +644,7 @@ impl CoordinatorContract {
         wf.status = WorkflowStatus::RolledBack;
         save_workflow(&env, &wf);
 
-        env.events().publish(
-            (
-                symbol_short!("coord"),
-                symbol_short!("rollbk"),
-                symbol_short!("v1"),
-            ),
-            request_id,
-        );
+        CoordRolledBack { request_id }.publish(&env);
 
         Ok(())
     }
@@ -709,14 +718,7 @@ impl CoordinatorContract {
         expired_wf.status = WorkflowStatus::RolledBack;
         save_workflow(&env, &expired_wf);
 
-        env.events().publish(
-            (
-                symbol_short!("coord"),
-                symbol_short!("expired"),
-                symbol_short!("v1"),
-            ),
-            request_id,
-        );
+        CoordExpired { request_id }.publish(&env);
 
         Ok(())
     }
@@ -771,10 +773,7 @@ impl CoordinatorContract {
             .map_err(|_| CoordinatorError::PaymentFlagFailed)?;
 
         let now = env.ledger().timestamp();
-        env.events().publish(
-            (symbol_short!("coord"), symbol_short!("tmp_brch")),
-            (payment_id, excursion_summary.unit_id, now),
-        );
+        CoordTemperatureBreach { payment_id, unit_id: excursion_summary.unit_id, timestamp: now }.publish(&env);
 
         Ok(())
     }

lifebank-soroban/contracts/delivery/src/lib.rs

@@ -1,9 +1,22 @@
 #![no_std]
 
 use soroban_sdk::{
-    contract, contracterror, contractimpl, contracttype, symbol_short, Address, Bytes, Env,
+    contract, contracterror, contractevent, contractimpl, contracttype, Address, Bytes, Env,
 };
 
+#[contractevent(topics = ["delivery", "init"], data_format = "vec")]
+pub struct DeliveryInitialized {
+    pub admin: Address,
+    pub request_contract: Address,
+}
+
+#[contractevent(topics = ["comply"], data_format = "vec")]
+pub struct ComplianceAttested {
+    pub delivery_id: u64,
+    pub compliance_hash: Bytes,
+    pub is_compliant: bool,
+}
+
 const DEFAULT_MIN_TEMPERATURE_C: i32 = 2;
 const DEFAULT_MAX_TEMPERATURE_C: i32 = 6;
 
@@ -78,10 +91,11 @@ impl DeliveryContract {
             .instance()
             .set(&DataKey::ProofRequirements, &proof_requirements);
 
-        env.events().publish(
-            (symbol_short!("init"), symbol_short!("v1")),
-            (admin, request_contract),
-        );
+        DeliveryInitialized {
+            admin,
+            request_contract,
+        }
+        .publish(&env);
 
         Ok(())
     }
@@ -144,10 +158,12 @@ impl DeliveryContract {
             &(compliance_hash.clone(), is_compliant),
         );
 
-        env.events().publish(
-            (symbol_short!("comply"), symbol_short!("v1")),
-            (delivery_id, compliance_hash, is_compliant),
-        );
+        ComplianceAttested {
+            delivery_id,
+            compliance_hash,
+            is_compliant,
+        }
+        .publish(&env);
 
         Ok(())
     }