feat(wallet,dashboard): sunset Vesting#10923
Merged
begonaalvarezd merged 3 commits intodevelopfrom Apr 10, 2026
Merged
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub. 6 Skipped Deployments
|
github-actions
bot
added
wallet
evavirseda
changed the title
evavirseda
force-pushed
the
feature/sunset-vesting
branch
from
538624f to
c8e45b5
Compare
evavirseda
force-pushed
the
feature/sunset-vesting
branch
from
c8e45b5 to
dc1cb2c
Compare
brancoder
added a commit
that referenced
this pull request
Apr 9, 2026
# Description of change example of collect [transaction](https://explorer.iota.org/txblock/HjKDYUXLjAnS9DGNK6Cqu2RrT7jcQwBWsS4zLMBuqKxV?network=devnet) - Regular timelocks → unlock → convert to coin → transfer - Timelocked stakes → unlock first, then group by `(pool_id, stake_activation_epoch)` and merge with `staking_pool::join_staked_iota` - Unlocks before joining to avoid `timelocked_staking::join_staked_iota`, which also checks `expiration_timestamp_ms` and would abort for stakes from different vesting periods - If the user already has a regular stake in the same pool/epoch, merges into it instead of creating a new object - Shows a summary dialog after a successful collect ## Links to any relevant issues :warning: nested PR from #10923 fixes #10800 ## How the change has been tested 1. Get a [vesting scenario](iotaledger/tooling-resources#101) 2. Change `SUPPLY_INCREASE_STARTING_VESTING_YEAR` from `2023` to `2024` because the testing objects that you created expire in `2026`, but the logic only considers staker up to `2025` 3. Wait a few minutes until all are unlocked ## Testing Collect Transaction with Existing Stake Objects To reproduce this scenario: - Run the [vesting scenario](iotaledger/tooling-resources#101) from the tooling-resources repository. - In the same epoch, add regular stakes using the dashboard or wallet. ❗ Make sure that the validator is the same for timelocked staking (vesting fast example) and regular stake This test ensures that the collect transaction correctly unlocks timelocked stake and adds it to the existing staking object in the pool --------- Co-authored-by: Mario Sarcevic <mario.sarcevic@iota.org> Co-authored-by: Bran <52735957+brancoder@users.noreply.github.com>
panteleymonchuk
approved these changes
Apr 10, 2026
<details> <summary>Screenshots 👀 </summary> <img width="433" height="750" alt="Screenshot from 2026-03-20 10-02-09" src="https://github.com/user-attachments/assets/4c557738-48dd-43dd-a32e-d6a5d007fea7" /> <img width="1081" height="548" alt="Screenshot from 2026-03-20 11-00-29" src="https://github.com/user-attachments/assets/ea1a55ed-bada-47fd-ac6f-8a80703ccaaf" /> <img width="956" height="475" alt="Screenshot from 2026-03-20 11-00-48" src="https://github.com/user-attachments/assets/0ec10edb-7b54-43ec-b2e3-989f7c7587ef" /> <img width="1194" height="708" alt="Screenshot from 2026-03-20 11-01-20" src="https://github.com/user-attachments/assets/fbd93210-5d16-40d4-805f-4f44de660784" /> </details> fixes #10799 Describe the tests that you ran to verify your changes. Make sure to provide instructions for the maintainer as well as any relevant configurations. --------- Co-authored-by: Mario Sarcevic <mario.sarcevic@iota.org>
# Description of change example of collect [transaction](https://explorer.iota.org/txblock/HjKDYUXLjAnS9DGNK6Cqu2RrT7jcQwBWsS4zLMBuqKxV?network=devnet) - Regular timelocks → unlock → convert to coin → transfer - Timelocked stakes → unlock first, then group by `(pool_id, stake_activation_epoch)` and merge with `staking_pool::join_staked_iota` - Unlocks before joining to avoid `timelocked_staking::join_staked_iota`, which also checks `expiration_timestamp_ms` and would abort for stakes from different vesting periods - If the user already has a regular stake in the same pool/epoch, merges into it instead of creating a new object - Shows a summary dialog after a successful collect ## Links to any relevant issues :warning: nested PR from #10923 fixes #10800 ## How the change has been tested 1. Get a [vesting scenario](iotaledger/tooling-resources#101) 2. Change `SUPPLY_INCREASE_STARTING_VESTING_YEAR` from `2023` to `2024` because the testing objects that you created expire in `2026`, but the logic only considers staker up to `2025` 3. Wait a few minutes until all are unlocked ## Testing Collect Transaction with Existing Stake Objects To reproduce this scenario: - Run the [vesting scenario](iotaledger/tooling-resources#101) from the tooling-resources repository. - In the same epoch, add regular stakes using the dashboard or wallet. ❗ Make sure that the validator is the same for timelocked staking (vesting fast example) and regular stake This test ensures that the collect transaction correctly unlocks timelocked stake and adds it to the existing staking object in the pool --------- Co-authored-by: Mario Sarcevic <mario.sarcevic@iota.org> Co-authored-by: Bran <52735957+brancoder@users.noreply.github.com>
marc2332
force-pushed
the
feature/sunset-vesting
branch
from
1b3625d to
60536b9
Compare
begonaalvarezd
added a commit
that referenced
this pull request
Apr 10, 2026
### be sure to squash & merge 🙏 fixes #10796 --------- Co-authored-by: Mario Sarcevic <mario.sarcevic@iota.org> Co-authored-by: Bran <52735957+brancoder@users.noreply.github.com> Co-authored-by: Begoña Alvarez <balvarez@boxfish.studio>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
be sure to squash & merge 🙏
fixes #10796