Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create Message for Staking Conversion (backport #5949) #6094

Merged
merged 1 commit into from
Aug 17, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 17, 2023

This is an automatic backport of pull request #5949 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* WIP

* Almost done, need more test cases...

* Finish adding test cases

* Use val set

* Add changelog

* Fix simple problems

* Update tx.pb.go

* Remove partial unlocking

* Use val set delegation and edit test cases

* Update proto/osmosis/superfluid/tx.proto

Co-authored-by: Adam Tucker <adam@osmosis.team>

* Update x/superfluid/keeper/stake.go

Co-authored-by: alpo <62043214+AlpinYukseloglu@users.noreply.github.com>

* Romans comment, add balancer check

* Adam's comment

* Change errors from bool to check error

* Add validate basic, bring back partial share migration for liquid gamm shares

* Try abstracting check logics from test

* Romans comment

* Add cli

* Fix cli

* Update x/superfluid/keeper/stake.go

* Update x/superfluid/client/cli/tx.go

* Update x/superfluid/keeper/stake.go

Co-authored-by: Roman <roman@osmosis.team>

* Roman and Adam

* Update x/superfluid/keeper/stake.go

* Adams comment

* Update x/superfluid/keeper/stake.go

Co-authored-by: Roman <roman@osmosis.team>

* Romans comments

---------

Co-authored-by: devbot-wizard <141283918+devbot-wizard@users.noreply.github.com>
Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
Co-authored-by: Adam Tucker <adam@osmosis.team>
Co-authored-by: alpo <62043214+AlpinYukseloglu@users.noreply.github.com>
Co-authored-by: Adam Tucker <adamleetucker@outlook.com>
Co-authored-by: Roman <roman@osmosis.team>
(cherry picked from commit d99138f)
Copy link
Member

@mattverse mattverse left a comment

Choose a reason for hiding this comment

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

Seems like nothing's breaking or conflicting, I think we can go ahead and merge this

@ValarDragon ValarDragon merged commit e4f2c3e into v17.x Aug 17, 2023
1 check passed
@ValarDragon ValarDragon deleted the mergify/bp/v17.x/pr-5949 branch August 17, 2023 14:27
traviolus pushed a commit to alleslabs/osmosis that referenced this pull request Aug 23, 2023
…bs#6094)

* WIP

* Almost done, need more test cases...

* Finish adding test cases

* Use val set

* Add changelog

* Fix simple problems

* Update tx.pb.go

* Remove partial unlocking

* Use val set delegation and edit test cases

* Update proto/osmosis/superfluid/tx.proto

Co-authored-by: Adam Tucker <adam@osmosis.team>

* Update x/superfluid/keeper/stake.go

Co-authored-by: alpo <62043214+AlpinYukseloglu@users.noreply.github.com>

* Romans comment, add balancer check

* Adam's comment

* Change errors from bool to check error

* Add validate basic, bring back partial share migration for liquid gamm shares

* Try abstracting check logics from test

* Romans comment

* Add cli

* Fix cli

* Update x/superfluid/keeper/stake.go

* Update x/superfluid/client/cli/tx.go

* Update x/superfluid/keeper/stake.go

Co-authored-by: Roman <roman@osmosis.team>

* Roman and Adam

* Update x/superfluid/keeper/stake.go

* Adams comment

* Update x/superfluid/keeper/stake.go

Co-authored-by: Roman <roman@osmosis.team>

* Romans comments

---------

Co-authored-by: devbot-wizard <141283918+devbot-wizard@users.noreply.github.com>
Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
Co-authored-by: Adam Tucker <adam@osmosis.team>
Co-authored-by: alpo <62043214+AlpinYukseloglu@users.noreply.github.com>
Co-authored-by: Adam Tucker <adamleetucker@outlook.com>
Co-authored-by: Roman <roman@osmosis.team>
(cherry picked from commit d99138f)

Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants