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

Speedup more stable swap math operations (backport #7214) #7232

Merged
merged 7 commits into from
Jan 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 2, 2024

This is an automatic backport of pull request #7214 done by Mergify.
Cherry-pick of 9cd7231 has failed:

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

You are currently cherry-picking commit 9cd72313.
  (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/binary_search.go
	modified:   osmomath/sigfig_round.go
	modified:   x/gamm/pool-models/stableswap/amm.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   osmomath/decimal.go
	both modified:   osmomath/decimal_test.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

* Speedup more stable swap math operations

* Try another speedup

* revert one sigfig change

* remove one more mutative operation

* update osmomath

* Update osmomath one more tiome

* Update osmomath/decimal.go

Co-authored-by: Matt, Park <[email protected]>

---------

Co-authored-by: Matt, Park <[email protected]>
(cherry picked from commit 9cd7231)

# Conflicts:
#	go.mod
#	go.sum
#	osmomath/decimal.go
#	osmomath/decimal_test.go
@mergify mergify bot requested review from mattverse and czarcas7ic as code owners January 2, 2024 21:47
@mergify mergify bot added the conflicts label Jan 2, 2024
@github-actions github-actions bot added the C:x/gamm Changes, features and bugs related to the gamm module. label Jan 2, 2024
Copy link
Contributor

github-actions bot commented Jan 2, 2024

Important Notice

This PR modifies an in-repo Go module. It is one of:

  • osmomath
  • osmoutils
  • x/ibc-hooks
  • x/epochs

The dependent Go modules, especially the root one, will have to be
updated to reflect the changes. Failing to do so might cause e2e to fail.

Please follow the instructions below:

  1. Open https://github.com/osmosis-labs/osmosis/actions/workflows/go-mod-auto-bump.yml
  2. Provide the current branch name
  3. On success, confirm if an automated commit corretly updated the go.mod and go.sum files

Please let us know if you need any help.

@mergify mergify bot requested a review from nicolaslara as a code owner January 7, 2024 03:16
@mattverse mattverse merged commit 769e6f8 into v21.x Jan 9, 2024
1 check passed
@mattverse mattverse deleted the mergify/bp/v21.x/pr-7214 branch January 9, 2024 11:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:x/epochs C:x/gamm Changes, features and bugs related to the gamm module. conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants