Timelocked delegation #162
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
valeriyr
force-pushed
the
issue-130-timelocked-delegation
branch
from
c8231bf to
8dabaf6
Compare
valeriyr
requested review from
fijter,
BugFreeSoftware,
samuel-rufi,
kodemartin and
lzpap
valeriyr
commented
May 6, 2024
| let (stake, expire_timestamp_ms) = time_lock::unpack(timelocked_stake); | ||
|
|
||
| let staked_sui = sui_system.request_add_stake_non_entry( | ||
| stake.into_coin(ctx), |
There was a problem hiding this comment.
It is necessary to get rid of Balance -> Coin conversion.
|
I suggest to move the modules out from the |
…on-in-stardust Move timelocked delegation to stardust package
valeriyr
force-pushed
the
issue-130-timelocked-delegation
branch
from
7fafe1a to
a0e4907
Compare
miker83z
requested changes
May 7, 2024
crates/sui-framework/packages/stardust/sources/timelock/timelocked_staking.move
Outdated
Show resolved
Hide resolved
crates/sui-framework/packages/stardust/sources/timelock/timelocked_staking.move
Show resolved
Hide resolved
crates/sui-framework/packages/stardust/sources/timelock/timelocked_staking.move
Outdated
Show resolved
Hide resolved
crates/sui-framework/packages/stardust/sources/timelock/timelocked_staked_sui.move
Show resolved
Hide resolved
crates/sui-framework/packages/stardust/sources/timelock/timelocked_staking.move
Outdated
Show resolved
Hide resolved
fijter
approved these changes
May 8, 2024
|
|
||
| use sui_system::staking_pool::StakedSui; | ||
|
|
||
| const EIncompatibleTimelockedStakedSui: u64 = 1; |
There was a problem hiding this comment.
Suggested change
| const EIncompatibleTimelockedStakedSui: u64 = 1; | |
| const EIncompatibleTimelockedStakedSui: u64 = 0; |
| use stardust::timelock::{Self, TimeLock}; | ||
| use stardust::timelocked_staked_sui::{Self, TimelockedStakedSui}; | ||
|
|
||
| const ETimeLockShouldNotBeExpired: u64 = 1; |
There was a problem hiding this comment.
Suggested change
| const ETimeLockShouldNotBeExpired: u64 = 1; | |
| const ETimeLockShouldNotBeExpired: u64 = 0; |
samuel-rufi
approved these changes
May 8, 2024
Comment on lines
+70
to
+92
| public(package) fun pack<T: store>(locked: T, expire_timestamp_ms: u64, ctx: &mut TxContext): TimeLock<T> { | ||
| // Create a timelock. | ||
| TimeLock { | ||
| id: object::new(ctx), | ||
| locked, | ||
| expire_timestamp_ms | ||
| } | ||
| } | ||
|
|
||
| /// An utility function to unpack a `TimeLock`. | ||
| public(package) fun unpack<T: store>(lock: TimeLock<T>): (T, u64) { | ||
| // Unpack the timelock. | ||
| let TimeLock { | ||
| id, | ||
| locked, | ||
| expire_timestamp_ms | ||
| } = lock; | ||
|
|
||
| // Delete the timelock. | ||
| object::delete(id); | ||
|
|
||
| (locked, expire_timestamp_ms) | ||
| } |
There was a problem hiding this comment.
Just wondering if we shouldn't just merge following two function bodies with the respective lock/unlock functions directly.
There was a problem hiding this comment.
@samuel-rufi, thank you for the question!
These functions are used internally in the request_add_stake_non_entry and request_withdraw_stake_non_entry ones to create/destroy a TimeLock instance during staking, or in other words, for TimeLock <-> TimeloedStakedSui conversion.
The lock and unlock functions can not be used because they check additional conditions.
There was a problem hiding this comment.
Awesome, thanks for the explaination @valeriyr 👌
miker83z
added
the
sc-platform
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of change
There are two solution proposals:
Links to any relevant issues
Closes #130
Fixes two tasks of #134
Tests
Move-level integration tests.