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

Convert sdk.Int to BigDec (backport #6409) #6449

Merged
merged 6 commits into from
Sep 20, 2023
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2023

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

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   go.mod
	both modified:   go.sum
	both modified:   osmomath/decimal_test.go
	both modified:   x/concentrated-liquidity/math/math.go

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

* refactor/test(CL): Stricter rounding behavior in CL math methods; unit tests at low price level

* comment updates

* convert int => bigdec instead of int => dec => bigdec

* tests

* Liquidity1 lack

* add changelog endpoint

* update go mod

* keep comments

* go mod

* fix

* Update CHANGELOG.md

---------

Co-authored-by: Roman <roman@osmosis.team>
(cherry picked from commit e2b521d)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum
#	osmomath/decimal_test.go
#	x/concentrated-liquidity/math/math.go
@p0mvn
Copy link
Member

p0mvn commented Sep 20, 2023

@hieuvubk please resolve conflicts and make CI pass

CHANGELOG.md Outdated Show resolved Hide resolved
@p0mvn
Copy link
Member

p0mvn commented Sep 20, 2023

The change had a state-break: https://github.com/osmosis-labs/osmosis/actions/runs/6246403698/job/16956949229

I reduced the go mod dependency updates as I'm not sure why we need to update anything other than osmomath

Will rerun the state-compat check now. If fails again, we will have to close this, revert the original PR from main and reinvestigate

@p0mvn
Copy link
Member

p0mvn commented Sep 20, 2023

Reason for failure: #6459

Tested on my node, no issues through epoch

@p0mvn p0mvn merged commit b185b2a into v19.x Sep 20, 2023
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v19.x/pr-6409 branch September 20, 2023 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants