Merge pull request #1266 from Sundayabel222/main

newchange

Author: jhayniffy

contracts/niffyinsure/src/claim.rs

@@ -150,6 +150,22 @@ struct ClaimFiled {
     pub evidence_hashes: Vec<BytesN<32>>,
 }
 
+/// Emitted when a claim filing fee is collected from the claimant.
+///
+/// Topic layout: ["niffyinsure", "claim_fee_collected", claim_id]
+/// Data: { fee_amount, payer, at_ledger }
+#[contractevent(topics = ["niffyinsure", "claim_fee_collected"])]
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct ClaimFeeCollected {
+    #[topic]
+    pub claim_id: u64,
+    /// Fee amount collected (stroops).
+    pub fee_amount: i128,
+    /// Address that paid the fee (the claimant).
+    pub payer: Address,
+    pub at_ledger: u32,
+}
+
 /// Emitted when the claimant withdraws before any vote is cast.
 ///
 /// Topic layout: ["niffyinsure", "claim_withdrawn", claim_id]
@@ -326,6 +342,33 @@ pub fn file_claim(
     let voting_deadline_ledger = now.checked_add(duration).ok_or(Error::Overflow)?;
 
     let claim_id = storage::next_claim_id(env)?;
+
+    // ── Claim filing fee ─────────────────────────────────────────────────────
+    //
+    // If a non-zero filing fee is configured, collect it from the claimant
+    // before creating (persisting) the claim. The fee is transferred to the
+    // treasury. If allowance is insufficient, the claim is rejected and
+    // claim_id is NOT consumed (next_claim_id already bumped; this is
+    // acceptable for auditability — gap claim_ids are harmless).
+    let filing_fee = storage::get_claim_filing_fee(env);
+    if filing_fee > 0 {
+        let token_client = soroban_sdk::token::TokenClient::new(env, &policy.asset);
+        let allowance = token_client.allowance(holder, &env.current_contract_address());
+        if allowance < filing_fee {
+            return Err(Error::InsufficientAllowanceForFee);
+        }
+
+        crate::token::collect_premium(env, holder, &policy.asset, filing_fee);
+
+        ClaimFeeCollected {
+            claim_id,
+            fee_amount: filing_fee,
+            payer: holder.clone(),
+            at_ledger: now,
+        }
+        .publish(env);
+    }
+
     let mut status_history: Vec<ClaimStatusHistoryEntry> = Vec::new(env);
     push_status_transition(&mut status_history, ClaimStatus::Processing, now);
     storage::snapshot_claim_voters(env, claim_id);

contracts/niffyinsure/src/lib.rs

@@ -209,6 +209,7 @@ impl NiffyInsure {
         storage::set_protocol_fee_bps(&env, 0);
         storage::set_fee_recipient(&env, &env.current_contract_address());
         storage::set_min_solvency_ratio_bps(&env, 0);
+        storage::set_claim_filing_fee(&env, 0);
         storage::set_voting_duration_ledgers(&env, ledger::VOTE_WINDOW_LEDGERS);
         storage::set_quorum_bps(&env, types::DEFAULT_QUORUM_BPS);
         admin::emit_admin_action(&env, &admin, "initialize");
@@ -863,6 +864,19 @@ impl NiffyInsure {
         results
     }
 
+    /// Admin-only: set the flat fee (stroops) charged to the claimant at file_claim.
+    /// 0 = disabled. Fee is transferred to the treasury before claim creation.
+    pub fn admin_set_claim_filing_fee(env: Env, fee: i128) {
+        let _admin = admin::require_admin(&env);
+        storage::bump_instance(&env);
+        storage::set_claim_filing_fee(&env, fee);
+    }
+
+    /// Read-only: the current claim filing fee. 0 = disabled.
+    pub fn get_claim_filing_fee(env: Env) -> i128 {
+        storage::get_claim_filing_fee(&env)
+    }
+
     pub fn get_policy_counter(env: Env, holder: Address) -> u32 {
         storage::get_policy_counter(&env, &holder)
     }

contracts/niffyinsure/src/storage.rs

@@ -205,6 +205,9 @@ pub enum DataKey {
     WhitelistEnabled,
     /// Per-address whitelist entry for KYC compliance gating.
     Whitelisted(Address),
+    /// Optional flat fee (stroops) charged to the claimant at file_claim.
+    /// 0 = disabled. Transferred directly to the treasury before claim creation.
+    ClaimFilingFee,
     // ── Appeal mechanism (Issue #1) ───────────────────────────────────────────
     /// Voter snapshot for an appeal round (separate from the base-claim snapshot).
     AppealVoters(u64),
@@ -1171,6 +1174,24 @@ pub fn get_max_weight_cap(env: &Env) -> i128 {
         .unwrap_or(i128::MAX)
 }
 
+// ── Claim filing fee (instance) ────────────────────────────────────────────
+
+/// Set the flat fee (stroops) charged to the claimant at file_claim.
+/// 0 = disabled. Fee is transferred to the treasury before claim creation.
+pub fn set_claim_filing_fee(env: &Env, fee: i128) {
+    env.storage()
+        .instance()
+        .set(&DataKey::ClaimFilingFee, &fee);
+}
+
+/// Get the current claim filing fee. Defaults to 0 (disabled) when unset.
+pub fn get_claim_filing_fee(env: &Env) -> i128 {
+    env.storage()
+        .instance()
+        .get(&DataKey::ClaimFilingFee)
+        .unwrap_or(0)
+}
+
 // ── Per-policy cooldown (persistent) ─────────────────────────────────────────
 
 /// Record the ledger at which the last claim for `(holder, policy_id)` was resolved.