Skip to content

Partial unlocking implementation#893

Merged
ValarDragon merged 5 commits intomainfrom
mconcat/partial-unlock
Feb 19, 2022
Merged

Partial unlocking implementation#893
ValarDragon merged 5 commits intomainfrom
mconcat/partial-unlock

Conversation

@mconcat
Copy link
Copy Markdown
Contributor

@mconcat mconcat commented Feb 17, 2022 •
edited
Loading

TODO

  • logic impl
  • testing

Description

For contributor use:

  • Targeted PR against correct branch (see CONTRIBUTING.md)
  • Updated relevant documentation (docs/) or specification (x/<module>/spec/)
  • Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
  • Re-reviewed Files changed in the Github PR explorer

ValarDragon
ValarDragon reviewed Feb 17, 2022
View reviewed changes
@mattverse
Copy link
Copy Markdown
Contributor

mattverse commented Feb 17, 2022

It might help, the old PR #543 has partial unlocking implemented that you can reference to!

@mconcat mconcat marked this pull request as ready for review February 18, 2022 06:56
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Feb 18, 2022 •
edited
Loading

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 83.33333% with 7 lines in your changes missing coverage. Please review.

Project coverage is 21.69%. Comparing base (b990199) to head (583e912).
Report is 3349 commits behind head on main.

Files with missing lines Patch % Lines
x/lockup/keeper/lock.go 81.81% 3 Missing and 3 partials ⚠️
x/lockup/keeper/msg_server.go 0.00% 1 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #893      +/-   ##
==========================================
+ Coverage   20.38%   21.69%   +1.30%     
==========================================
  Files         192      192              
  Lines       24783    25626     +843     
==========================================
+ Hits         5053     5559     +506     
- Misses      18798    19065     +267     
- Partials      932     1002      +70

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

ValarDragon
ValarDragon reviewed Feb 18, 2022
View reviewed changes
ValarDragon
ValarDragon reviewed Feb 18, 2022
View reviewed changes
ValarDragon
ValarDragon reviewed Feb 18, 2022
View reviewed changes
x/lockup/keeper/synthetic_lock.go
return synthLocks
}

func (k Keeper) HasAnySyntheticLockups(ctx sdk.Context, lockID uint64) bool {
Copy link
Copy Markdown
Member

@ValarDragon ValarDragon Feb 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, this is a good fn to have!

ValarDragon
ValarDragon reviewed Feb 18, 2022
View reviewed changes
ValarDragon
ValarDragon reviewed Feb 18, 2022
View reviewed changes
x/lockup/keeper/lock_test.go
Comment on lines +244 to +246
locked = suite.app.LockupKeeper.GetAccountLockedCoins(suite.ctx, addr1)
suite.Require().Equal(len(locked), 1)
suite.Require().Equal(locked[0].Amount.Int64(), int64(10))
Copy link
Copy Markdown
Member

@ValarDragon ValarDragon Feb 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this by 9?

Copy link
Copy Markdown
Contributor Author

@mconcat mconcat Feb 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GetAccountLockedCoins returns all coins that is qualified for reward, so it includes unlocking coins. Will add logic for checking 9 case!

ValarDragon
ValarDragon reviewed Feb 18, 2022
View reviewed changes
@ValarDragon ValarDragon mentioned this pull request Feb 19, 2022
Closed
mconcat and others added 2 commits February 18, 2022 21:09
@mconcat @ValarDragon
Apply suggestions from code review
9548855 
Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
@mconcat
add test for case after unlocking period
583e912
@ValarDragon ValarDragon merged commit debeb29 into main Feb 19, 2022
@ValarDragon ValarDragon deleted the mconcat/partial-unlock branch February 19, 2022 07:19
UnityChaos pushed a commit that referenced this pull request Feb 20, 2022
@mconcat @ValarDragon @UnityChaos
Partial unlocking implementation (#893)
a5bee64 
* add partial unlock logic

* add partial unlock test

* fix lint

* Apply suggestions from code review

Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>

* add test for case after unlocking period

Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
@github-actions github-actions bot mentioned this pull request Mar 15, 2024
Closed
@github-actions github-actions bot mentioned this pull request Apr 1, 2024
Closed
@github-actions github-actions bot mentioned this pull request May 1, 2024
Closed
@github-actions github-actions bot mentioned this pull request May 15, 2024
Closed
@github-actions github-actions bot mentioned this pull request Feb 1, 2025
Closed
@github-actions github-actions bot mentioned this pull request Apr 1, 2025
Closed
@github-actions github-actions bot mentioned this pull request Apr 15, 2025
Closed
@github-actions github-actions bot mentioned this pull request Jul 15, 2025
Closed
@github-actions github-actions bot mentioned this pull request Aug 15, 2025
Closed
@github-actions github-actions bot mentioned this pull request Mar 15, 2026
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ValarDragon ValarDragon ValarDragon approved these changes

Assignees

No one assigned

Labels

None yet

Projects

Osmosis Chain Development
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@mconcat @mattverse @codecov-commenter @ValarDragon