Skip to content

fix: 4.1 BNB migration (backport #1807)#1820

Merged
toteki merged 2 commits intorelease/v4.1.xfrom
mergify/bp/release/v4.1.x/pr-1807
Feb 14, 2023
Merged

fix: 4.1 BNB migration (backport #1807)#1820
toteki merged 2 commits intorelease/v4.1.xfrom
mergify/bp/release/v4.1.x/pr-1807

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Feb 14, 2023

This is an automatic backport of pull request #1807 done by Mergify.
Cherry-pick of 0e4df51 has failed:

On branch mergify/bp/release/v4.1.x/pr-1807
Your branch is up to date with 'origin/release/v4.1.x'.

You are currently cherry-picking commit 0e4df51.
  (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:   CHANGELOG.md
	new file:   x/leverage/keeper/migrations.go
	modified:   x/leverage/keeper/suite_test.go
	modified:   x/leverage/types/errors.go
	modified:   x/oracle/keeper/migrations.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   app/upgrades.go
	both modified:   x/leverage/keeper/internal_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

This will switch the BNB ibc denom in the leverage registry and oracle accept list to the correct denom.

(cherry picked from commit 0e4df51)

# Conflicts:
#	app/upgrades.go
#	x/leverage/keeper/internal_test.go
@mergify mergify bot requested review from a team as code owners February 14, 2023 13:12
@mergify mergify bot added the conflicts label Feb 14, 2023
@toteki toteki merged commit a4d43c3 into release/v4.1.x Feb 14, 2023
@toteki toteki deleted the mergify/bp/release/v4.1.x/pr-1807 branch February 14, 2023 15:11
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