feat: fix all error

Author: abdegenius

contracts/niffyinsure/src/claim.rs

@@ -15,15 +15,20 @@
 //   - Rejected claims remain visible on-chain for auditability
 //   - Admin overrides (if implemented) must be documented in governance docs
 
+#![allow(deprecated)]
+
 use crate::{
     storage::{self, DataKey},
-    types::{Claim, ClaimError, ClaimStatus, Policy, VoteOption, DETAILS_MAX_LEN, IMAGE_URLS_MAX, IMAGE_URL_MAX_LEN},
+    types::{
+        Claim, ClaimError, ClaimStatus, Policy, VoteOption, DETAILS_MAX_LEN, IMAGE_URLS_MAX,
+        IMAGE_URL_MAX_LEN,
+    },
 };
 use soroban_sdk::{contracttype, Address, Env, String, Vec};
 
 /// Maximum rejected claims before policy is automatically deactivated.
 /// This threshold must be aligned with legal review and product specifications.
-/// 
+///
 /// GOVERNANCE RISK: This constant is hardcoded; changing it requires contract upgrade.
 /// Consider making this configurable per-policy-type in future iterations.
 pub const MAX_REJECTED_CLAIMS_BEFORE_DEACTIVATION: u32 = 3;
@@ -74,6 +79,27 @@ pub struct ClaimRejected {
     pub claimant: Address,
 }
 
+/// Emitted when an appeal is opened on a rejected claim.
+#[contracttype]
+#[derive(Clone, Debug)]
+pub struct AppealOpened {
+    pub claim_id: u64,
+    pub policy_id: u32,
+    pub claimant: Address,
+    pub appeal_number: u32,
+    pub additional_evidence: String,
+}
+
+/// Emitted when an appeal is closed (either approved or finally rejected).
+#[contracttype]
+#[derive(Clone, Debug)]
+pub struct AppealClosed {
+    pub claim_id: u64,
+    pub policy_id: u32,
+    pub claimant: Address,
+    pub final_status: ClaimStatus,
+}
+
 /// Emitted when a policy receives a strike due to claim rejection.
 #[contracttype]
 #[derive(Clone, Debug)]
@@ -159,6 +185,7 @@ pub fn file_claim(
 
     // Create claim
     let claim_id = storage::next_claim_id(env);
+    let current_ledger = env.ledger().sequence();
     let claim = Claim {
         claim_id,
         policy_id,
@@ -169,6 +196,10 @@ pub fn file_claim(
         status: ClaimStatus::Processing,
         approve_votes: 0,
         reject_votes: 0,
+        filed_at_ledger: current_ledger,
+        rejected_at_ledger: None,
+        appeal_count: 0,
+        appeal_opened_at_ledger: None,
     };
 
     env.storage()
@@ -194,13 +225,15 @@ pub fn file_claim(
 /// Casts a vote on a claim.
 ///
 /// Validation:
-///   - Claim must exist and be in Processing state
+///   - Claim must exist and be in an active voting state (Processing or AppealOpen)
 ///   - Voter must have an active policy (one-policy-one-vote)
-///   - Voter cannot vote twice on the same claim
+///   - Voter cannot vote twice on the same claim phase
 ///
 /// State transitions:
 ///   - Processing → Approved: if approve_votes reaches majority
 ///   - Processing → Rejected: if reject_votes reaches majority
+///   - AppealOpen → Approved: if approve_votes reaches majority
+///   - AppealOpen → RejectedFinal: if reject_votes reaches majority
 ///
 /// Rejection consequences:
 ///   - Increments policy.rejected_claims_count
@@ -212,6 +245,11 @@ pub fn file_claim(
 ///   - Emits ClaimApproved event
 ///
 /// CRITICAL: Rejection path never transfers payout tokens.
+///
+/// APPEAL VOTING RULES:
+///   - Votes reset when appeal is opened (fresh voting round)
+///   - Voters can vote again even if they voted in the initial round
+///   - Vote storage key includes claim phase to prevent double-voting within same phase
 #[allow(dead_code)]
 pub fn vote_on_claim(
     env: &Env,
@@ -229,8 +267,8 @@ pub fn vote_on_claim(
         .get(&claim_key)
         .ok_or(ClaimError::ClaimNotFound)?;
 
-    // Validate claim is in Processing state
-    if claim.status.is_terminal() {
+    // Validate claim is in an active voting state
+    if !claim.status.is_voting_active() {
         return Err(ClaimError::ClaimAlreadyFinalized);
     }
 
@@ -241,8 +279,9 @@ pub fn vote_on_claim(
         return Err(ClaimError::VoterHasNoPolicies);
     }
 
-    // Check if voter already voted
-    let vote_key = DataKey::Vote(claim_id, voter.clone());
+    // Check if voter already voted in this phase
+    // Vote key includes appeal_count to allow re-voting in appeal phase
+    let vote_key = DataKey::VotePhase(claim_id, voter.clone(), claim.appeal_count);
     if env.storage().persistent().has(&vote_key) {
         return Err(ClaimError::AlreadyVoted);
     }
@@ -368,10 +407,7 @@ fn finalize_rejection(env: &Env, claim: &mut Claim) -> Result<(), ClaimError> {
     // Check if deactivation threshold reached
     if policy.rejected_claims_count >= MAX_REJECTED_CLAIMS_BEFORE_DEACTIVATION {
         policy.is_active = false;
-        let reason = String::from_str(
-            env,
-            "deactivated: excessive rejected claims",
-        );
+        let reason = String::from_str(env, "deactivated: excessive rejected claims");
         policy.deactivation_reason = Some(reason.clone());
 
         // Emit deactivation event

contracts/niffyinsure/src/storage.rs

@@ -11,6 +11,8 @@ pub enum DataKey {
     Claim(u64),
     /// (claim_id, voter_address) → VoteOption
     Vote(u64, Address),
+    /// (claim_id, voter_address, appeal_count) → VoteOption for phase-specific voting
+    VotePhase(u64, Address, u32),
     /// Vec<Address> of all current active policyholders (voters)
     Voters,
     /// Global monotonic claim id counter

contracts/niffyinsure/src/types.rs

@@ -21,6 +21,18 @@ pub const REASON_MAX_LEN: u32 = 128;
 /// finalize_claim may be called to settle the outcome.
 pub const VOTE_WINDOW_LEDGERS: u32 = 120_960;
 
+/// Maximum number of appeals allowed per claim.
+/// Prevents infinite ping-pong of voting rounds.
+pub const MAX_APPEALS_PER_CLAIM: u32 = 1;
+
+/// Appeal window in ledgers (~3 days at 5 s/ledger ≈ 51_840 ledgers).
+/// Claimant must open appeal within this window after rejection.
+pub const APPEAL_WINDOW_LEDGERS: u32 = 51_840;
+
+/// Appeal voting window in ledgers (~5 days at 5 s/ledger ≈ 86_400 ledgers).
+/// Shorter than initial vote to expedite resolution.
+pub const APPEAL_VOTE_WINDOW_LEDGERS: u32 = 86_400;
+
 // ── policy_id assignment ─────────────────────────────────────────────────────
 //
 // policy_id is a u32 scoped per holder: the contract increments a per-holder
@@ -48,6 +60,11 @@ pub enum ClaimError {
     ClaimAlreadyFinalized = 9,
     VoterHasNoPolicies = 10,
     AlreadyVoted = 11,
+    AppealNotAllowed = 12,
+    AppealWindowExpired = 13,
+    MaxAppealsReached = 14,
+    NotClaimant = 15,
+    AppealNotInProgress = 16,
 }
 
 // ── Enums ────────────────────────────────────────────────────────────────────
@@ -72,34 +89,52 @@ pub enum RegionTier {
     High,   // urban / high-risk zone
 }
 
-/// Claim lifecycle state machine.
+/// Claim lifecycle state machine with appeals support.
 ///
 /// ```text
 /// [filed] → Processing
 ///               │
 ///        ┌──────┴──────┐
 ///        ▼             ▼
-///    Approved       Rejected
+///    Approved       Rejected ──┐
+///                      │       │ (appeal window)
+///                      ▼       │
+///                 AppealOpen ◄─┘
+///                      │
+///               ┌──────┴──────┐
+///               ▼             ▼
+///          Approved    RejectedFinal
 /// ```
 ///
 /// Transitions:
-///   Processing → Approved  : majority Approve votes reached
-///   Processing → Rejected  : majority Reject votes reached OR policy deactivated
+///   Processing → Approved       : majority Approve votes reached
+///   Processing → Rejected       : majority Reject votes reached
+///   Rejected → AppealOpen       : claimant opens appeal within window
+///   Rejected → RejectedFinal    : appeal window expires without appeal
+///   AppealOpen → Approved       : majority Approve votes on appeal
+///   AppealOpen → RejectedFinal  : majority Reject votes on appeal
 ///
-/// Terminal states (Approved / Rejected) are immutable; no re-open path exists
-/// on-chain.  Off-chain dispute resolution must open a new claim.
+/// Terminal states (Approved / RejectedFinal) are immutable.
+/// Appeals are capped at MAX_APPEALS_PER_CLAIM to prevent infinite loops.
 #[contracttype]
 #[derive(Clone, PartialEq, Debug)]
 pub enum ClaimStatus {
     Processing,
     Approved,
     Rejected,
+    AppealOpen,
+    RejectedFinal,
 }
 
 impl ClaimStatus {
-    /// Returns true only for the two terminal states.
+    /// Returns true only for the terminal states.
     pub fn is_terminal(&self) -> bool {
-        matches!(self, ClaimStatus::Approved | ClaimStatus::Rejected)
+        matches!(self, ClaimStatus::Approved | ClaimStatus::RejectedFinal)
+    }
+
+    /// Returns true if the claim is in an active voting phase.
+    pub fn is_voting_active(&self) -> bool {
+        matches!(self, ClaimStatus::Processing | ClaimStatus::AppealOpen)
     }
 }
 
@@ -155,17 +190,21 @@ pub struct Policy {
 
 /// On-chain claim record.
 ///
-/// | Field         | Authoritative | Notes |
-/// |---------------|---------------|-------|
-/// | claim_id      | on-chain      | global monotonic u64 from ClaimCounter |
-/// | policy_id     | on-chain      | references Policy(holder, policy_id) |
-/// | claimant      | on-chain      | must equal policy.holder |
-/// | amount        | on-chain      | stroops; 0 < amount ≤ policy.coverage |
-/// | details       | on-chain      | ≤ DETAILS_MAX_LEN bytes |
-/// | image_urls    | on-chain      | ≤ IMAGE_URLS_MAX items, each ≤ IMAGE_URL_MAX_LEN |
-/// | status        | on-chain      | ClaimStatus state machine |
-/// | approve_votes | on-chain      | running tally |
-/// | reject_votes  | on-chain      | running tally |
+/// | Field                  | Authoritative | Notes |
+/// |------------------------|---------------|-------|
+/// | claim_id               | on-chain      | global monotonic u64 from ClaimCounter |
+/// | policy_id              | on-chain      | references Policy(holder, policy_id) |
+/// | claimant               | on-chain      | must equal policy.holder |
+/// | amount                 | on-chain      | stroops; 0 < amount ≤ policy.coverage |
+/// | details                | on-chain      | ≤ DETAILS_MAX_LEN bytes |
+/// | image_urls             | on-chain      | ≤ IMAGE_URLS_MAX items, each ≤ IMAGE_URL_MAX_LEN |
+/// | status                 | on-chain      | ClaimStatus state machine |
+/// | approve_votes          | on-chain      | running tally |
+/// | reject_votes           | on-chain      | running tally |
+/// | filed_at_ledger        | on-chain      | ledger when claim was filed |
+/// | rejected_at_ledger     | on-chain      | ledger when claim was rejected (for appeal window) |
+/// | appeal_count           | on-chain      | number of appeals opened (capped at MAX_APPEALS_PER_CLAIM) |
+/// | appeal_opened_at_ledger| on-chain      | ledger when current appeal was opened |
 #[contracttype]
 #[derive(Clone)]
 pub struct Claim {
@@ -181,6 +220,14 @@ pub struct Claim {
     pub status: ClaimStatus,
     pub approve_votes: u32,
     pub reject_votes: u32,
+    /// Ledger sequence when claim was filed.
+    pub filed_at_ledger: u32,
+    /// Ledger sequence when claim was rejected (used for appeal window).
+    pub rejected_at_ledger: Option<u32>,
+    /// Number of appeals opened for this claim.
+    pub appeal_count: u32,
+    /// Ledger sequence when current appeal was opened.
+    pub appeal_opened_at_ledger: Option<u32>,
 }
 
 /// Premium quote line item for UX display.