Skip to content

feat: typed session lifecycle events (Completed/Approved/Refunded/AutoRefund) #889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nafiuishaaq merged 2 commits into from
Jun 27, 2026
Merged

feat: typed session lifecycle events (Completed/Approved/Refunded/AutoRefund) #889

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6743414
feat: typed SessionCompleted/Approved/Refunded/AutoRefundExecuted events
NteinPrecious Jun 27, 2026
bd85904
Merge branch 'main' into feature/Monique-7arch-issues-775-776-777-778
nafiuishaaq Jun 27, 2026
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
58 changes: 58 additions & 0 deletions contract/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,11 @@ impl SkillSyncContract {

// ── Issue #776: approve_session ───────────────────────────────────────────

/// Buyer approves a completed session, releasing funds to seller minus platform fee.
/// Emits: SessionApproved(session_id, buyer, seller, amount, fee, timestamp)
pub fn approve_session(env: Env, session_id: Bytes) {
let mut session: Session = env.storage().persistent()

/// Buyer approves a completed session, releasing funds to seller minus platform fee.
/// Emits: SessionApproved(session_id, buyer, seller, amount, fee, timestamp)
pub fn approve_session(env: Env, session_id: Bytes) {
Expand All @@ -305,6 +310,21 @@ impl SkillSyncContract {
session.buyer.require_auth();
assert!(session.status == SessionStatus::Completed, "InvalidSessionState");

let fee_bps: u32 = env.storage().persistent()
.get(&DataKey::PlatformFeeBps).unwrap_or(0);
let fee = session.amount * fee_bps as i128 / 10000;
let payout = session.amount - fee;

let treasury: Address = env.storage().persistent()
.get(&DataKey::Treasury).expect("treasury not set");

let native = token::TokenClient::new(&env, &env.current_contract_address());
native.transfer(&env.current_contract_address(), &session.seller, &payout);
if fee > 0 {
native.transfer(&env.current_contract_address(), &treasury, &fee);
}


let fee_bps: u32 = env.storage().persistent()
.get(&DataKey::PlatformFeeBps).unwrap_or(0);
let fee = session.amount * fee_bps as i128 / 10000;
Expand All @@ -326,6 +346,11 @@ impl SkillSyncContract {
session.status = SessionStatus::Approved;
env.storage().persistent().set(&DataKey::Session(session_id.clone()), &session);

// Issue #776: typed SessionApproved event
env.events().publish(
(symbol_short!("SessAppr"),),
(session_id, buyer, seller, amount, fee, timestamp),

// Issue #776: typed SessionApproved event
env.events().publish(
(symbol_short!("SessAppr"),),
Expand Down Expand Up @@ -371,6 +396,39 @@ impl SkillSyncContract {

// ── Issue #779: open_dispute ──────────────────────────────────────────────

/// Opens a dispute on a Locked or Completed session.
/// Emits: DisputeOpened(session_id, opened_by, reason, timestamp)
pub fn open_dispute(env: Env, session_id: Bytes, reason: String) {
let mut session: Session = env.storage().persistent()
.get(&DataKey::Session(session_id.clone()))
.expect("session not found");

assert!(
session.status == SessionStatus::Completed || session.status == SessionStatus::Locked,
"session not in disputable state"
);

let opened_by = session.buyer.clone();
let timestamp = env.ledger().sequence();
session.status = SessionStatus::Disputed;
session.dispute_opened_at = timestamp;
Self::save_session(&env, session_id.clone(), session);

// Issue #779: typed DisputeOpened event
env.events().publish(
(symbol_short!("dis_open"),),
(session_id, opened_by, reason, timestamp),
);
}

env.events().publish(
(symbol_short!("SessRef"),),
(session_id, buyer, amount, timestamp),
);
}

// ── Issue #779: open_dispute ──────────────────────────────────────────────

/// Opens a dispute on a Locked or Completed session.
/// Emits: DisputeOpened(session_id, opened_by, reason, timestamp)
pub fn open_dispute(env: Env, session_id: Bytes, reason: String) {
Expand Down