Skip to content

fix: pending matches issues #720

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

Open
0xfaan wants to merge 1 commit into
base: main
Choose a base branch
from
+121 −31
Open

fix: pending matches issues #720

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
107 changes: 82 additions & 25 deletions contracts/escrow/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ impl EscrowContract {
(Symbol::new(&env, "match"), symbol_short!("activated")),
match_id,
);
Self::add_live_match(env.clone(), match_id);
}

env.storage()
Expand Down Expand Up @@ -378,6 +379,8 @@ impl EscrowContract {
}
}

Self::remove_live_match(env.clone(), match_id);

m.state = MatchState::Completed;
m.completed_ledger = Some(env.ledger().sequence());
env.storage()
Expand Down Expand Up @@ -643,31 +646,91 @@ impl EscrowContract {
Ok(depositors * m.stake_amount)
}

fn get_live_match_ids(env: Env) -> soroban_sdk::Vec<u64> {
let has_key = env.storage().persistent().has(&DataKey::LiveMatches);
let ids: soroban_sdk::Vec<u64> = env
.storage()
.persistent()
.get(&DataKey::LiveMatches)
.unwrap_or_else(|| soroban_sdk::vec![&env]);
if has_key {
env.storage().persistent().extend_ttl(
&DataKey::LiveMatches,
MATCH_TTL_LEDGERS,
MATCH_TTL_LEDGERS,
);
}
ids
}

fn set_live_match_ids(env: Env, ids: &soroban_sdk::Vec<u64>) {
env.storage().persistent().set(&DataKey::LiveMatches, ids);
env.storage().persistent().extend_ttl(
&DataKey::LiveMatches,
MATCH_TTL_LEDGERS,
MATCH_TTL_LEDGERS,
);
}

fn add_live_match(env: Env, match_id: u64) {
let ids = Self::get_live_match_ids(env.clone());
let mut updated = soroban_sdk::vec![&env];
let mut inserted = false;

for i in 0..ids.len() {
let current = *ids.get(i).unwrap();
if !inserted && current > match_id {
updated.push_back(match_id);
inserted = true;
}
if current != match_id {
updated.push_back(current);
} else {
inserted = true;
}
}

if !inserted {
updated.push_back(match_id);
}

Self::set_live_match_ids(env, &updated);
}

fn remove_live_match(env: Env, match_id: u64) {
let ids = Self::get_live_match_ids(env.clone());
let mut updated = soroban_sdk::vec![&env];

for i in 0..ids.len() {
let current = *ids.get(i).unwrap();
if current != match_id {
updated.push_back(current);
}
}

Self::set_live_match_ids(env, &updated);
}

/// Return all matches that are in Active state (fully funded).
pub fn get_live_matches(env: Env) -> Result<soroban_sdk::Vec<Match>, Error> {
let ids = Self::get_live_match_ids(env.clone());
let mut live_matches = soroban_sdk::vec![&env];
let count: u64 = env
.storage()
.instance()
.get(&DataKey::MatchCount)
.unwrap_or(0);

for i in 0..count {
for i in 0..ids.len() {
let match_id = *ids.get(i).unwrap();
if let Ok(m) = env
.storage()
.persistent()
.get::<DataKey, Match>(&DataKey::Match(i))
.get::<DataKey, Match>(&DataKey::Match(match_id))
{
if m.state == MatchState::Active {
live_matches.push_back(m);
}
live_matches.push_back(m);
}
}

Ok(live_matches)
}

/// Return the total number of active matches created, ordered by match ID ascending.
/// Return all active matches ordered by match ID ascending.
pub fn get_active_matches(env: Env) -> Result<soroban_sdk::Vec<Match>, Error> {
Self::get_live_matches(env)
}
Expand All @@ -683,27 +746,21 @@ impl EscrowContract {
return Ok(active_matches);
}

let count: u64 = env
.storage()
.instance()
.get(&DataKey::MatchCount)
.unwrap_or(0);
let ids = Self::get_live_match_ids(env.clone());
let mut skipped = 0u32;
let mut added = 0u32;

for i in 0..count {
for i in 0..ids.len() {
if skipped < offset {
skipped = skipped.saturating_add(1);
continue;
}
let match_id = *ids.get(i).unwrap();
if let Ok(m) = env
.storage()
.persistent()
.get::<DataKey, Match>(&DataKey::Match(i))
.get::<DataKey, Match>(&DataKey::Match(match_id))
{
if m.state != MatchState::Active {
continue;
}
if skipped < offset {
skipped = skipped.saturating_add(1);
continue;
}
active_matches.push_back(m);
added = added.saturating_add(1);
if added >= limit {
Expand Down
33 changes: 33 additions & 0 deletions contracts/escrow/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1714,4 +1714,37 @@ fn test_get_live_matches_returns_only_fully_funded_matches() {
let live_matches = client.get_live_matches();
assert_eq!(live_matches.len(), 1);
assert_eq!(live_matches.get(0).unwrap().id, active_id);
assert_ne!(live_matches.get(0).unwrap().id, pending_id);
}

#[test]
fn test_get_active_matches_excludes_pending_matches() {
let (env, contract_id, _oracle, player1, player2, token, _admin) = setup();
let client = EscrowContractClient::new(&env, &contract_id);

// Create pending match and active match.
let pending_id = client.create_match(
&player1,
&player2,
&100,
&token,
&String::from_str(&env, "pending_match_exclusion"),
&Platform::Lichess,
);

let active_id = client.create_match(
&player1,
&player2,
&100,
&token,
&String::from_str(&env, "active_match_exclusion"),
&Platform::Lichess,
);
client.deposit(&active_id, &player1);
client.deposit(&active_id, &player2);

let active_matches = client.get_active_matches();
assert_eq!(active_matches.len(), 1);
assert_eq!(active_matches.get(0).unwrap().id, active_id);
assert_ne!(active_matches.get(0).unwrap().id, pending_id);
}
8 changes: 4 additions & 4 deletions contracts/escrow/src/tests/lifecycle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@ fn test_expire_match_refunds_depositor_after_timeout() {
.extend_ttl_for_code(token.clone(), MATCH_TTL_LEDGERS, MATCH_TTL_LEDGERS);
env.as_contract(&contract_id, || {
env.storage().persistent().extend_ttl(
&DataKey::ActiveMatches,
&DataKey::LiveMatches,
MATCH_TTL_LEDGERS,
MATCH_TTL_LEDGERS,
);
Expand Down Expand Up @@ -1304,7 +1304,7 @@ fn test_get_match_returns_cancelled_after_expire_match() {
}
env.as_contract(&contract_id, || {
env.storage().persistent().extend_ttl(
&DataKey::ActiveMatches,
&DataKey::LiveMatches,
MATCH_TTL_LEDGERS,
MATCH_TTL_LEDGERS,
);
Expand All @@ -1323,7 +1323,7 @@ fn test_get_match_returns_cancelled_after_expire_match() {
}
env.as_contract(&contract_id, || {
env.storage().persistent().extend_ttl(
&DataKey::ActiveMatches,
&DataKey::LiveMatches,
MATCH_TTL_LEDGERS,
MATCH_TTL_LEDGERS,
);
Expand Down Expand Up @@ -1535,7 +1535,7 @@ fn test_expire_match_refunds_both_players_when_both_deposited_but_still_pending(
.extend_ttl_for_code(token.clone(), MATCH_TTL_LEDGERS, MATCH_TTL_LEDGERS);
env.as_contract(&contract_id, || {
env.storage().persistent().extend_ttl(
&DataKey::ActiveMatches,
&DataKey::LiveMatches,
MATCH_TTL_LEDGERS,
MATCH_TTL_LEDGERS,
);
Expand Down
4 changes: 2 additions & 2 deletions contracts/escrow/src/tests/ttl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ fn test_active_matches_ttl_refreshed_on_append_and_removal() {
);

let ttl_after_append = env.as_contract(&contract_id, || {
env.storage().persistent().get_ttl(&DataKey::ActiveMatches)
env.storage().persistent().get_ttl(&DataKey::LiveMatches)
});
assert_eq!(ttl_after_append, crate::MATCH_TTL_LEDGERS);

Expand All @@ -101,7 +101,7 @@ fn test_active_matches_ttl_refreshed_on_append_and_removal() {
client.submit_result(&match1, &Winner::Player1);

let ttl_after_removal = env.as_contract(&contract_id, || {
env.storage().persistent().get_ttl(&DataKey::ActiveMatches)
env.storage().persistent().get_ttl(&DataKey::LiveMatches)
});
assert_eq!(ttl_after_removal, crate::MATCH_TTL_LEDGERS);
}
Expand Down