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

feat: make PoolModuleI CalculateSpotPrice API return BigDec (backport #6487) #6495

Merged
merged 1 commit into from
Sep 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 22, 2023

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

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

You are currently cherry-picking commit a1717070.
  (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:   app/apptesting/gamm.go
	modified:   app/apptesting/test_suite.go
	modified:   tests/mocks/pool_module.go
	modified:   x/concentrated-liquidity/pool.go
	modified:   x/concentrated-liquidity/pool_test.go
	modified:   x/cosmwasmpool/pool_module.go
	modified:   x/gamm/keeper/grpc_query.go
	modified:   x/gamm/keeper/grpc_query_test.go
	modified:   x/gamm/keeper/pool_service.go
	modified:   x/gamm/keeper/pool_service_test.go
	modified:   x/gamm/keeper/swap_test.go
	modified:   x/gamm/pool-models/balancer/pool_suite_test.go
	modified:   x/gamm/types/constants.go
	modified:   x/poolmanager/client/query_proto_wrap.go
	modified:   x/poolmanager/router_test.go
	modified:   x/poolmanager/types/expected_keepers.go
	modified:   x/twap/api_test.go
	modified:   x/twap/listeners_test.go
	modified:   x/twap/logic.go
	modified:   x/twap/types/expected_interfaces.go
	modified:   x/twap/types/twapmock/amminterface.go
	modified:   x/twap/types/utils.go
	modified:   x/txfees/keeper/feetokens.go
	modified:   x/txfees/keeper/grpc_query.go
	modified:   x/txfees/types/expected_keepers.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   app/upgrades/v16/upgrades_test.go
	both modified:   app/upgrades/v17/upgrades_test.go
	both modified:   x/poolmanager/router.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

@mergify mergify bot added the conflicts label Sep 22, 2023
@mergify mergify bot assigned p0mvn Sep 22, 2023
@github-actions github-actions bot added C:CLI C:x/gamm Changes, features and bugs related to the gamm module. C:x/txfees C:app-wiring Changes to the app folder C:x/twap Changes to the twap module C:x/concentrated-liquidity C:x/poolmanager labels Sep 22, 2023
@p0mvn p0mvn force-pushed the mergify/bp/v19.x/pr-6487 branch from 137781e to 5eca5bb Compare September 22, 2023 12:37
@p0mvn
Copy link
Member

p0mvn commented Sep 22, 2023

Confirmed state compat on the node

@p0mvn p0mvn merged commit 28f1afc into v19.x Sep 22, 2023
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v19.x/pr-6487 branch September 22, 2023 13:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:app-wiring Changes to the app folder C:CLI C:x/concentrated-liquidity C:x/gamm Changes, features and bugs related to the gamm module. C:x/poolmanager C:x/twap Changes to the twap module C:x/txfees conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant