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
2 changes: 1 addition & 1 deletion contracts/mtoken/Move.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[move]
version = 3
manifest_digest = "621AB19773C2DEDCF619E96217605A9FF2BC18173F9DF2D50083C0CE7C974030"
manifest_digest = "1253F4654A86D7FC13E19FC669EA78F29BAC19E2F349101A7A9C44F1BB8E18CC"
deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600"
dependencies = [
{ id = "Sui", name = "Sui" },
Expand Down
45 changes: 29 additions & 16 deletions contracts/mtoken/sources/mtoken.move
Original file line number Diff line number Diff line change
Expand Up @@ -174,22 +174,8 @@ module mtoken::mtoken {
// Ensure current time is within the valid range
assert!(current_time >= manager.start_time_s, ERedeemingBeforeStartTime);

// Interpolate penalty linearly
let end_penalty = decimal::from(manager.end_penalty_numerator)
.mul(decimal::from(withdraw_amount))
.div(decimal::from(manager.penalty_denominator));

let penalty_amount = if (current_time < manager.end_time_s) {
let start_penalty = decimal::from(manager.start_penalty_numerator)
.mul(decimal::from(withdraw_amount))
.div(decimal::from(manager.penalty_denominator));

let time_weight = decimal::from(manager.end_time_s)
.sub(decimal::from(current_time))
.div(decimal::from(manager.end_time_s).sub(decimal::from(manager.start_time_s)));

start_penalty.mul(time_weight).add(end_penalty.mul(decimal::from(1).sub(time_weight))).ceil()
} else { end_penalty.ceil() };
// Get penalty amount
let penalty_amount = manager.get_penalty_amount(withdraw_amount, clock);

assert!(penalty_coin.value() >= penalty_amount, ENotEnoughPenaltyFunds);

Expand Down Expand Up @@ -234,6 +220,33 @@ module mtoken::mtoken {
coin::from_balance(balance, ctx)
}

public fun get_penalty_amount<MToken, Vesting, Penalty>(
manager: &VestingManager<MToken, Vesting, Penalty>,
mtoken_burn_amount: u64,
clock: &Clock,
): u64 {
let current_time = clock::timestamp_ms(clock) / 1000;

// Interpolate penalty linearly
let end_penalty = decimal::from(manager.end_penalty_numerator)
.mul(decimal::from(mtoken_burn_amount))
.div(decimal::from(manager.penalty_denominator));

let penalty_amount = if (current_time < manager.end_time_s) {
let start_penalty = decimal::from(manager.start_penalty_numerator)
.mul(decimal::from(mtoken_burn_amount))
.div(decimal::from(manager.penalty_denominator));

let time_weight = decimal::from(manager.end_time_s)
.sub(decimal::from(current_time))
.div(decimal::from(manager.end_time_s).sub(decimal::from(manager.start_time_s)));

start_penalty.mul(time_weight).add(end_penalty.mul(decimal::from(1).sub(time_weight))).ceil()
} else { end_penalty.ceil() };

penalty_amount
}

// ===== View functions =====

public fun manager<MToken, Vesting, Penalty>(admin_cap: &AdminCap<MToken, Vesting, Penalty>): ID { admin_cap.id.to_inner() }
Expand Down