-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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(keyring): update keyring for kwallet fix #9563
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK
We should have someone with kwallet installed review and test before merging.
Also, should we create a followup issue or keep the current issue open to remove the replace once 99designs/keyring#87 has been added?
OK for the followup issue.
I tested it because I was facing this problem. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have one question whether app devs need to change their go.mod
go.mod
Outdated
@@ -57,3 +57,5 @@ require ( | |||
replace google.golang.org/grpc => google.golang.org/grpc v1.33.2 | |||
|
|||
replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 | |||
|
|||
replace github.com/99designs/keyring => github.com/robert-zaremba/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the docs we mentioned to all app developer to add the line replace google.golang.org/grpc => google.golang.org/grpc v1.33.2
.
If we merge this PR, should all developers also add this line? If yes, I would maybe prefer to wait for 99designs to merge your PR and wait for the next release.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The priority is to have a working software.
If we don't want to use replace statement, then we can use my patch (or clone it into cosmos-sdk) and change the dependency - which will require changing it in all files where 99designs/keyring package is used.
We decided to fork the keyring into The remaining question was to use replace or change the dependency. Initially I wanted to change the dependency, but that would involve more changes in the keyring fork (we would need to change imports there and go.mod). So instead I proposed to use the replacement. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK
The remaining question was to use replace or change the dependency. Initially I wanted to change the dependency, but that would involve more changes in the keyring fork (we would need to change imports there and go.mod). So instead I proposed to use the replacement.
I have a slight preference for replace
too.
## Description Closes: #9562 --- ### 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... - [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)) - [x] provided a link to the relevant issue or specification - [x] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [x] 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... - [x] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [x] 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 e845a50) # Conflicts: # CHANGELOG.md # go.sum
* fix(keyring): update keyring for kwallet fix (#9563) ## Description Closes: #9562 --- ### 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... - [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)) - [x] provided a link to the relevant issue or specification - [x] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [x] 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... - [x] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [x] 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 e845a50) # Conflicts: # CHANGELOG.md # go.sum * resolve conflicts * Update CHANGELOG.md Co-authored-by: Robert Zaremba <[email protected]> Co-authored-by: Amaury <[email protected]>
* 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]>
The `replace` for 99designs/keyring to a Cosmos fork of keyring (cosmos/keyring) was added in cosmos#9563 Removal of the `replace` was tracked in cosmos#9568 but never completed. The original issue was fixed in upstream: 99designs/keyring#87 so this PR removes the `replace` and upgrades to the latest release of 99designs/keyring.
Description
Closes: #9562
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...
!
to the type prefix if API or client breaking changeCHANGELOG.md
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...
!
in the type prefix if API or client breaking change