Implement maintenance alert generation in asset-maintenance in opsce crate

contracts/Cargo.toml

@@ -6,7 +6,7 @@ members = [
   "contrib",
   "multisig-wallet",
   "multisig_transfer",
-  "./opsce",
+  "opsce",
 ]
 
 [workspace.dependencies]

contracts/opsce/Cargo.toml

@@ -3,12 +3,11 @@ name = "opsce"
 version = "0.1.0"
 edition = "2021"
 
-t[lib]
+[lib]
 crate-type = ["lib", "cdylib"]
 doctest = false
 
 [dependencies]
-assetsup = { path = "../assetsup" }
 soroban-sdk = { workspace = true }
 
 [dev-dependencies]

contracts/opsce/src/error.rs

@@ -0,0 +1,24 @@
+use soroban_sdk::contracterror;
+
+#[contracterror]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
+#[repr(u32)]
+pub enum ContractError {
+    WalletNotFound = 1,
+    TransactionNotFound = 2,
+    NotAnOwner = 3,
+    AlreadyApproved = 4,
+    ApprovalNotFound = 5,
+    AlreadyExecuted = 6,
+    InsufficientApprovals = 7,
+    InvalidThreshold = 8,
+    InsufficientOwners = 9,
+    InvalidAssetId = 10,
+    InvalidCost = 11,
+    DuplicateRecord = 12,
+    RecordNotFound = 13,
+    AdminNotSet = 14,
+    NotAdmin = 15,
+    AlertNotFound = 16,
+    AdminAlreadySet = 17,
+}

contracts/opsce/src/lib.rs

@@ -1,13 +1,258 @@
 #![no_std]
 
-mod insurance_claim;
-mod batch_transfer;
+use soroban_sdk::{contract, contractimpl, Address, BytesN, Env, String, Vec};
 
-pub use insurance_claim::*;
-pub use batch_transfer::*;
+pub mod error;
+pub mod maintenance_alerts;
+pub mod maintenance_record;
+pub mod multisig_revoke;
+pub mod types;
 
 #[cfg(test)]
-mod insurance_claim_test;
+mod tests;
 
-#[cfg(test)]
-mod batch_transfer_test;
+pub use crate::error::ContractError;
+pub use crate::types::{
+    AlertSeverity, AlertType, DataKey, MaintenanceAlert, MaintenanceRecord, MaintenanceRecordType,
+    MaintenanceStatus, Transaction, Wallet,
+};
+
+#[contract]
+pub struct OpsceMultisig;
+
+#[contractimpl]
+impl OpsceMultisig {
+    /// Create a new multisig wallet and return its `wallet_id`.
+    pub fn create_wallet(
+        env: Env,
+        admin: Address,
+        owners: Vec<Address>,
+        threshold: u32,
+    ) -> Result<u64, ContractError> {
+        admin.require_auth();
+
+        if owners.len() < 2 {
+            return Err(ContractError::InsufficientOwners);
+        }
+        if threshold == 0 || threshold > owners.len() {
+            return Err(ContractError::InvalidThreshold);
+        }
+
+        let wallet_id: u64 = env
+            .storage()
+            .instance()
+            .get(&DataKey::NextWalletId)
+            .unwrap_or(1);
+        env.storage()
+            .instance()
+            .set(&DataKey::NextWalletId, &(wallet_id + 1));
+
+        let wallet = Wallet {
+            id: wallet_id,
+            owners,
+            threshold,
+        };
+        env.storage()
+            .persistent()
+            .set(&DataKey::Wallet(wallet_id), &wallet);
+        env.storage()
+            .persistent()
+            .set(&DataKey::NextTxId(wallet_id), &1u64);
+
+        Ok(wallet_id)
+    }
+
+    /// Submit a new transaction proposal for a wallet. Returns its `tx_id`.
+    pub fn submit_transaction(
+        env: Env,
+        initiator: Address,
+        wallet_id: u64,
+    ) -> Result<u64, ContractError> {
+        initiator.require_auth();
+
+        let wallet: Wallet = env
+            .storage()
+            .persistent()
+            .get(&DataKey::Wallet(wallet_id))
+            .ok_or(ContractError::WalletNotFound)?;
+
+        if !wallet.owners.contains(&initiator) {
+            return Err(ContractError::NotAnOwner);
+        }
+
+        let tx_id: u64 = env
+            .storage()
+            .persistent()
+            .get(&DataKey::NextTxId(wallet_id))
+            .unwrap_or(1);
+        env.storage()
+            .persistent()
+            .set(&DataKey::NextTxId(wallet_id), &(tx_id + 1));
+
+        let tx = Transaction {
+            id: tx_id,
+            wallet_id,
+            initiator,
+            approvers: Vec::new(&env),
+            approvals: 0,
+            executed: false,
+        };
+        env.storage()
+            .persistent()
+            .set(&DataKey::Transaction(wallet_id, tx_id), &tx);
+
+        Ok(tx_id)
+    }
+
+    /// Approve a pending transaction.
+    pub fn approve_transaction(
+        env: Env,
+        caller: Address,
+        wallet_id: u64,
+        tx_id: u64,
+    ) -> Result<(), ContractError> {
+        caller.require_auth();
+
+        let wallet: Wallet = env
+            .storage()
+            .persistent()
+            .get(&DataKey::Wallet(wallet_id))
+            .ok_or(ContractError::WalletNotFound)?;
+
+        if !wallet.owners.contains(&caller) {
+            return Err(ContractError::NotAnOwner);
+        }
+
+        let mut tx: Transaction = env
+            .storage()
+            .persistent()
+            .get(&DataKey::Transaction(wallet_id, tx_id))
+            .ok_or(ContractError::TransactionNotFound)?;
+
+        if tx.executed {
+            return Err(ContractError::AlreadyExecuted);
+        }
+        if tx.approvers.contains(&caller) {
+            return Err(ContractError::AlreadyApproved);
+        }
+
+        tx.approvers.push_back(caller);
+        tx.approvals += 1;
+
+        env.storage()
+            .persistent()
+            .set(&DataKey::Transaction(wallet_id, tx_id), &tx);
+
+        Ok(())
+    }
+
+    /// Execute the transaction once the approval threshold has been reached.
+    pub fn execute_transaction(
+        env: Env,
+        wallet_id: u64,
+        tx_id: u64,
+    ) -> Result<(), ContractError> {
+        let wallet: Wallet = env
+            .storage()
+            .persistent()
+            .get(&DataKey::Wallet(wallet_id))
+            .ok_or(ContractError::WalletNotFound)?;
+
+        let mut tx: Transaction = env
+            .storage()
+            .persistent()
+            .get(&DataKey::Transaction(wallet_id, tx_id))
+            .ok_or(ContractError::TransactionNotFound)?;
+
+        if tx.executed {
+            return Err(ContractError::AlreadyExecuted);
+        }
+        if tx.approvals < wallet.threshold {
+            return Err(ContractError::InsufficientApprovals);
+        }
+
+        tx.executed = true;
+        env.storage()
+            .persistent()
+            .set(&DataKey::Transaction(wallet_id, tx_id), &tx);
+
+        Ok(())
+    }
+
+    /// Revoke a previously submitted approval (see [`multisig_revoke::revoke_approval`]).
+    pub fn revoke_approval(
+        env: Env,
+        caller: Address,
+        wallet_id: u64,
+        tx_id: u64,
+    ) -> Result<(), ContractError> {
+        multisig_revoke::revoke_approval(&env, caller, wallet_id, tx_id)
+    }
+
+    /// Create a maintenance record (see [`maintenance_record::create_maintenance_record`]).
+    pub fn create_maintenance_record(
+        env: Env,
+        asset_id: String,
+        record_type: MaintenanceRecordType,
+        provider: Address,
+        scheduled_date: u64,
+        cost: i128,
+        notes: String,
+    ) -> Result<BytesN<32>, ContractError> {
+        maintenance_record::create_maintenance_record(
+            &env,
+            asset_id,
+            record_type,
+            provider,
+            scheduled_date,
+            cost,
+            notes,
+        )
+    }
+
+    /// Get all maintenance records associated with the given `asset_id`.
+    pub fn get_maintenance_records(env: Env, asset_id: String) -> Vec<MaintenanceRecord> {
+        maintenance_record::get_maintenance_records(&env, asset_id)
+    }
+
+    /// Get a single maintenance record by its `record_id`.
+    pub fn get_maintenance_record(
+        env: Env,
+        record_id: BytesN<32>,
+    ) -> Option<MaintenanceRecord> {
+        env.storage()
+            .persistent()
+            .get(&DataKey::MaintenanceRecord(record_id))
+    }
+
+    /// One-time admin initialization (used by alert dismissal).
+    pub fn set_admin(env: Env, admin: Address) -> Result<(), ContractError> {
+        maintenance_alerts::set_admin(&env, admin)
+    }
+
+    /// Evaluate scheduled maintenance and generate / return alerts due within 7 days.
+    pub fn check_maintenance_alerts(env: Env, asset_id: String) -> Vec<MaintenanceAlert> {
+        maintenance_alerts::check_maintenance_alerts(&env, asset_id)
+    }
+
+    /// Return all unresolved alerts for the given asset.
+    pub fn get_active_alerts(env: Env, asset_id: String) -> Vec<MaintenanceAlert> {
+        maintenance_alerts::get_active_alerts(&env, asset_id)
+    }
+
+    /// Mark an alert resolved (admin only).
+    pub fn dismiss_alert(
+        env: Env,
+        caller: Address,
+        alert_id: BytesN<32>,
+    ) -> Result<(), ContractError> {
+        maintenance_alerts::dismiss_alert(&env, caller, alert_id)
+    }
+
+    /// Read-only getter for tests / clients.
+    pub fn get_transaction(env: Env, wallet_id: u64, tx_id: u64) -> Option<Transaction> {
+        env.storage()
+            .persistent()
+            .get(&DataKey::Transaction(wallet_id, tx_id))
+    }
+}