Merge branch 'main' into driptide/issue-313-1784888228412

Author: Kingsman-99

contracts/dashboard/src/lib.rs

@@ -44,17 +44,17 @@ impl DashboardContract {
         authorized.require_auth();
 
         let key = creator_dashboard_key(&creator);
-        let mut dashboard: CreatorDashboard = env
-            .storage()
-            .persistent()
-            .get(&key)
-            .unwrap_or(CreatorDashboard {
-                invoice_count: 0,
-                total_volume: 0,
-                released_count: 0,
-                refunded_count: 0,
-                released_volume: 0,
-            });
+        let mut dashboard: CreatorDashboard =
+            env.storage()
+                .persistent()
+                .get(&key)
+                .unwrap_or(CreatorDashboard {
+                    invoice_count: 0,
+                    total_volume: 0,
+                    released_count: 0,
+                    refunded_count: 0,
+                    released_volume: 0,
+                });
         dashboard.invoice_count = dashboard
             .invoice_count
             .checked_add(1)
@@ -75,17 +75,17 @@ impl DashboardContract {
         authorized.require_auth();
 
         let key = creator_dashboard_key(&creator);
-        let mut dashboard: CreatorDashboard = env
-            .storage()
-            .persistent()
-            .get(&key)
-            .unwrap_or(CreatorDashboard {
-                invoice_count: 0,
-                total_volume: 0,
-                released_count: 0,
-                refunded_count: 0,
-                released_volume: 0,
-            });
+        let mut dashboard: CreatorDashboard =
+            env.storage()
+                .persistent()
+                .get(&key)
+                .unwrap_or(CreatorDashboard {
+                    invoice_count: 0,
+                    total_volume: 0,
+                    released_count: 0,
+                    refunded_count: 0,
+                    released_volume: 0,
+                });
         dashboard.released_count = dashboard
             .released_count
             .checked_add(1)
@@ -106,17 +106,17 @@ impl DashboardContract {
         authorized.require_auth();
 
         let key = creator_dashboard_key(&creator);
-        let mut dashboard: CreatorDashboard = env
-            .storage()
-            .persistent()
-            .get(&key)
-            .unwrap_or(CreatorDashboard {
-                invoice_count: 0,
-                total_volume: 0,
-                released_count: 0,
-                refunded_count: 0,
-                released_volume: 0,
-            });
+        let mut dashboard: CreatorDashboard =
+            env.storage()
+                .persistent()
+                .get(&key)
+                .unwrap_or(CreatorDashboard {
+                    invoice_count: 0,
+                    total_volume: 0,
+                    released_count: 0,
+                    refunded_count: 0,
+                    released_volume: 0,
+                });
         dashboard.refunded_count = dashboard
             .refunded_count
             .checked_add(1)

contracts/dashboard/src/test.rs

@@ -1,4 +1,5 @@
 #![cfg(test)]
+#![allow(clippy::all)]
 
 use super::*;
 use soroban_sdk::{testutils::Address as _, Address, Env};

contracts/split/src/error.rs

@@ -5,6 +5,39 @@ use soroban_sdk::contracterror;
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 #[repr(u32)]
 pub enum ContractError {
+    NotAuthorized = 1,
+    InvoiceNotFound = 2,
+    DeadlinePassed = 3,
+    AlreadyFunded = 4,
+    InvalidAmount = 5,
+    InvoiceFrozen = 6,
+    InvalidStatus = 7,
+    PayerNotAllowed = 8,
+    FundingInsufficient = 9,
+    NotAuthorized       = 1,
+    InvoiceNotFound     = 2,
+    DeadlinePassed      = 3,
+    AlreadyFunded       = 4,
+    InvalidAmount       = 5,
+    InvoiceFrozen       = 6,
+    InvalidStatus       = 7,
+    PayerNotAllowed     = 8,
+    FundingInsufficient = 9,
+    OracleCallFailed    = 10,
+    NotArbiter          = 11,
+    NotDisputed         = 12,
+    AlreadyExecuted     = 13,
+    TimelockPending     = 14,
+    ContractPaused      = 15,
+    InvalidRecipients   = 16,
+    PrerequisiteNotMet  = 17,
+    BatchLimitExceeded  = 18,
+    /// Issue #330: Recipient has already been paid on this invoice.
+    RecipientAlreadyPaid = 19,
+    /// Issue #327: Funds are still time-locked and cannot be released yet.
+    FundsLockedUntil    = 20,
+    /// Aggregate protocol statistics would exceed their numeric bounds.
+    StatsOverflow       = 21,
     NotAuthorized = 1,
     InvoiceNotFound = 2,
     DeadlinePassed = 3,
@@ -29,4 +62,11 @@ pub enum ContractError {
     FundsLockedUntil = 20,
     /// Aggregate protocol statistics would overflow their storage type.
     StatsOverflow = 21,
+    /// Issue #327: Funds are still time-locked and cannot be released yet.
+    FundsLockedUntil = 20,
+    /// Issue #330: Recipient has already been paid on this invoice.
+    RecipientAlreadyPaid = 19,
+    /// Oracle-priced invoice: the configured price oracle is unreachable, trapped, or
+    /// returned a non-positive rate at payment time.
+    OracleUnavailable  = 21,
 }