diff --git a/contracts/escrow/src/lib.rs b/contracts/escrow/src/lib.rs index 56cc93de..514a7e06 100644 --- a/contracts/escrow/src/lib.rs +++ b/contracts/escrow/src/lib.rs @@ -68,6 +68,28 @@ pub struct Milestone { pub status: MilestoneStatus, } +#[contracttype] +#[derive(Clone, Debug, PartialEq)] +pub struct MilestoneRecord { + pub amount: i128, + pub released: bool, +} + +#[contracttype] +#[derive(Clone)] +pub struct EscrowJobCore { + pub client: Address, + pub freelancer: Address, + pub token: Address, + pub total_amount: i128, + pub released_amount: i128, + pub released_milestones: u32, + pub status: EscrowStatus, + pub created_at: u64, + pub expires_at: u64, + pub milestone_count: u32, +} + #[contracttype] #[derive(Clone)] pub struct EscrowJob { @@ -95,6 +117,10 @@ pub struct ContractConfig { #[contracttype] pub enum DataKey { + JobCore(u64), + JobMilestones(u64), + Admin, + AgentJudge, Job(u64), Config, // Replaces separate Admin + AgentJudge entries JobRegistry, @@ -142,6 +168,7 @@ pub enum EscrowError { UpgradeUnauthorized = 10, InvalidStateTransition = 11, ReentrancyDetected = 12, + MathOverflow = 13, MultisigRequired = 13, InsufficientSignatures = 14, AlreadySigned = 15, @@ -268,6 +295,33 @@ fn exit_reentrancy_guard(env: &Env) { env.storage().instance().remove(&DataKey::Locked); } +fn job_core_key(job_id: u64) -> DataKey { + DataKey::JobCore(job_id) +} + +fn job_milestones_key(job_id: u64) -> DataKey { + DataKey::JobMilestones(job_id) +} + +fn checked_i128_add(lhs: i128, rhs: i128) -> Result { + lhs.checked_add(rhs).ok_or(EscrowError::MathOverflow) +} + +fn checked_i128_sub(lhs: i128, rhs: i128) -> Result { + lhs.checked_sub(rhs).ok_or(EscrowError::MathOverflow) +} + +fn view_milestone(record: &MilestoneRecord) -> Milestone { + Milestone { + amount: record.amount, + status: if record.released { + MilestoneStatus::Released + } else { + MilestoneStatus::Pending + }, + } +} + #[contract] pub struct EscrowContract; @@ -285,14 +339,84 @@ impl EscrowContract { .extend_ttl(Self::INSTANCE_TTL_THRESHOLD, Self::INSTANCE_TTL_EXTEND_TO); } - fn bump_job_ttl(env: &Env, key: &DataKey) { - if env.storage().persistent().has(key) { + fn bump_job_ttl(env: &Env, job_id: u64) { + let core_key = job_core_key(job_id); + let milestones_key = job_milestones_key(job_id); + + if env.storage().persistent().has(&core_key) { env.storage().persistent().extend_ttl( - key, + &core_key, Self::PERSISTENT_TTL_THRESHOLD, Self::PERSISTENT_TTL_EXTEND_TO, ); } + if env.storage().persistent().has(&milestones_key) { + env.storage().persistent().extend_ttl( + &milestones_key, + Self::PERSISTENT_TTL_THRESHOLD, + Self::PERSISTENT_TTL_EXTEND_TO, + ); + } + } + + fn read_job_core(env: &Env, job_id: u64) -> Result { + env.storage() + .persistent() + .get(&job_core_key(job_id)) + .ok_or(EscrowError::JobNotFound) + } + + fn read_milestones(env: &Env, job_id: u64) -> Result, EscrowError> { + env.storage() + .persistent() + .get(&job_milestones_key(job_id)) + .ok_or(EscrowError::JobNotFound) + } + + fn persist_job( + env: &Env, + job_id: u64, + core: &EscrowJobCore, + milestones: &Vec, + ) { + let core_key = job_core_key(job_id); + let milestones_key = job_milestones_key(job_id); + env.storage().persistent().set(&core_key, core); + env.storage().persistent().set(&milestones_key, milestones); + Self::bump_job_ttl(env, job_id); + } + + fn load_job( + env: &Env, + job_id: u64, + ) -> Result<(EscrowJobCore, Vec), EscrowError> { + let core = Self::read_job_core(env, job_id)?; + let milestones = Self::read_milestones(env, job_id)?; + Ok((core, milestones)) + } + + fn to_public_job( + env: &Env, + core: EscrowJobCore, + milestones: Vec, + ) -> EscrowJob { + let mut public_milestones = Vec::new(env); + // Rebuild the user-facing milestone vector from the compact ledger record. + for milestone in milestones.iter() { + public_milestones.push_back(view_milestone(&milestone)); + } + + EscrowJob { + client: core.client, + freelancer: core.freelancer, + token: core.token, + total_amount: core.total_amount, + released_amount: core.released_amount, + status: core.status, + created_at: core.created_at, + expires_at: core.expires_at, + milestones: public_milestones, + } } fn checked_add_i128(env: &Env, a: i128, b: i128) -> Result { @@ -549,6 +673,17 @@ impl EscrowContract { token_addr: Address, ) -> Result<(), EscrowError> { client.require_auth(); + let core_key = job_core_key(job_id); + let milestones_key = job_milestones_key(job_id); + if env.storage().persistent().has(&core_key) + || env.storage().persistent().has(&milestones_key) + { + panic!("job already exists"); + } + let now: u64 = env.ledger().timestamp(); + let expires_at = now + .checked_add(30 * 24 * 60 * 60) + .expect("job expiration overflow"); let key = DataKey::Job(job_id); if env.storage().persistent().has(&key) { return Err(EscrowError::InvalidInput); @@ -563,15 +698,17 @@ impl EscrowContract { .checked_add(expires_duration) .ok_or(EscrowError::ArithmeticError)?; - let job = EscrowJob { + let core = EscrowJobCore { client: client.clone(), freelancer: freelancer.clone(), token: token_addr, total_amount: 0, released_amount: 0, + released_milestones: 0, status: EscrowStatus::Setup, created_at: now, expires_at, + milestone_count: 0, milestones: Vec::new(&env), requires_multisig: false, token_decimals: 0, @@ -584,6 +721,21 @@ impl EscrowContract { client, freelancer ); + env.storage().persistent().set(&core_key, &core); + env.storage() + .persistent() + .set(&milestones_key, &Vec::::new(&env)); + Self::bump_job_ttl(&env, job_id); + } + + /// Add a milestone to the job (setup phase only). + pub fn add_milestone(env: Env, job_id: u64, amount: i128) { + let mut core = Self::read_job_core(&env, job_id).expect("job not found"); + let mut milestones = Self::read_milestones(&env, job_id).expect("job not found"); + Self::bump_job_ttl(&env, job_id); + core.client.require_auth(); + assert!(core.status == EscrowStatus::Setup, "not in setup phase"); + assert!(amount > 0, "amount must be > 0"); env.storage().persistent().set(&key, &job); Self::bump_job_ttl(&env, &key); Ok(()) @@ -606,11 +758,16 @@ impl EscrowContract { return Err(EscrowError::InvalidInput); } - job.milestones.push_back(Milestone { + milestones.push_back(MilestoneRecord { amount, - status: MilestoneStatus::Pending, + released: false, }); log!(&env, "add_milestone: job {} amount {}", job_id, amount); + core.milestone_count = core + .milestone_count + .checked_add(1) + .expect("milestone count overflow"); + Self::persist_job(&env, job_id, &core, &milestones); env.storage().persistent().set(&key, &job); Self::bump_job_ttl(&env, &key); Ok(()) @@ -618,19 +775,15 @@ impl EscrowContract { /// Client deposits total amount and transitions job to Funded. pub fn deposit(env: Env, job_id: u64, amount: i128) -> Result<(), EscrowError> { - let key = DataKey::Job(job_id); - let mut job: EscrowJob = env - .storage() - .persistent() - .get(&key) - .ok_or(EscrowError::JobNotFound)?; - Self::bump_job_ttl(&env, &key); + let mut core = Self::read_job_core(&env, job_id)?; + let milestones = Self::read_milestones(&env, job_id)?; + Self::bump_job_ttl(&env, job_id); // Caller must be client - job.client.require_auth(); + core.client.require_auth(); // Only allow deposit in Setup state - if job.status != EscrowStatus::Setup { + if core.status != EscrowStatus::Setup { return Err(EscrowError::InvalidState); } @@ -638,7 +791,7 @@ impl EscrowContract { return Err(EscrowError::InvalidInput); } - if job.milestones.is_empty() { + if milestones.is_empty() { return Err(EscrowError::InvalidInput); } @@ -650,6 +803,8 @@ impl EscrowContract { job.token_decimals = decimals; let mut total_milestones_amount = 0i128; + for m in milestones.iter() { + total_milestones_amount = checked_i128_add(total_milestones_amount, m.amount)?; for m in job.milestones.iter() { total_milestones_amount = Self::checked_add_i128(&env, total_milestones_amount, m.amount)?; @@ -662,17 +817,16 @@ impl EscrowContract { enter_reentrancy_guard(&env); let next_status = EscrowStatus::Funded; - job.status.validate_transition(&next_status)?; - job.total_amount = amount; - job.status = next_status; + core.status.validate_transition(&next_status)?; + core.total_amount = amount; + core.status = next_status; // Transfer tokens from client to contract - let token_client = token::Client::new(&env, &job.token); - token_client.transfer(&job.client, &env.current_contract_address(), &amount); + let token_client = token::Client::new(&env, &core.token); + token_client.transfer(&core.client, &env.current_contract_address(), &amount); log!(&env, "deposit: job {} amount {}", job_id, amount); - env.storage().persistent().set(&key, &job); - Self::bump_job_ttl(&env, &key); + Self::persist_job(&env, job_id, &core, &milestones); exit_reentrancy_guard(&env); @@ -691,26 +845,21 @@ impl EscrowContract { pub fn release_milestone(env: Env, job_id: u64, caller: Address) -> Result<(), EscrowError> { caller.require_auth(); - let key = DataKey::Job(job_id); - let mut job: EscrowJob = env - .storage() - .persistent() - .get(&key) - .ok_or(EscrowError::JobNotFound)?; - Self::bump_job_ttl(&env, &key); + let (mut core, mut milestones) = Self::load_job(&env, job_id)?; + Self::bump_job_ttl(&env, job_id); - if !(job.status == EscrowStatus::Funded || job.status == EscrowStatus::WorkInProgress) { + if !(core.status == EscrowStatus::Funded || core.status == EscrowStatus::WorkInProgress) { return Err(EscrowError::InvalidState); } - if caller != job.client { + if caller != core.client { return Err(EscrowError::Unauthorized); } // Find next pending milestone let mut found_idx: Option = None; - for idx in 0..job.milestones.len() { - if job.milestones.get(idx).unwrap().status == MilestoneStatus::Pending { + for idx in 0..milestones.len() { + if !milestones.get(idx).unwrap().released { found_idx = Some(idx); break; } @@ -721,22 +870,33 @@ impl EscrowContract { None => return Err(EscrowError::NoPendingMilestones), }; - let mut milestone = job.milestones.get(idx).unwrap(); - milestone.status = MilestoneStatus::Released; - job.milestones.set(idx, milestone.clone()); + let mut milestone = milestones.get(idx).unwrap(); + milestone.released = true; + milestones.set(idx, milestone.clone()); + core.released_amount = checked_i128_add(core.released_amount, milestone.amount)?; + core.released_milestones = core + .released_milestones + .checked_add(1) + .ok_or(EscrowError::MathOverflow)?; job.released_amount = Self::checked_add_i128(&env, job.released_amount, milestone.amount)?; - let next_status = if job.released_amount == job.total_amount { + let next_status = if core.released_amount == core.total_amount { EscrowStatus::Completed } else { EscrowStatus::WorkInProgress }; - job.status.validate_transition(&next_status)?; - job.status = next_status; + core.status.validate_transition(&next_status)?; + core.status = next_status; enter_reentrancy_guard(&env); + let token_client = token::Client::new(&env, &core.token); + token_client.transfer( + &env.current_contract_address(), + &core.freelancer, + &milestone.amount, + ); Self::payout_with_fee(&env, job_id, &job, milestone.amount); log!( @@ -745,8 +905,7 @@ impl EscrowContract { job_id, milestone.amount ); - env.storage().persistent().set(&key, &job); - Self::bump_job_ttl(&env, &key); + Self::persist_job(&env, job_id, &core, &milestones); exit_reentrancy_guard(&env); @@ -769,6 +928,21 @@ impl EscrowContract { ) -> Result<(), EscrowError> { caller.require_auth(); + let (mut core, mut milestones) = Self::load_job(&env, job_id).expect("job not found"); + Self::bump_job_ttl(&env, job_id); + + assert!( + core.status == EscrowStatus::Funded || core.status == EscrowStatus::WorkInProgress, + "job not in releaseable state" + ); + assert!(caller == core.client, "only client can release"); + assert!( + milestone_index < milestones.len(), + "invalid milestone index" + ); + + let mut milestone = milestones.get(milestone_index).expect("invalid milestone"); + assert!(!milestone.released, "milestone already released"); let key = DataKey::Job(job_id); let mut job: EscrowJob = env .storage() @@ -792,9 +966,16 @@ impl EscrowContract { return Err(EscrowError::InvalidState); } - milestone.status = MilestoneStatus::Released; - job.milestones.set(milestone_index, milestone.clone()); + milestone.released = true; + milestones.set(milestone_index, milestone.clone()); + core.released_amount = + checked_i128_add(core.released_amount, milestone.amount).expect("math overflow"); + core.released_milestones = core + .released_milestones + .checked_add(1) + .expect("math overflow"); + let next_status = if core.released_amount == core.total_amount { job.released_amount = job .released_amount .checked_add(milestone.amount) @@ -808,6 +989,19 @@ impl EscrowContract { } else { EscrowStatus::WorkInProgress }; + core.status + .validate_transition(&next_status) + .expect("invalid state transition"); + core.status = next_status; + + enter_reentrancy_guard(&env); + + let token_client = token::Client::new(&env, &core.token); + token_client.transfer( + &env.current_contract_address(), + &core.freelancer, + &milestone.amount, + ); job.status.validate_transition(&next_status)?; job.status = next_status; @@ -821,8 +1015,7 @@ impl EscrowContract { job_id, milestone.amount ); - env.storage().persistent().set(&key, &job); - Self::bump_job_ttl(&env, &key); + Self::persist_job(&env, job_id, &core, &milestones); exit_reentrancy_guard(&env); Ok(()) @@ -832,29 +1025,25 @@ impl EscrowContract { pub fn open_dispute(env: Env, job_id: u64, caller: Address) -> Result<(), EscrowError> { caller.require_auth(); - let key = DataKey::Job(job_id); - let mut job: EscrowJob = env - .storage() - .persistent() - .get(&key) - .ok_or(EscrowError::JobNotFound)?; - Self::bump_job_ttl(&env, &key); + let mut core = Self::read_job_core(&env, job_id)?; + Self::bump_job_ttl(&env, job_id); - if !(job.status == EscrowStatus::Funded || job.status == EscrowStatus::WorkInProgress) { + if !(core.status == EscrowStatus::Funded || core.status == EscrowStatus::WorkInProgress) { return Err(EscrowError::InvalidState); } - if !(caller == job.client || caller == job.freelancer) { + if !(caller == core.client || caller == core.freelancer) { return Err(EscrowError::Unauthorized); } let next_status = EscrowStatus::Disputed; + core.status.validate_transition(&next_status)?; + core.status = next_status; job.status.validate_transition(&next_status)?; job.status = next_status; job.dispute_deadline = env.ledger().timestamp() + Self::DISPUTE_RESOLUTION_WINDOW; log!(&env, "open_dispute: job {}", job_id); - env.storage().persistent().set(&key, &job); - Self::bump_job_ttl(&env, &key); + Self::persist_job(&env, job_id, &core, &Self::read_milestones(&env, job_id)?); Self::sync_dispute_to_job_registry(&env, job_id)?; @@ -872,6 +1061,44 @@ impl EscrowContract { // 1. Authenticate the caller caller.require_auth(); + let core = Self::read_job_core(&env, job_id).expect("job not found"); + Self::bump_job_ttl(&env, job_id); + + // 2. Only client or freelancer may raise a dispute + assert!( + caller == core.client || caller == core.freelancer, + "unauthorized: only client or freelancer can raise a dispute" + ); + + // 3. Job must still be active + assert!( + core.status == EscrowStatus::Funded || core.status == EscrowStatus::WorkInProgress, + "dispute cannot be raised: job is not in active state" + ); + + // 4. Prevent dispute if all funds are already released + assert!( + core.released_amount < core.total_amount, + "dispute cannot be raised: all funds already released" + ); + + // 5. Prevent dispute if deadline has drastically expired (7-day grace period) + let now: u64 = env.ledger().timestamp(); + let grace_period: u64 = 7 * 24 * 60 * 60; + let deadline = core + .expires_at + .checked_add(grace_period) + .ok_or(EscrowError::MathOverflow)?; + assert!( + now <= deadline, + "dispute cannot be raised: deadline has drastically expired" + ); + + // 6. Lock funds by transitioning to Disputed — blocks release_funds & release_milestone + let next_status = EscrowStatus::Disputed; + let mut disputed_core = core.clone(); + disputed_core.status.validate_transition(&next_status)?; + disputed_core.status = next_status; let key = DataKey::Job(job_id); let mut job: EscrowJob = env .storage() @@ -916,26 +1143,23 @@ impl EscrowContract { job.status = next_status; job.dispute_deadline = now + Self::DISPUTE_RESOLUTION_WINDOW; log!(&env, "raise_dispute: job {}", job_id); - env.storage().persistent().set(&key, &job); - Self::bump_job_ttl(&env, &key); + Self::persist_job( + &env, + job_id, + &disputed_core, + &Self::read_milestones(&env, job_id)?, + ); Self::sync_dispute_to_job_registry(&env, job_id)?; // 7. Emit DisputeRaised event for backend / AI Judge to consume - let mut released_count = 0u32; - for m in job.milestones.iter() { - if m.status == MilestoneStatus::Released { - released_count += 1; - } - } - env.events().publish( ("escrow", "DisputeRaised"), ( job_id, caller.clone(), - released_count, - job.milestones.len(), + core.released_milestones, + core.milestone_count, now, ), ); @@ -964,6 +1188,13 @@ impl EscrowContract { return Err(EscrowError::InvalidInput); } + let mut core = Self::read_job_core(&env, job_id).expect("job not found"); + Self::bump_job_ttl(&env, job_id); + assert!(core.status == EscrowStatus::Disputed, "job not disputed"); + + let remaining = checked_i128_sub(core.total_amount, core.released_amount) + .expect("invalid released amount"); + let total_payout = checked_i128_add(payee_amount, payer_amount).expect("math overflow"); let key = DataKey::Job(job_id); let mut job: EscrowJob = env .storage() @@ -986,25 +1217,28 @@ impl EscrowContract { assert!(total_payout <= remaining, "payout exceeds remaining funds"); let next_status = EscrowStatus::Resolved; - job.status + core.status .validate_transition(&next_status) .expect("invalid state transition"); + core.released_amount = + checked_i128_add(core.released_amount, total_payout).expect("math overflow"); + core.status = next_status; job.released_amount = Self::checked_add_i128(&env, job.released_amount, total_payout) .expect("released amount overflow"); job.status = next_status; enter_reentrancy_guard(&env); - let token_client = token::Client::new(&env, &job.token); + let token_client = token::Client::new(&env, &core.token); if payee_amount > 0 { token_client.transfer( &env.current_contract_address(), - &job.freelancer, + &core.freelancer, &payee_amount, ); } if payer_amount > 0 { - token_client.transfer(&env.current_contract_address(), &job.client, &payer_amount); + token_client.transfer(&env.current_contract_address(), &core.client, &payer_amount); } log!( @@ -1014,8 +1248,12 @@ impl EscrowContract { payee_amount, payer_amount ); - env.storage().persistent().set(&key, &job); - Self::bump_job_ttl(&env, &key); + Self::persist_job( + &env, + job_id, + &core, + &Self::read_milestones(&env, job_id).expect("job not found"), + ); exit_reentrancy_guard(&env); Ok(()) @@ -1025,39 +1263,36 @@ impl EscrowContract { pub fn refund(env: Env, job_id: u64, client: Address) -> Result<(), EscrowError> { client.require_auth(); - let key = DataKey::Job(job_id); - let mut job: EscrowJob = env - .storage() - .persistent() - .get(&key) - .ok_or(EscrowError::JobNotFound)?; - Self::bump_job_ttl(&env, &key); + let mut core = Self::read_job_core(&env, job_id)?; + let milestones = Self::read_milestones(&env, job_id)?; + Self::bump_job_ttl(&env, job_id); - if !(job.status == EscrowStatus::Funded || job.status == EscrowStatus::WorkInProgress) { + if !(core.status == EscrowStatus::Funded || core.status == EscrowStatus::WorkInProgress) { return Err(EscrowError::InvalidState); } - if client != job.client { + if client != core.client { return Err(EscrowError::Unauthorized); } + let remaining = checked_i128_sub(core.total_amount, core.released_amount)?; let remaining = Self::checked_sub_i128(&env, job.total_amount, job.released_amount)?; let next_status = EscrowStatus::Refunded; - job.status.validate_transition(&next_status)?; - job.released_amount = job.total_amount; - job.status = next_status; + core.status.validate_transition(&next_status)?; + core.released_amount = core.total_amount; + core.released_milestones = core.milestone_count; + core.status = next_status; enter_reentrancy_guard(&env); if remaining > 0 { - let token_client = token::Client::new(&env, &job.token); - token_client.transfer(&env.current_contract_address(), &job.client, &remaining); + let token_client = token::Client::new(&env, &core.token); + token_client.transfer(&env.current_contract_address(), &core.client, &remaining); } log!(&env, "refund: job {} amount {}", job_id, remaining); - env.storage().persistent().set(&key, &job); - Self::bump_job_ttl(&env, &key); + Self::persist_job(&env, job_id, &core, &milestones); exit_reentrancy_guard(&env); @@ -1069,6 +1304,25 @@ impl EscrowContract { Ok(()) } + pub fn get_job(env: Env, job_id: u64) -> EscrowJob { + let (core, milestones) = Self::load_job(&env, job_id).expect("job not found"); + Self::bump_job_ttl(&env, job_id); + Self::to_public_job(&env, core, milestones) + } + + /// Retrieve the status of all milestones for a given job. + pub fn get_milestone_status(env: Env, job_id: u64) -> Vec { + let milestones = Self::read_milestones(&env, job_id).expect("job not found"); + Self::bump_job_ttl(&env, job_id); + let mut statuses = Vec::new(&env); + for m in milestones.iter() { + statuses.push_back(if m.released { + MilestoneStatus::Released + } else { + MilestoneStatus::Pending + }); + } + statuses /// Client cancels a brief and triggers graceful refund behavior. /// Supports Setup (no funds moved yet), Funded, and WorkInProgress states. pub fn cancel_brief(env: Env, job_id: u64, client: Address) -> Result<(), EscrowError> { @@ -1166,6 +1420,63 @@ impl EscrowContract { config.agent_judge } + #[contracttype] + enum AttackKey { + Escrow, + JobId, + Client, + Armed, + } + + #[contract] + pub struct ReentrantTokenContract; + + #[contractimpl] + impl ReentrantTokenContract { + pub fn initialize(env: Env, escrow: Address, job_id: u64, client: Address) { + env.storage().instance().set(&AttackKey::Escrow, &escrow); + env.storage().instance().set(&AttackKey::JobId, &job_id); + env.storage().instance().set(&AttackKey::Client, &client); + env.storage().instance().set(&AttackKey::Armed, &false); + } + + pub fn arm(env: Env, armed: bool) { + env.storage().instance().set(&AttackKey::Armed, &armed); + } + + pub fn balance(_env: Env, _id: Address) -> i128 { + 0 + } + + pub fn transfer(env: Env, _from: Address, _to: Address, _amount: i128) { + let armed = env + .storage() + .instance() + .get::<_, bool>(&AttackKey::Armed) + .unwrap_or(false); + if !armed { + return; + } + + let escrow = env + .storage() + .instance() + .get::<_, Address>(&AttackKey::Escrow) + .expect("escrow not configured"); + let job_id = env + .storage() + .instance() + .get::<_, u64>(&AttackKey::JobId) + .expect("job not configured"); + let client = env + .storage() + .instance() + .get::<_, Address>(&AttackKey::Client) + .expect("client not configured"); + + let cc = EscrowContractClient::new(&env, &escrow); + cc.release_funds(&job_id, &client, &0u32); + } pub fn get_token_decimals(env: Env, job_id: u64) -> u32 { let key = DataKey::Job(job_id); let job: EscrowJob = env.storage().persistent().get(&key).expect("job not found"); @@ -2821,6 +3132,102 @@ mod test { assert_eq!(job.released_amount, 0); } + #[test] + #[should_panic(expected = "Error(Contract, #12)")] + fn test_reentrant_release_attack_panics() { + let env = Env::default(); + env.mock_all_auths(); + + let admin = Address::generate(&env); + let agent_judge = Address::generate(&env); + let client = Address::generate(&env); + let freelancer = Address::generate(&env); + + let token_addr = env.register_contract(None, ReentrantTokenContract); + + let contract_id = env.register_contract(None, EscrowContract); + let cc = EscrowContractClient::new(&env, &contract_id); + + let token_client = ReentrantTokenContractClient::new(&env, &token_addr); + token_client.initialize(&contract_id, &1u64, &client); + + cc.initialize(&admin, &agent_judge); + cc.create_job(&1u64, &client, &freelancer, &token_addr); + cc.add_milestone(&1u64, &5000i128); + cc.deposit(&1u64, &5000i128); + + token_client.arm(&true); + cc.release_funds(&1u64, &client, &0u32); + } + + #[test] + fn test_release_funds_gas_budget_stays_below_threshold() { + let env = Env::default(); + env.mock_all_auths(); + + let admin = Address::generate(&env); + let agent_judge = Address::generate(&env); + let client = Address::generate(&env); + let freelancer = Address::generate(&env); + + let token_addr = setup_token(&env, &admin); + mint(&env, &token_addr, &client); + + let contract_id = env.register_contract(None, EscrowContract); + let cc = EscrowContractClient::new(&env, &contract_id); + + cc.initialize(&admin, &agent_judge); + cc.create_job(&1u64, &client, &freelancer, &token_addr); + cc.add_milestone(&1u64, &2500i128); + cc.add_milestone(&1u64, &2500i128); + cc.add_milestone(&1u64, &2500i128); + cc.add_milestone(&1u64, &2500i128); + cc.deposit(&1u64, &10_000i128); + + env.budget().reset_unlimited(); + + cc.release_funds(&1u64, &client, &3u32); + + let budget = env.budget(); + assert!(budget.cpu_instruction_cost() < 1_500_000); + assert!(budget.memory_bytes_cost() < 200_000); + } + + #[test] + fn test_refund_gas_budget_stays_below_threshold() { + let env = Env::default(); + env.mock_all_auths(); + + let admin = Address::generate(&env); + let agent_judge = Address::generate(&env); + let client = Address::generate(&env); + let freelancer = Address::generate(&env); + + let token_addr = setup_token(&env, &admin); + mint(&env, &token_addr, &client); + + let contract_id = env.register_contract(None, EscrowContract); + let cc = EscrowContractClient::new(&env, &contract_id); + + cc.initialize(&admin, &agent_judge); + cc.create_job(&1u64, &client, &freelancer, &token_addr); + cc.add_milestone(&1u64, &6000i128); + cc.add_milestone(&1u64, &4000i128); + cc.deposit(&1u64, &10_000i128); + + env.budget().reset_unlimited(); + + cc.refund(&1u64, &client); + + let budget = env.budget(); + assert!(budget.cpu_instruction_cost() < 1_300_000); + assert!(budget.memory_bytes_cost() < 180_000); + } + + // ───────────────────────────────────────────────────────────────────────── + // Comprehensive Escrow Dispute & Resolution Tests (>90% coverage) + // ───────────────────────────────────────────────────────────────────────── + #[test] fn test_dispute_event_emission() { let env = Env::default(); diff --git a/contracts/reputation/src/lib.rs b/contracts/reputation/src/lib.rs index ec22f312..60576b49 100644 --- a/contracts/reputation/src/lib.rs +++ b/contracts/reputation/src/lib.rs @@ -44,6 +44,7 @@ pub enum Role { pub struct ReputationScore { pub address: Address, pub role: Role, + /// Score in basis points (0\u201310000 = 0\u2013100%) pub score: i32, pub total_jobs: u32, pub total_points: i128, @@ -219,6 +220,7 @@ impl ReputationContract { } } + fn score_from_profile(address: &Address, role: Role, profile: &profile::Profile) -> ReputationScore { fn score_from_profile( address: &Address, role: Role, @@ -470,6 +472,19 @@ impl ReputationContract { Self::require_authorized_contract(&env, &caller_contract); let mut profile = storage::read_profile_or_default(&env, &address); + let (new_score, total_jobs) = match role { + Role::Client => { + profile.client_score = Self::clamp_score(profile.client_score.saturating_add(delta)); + profile.client_jobs = profile.client_jobs.saturating_add(1); + (profile.client_score, profile.client_jobs) + } + Role::Freelancer => { + profile.freelancer_score = + Self::clamp_score(profile.freelancer_score.saturating_add(delta)); + profile.freelancer_jobs = profile.freelancer_jobs.saturating_add(1); + (profile.freelancer_score, profile.freelancer_jobs) + } + }; if profile.is_blacklisted { soroban_sdk::panic_with_error!(&env, ReputationError::Blacklisted); } @@ -642,6 +657,9 @@ mod test { #[contractimpl] impl MockJobRegistry { pub fn set_job(env: Env, job_id: u64, job: JobRecord) { + env.storage() + .persistent() + .set(&MockKey::Job(job_id), &job); env.storage().persistent().set(&MockKey::Job(job_id), &job); } @@ -1016,6 +1034,22 @@ mod test { let client = ReputationContractClient::new(&env, &cid); client.initialize(&admin); + let view = client.query_reputation(&address); + assert_eq!(view.address, address); + assert_eq!(view.client.score, 5500); + assert_eq!(view.client.total_jobs, 1); + assert_eq!(view.client.total_points, 500); + assert_eq!(view.freelancer.score, 6000); + assert_eq!(view.freelancer.total_jobs, 1); + assert_eq!(view.freelancer.total_points, 1000); + } + + #[test] + #[should_panic(expected = "Error(Contract, #3)")] + assert_eq!(view.client.total_points, 0); + assert_eq!(view.freelancer.score, 6000); + assert_eq!(view.freelancer.total_jobs, 1); + assert_eq!(view.freelancer.total_points, 0); // Bring to Gold first, then slash twice to drop back to Bronze client.update_score(&addr, &Role::Client, &3000); // 8000 → Gold assert_eq!(client.get_badge(&addr, &Role::Client), BadgeLevel::Gold); @@ -1095,6 +1129,7 @@ mod test { } #[test] + #[should_panic(expected = "Error(Contract, #2)")] #[should_panic(expected = "Error(Contract, #2)")] fn test_upgrade_requires_admin() { let env = Env::default(); @@ -1109,4 +1144,4 @@ mod test { let wasm_hash = BytesN::from_array(&env, &[0; 32]); client.upgrade(&attacker, &wasm_hash); } -} +} \ No newline at end of file