Skip to content

chore: use decred secp256k1 directly (backport #4294)#4328

Merged
mergify[bot] merged 7 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-4294
Oct 24, 2024
Merged

chore: use decred secp256k1 directly (backport #4294)#4328
mergify[bot] merged 7 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-4294

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 24, 2024

Use github.com/decred/dcrd/dcrec/secp256k1/v4 directly rather than github.com/btcsuite/btcd/btcec/v2 which is just a wrapper around the underlying decred library. Inspired by cosmos/cosmos-sdk#15018

github.com/btcsuite/btcd/btcec/v2 has a very annoying breaking change when upgrading from v2.3.3 to v2.3.4. The easiest way to workaround this is to just remove the wrapper.

Would be very nice if you could backport this to v0.37.x and v0.38.x.

References:


PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments

This is an automatic backport of pull request #4294 done by [Mergify](https://mergify.com).

Use `github.com/decred/dcrd/dcrec/secp256k1/v4` directly rather than
`github.com/btcsuite/btcd/btcec/v2` which is just a wrapper around the
underlying decred library. Inspired by
cosmos/cosmos-sdk#15018

`github.com/btcsuite/btcd/btcec/v2` has a very annoying breaking change
when upgrading from `v2.3.3` to `v2.3.4`. The easiest way to workaround
this is to just remove the wrapper.

Would be very nice if you could backport this to v0.37.x and v0.38.x.

References:
- btcsuite/btcd#2221
- #3728
- zeta-chain/node#2934

---

#### PR checklist

- [ ] Tests written/updated
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments

---------

Co-authored-by: Andy Nogueira <me@andynogueira.dev>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 9b8eafa)

# Conflicts:
#	.golangci.yml
#	crypto/secp256k1/secp256k1.go
#	crypto/secp256k1/secp256k1_internal_test.go
#	crypto/secp256k1/secp256k1_test.go
#	go.mod
@mergify mergify bot requested a review from a team as a code owner October 24, 2024 08:22
@mergify mergify bot added the conflicts label Oct 24, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Oct 24, 2024

Cherry-pick of 9b8eafa has failed:

On branch mergify/bp/v0.38.x/pr-4294
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit 9b8eafa8b.
  (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:
	new file:   .changelog/unreleased/features/4294-remove-secp256k1-wrapper.md
	modified:   go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .golangci.yml
	both modified:   crypto/secp256k1/secp256k1.go
	both modified:   crypto/secp256k1/secp256k1_internal_test.go
	both modified:   crypto/secp256k1/secp256k1_test.go
	both modified:   go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@melekes melekes removed the conflicts label Oct 24, 2024
@mergify mergify bot merged commit 048bb7a into v0.38.x Oct 24, 2024
@mergify mergify bot deleted the mergify/bp/v0.38.x/pr-4294 branch October 24, 2024 15:33
mergify bot added a commit that referenced this pull request Oct 24, 2024
Use `github.com/decred/dcrd/dcrec/secp256k1/v4` directly rather than
`github.com/btcsuite/btcd/btcec/v2` which is just a wrapper around the
underlying decred library. Inspired by
cosmos/cosmos-sdk#15018

`github.com/btcsuite/btcd/btcec/v2` has a very annoying breaking change
when upgrading from `v2.3.3` to `v2.3.4`. The easiest way to workaround
this is to just remove the wrapper.

Would be very nice if you could backport this to v0.37.x and v0.38.x.

References:
- btcsuite/btcd#2221
- #3728
- zeta-chain/node#2934

---

#### PR checklist

- [ ] Tests written/updated
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments
<hr>This is an automatic backport of pull request #4294 done by
[Mergify](https://mergify.com).

---------

Co-authored-by: Alex Gartner <github@agartner.com>
Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
(cherry picked from commit 048bb7a)

# Conflicts:
#	go.mod
#	go.sum
mergify bot added a commit that referenced this pull request Oct 24, 2024
#4330)

Use `github.com/decred/dcrd/dcrec/secp256k1/v4` directly rather than
`github.com/btcsuite/btcd/btcec/v2` which is just a wrapper around the
underlying decred library. Inspired by
cosmos/cosmos-sdk#15018

`github.com/btcsuite/btcd/btcec/v2` has a very annoying breaking change
when upgrading from `v2.3.3` to `v2.3.4`. The easiest way to workaround
this is to just remove the wrapper.

Would be very nice if you could backport this to v0.37.x and v0.38.x.

References:
- btcsuite/btcd#2221
- #3728
- zeta-chain/node#2934

---

#### PR checklist

- [ ] Tests written/updated
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments
<hr>This is an automatic backport of pull request #4294 done by
[Mergify](https://mergify.com).<hr>This is an automatic backport of pull
request #4328 done by [Mergify](https://mergify.com).

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants