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
46 changes: 46 additions & 0 deletions contracts/sorosave/src/admin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,52 @@ pub fn resume_group(env: &Env, admin: Address, group_id: u64) -> Result<(), Cont
Ok(())
}

pub fn extend_deadline(
env: &Env,
admin: Address,
group_id: u64,
extra_seconds: u64,
) -> Result<(), ContractError> {
admin.require_auth();

let group = storage::get_group(env, group_id).ok_or(ContractError::GroupNotFound)?;

if admin != group.admin && admin != storage::get_admin(env) {
return Err(ContractError::Unauthorized);
}

if group.status != GroupStatus::Active {
return Err(ContractError::GroupNotActive);
}

if extra_seconds == 0 || extra_seconds > group.cycle_length {
return Err(ContractError::DeadlineExtensionTooLarge);
}

let mut round_info = storage::get_round(env, group_id, group.current_round)
.ok_or(ContractError::RoundNotActive)?;

if round_info.deadline_extensions >= 2 {
return Err(ContractError::DeadlineExtensionLimitReached);
}

round_info.deadline += extra_seconds;
round_info.deadline_extensions += 1;
storage::set_round(env, group_id, &round_info);

env.events().publish(
(crate::symbol_short!("dl_ext"),),
(
group_id,
group.current_round,
round_info.deadline,
round_info.deadline_extensions,
),
);

Ok(())
}

pub fn raise_dispute(
env: &Env,
member: Address,
Expand Down
2 changes: 2 additions & 0 deletions contracts/sorosave/src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,6 @@ pub enum ContractError {
InsufficientMembers = 16,
RoundNotComplete = 17,
GroupCompleted = 18,
DeadlineExtensionTooLarge = 19,
DeadlineExtensionLimitReached = 20,
}
1 change: 1 addition & 0 deletions contracts/sorosave/src/group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ pub fn start_group(env: &Env, admin: Address, group_id: u64) -> Result<(), Contr
total_contributed: 0,
is_complete: false,
deadline: env.ledger().timestamp() + group.cycle_length,
deadline_extensions: 0,
};

storage::set_round(env, group_id, &round_info);
Expand Down
10 changes: 10 additions & 0 deletions contracts/sorosave/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,16 @@ impl SoroSaveContract {
admin::resume_group(&env, admin, group_id)
}

/// Extend the current round deadline. A round can be extended at most twice.
pub fn extend_deadline(
env: Env,
admin: Address,
group_id: u64,
extra_seconds: u64,
) -> Result<(), ContractError> {
admin::extend_deadline(&env, admin, group_id, extra_seconds)
}

/// Raise a dispute on a group.
pub fn raise_dispute(
env: Env,
Expand Down
1 change: 1 addition & 0 deletions contracts/sorosave/src/payout.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ pub fn distribute_payout(env: &Env, group_id: u64) -> Result<(), ContractError>
total_contributed: 0,
is_complete: false,
deadline: env.ledger().timestamp() + group.cycle_length,
deadline_extensions: 0,
};

storage::set_round(env, group_id, &new_round);
Expand Down
30 changes: 30 additions & 0 deletions contracts/sorosave/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,36 @@ fn test_pause_resume_group() {
assert_eq!(client.get_group(&group_id).status, GroupStatus::Active);
}

#[test]
fn test_extend_deadline_limits() {
let (env, admin, client, token) = setup_env();
let group_id = create_test_group(&env, &client, &admin, &token);

let member1 = Address::generate(&env);
client.join_group(&member1, &group_id);
client.start_group(&admin, &group_id);

let original_deadline = client.get_round_status(&group_id, &1).deadline;

client.extend_deadline(&admin, &group_id, &3600);
let round = client.get_round_status(&group_id, &1);
assert_eq!(round.deadline, original_deadline + 3600);
assert_eq!(round.deadline_extensions, 1);

client.extend_deadline(&admin, &group_id, &7200);
let round = client.get_round_status(&group_id, &1);
assert_eq!(round.deadline, original_deadline + 10800);
assert_eq!(round.deadline_extensions, 2);

assert!(client.try_extend_deadline(&admin, &group_id, &1).is_err());
assert!(client
.try_extend_deadline(&member1, &group_id, &3600)
.is_err());
assert!(client
.try_extend_deadline(&admin, &group_id, &86401)
.is_err());
}

#[test]
fn test_dispute_flow() {
let (env, admin, client, token) = setup_env();
Expand Down
1 change: 1 addition & 0 deletions contracts/sorosave/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ pub struct RoundInfo {
pub total_contributed: i128,
pub is_complete: bool,
pub deadline: u64,
pub deadline_extensions: u32,
}

/// Dispute information for a group.
Expand Down