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.

Sign up for GitHub

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

Jump to bottom

fix: correct ibc metric labels #9645

Merged
merged 3 commits into from
Jul 7, 2021
Merged

fix: correct ibc metric labels #9645

merged 3 commits into from
Jul 7, 2021

Conversation

colin-axner
Copy link
Contributor

@colin-axner colin-axner commented Jul 7, 2021 •
edited
Loading

Description

backport of fix on ibc-go

Closes: #XXXX

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 in the PR title
  • added ! to the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • followed the guidelines for building modules
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • included comments for documenting Go code
  • 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 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)

@colin-axner colin-axner changed the base branch from master to release/v0.42.x July 7, 2021 13:52
@colin-axner colin-axner requested a review from alessio as a code owner July 7, 2021 13:52
amaury1093
amaury1093 approved these changes Jul 7, 2021
View reviewed changes
Copy link
Contributor

@amaury1093 amaury1093 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked that it's the same PR on ibc-go

@amaury1093 amaury1093 merged commit cc47294 into release/v0.42.x Jul 7, 2021
@amaury1093 amaury1093 deleted the colin/backport-ibc-metrics branch July 7, 2021 15:39
Raumo0 pushed a commit to mapofzones/cosmos-sdk that referenced this pull request Feb 13, 2022
@daeMOn63 @mergify
@PrathyushaLakkireddy @amaury1093 @zmanian @AdityaSripal @colin-axner
chores: bump sdk v0.42.7 (cosmos#97)
717e05b 
* Fixed parse key issue (backport cosmos#9299) (cosmos#9561)

* Fixed parse key issue (cosmos#9299)

* Fixed parse key issue

* Added getconfig in root command

* uncommented changes in parse.go

(cherry picked from commit d7dd1d7)

# Conflicts:
#	simapp/simd/cmd/root.go

* Add changelog

Co-authored-by: Prathyusha Lakkireddy <[email protected]>
Co-authored-by: Amaury M <[email protected]>

* feat: return trace value from baseapp (backport cosmos#9578) (cosmos#9580)

* feat: return trace value from baseapp (cosmos#9578)

## Description

Closes: #XXXX

<!-- Add a description of the changes that this PR introduces and the files that
are the most critical to review. -->

* fix: Dumping upgrade info interrupted by cosmovisor (cosmos#9384) (cosmos#9608)

Solution:
- dumping upgrade info before emit `UPGRADED NEEDED` log which will
  cause cosmovisor to kill chain process

<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
v                               ✰  Thanks for creating a PR! ✰
v    Before smashing the submit button please review the checkboxes.
v    If a checkbox is n/a - please still include it but + a little note why
☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >  -->

## Description

The problematic procedure:

1. chain process output UPGRADE NEEDED log
2. cosmovisor see the message and kill the chain binary
3. chain process dump upgrade info and panic itself

the step 2 and 3 runs concurrently, so the dumping process can be interrupted by cosmovisor's terminate signal. The proposed solution is to dump upgrade info before emitting the log.
there are two problematic situation:
1. the upgrade info file is created, but content is not written or flushed before killed, when the chain process restart, it'll panic because of json parsing error.
2. the upgrade info file is not created at all, when the chain process restart, the [store upgrades](https://github.com/crypto-org-chain/chain-main/blob/master/app/app.go#L436) are not activated, will cause app hash mismatch error later on.

* feat: Error on blank chain-id in multisign command (backport cosmos#9593) (cosmos#9605)

* feat: Error on blank chain-id in multisign command (cosmos#9593)

Error on `tx multisign` command if chain-id is blank. This is a common cause of signature verification failures when combining signatures and the error message doesn't provide any clues to this common cause.

I have...

- [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [x] added `!` to the type prefix if API or client breaking change
- [x] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting))
- [] provided a link to the relevant issue or specification
- [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules)
- [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing)
- [ ] 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 f65b6c9)

# Conflicts:
#	CHANGELOG.md

* fix conflicts

* less change diff

Co-authored-by: Zaki Manian <[email protected]>
Co-authored-by: Amaury M <[email protected]>

* x/capability: Cap Initialization Fix (cosmos#9392)

* fix: correct ibc metric labels (cosmos#9645)

* backport cosmos/ibc-go#223

* add changelog

* fix unnecessary changes

* fix: Fix IBC Transfer Event (cosmos#9640)

* fix event type

* CHANGELOG

* Update CHANGELOG.md

Co-authored-by: Amaury M <[email protected]>

* chore: v0.42.7 release notes & changelog (cosmos#9661)

* chore: v0.42.7 release notes & changelog

* Add ibc

* fix(keyring): update keyring for kwallet fix (backport cosmos#9563) (cosmos#9579)

* fix(keyring): update keyring for kwallet fix (cosmos#9563)

## Description

Closes: cosmos#9562

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Prathyusha Lakkireddy <[email protected]>
Co-authored-by: Amaury M <[email protected]>
Co-authored-by: Zaki Manian <[email protected]>
Co-authored-by: Aditya <[email protected]>
Co-authored-by: colin axnér <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexanderbez alexanderbez alexanderbez approved these changes

@amaury1093 amaury1093 amaury1093 approved these changes

@aaronc aaronc Awaiting requested review from aaronc aaronc is a code owner

@alessio alessio Awaiting requested review from alessio

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@colin-axner @amaury1093 @alexanderbez