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

refactor: remove cosmos/keyring #12576

Merged
merged 3 commits into from
Jul 14, 2022
Merged

refactor: remove cosmos/keyring #12576

merged 3 commits into from
Jul 14, 2022

Conversation

rootulp
Copy link
Contributor

@rootulp rootulp commented Jul 14, 2022 •
edited
Loading

Description

Resolves #9568 which should be re-opened and closed after this PR is merged
Resolves #5759
Likely resolves #10818

The replace for 99designs/keyring to a Cosmos fork of keyring (cosmos/keyring) was added in #9563

Removal of the replace was tracked in #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.

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)

@rootulp
Remove cosmos/keyring
0b3e60e 
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.
@rootulp
Add changelog
1995975
@rootulp rootulp mentioned this pull request Jul 14, 2022
Merged
@rootulp
Copy link
Contributor Author

rootulp commented Jul 14, 2022

I suspect that upgrading to 99designs/keyring v1.2.1 will also resolve #10818 because it includes 99designs/keyring#102

@rootulp
Copy link
Contributor Author

rootulp commented Jul 14, 2022

I suspect this will also resolve #5759

@rootulp rootulp marked this pull request as ready for review July 14, 2022 10:06
@rootulp rootulp requested a review from a team as a code owner July 14, 2022 10:06
tac0turtle
tac0turtle approved these changes Jul 14, 2022
View reviewed changes
Copy link
Member

@tac0turtle tac0turtle left a comment •
edited
Loading

Choose a reason for hiding this comment

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

should do some testing before we merge. Thank you for opening this PR

@jleni any chance you can approve this

julienrbrt
julienrbrt reviewed Jul 14, 2022
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Jul 14, 2022 •
edited
Loading

Codecov Report

Merging #12576 (9c9f25f) into main (da7f046) will increase coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main   #12576   +/-   ##
=======================================
  Coverage   65.20%   65.20%           
=======================================
  Files         694      694           
  Lines       71855    71855           
=======================================
+ Hits        46851    46852    +1     
+ Misses      22374    22372    -2     
- Partials     2630     2631    +1
Impacted Files Coverage Δ
x/group/keeper/keeper.go 58.66% <0.00%> (+0.39%) ⬆️

@jleni
Copy link
Member

jleni commented Jul 14, 2022

Should we test that this resolves?

or should we keep these issues open and review then later?

@tac0turtle
Copy link
Member

Should we test that this resolves?

or should we keep these issues open and review then later?

ideally yes, would be nice to test

@rootulp
Copy link
Contributor Author

rootulp commented Jul 14, 2022

Can confirm this resolves #5759 (updated PR description)

Before After
before after

@rootulp rootulp requested a review from julienrbrt July 14, 2022 11:43
@raynaudoe
Copy link
Contributor

Hi! I can also confirm that no go-keychain related errors are thrown when building.
Tested on: macos 12.4, M1 arch.

@tac0turtle tac0turtle merged commit 01b4a42 into cosmos:main Jul 14, 2022
@rootulp rootulp deleted the rp/remove-cosmos-keyring branch July 14, 2022 15:49
rootulp added a commit to rootulp/cosmos-sdk that referenced this pull request Jul 14, 2022
@rootulp
refactor: remove cosmos/keyring (cosmos#12576)
6980306
This was referenced Jul 14, 2022
Merged
Closed
@gjermundgaraba gjermundgaraba mentioned this pull request Jul 24, 2022
Merged
@tac0turtle
Copy link
Member

@Mergifyio backport release/v0.46.x

@mergify mergify bot mentioned this pull request Jul 25, 2022
Merged
@mergify
Copy link
Contributor

mergify bot commented Jul 25, 2022

backport release/v0.46.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jul 25, 2022
@rootulp @mergify
refactor: remove cosmos/keyring (#12576)
bc4257d 
(cherry picked from commit 01b4a42)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum
tac0turtle added a commit that referenced this pull request Jul 25, 2022
@mergify @rootulp @tac0turtle
refactor: remove cosmos/keyring (backport #12576) (#12707)
24be8ea 
* refactor: remove cosmos/keyring (#12576)

(cherry picked from commit 01b4a42)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum

* resolve conflicts

* revert extra change

* minor cleanup

Co-authored-by: Rootul Patel <rootulp@gmail.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
@rootulp rootulp mentioned this pull request Sep 20, 2022
Merged
@NibiruHeisenberg NibiruHeisenberg mentioned this pull request Sep 23, 2022
Closed
@NibiruHeisenberg NibiruHeisenberg mentioned this pull request Sep 23, 2022
Closed
@0xmuralik 0xmuralik mentioned this pull request Aug 24, 2023
Merged
19 tasks
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
@mergify @rootulp
@tac0turtle @JeancarloBarrios
refactor: remove cosmos/keyring (backport cosmos#12576) (cosmos#12707)
b955246 
* refactor: remove cosmos/keyring (cosmos#12576)

(cherry picked from commit 01b4a42)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum

* resolve conflicts

* revert extra change

* minor cleanup

Co-authored-by: Rootul Patel <rootulp@gmail.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@julienrbrt julienrbrt julienrbrt approved these changes

@tac0turtle tac0turtle tac0turtle approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@rootulp @jleni @tac0turtle @raynaudoe @julienrbrt