osmosis icon indicating copy to clipboard operation
osmosis copied to clipboard

feat: speedup epoch distribution, superfluid component (backport #2214)

Open mergify[bot] opened this issue 3 years ago • 2 comments

This is an automatic backport of pull request #2214 done by Mergify. Cherry-pick of 3cdfbccd2957e78e8a62877b47941a8e1cee537d has failed:

On branch mergify/bp/v7.x/pr-2214
Your branch is up to date with 'origin/v7.x'.

You are currently cherry-picking commit 3cdfbccd.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/incentives/keeper/distribute.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


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

mergify[bot] avatar Jul 31 '22 13:07 mergify[bot]

I think it's good to merge given that this is backported + merge conflict changes.

p0mvn avatar Aug 02 '22 17:08 p0mvn

This looks correct to me, would like to try syncing through an epoch on one of these versions pre-release if possible

ValarDragon avatar Aug 02 '22 17:08 ValarDragon

This pull request has been automatically marked as stale because it has not had any recent activity. It will be closed if no further activity occurs. Thank you!

github-actions[bot] avatar Aug 17 '22 00:08 github-actions[bot]

@ValarDragon I just realized we shouldn't be back-porting to this branch right? Should only have this for v10.x and v8.x right? If so will close these.

czarcas7ic avatar Aug 19 '22 14:08 czarcas7ic

We didn't fork away from v7 IIRC. Its still a version you have to use in syncing from genesis AFAIU

ValarDragon avatar Aug 19 '22 19:08 ValarDragon

We can close the v9.x one tho

ValarDragon avatar Aug 19 '22 19:08 ValarDragon

@ValarDragon I could have sworn the order is v3 > v4 > v6 > v8 > v10 > v11. Thats how I have the installer setup at least. Is this wrong?

czarcas7ic avatar Aug 19 '22 19:08 czarcas7ic

Ah you are right

ValarDragon avatar Aug 20 '22 06:08 ValarDragon