build(crypto/secp256k1): Update btcec/v2 to v2.3.4 (backport #3728)#3759
Merged
build(crypto/secp256k1): Update btcec/v2 to v2.3.4 (backport #3728)#3759
btcec/v2 to v2.3.4 (backport #3728)#3759Conversation
Running a `go get` should consistently build this project as per the README. However, the latest patch release of `btcec/v2` is not a proper Semantic Versioning patch. It removes an error return value from `ecdsa.SignCompact` function (btcsuite/btcd@e5d15fd). This is functionally a no-op, as the underlying function was hardcoded to always return `nil` as error. However, this is still a breaking change (compiler/build error) for all consumers of this function, as they historically expected two return values, but now only get one. Ref: btcsuite/btcd#2211 Ref: #3531 Ref: #3536 --- #### 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: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit 17abb80) # Conflicts: # crypto/secp256k1/secp256k1.go # go.mod # go.sum
This comment was marked as resolved.
This comment was marked as resolved.
3 tasks
sigv
reviewed
Aug 20, 2024
Contributor
sigv
left a comment
There was a problem hiding this comment.
Proposing conflict resolution.
crypto/secp256k1/secp256k1.go
Outdated
Comment on lines
+131
to
+139
| <<<<<<< HEAD | ||
| sig, err := ecdsa.SignCompact(priv, crypto.Sha256(msg), false) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| ======= | ||
| sum := sha256.Sum256(msg) | ||
| sig := ecdsa.SignCompact(priv, sum[:], false) | ||
| >>>>>>> 17abb8006 (build(crypto/secp256k1): Update `btcec/v2` to v2.3.4 (#3728)) |
Contributor
There was a problem hiding this comment.
Suggested change
| <<<<<<< HEAD | |
| sig, err := ecdsa.SignCompact(priv, crypto.Sha256(msg), false) | |
| if err != nil { | |
| return nil, err | |
| } | |
| ======= | |
| sum := sha256.Sum256(msg) | |
| sig := ecdsa.SignCompact(priv, sum[:], false) | |
| >>>>>>> 17abb8006 (build(crypto/secp256k1): Update `btcec/v2` to v2.3.4 (#3728)) | |
| sig := ecdsa.SignCompact(priv, crypto.Sha256(msg), false) |
go.mod
Outdated
Comment on lines
+47
to
+68
| <<<<<<< HEAD | ||
| github.com/Masterminds/semver/v3 v3.2.0 | ||
| github.com/btcsuite/btcd/btcec/v2 v2.2.1 | ||
| github.com/btcsuite/btcd/btcutil v1.1.2 | ||
| github.com/cometbft/cometbft-db v0.7.0 | ||
| github.com/cosmos/gogoproto v1.4.1 | ||
| github.com/go-git/go-git/v5 v5.11.0 | ||
| github.com/golang/protobuf v1.5.3 | ||
| ======= | ||
| github.com/Masterminds/semver/v3 v3.2.1 | ||
| github.com/btcsuite/btcd/btcec/v2 v2.3.4 | ||
| github.com/btcsuite/btcd/btcutil v1.1.6 | ||
| github.com/cometbft/cometbft-db v0.14.0 | ||
| github.com/cometbft/cometbft-load-test v0.1.0 | ||
| github.com/cometbft/cometbft/api v1.0.0-rc.1 | ||
| github.com/cosmos/gogoproto v1.7.0 | ||
| github.com/dgraph-io/badger/v4 v4.2.0 | ||
| github.com/go-git/go-git/v5 v5.12.0 | ||
| github.com/goccmack/goutil v1.2.3 | ||
| github.com/gofrs/uuid v4.4.0+incompatible | ||
| github.com/google/uuid v1.6.0 | ||
| >>>>>>> 17abb8006 (build(crypto/secp256k1): Update `btcec/v2` to v2.3.4 (#3728)) |
Contributor
There was a problem hiding this comment.
Suggested change
| <<<<<<< HEAD | |
| github.com/Masterminds/semver/v3 v3.2.0 | |
| github.com/btcsuite/btcd/btcec/v2 v2.2.1 | |
| github.com/btcsuite/btcd/btcutil v1.1.2 | |
| github.com/cometbft/cometbft-db v0.7.0 | |
| github.com/cosmos/gogoproto v1.4.1 | |
| github.com/go-git/go-git/v5 v5.11.0 | |
| github.com/golang/protobuf v1.5.3 | |
| ======= | |
| github.com/Masterminds/semver/v3 v3.2.1 | |
| github.com/btcsuite/btcd/btcec/v2 v2.3.4 | |
| github.com/btcsuite/btcd/btcutil v1.1.6 | |
| github.com/cometbft/cometbft-db v0.14.0 | |
| github.com/cometbft/cometbft-load-test v0.1.0 | |
| github.com/cometbft/cometbft/api v1.0.0-rc.1 | |
| github.com/cosmos/gogoproto v1.7.0 | |
| github.com/dgraph-io/badger/v4 v4.2.0 | |
| github.com/go-git/go-git/v5 v5.12.0 | |
| github.com/goccmack/goutil v1.2.3 | |
| github.com/gofrs/uuid v4.4.0+incompatible | |
| github.com/google/uuid v1.6.0 | |
| >>>>>>> 17abb8006 (build(crypto/secp256k1): Update `btcec/v2` to v2.3.4 (#3728)) | |
| github.com/Masterminds/semver/v3 v3.2.0 | |
| github.com/btcsuite/btcd/btcec/v2 v2.3.4 | |
| github.com/btcsuite/btcd/btcutil v1.1.2 | |
| github.com/cometbft/cometbft-db v0.7.0 | |
| github.com/cosmos/gogoproto v1.4.1 | |
| github.com/go-git/go-git/v5 v5.11.0 | |
| github.com/golang/protobuf v1.5.3 |
go.sum
Outdated
Comment on lines
+124
to
+130
| <<<<<<< HEAD | ||
| github.com/btcsuite/btcd/btcec/v2 v2.2.1 h1:xP60mv8fvp+0khmrN0zTdPC3cNm24rfeE6lh2R/Yv3E= | ||
| github.com/btcsuite/btcd/btcec/v2 v2.2.1/go.mod h1:9/CSmJxmuvqzX9Wh2fXMWToLOHhPd11lSPuIupwTkI8= | ||
| ======= | ||
| github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ= | ||
| github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= | ||
| >>>>>>> 17abb8006 (build(crypto/secp256k1): Update `btcec/v2` to v2.3.4 (#3728)) |
Contributor
There was a problem hiding this comment.
Suggested change
| <<<<<<< HEAD | |
| github.com/btcsuite/btcd/btcec/v2 v2.2.1 h1:xP60mv8fvp+0khmrN0zTdPC3cNm24rfeE6lh2R/Yv3E= | |
| github.com/btcsuite/btcd/btcec/v2 v2.2.1/go.mod h1:9/CSmJxmuvqzX9Wh2fXMWToLOHhPd11lSPuIupwTkI8= | |
| ======= | |
| github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ= | |
| github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= | |
| >>>>>>> 17abb8006 (build(crypto/secp256k1): Update `btcec/v2` to v2.3.4 (#3728)) | |
| github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ= | |
| github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= |
Contributor
|
@melekes, provided a proposed resolution above. |
melekes
approved these changes
Aug 20, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Running a
go getshould consistently build this project as per the README. However, the latest patch release ofbtcec/v2is not a proper Semantic Versioning patch. It removes an error return value fromecdsa.SignCompactfunction (btcsuite/btcd@e5d15fd). This is functionally a no-op, as the underlying function was hardcoded to always returnnilas error. However, this is still a breaking change (compiler/build error) for all consumers of this function, as they historically expected two return values, but now only get one.Ref: btcsuite/btcd#2211
Ref: #3531
Ref: #3536
PR checklist
.changelog(we use unclog to manage our changelog)docs/orspec/) and code commentsThis is an automatic backport of pull request build(crypto/secp256k1): Update
btcec/v2to v2.3.4 #3728 done by Mergify.