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

osmomath: mutative and efficient BigDec truncations with arbitrary decimals (backport #6261) #6470

Merged
merged 2 commits into from
Sep 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2023

This is an automatic backport of pull request #6261 done by Mergify.
Cherry-pick of d5c8abc has failed:

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

You are currently cherry-picking commit d5c8abca.
  (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)

Changes to be committed:
	modified:   osmomath/decimal.go
	modified:   osmomath/decimal_test.go
	modified:   simulation/simtypes/random/sdkrand.go
	modified:   x/concentrated-liquidity/math/tick.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   go.mod
	both modified:   go.sum
	both modified:   x/epochs/go.mod
	both modified:   x/epochs/go.sum

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

@p0mvn p0mvn force-pushed the mergify/bp/v19.x/pr-6261 branch from 2dbd3cb to 3eba9e9 Compare September 20, 2023 19:43
@p0mvn
Copy link
Member

p0mvn commented Sep 20, 2023

Synched through epoch on a node as well

@p0mvn p0mvn merged commit 992b5b2 into v19.x Sep 20, 2023
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v19.x/pr-6261 branch September 20, 2023 20:06
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.

2 participants