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

build(deps): bump btcd in v0.45 (backport #14846) #15127

Merged
merged 5 commits into from
Feb 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 22, 2023

This is an automatic backport of pull request #14846 done by Mergify.
Cherry-pick of 0b64514 has failed:

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

You are currently cherry-picking commit 0b6451402.
  (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/hd/hdpath.go
	modified:   crypto/keys/secp256k1/secp256k1.go
	modified:   crypto/keys/secp256k1/secp256k1_internal_test.go
	modified:   crypto/keys/secp256k1/secp256k1_nocgo.go
	modified:   crypto/keys/secp256k1/secp256k1_nocgo_test.go
	modified:   crypto/keys/secp256k1/secp256k1_test.go
	deleted:    crypto/keys/utils.go
	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:   CHANGELOG.md
	both modified:   go.mod
	both modified:   go.sum
	both modified:   server/rosetta/converter.go

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

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Elias Naur <103319121+elias-orijtech@users.noreply.github.com>
Co-authored-by: Marko <marbar3778@yahoo.com>
(cherry picked from commit 0b64514)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum
#	server/rosetta/converter.go
@mergify mergify bot added the conflicts label Feb 22, 2023
@mergify mergify bot mentioned this pull request Feb 22, 2023
19 tasks
@julienrbrt julienrbrt changed the title build(deps): bump btcd in v0.46 (backport #14846) build(deps): bump btcd in v0.45 (backport #14846) Feb 22, 2023
@julienrbrt
Copy link
Member

ref: #15089 (comment)

@julienrbrt julienrbrt self-assigned this Feb 22, 2023
@julienrbrt julienrbrt removed their assignment Feb 22, 2023
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

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

tACK again with ledger.

@julienrbrt julienrbrt merged commit 3a48354 into release/v0.45.x Feb 22, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.45.x/pr-14846 branch February 22, 2023 22:01
@julienrbrt
Copy link
Member

Bonus point, it fixed make proto-gen in the release/v0.45.x branch :D

@faddat faddat mentioned this pull request Mar 23, 2023
19 tasks
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
Co-authored-by: Robert Zaremba <robert@zaremba.ch>
Co-authored-by: Julien Robert <julien@rbrt.fr>
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