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

fix: panic protection for DenomResolver (backport #104) #105

Merged
merged 2 commits into from
Jun 10, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 10, 2024

Closes BLO-1340

Remove GetDenomResolver function and always use ResolveToDenom which includes nil protection.


This is an automatic backport of pull request #104 done by Mergify.

(cherry picked from commit bcd3fc7)

# Conflicts:
#	go.sum
#	x/feemarket/ante/mocks/mock_account_keeper.go
#	x/feemarket/post/mocks/mock_account_keeper.go
#	x/feemarket/types/mocks/mock_account_keeper.go
Copy link
Author

mergify bot commented Jun 10, 2024

Cherry-pick of bcd3fc7 has failed:

On branch mergify/bp/sdk-47/pr-104
Your branch is up to date with 'origin/sdk-47'.

You are currently cherry-picking commit bcd3fc7.
  (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:   Makefile
	modified:   go.mod
	modified:   tools/tools.go
	modified:   x/feemarket/ante/expected_keepers.go
	modified:   x/feemarket/ante/fee.go
	modified:   x/feemarket/ante/mocks/mock_bank_keeper.go
	modified:   x/feemarket/ante/mocks/mock_feegrant_keeper.go
	modified:   x/feemarket/ante/mocks/mock_feemarket_keeper.go
	modified:   x/feemarket/keeper/feemarket.go
	modified:   x/feemarket/keeper/keeper.go
	modified:   x/feemarket/post/expected_keeper.go
	modified:   x/feemarket/post/mocks/mock_bank_keeper.go
	modified:   x/feemarket/post/mocks/mock_feegrant_keeper.go
	modified:   x/feemarket/post/mocks/mock_feemarket_keeper.go
	modified:   x/feemarket/types/errors.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.sum
	both modified:   x/feemarket/ante/mocks/mock_account_keeper.go
	both modified:   x/feemarket/post/mocks/mock_account_keeper.go
	both modified:   x/feemarket/types/mocks/mock_account_keeper.go

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

@aljo242 aljo242 merged commit f61b9cb into sdk-47 Jun 10, 2024
8 checks passed
@aljo242 aljo242 deleted the mergify/bp/sdk-47/pr-104 branch June 10, 2024 14:47
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.

1 participant