Merge pull request #190 from nafsonig/feat/asset

Feat/asset

Author: ayshadogo

campaign/src/lib.rs

@@ -4,7 +4,7 @@ pub mod storage;
 pub mod types;
 
 use soroban_sdk::{contract, contractimpl, Env, Vec};
-use types::{AssetInfo, CampaignData, CampaignStatus, Error, MilestoneData, MilestoneStatus};
+use types::{CampaignData, CampaignStatus, Error, MilestoneData, MilestoneStatus, StellarAsset, CampaignEvent};
 use storage::{get_campaign, set_campaign, set_milestone};
 
 pub const VERSION: u32 = 1;
@@ -16,20 +16,38 @@ pub struct CampaignContract;
 impl CampaignContract {
     /// Initialize a new campaign with strict validation on all inputs.
     ///
+    /// Requires: Creator authorization via `creator.require_auth()`
+    /// Can only be called once per contract instance
+    ///
     /// # Panics
+    /// - `Error::UnauthorizedCreator` if caller is not the creator or lacks authorization
+    /// - `Error::AlreadyInitialized` if campaign already exists
     /// - `Error::InvalidGoalAmount` if goal_amount <= 0
     /// - `Error::InvalidEndTime` if end_time <= current ledger timestamp
     /// - `Error::InvalidAssets` if accepted_assets is empty
+    /// - `Error::InvalidAssetCode` if any asset_code is empty or invalid
+    /// - `Error::InvalidMilestoneCount` if milestone count is not 1-5
     /// - `Error::InvalidMilestones` if milestones are not sorted ascending by target_amount
     /// - `Error::MilestoneMismatch` if last milestone.target_amount != goal_amount
+    ///
+    /// # Events
+    /// Emits `campaign_initialized` event with campaign details
     pub fn initialize(
         env: Env,
         creator: soroban_sdk::Address,
         goal_amount: i128,
         end_time: u64,
-        accepted_assets: Vec<AssetInfo>,
+        accepted_assets: Vec<StellarAsset>,
         milestones: Vec<MilestoneData>,
     ) -> Result<(), Error> {
+        // Authorization check: creator must authorize this call
+        creator.require_auth();
+
+        // Check if already initialized - can only initialize once
+        if get_campaign(&env).is_some() {
+            panic_with_error(&env, Error::AlreadyInitialized);
+        }
+
         // Validation 1: goal_amount > 0
         if goal_amount <= 0 {
             panic_with_error(&env, Error::InvalidGoalAmount);
@@ -46,20 +64,27 @@ impl CampaignContract {
             panic_with_error(&env, Error::InvalidAssets);
         }
 
-        // Validation 4 & 5: milestones sorted ascending and last == goal_amount
-        if !milestones.is_empty() {
-            validate_milestones(&env, &milestones, goal_amount)?;
+        // Validation 3b: validate each asset code
+        validate_assets(&env, &accepted_assets)?;
+
+        // Validation 4: milestone count must be 1-5
+        let milestone_count = milestones.len() as u32;
+        if milestone_count == 0 || milestone_count > types::MAX_MILESTONES {
+            panic_with_error(&env, Error::InvalidMilestoneCount);
         }
 
+        // Validation 5 & 6: milestones sorted ascending and last == goal_amount
+        validate_milestones(&env, &milestones, goal_amount)?;
+
         // All validations passed, store campaign data
         let campaign = CampaignData {
-            creator,
+            creator: creator.clone(),
             goal_amount,
             raised_amount: 0,
             end_time,
             status: CampaignStatus::Active,
-            accepted_assets,
-            milestone_count: milestones.len() as u32,
+            accepted_assets: accepted_assets.clone(),
+            milestone_count,
         };
 
         set_campaign(&env, &campaign);
@@ -69,6 +94,16 @@ impl CampaignContract {
             set_milestone(&env, index as u32, milestone);
         }
 
+        // Emit campaign_initialized event
+        let event = CampaignEvent::Initialized {
+            creator,
+            goal_amount,
+            end_time,
+            asset_count: accepted_assets.len() as u32,
+            milestone_count,
+        };
+        env.events().publish(("campaign", "initialized"), event);
+
         Ok(())
     }
 
@@ -81,6 +116,18 @@ impl CampaignContract {
     }
 }
 
+/// Helper function to validate Stellar assets
+/// Ensures each asset has a non-empty asset_code
+fn validate_assets(env: &Env, assets: &Vec<StellarAsset>) -> Result<(), Error> {
+    for asset in assets.iter() {
+        // asset_code must be non-empty
+        if asset.asset_code.len() == 0 {
+            panic_with_error(env, Error::InvalidAssetCode);
+        }
+    }
+    Ok(())
+}
+
 /// Helper function to validate milestone conditions
 fn validate_milestones(
     env: &Env,
@@ -115,8 +162,12 @@ fn panic_with_error(env: &Env, error: Error) -> ! {
         Error::InvalidGoalAmount => "InvalidGoalAmount",
         Error::InvalidEndTime => "InvalidEndTime",
         Error::InvalidAssets => "InvalidAssets",
+        Error::InvalidAssetCode => "InvalidAssetCode",
         Error::InvalidMilestones => "InvalidMilestones",
         Error::MilestoneMismatch => "MilestoneMismatch",
+        Error::InvalidMilestoneCount => "InvalidMilestoneCount",
+        Error::AlreadyInitialized => "AlreadyInitialized",
+        Error::UnauthorizedCreator => "UnauthorizedCreator",
         Error::InvalidCampaignTransition => "InvalidCampaignTransition",
         Error::InvalidMilestoneTransition => "InvalidMilestoneTransition",
         Error::CampaignNotActive => "CampaignNotActive",

campaign/src/types.rs

@@ -10,8 +10,12 @@ pub enum Error {
     InvalidGoalAmount,        // goal_amount must be > 0
     InvalidEndTime,           // end_time must be > current ledger timestamp
     InvalidAssets,            // accepted_assets must be non-empty
+    InvalidAssetCode,         // asset_code must be non-empty and valid
     InvalidMilestones,        // milestones must be sorted ascending and last must equal goal
     MilestoneMismatch,        // last milestone.target_amount != goal_amount
+    InvalidMilestoneCount,    // milestone count must be 1-5
+    AlreadyInitialized,       // campaign already initialized
+    UnauthorizedCreator,      // caller is not the creator or lacks authorization
 
     // ── State transition errors ──
     InvalidCampaignTransition, // campaign status transition not allowed
@@ -51,7 +55,41 @@ pub enum MilestoneStatus {
     Released, // Funds released to beneficiary
 }
 
+// ── Contract events ──────────────────────────────────────────────────────────
+
+/// Campaign lifecycle events
+#[contracttype]
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum CampaignEvent {
+    Initialized {
+        creator: Address,
+        goal_amount: i128,
+        end_time: u64,
+        asset_count: u32,
+        milestone_count: u32,
+    },
+}
+
+/// Reusable struct for Stellar asset representation
+/// Enables consistent multi-asset support across the contract
+#[contracttype]
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct StellarAsset {
+    /// Asset code (e.g., "XLM", "USDC", "EUR")
+    pub asset_code: soroban_sdk::String,
+    /// Issuer address; None for native XLM
+    pub issuer: Option<Address>,
+}
+
+impl StellarAsset {
+    /// Helper function to check if this asset is native XLM
+    pub fn is_xlm(&self) -> bool {
+        self.issuer.is_none()
+    }
+}
+
 /// Accepted asset descriptor (native XLM or a Stellar asset)
+/// Deprecated: Use StellarAsset instead
 #[contracttype]
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum AssetInfo {
@@ -83,7 +121,7 @@ pub struct CampaignData {
     pub raised_amount: i128,
     pub end_time: u64,
     pub status: CampaignStatus,
-    pub accepted_assets: Vec<AssetInfo>,
+    pub accepted_assets: Vec<StellarAsset>,
     pub milestone_count: u32,
 }