Skip to content
Open
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
10 changes: 10 additions & 0 deletions contracts/sorosave/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,16 @@ impl SoroSaveContract {
payout::get_current_recipient(&env, group_id)
}

/// Get completed round history for a group, paginated by completed-round index.
pub fn get_round_history(
env: Env,
group_id: u64,
offset: u32,
limit: u32,
) -> Result<Vec<RoundInfo>, ContractError> {
payout::get_round_history(&env, group_id, offset, limit)
}

// ─── Admin / Governance ─────────────────────────────────────────

/// Pause an active group.
Expand Down
36 changes: 36 additions & 0 deletions contracts/sorosave/src/payout.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,39 @@ pub fn get_current_recipient(env: &Env, group_id: u64) -> Result<Address, Contra

Ok(round_info.recipient)
}

pub fn get_round_history(
env: &Env,
group_id: u64,
offset: u32,
limit: u32,
) -> Result<Vec<RoundInfo>, ContractError> {
let group = storage::get_group(env, group_id).ok_or(ContractError::GroupNotFound)?;
let mut history = Vec::new(env);

if limit == 0 {
return Ok(history);
}

let mut skipped = 0;
let mut round_number = 1;

while round_number <= group.current_round {
if let Some(round_info) = storage::get_round(env, group_id, round_number) {
if round_info.is_complete {
if skipped < offset {
skipped += 1;
} else {
history.push_back(round_info);
if history.len() >= limit {
break;
}
}
}
}

round_number += 1;
}

Ok(history)
}
53 changes: 53 additions & 0 deletions contracts/sorosave/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,59 @@ fn test_full_cycle() {
assert_eq!(group.status, GroupStatus::Completed);
}

#[test]
fn test_round_history_pagination() {
let (env, admin, client, _token) = setup_env();
let member1 = Address::generate(&env);
let member2 = Address::generate(&env);
let mint_admin = Address::generate(&env);
let token_id = env.register_stellar_asset_contract_v2(mint_admin);
let token_sac = StellarAssetClient::new(&env, &token_id.address());
token_sac.mint(&admin, &10_000_000);
token_sac.mint(&member1, &10_000_000);
token_sac.mint(&member2, &10_000_000);

let group_id = client.create_group(
&admin,
&String::from_str(&env, "Round History Test"),
&token_id.address(),
&1_000_000,
&86400,
&5,
);
client.join_group(&member1, &group_id);
client.join_group(&member2, &group_id);
client.start_group(&admin, &group_id);

client.contribute(&admin, &group_id);
client.contribute(&member1, &group_id);
client.contribute(&member2, &group_id);

let first_page = client.get_round_history(&group_id, &0, &10);
assert_eq!(first_page.len(), 1);
assert_eq!(first_page.get(0).unwrap().round_number, 1);
assert_eq!(first_page.get(0).unwrap().recipient, admin);
assert_eq!(first_page.get(0).unwrap().total_contributed, 3_000_000);
assert!(first_page.get(0).unwrap().is_complete);

client.distribute_payout(&group_id);
client.contribute(&admin, &group_id);

let history_before_second_complete = client.get_round_history(&group_id, &0, &10);
assert_eq!(history_before_second_complete.len(), 1);

client.contribute(&member1, &group_id);
client.contribute(&member2, &group_id);

let second_page = client.get_round_history(&group_id, &1, &1);
assert_eq!(second_page.len(), 1);
assert_eq!(second_page.get(0).unwrap().round_number, 2);
assert_eq!(second_page.get(0).unwrap().recipient, member1);

assert_eq!(client.get_round_history(&group_id, &0, &0).len(), 0);
assert_eq!(client.get_round_history(&group_id, &5, &2).len(), 0);
}

#[test]
fn test_member_groups() {
let (env, admin, client, token) = setup_env();
Expand Down