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

refactor: update crypto/ledger to btcec/v2 (backport #14123) #14160

Merged
merged 2 commits into from
Dec 5, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 5, 2022

This is an automatic backport of pull request #14123 done by Mergify.
Cherry-pick of 417ce25 has failed:

On branch mergify/bp/release/v0.47.x/pr-14123
Your branch is up to date with 'origin/release/v0.47.x'.

You are currently cherry-picking commit 417ce2511.
  (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:   crypto/ledger/ledger_mock.go
	modified:   crypto/ledger/ledger_notavail.go
	modified:   crypto/ledger/ledger_secp256k1.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   simapp/go.mod
	both modified:   simapp/go.sum
	both modified:   tests/go.mod
	both modified:   tests/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

* chore(crypto): update crypto/ledger to v2

* go mod tidy

* updates

* add comment

(cherry picked from commit 417ce25)

# Conflicts:
#	go.mod
#	simapp/go.mod
#	simapp/go.sum
#	tests/go.mod
#	tests/go.sum
@mergify mergify bot requested a review from a team as a code owner December 5, 2022 14:16
@mergify mergify bot added the conflicts label Dec 5, 2022
@tac0turtle tac0turtle enabled auto-merge (squash) December 5, 2022 14:21
@sonarqubecloud
Copy link

sonarqubecloud bot commented Dec 5, 2022

[Cosmos SDK - SimApp] Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@tac0turtle tac0turtle merged commit fe84b9f into release/v0.47.x Dec 5, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.47.x/pr-14123 branch December 5, 2022 14:39
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.

2 participants