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

fix: restore ability to sign transaction with ledger firmware 2.2.2 (backport #2668) #2678

Merged
merged 2 commits into from
Oct 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 13, 2023

This is an automatic backport of pull request #2668 done by Mergify.
Cherry-pick of c0e1c22 has failed:

On branch mergify/bp/v1.x/pr-2668
Your branch is up to date with 'origin/v1.x'.

You are currently cherry-picking commit c0e1c22.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

## Overview

Closes #2650 by upgrading to celestiaorg/cosmos-sdk
[v1.18.2-sdk-v0.46.14](https://github.com/celestiaorg/cosmos-sdk/releases/tag/v1.18.2-sdk-v0.46.14)

## Checklist

- [x] New and updated code has appropriate documentation
- [x] New and updated code has new and/or updated testing
- [x] Required CI checks are passing
- [x] Visual proof for any user facing features like CLI or
documentation updates
- [x] Linked issues closed with keywords

---------

Co-authored-by: Rootul Patel <[email protected]>
(cherry picked from commit c0e1c22)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot added the conflicts label Oct 13, 2023
@celestia-bot celestia-bot requested a review from a team October 13, 2023 20:05
@github-actions github-actions bot added the bot item was created by a bot label Oct 13, 2023
@rootulp rootulp changed the title fix: signing with ledger throws an empty error (backport #2668) fix: restore ability to sign transaction with ledger firmware 2.2.2 (backport #2668) Oct 13, 2023
@rootulp rootulp enabled auto-merge (squash) October 13, 2023 20:33
@rootulp rootulp merged commit 2b8cc9e into v1.x Oct 13, 2023
23 checks passed
@rootulp rootulp deleted the mergify/bp/v1.x/pr-2668 branch October 13, 2023 20:40
Comment on lines -418 to +419
github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA=
github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI=
github.com/cosmos/ledger-cosmos-go v0.13.1 h1:12ac9+GwBb9BjP7X5ygpFk09Itwzjzfmg6A2CWFjoVs=
github.com/cosmos/ledger-cosmos-go v0.13.1/go.mod h1:5tv2RVJEd2+Y38TIQN4CRjJeQGyqOEiKJDfqhk5UjqE=
Copy link
Member

Choose a reason for hiding this comment

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

leaving a comment here to highlight this diff as the branch is deleted and I can't link to it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants