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: update gravity bridge to v1.5.0 + upgrade handler for Calypso (v2.0.0) (backport #729) #736

Merged
merged 4 commits into from
Apr 5, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 4, 2022

This is an automatic backport of pull request #729 done by Mergify.
Cherry-pick of 3b596e0 has failed:

On branch mergify/bp/release/v2.x.x/pr-729
Your branch is up to date with 'origin/release/v2.x.x'.

You are currently cherry-picking commit 3b596e0.
  (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/app.go
	modified:   app/modules.go
	new file:   app/upgrades/calypso/constants.go
	new file:   app/upgrades/calypso/handler.go
	new file:   app/upgrades/register.go
	modified:   cmd/umeed/cmd/root.go
	modified:   go.mod
	modified:   go.sum
	new file:   tests/e2e/docker/ganache.Dockerfile
	modified:   tests/e2e/e2e_setup_test.go
	modified:   tests/e2e/e2e_util_test.go
	modified:   tests/e2e/validator.go
	modified:   tests/simulation/state.go
	modified:   umee.e2e.Dockerfile
	modified:   x/ibctransfer/keeper/keeper_test.go
	modified:   x/leverage/client/tests/cli_test.go
	modified:   x/oracle/client/tests/cli_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   price-feeder/go.mod
	both modified:   price-feeder/go.sum

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

…v2.0.0) (#729)

## Description

- Upgrade to Gravity Bridge v1.5.0
- Add upgrade handlers to do the Calypso update (Leverage and oracle modules)
- While I was at it I added the option to run tests with Ganache instead of geth, pretty helpful when running on Mac M1

----

### Author Checklist

*All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.*

I have...

- [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] added appropriate labels to the PR
- [ ] added `!` to the type prefix if API or client breaking change
- [ ] targeted the correct branch (see [PR Targeting](https://github.com/umee-network/umee/blob/main/CONTRIBUTING.md#pr-targeting))
- [ ] provided a link to the relevant issue or specification
- [ ] added a changelog entry to `CHANGELOG.md`
- [ ] included comments for [documenting Go code](https://blog.golang.org/godoc)
- [ ] updated the relevant documentation or specification
- [ ] reviewed "Files changed" and left comments if necessary
- [ ] confirmed all CI checks have passed

### Reviewers Checklist

*All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.*

I have...

- [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] confirmed `!` in the type prefix if API or client breaking change
- [ ] confirmed all author checklist items have been addressed
- [ ] reviewed state machine logic
- [ ] reviewed API design and naming
- [ ] reviewed documentation is accurate
- [ ] reviewed tests and test coverage
- [ ] manually tested (if applicable)

(cherry picked from commit 3b596e0)

# Conflicts:
#	price-feeder/go.mod
#	price-feeder/go.sum
@mergify mergify bot requested a review from a team as a code owner April 4, 2022 23:14
@mergify mergify bot added the conflicts label Apr 4, 2022
@adamewozniak
Copy link
Collaborator

image

@adamewozniak adamewozniak merged commit 723bf0e into release/v2.x.x Apr 5, 2022
@adamewozniak adamewozniak deleted the mergify/bp/release/v2.x.x/pr-729 branch April 5, 2022 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants