Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions contracts/src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ pub enum TrustFlowError {
OracleStale = 8,
ArithmeticOverflow = 9,
InvalidState = 10,
ReentrancyDetected = 11,
}
18 changes: 16 additions & 2 deletions contracts/src/settlement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,23 @@ pub fn release_to_beneficiary(env: &Env, escrow_id: u64) -> Result<i128, TrustFl
let fee_bps: u32 = env.storage().persistent().get(&DataKey::FeeBps).unwrap_or(50);
let fee = escrow.amount * fee_bps as i128 / 10_000;
let payout = escrow.amount - fee;
let token_client = token::Client::new(env, &escrow.token);
token_client.transfer(&env.current_contract_address(), &escrow.beneficiary, &payout);
let locked: bool = env
.storage()
.instance()
.get(&DataKey::ReentrancyGuard)
.unwrap_or(false);
if locked {
return Err(TrustFlowError::ReentrancyDetected);
}
env.storage()
.instance()
.set(&DataKey::ReentrancyGuard, &true);
escrow.status = EscrowStatus::Released;
env.storage().persistent().set(&DataKey::Escrow(escrow_id), &escrow);
let token_client = token::Client::new(env, &escrow.token);
token_client.transfer(&env.current_contract_address(), &escrow.beneficiary, &payout);
env.storage()
.instance()
.set(&DataKey::ReentrancyGuard, &false);
Ok(payout)
}
2 changes: 2 additions & 0 deletions contracts/src/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pub enum DataKey {
OracleAddress,
/// Whether the contract is paused (emergency stop)
Paused,
/// Re-entrancy guard lock flag for cross-contract token calls
ReentrancyGuard,
}

/// Number of ledgers to extend persistent storage TTL (time-to-live)
Expand Down
Loading