Skip to content

feat: add Initialized event to EscrowContract (#544) #635

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 1 commit into from
May 30, 2026
Merged

feat: add Initialized event to EscrowContract (#544) #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion contract/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ pub enum DataKey {
Admin,
PlatformFee,
Treasury,
DisputeWindow,
}

#[contracttype]
Expand Down Expand Up @@ -121,13 +122,18 @@ pub struct EscrowContract;

#[contractimpl]
impl EscrowContract {
pub fn initialize(env: Env, admin: Address, treasury: Address) {
pub fn initialize(env: Env, admin: Address, treasury: Address, dispute_window: u32) {
if env.storage().persistent().has(&DataKey::Admin) {
panic!("already initialized");
}
env.storage().persistent().set(&DataKey::Admin, &admin);
env.storage().persistent().set(&DataKey::Treasury, &treasury);
env.storage().persistent().set(&DataKey::PlatformFee, &0_u32);
env.storage().persistent().set(&DataKey::DisputeWindow, &dispute_window);
env.events().publish(
(Symbol::new(&env, "Initialized"),),
(admin, treasury, dispute_window),
);
}

pub fn set_treasury(env: Env, new_treasury: Address) {
Expand Down
50 changes: 35 additions & 15 deletions contract/src/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ mod test_multi_session {
let (env, buyer, seller, treasury, token_id, admin) = setup();
let contract_id = env.register(EscrowContract, ());
let client = EscrowContractClient::new(&env, &contract_id);
client.initialize(&admin, &treasury);
client.initialize(&admin, &treasury, &604800);
client.lock_funds(&1, &buyer, &seller, &500, &token_id);
let s = client.get_session(&1);
assert!(matches!(s.state, SessionState::Locked));
Expand All @@ -147,7 +147,7 @@ mod test_multi_session {
fn test_lock_funds_zero_amount_reverts() {
let (env, buyer, seller, treasury, token_id, admin) = setup();
let client = EscrowContractClient::new(&env, &env.register(EscrowContract, ()));
client.initialize(&admin, &treasury);
client.initialize(&admin, &treasury, &604800);
client.lock_funds(&1, &buyer, &seller, &0, &token_id);
}

Expand All @@ -156,7 +156,7 @@ mod test_multi_session {
fn test_lock_funds_duplicate_session_reverts() {
let (env, buyer, seller, treasury, token_id, admin) = setup();
let client = EscrowContractClient::new(&env, &env.register(EscrowContract, ()));
client.initialize(&admin, &treasury);
client.initialize(&admin, &treasury, &604800);
client.lock_funds(&1, &buyer, &seller, &100, &token_id);
client.lock_funds(&1, &buyer, &seller, &100, &token_id);
}
Expand All @@ -166,7 +166,7 @@ mod test_multi_session {
let (env, buyer, seller, treasury, token_id, admin) = setup();
let cid = env.register(EscrowContract, ());
let client = EscrowContractClient::new(&env, &cid);
client.initialize(&admin, &treasury);
client.initialize(&admin, &treasury, &604800);

// Admin sets platform fee to 500 bps (5%)
client.set_platform_fee(&500);
Expand All @@ -188,7 +188,7 @@ mod test_multi_session {
fn test_seller_cannot_complete_before_lock() {
let (env, buyer, seller, treasury, token_id, admin) = setup();
let client = EscrowContractClient::new(&env, &env.register(EscrowContract, ()));
client.initialize(&admin, &treasury);
client.initialize(&admin, &treasury, &604800);
client.complete(&99);
}

Expand All @@ -197,7 +197,7 @@ mod test_multi_session {
fn test_buyer_cannot_approve_before_complete() {
let (env, buyer, seller, treasury, token_id, admin) = setup();
let client = EscrowContractClient::new(&env, &env.register(EscrowContract, ()));
client.initialize(&admin, &treasury);
client.initialize(&admin, &treasury, &604800);
client.lock_funds(&1, &buyer, &seller, &500, &token_id);
client.approve(&1, &token_id); // not completed yet
}
Expand All @@ -207,7 +207,7 @@ mod test_multi_session {
let (env, buyer, seller, treasury, token_id, admin) = setup();
let cid = env.register(EscrowContract, ());
let client = EscrowContractClient::new(&env, &cid);
client.initialize(&admin, &treasury);
client.initialize(&admin, &treasury, &604800);
client.lock_funds(&1, &buyer, &seller, &600, &token_id);
client.refund(&1, &token_id);
assert_eq!(TokenClient::new(&env, &token_id).balance(&buyer), 1000);
Expand All @@ -219,7 +219,7 @@ mod test_multi_session {
fn test_refund_reverts_if_already_completed() {
let (env, buyer, seller, treasury, token_id, admin) = setup();
let client = EscrowContractClient::new(&env, &env.register(EscrowContract, ()));
client.initialize(&admin, &treasury);
client.initialize(&admin, &treasury, &604800);
client.lock_funds(&1, &buyer, &seller, &500, &token_id);
client.complete(&1);
client.refund(&1, &token_id); // should panic — not Locked
Expand All @@ -230,7 +230,7 @@ mod test_multi_session {
fn test_refund_reverts_if_already_approved() {
let (env, buyer, seller, treasury, token_id, admin) = setup();
let client = EscrowContractClient::new(&env, &env.register(EscrowContract, ()));
client.initialize(&admin, &treasury);
client.initialize(&admin, &treasury, &604800);
client.lock_funds(&1, &buyer, &seller, &500, &token_id);
client.complete(&1);
client.approve(&1, &token_id);
Expand All @@ -242,7 +242,7 @@ mod test_multi_session {
let (env, buyer, seller, treasury, token_id, admin) = setup();
let cid = env.register(EscrowContract, ());
let client = EscrowContractClient::new(&env, &cid);
client.initialize(&admin, &treasury);
client.initialize(&admin, &treasury, &604800);
client.lock_funds(&1, &buyer, &seller, &800, &token_id);
client.complete(&1);
env.ledger().set_timestamp(env.ledger().timestamp() + DISPUTE_WINDOW + 1);
Expand All @@ -256,7 +256,7 @@ mod test_multi_session {
fn test_auto_refund_before_window_reverts() {
let (env, buyer, seller, treasury, token_id, admin) = setup();
let client = EscrowContractClient::new(&env, &env.register(EscrowContract, ()));
client.initialize(&admin, &treasury);
client.initialize(&admin, &treasury, &604800);
client.lock_funds(&1, &buyer, &seller, &500, &token_id);
client.complete(&1);
// Do NOT advance time — should panic
Expand All @@ -268,7 +268,7 @@ mod test_multi_session {
fn test_approve_after_auto_refund_reverts() {
let (env, buyer, seller, treasury, token_id, admin) = setup();
let client = EscrowContractClient::new(&env, &env.register(EscrowContract, ()));
client.initialize(&admin, &treasury);
client.initialize(&admin, &treasury, &604800);
client.lock_funds(&1, &buyer, &seller, &500, &token_id);
client.complete(&1);
env.ledger().set_timestamp(env.ledger().timestamp() + DISPUTE_WINDOW + 1);
Expand Down Expand Up @@ -408,7 +408,7 @@ mod test_multi_session {
let (env, _, _, treasury, _, admin) = setup();
let cid = env.register(EscrowContract, ());
let client = EscrowContractClient::new(&env, &cid);
client.initialize(&admin, &treasury);
client.initialize(&admin, &treasury, &604800);

assert_eq!(client.get_platform_fee(), 0);

Expand All @@ -428,7 +428,7 @@ mod test_multi_session {
let (env, _, _, treasury, _, admin) = setup();
let cid = env.register(EscrowContract, ());
let client = EscrowContractClient::new(&env, &cid);
client.initialize(&admin, &treasury);
client.initialize(&admin, &treasury, &604800);
client.set_platform_fee(&1001);
}

Expand All @@ -437,7 +437,7 @@ mod test_multi_session {
let (env, _, _, treasury, _, admin) = setup();
let cid = env.register(EscrowContract, ());
let client = EscrowContractClient::new(&env, &cid);
client.initialize(&admin, &treasury);
client.initialize(&admin, &treasury, &604800);

assert_eq!(client.get_treasury(), treasury);

Expand All @@ -451,6 +451,26 @@ mod test_multi_session {
assert_eq!(last_event.1, (Symbol::new(&env, "TreasuryUpdated"),).into_val(&env));
assert_eq!(last_event.2, new_treasury.into_val(&env));
}

#[test]
fn test_initialize_emits_initialized_event() {
let (env, _, _, treasury, _, admin) = setup();
let cid = env.register(EscrowContract, ());
let client = EscrowContractClient::new(&env, &cid);
let dispute_window = 604800_u32;
client.initialize(&admin, &treasury, &dispute_window);
let events = env.events().all();
let last = events.last().unwrap();
assert_eq!(last.0, cid);
assert_eq!(
last.1,
(Symbol::new(&env, "Initialized"),).into_val(&env)
);
assert_eq!(
last.2,
(admin, treasury, dispute_window).into_val(&env)
);
}
}

// ============================================================================
Expand Down
Loading