build(crypto/secp256k1): Update `btcec/v2` to v2.3.4 (backport #3728) by mergify[bot] · Pull Request #3758 · cometbft/cometbft

mergify · 2024-08-20T03:12:40Z

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
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 build(crypto/secp256k1): Update btcec/v2 to v2.3.4 #3728 done by Mergify.

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

sigv

Proposing conflict resolution.

sigv · 2024-08-20T06:57:47Z

crypto/secp256k1/secp256k1.go

+<<<<<<< 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))


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)

sigv · 2024-08-20T06:58:26Z

go.mod

+<<<<<<< HEAD
 	github.com/Masterminds/semver/v3 v3.2.0
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2
 	github.com/btcsuite/btcd/btcutil v1.1.3
 	github.com/cometbft/cometbft-db v0.7.0
 	github.com/cosmos/gogoproto v1.4.11
 	github.com/go-git/go-git/v5 v5.11.0
+=======
+	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
+>>>>>>> 17abb8006 (build(crypto/secp256k1): Update `btcec/v2` to v2.3.4 (#3728))


Suggested change

<<<<<<< HEAD

github.com/Masterminds/semver/v3 v3.2.0

github.com/btcsuite/btcd/btcec/v2 v2.3.2

github.com/btcsuite/btcd/btcutil v1.1.3

github.com/cometbft/cometbft-db v0.7.0

github.com/cosmos/gogoproto v1.4.11

github.com/go-git/go-git/v5 v5.11.0

=======

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

>>>>>>> 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.3

github.com/cometbft/cometbft-db v0.7.0

github.com/cosmos/gogoproto v1.4.11

github.com/go-git/go-git/v5 v5.11.0

sigv · 2024-08-20T06:59:06Z

go.sum

+<<<<<<< HEAD
 github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=
 github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
+=======
+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))


Suggested change

<<<<<<< HEAD

github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=

github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=

=======

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=

sigv · 2024-08-20T07:04:18Z

@melekes, provided a proposed resolution above.

…#3758) 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<hr>This is an automatic backport of pull request #3728 done by [Mergify](https://mergify.com). --------- Co-authored-by: Valters Jansons <sigv@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com> (cherry picked from commit 01ee8c4) # Conflicts: # go.mod # go.sum

… (backport #3758) (#3808) 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<hr>This is an automatic backport of pull request #3728 done by [Mergify](https://mergify.com).<hr>This is an automatic backport of pull request #3758 done by [Mergify](https://mergify.com).

mergify bot added the conflicts label Aug 20, 2024

mergify bot requested a review from a team as a code owner August 20, 2024 03:12

This comment was marked as resolved.

Sign in to view

mergify bot mentioned this pull request Aug 20, 2024

build(crypto/secp256k1): Update btcec/v2 to v2.3.4 #3728

Merged

3 tasks

mergify bot added the backport-to-v0.38.x-experimental label Aug 20, 2024

sigv reviewed Aug 20, 2024

View reviewed changes

mergify bot and others added 5 commits August 20, 2024 14:18

Merge branch 'v0.38.x' into mergify/bp/v0.38.x/pr-3728

f63f574

Merge branch 'v0.38.x' into mergify/bp/v0.38.x/pr-3728

0e6cebb

Merge branch 'v0.38.x' into mergify/bp/v0.38.x/pr-3728

6a7aff7

fix conflicts

08cad95

2.3.4

619cfab

melekes approved these changes Aug 20, 2024

View reviewed changes

melekes merged commit 01ee8c4 into v0.38.x Aug 20, 2024

melekes deleted the mergify/bp/v0.38.x/pr-3728 branch August 20, 2024 17:12

mergify bot mentioned this pull request Aug 20, 2024

build(crypto/secp256k1): Update btcec/v2 to v2.3.4 (backport #3728) (backport #3758) #3808

Merged

3 tasks

sergio-mena removed the conflicts label Aug 27, 2024

mergify bot added automerge and removed automerge labels Aug 27, 2024

faddat mentioned this pull request Oct 15, 2024

chore: use latest cometbft-db in v0.38.x #4296

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build(crypto/secp256k1): Update `btcec/v2` to v2.3.4 (backport #3728)#3758

build(crypto/secp256k1): Update `btcec/v2` to v2.3.4 (backport #3728)#3758
melekes merged 6 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-3728

mergify bot commented Aug 20, 2024

Uh oh!

This comment was marked as resolved.

sigv left a comment

Uh oh!

sigv Aug 20, 2024

Uh oh!

sigv Aug 20, 2024

Uh oh!

sigv Aug 20, 2024

Uh oh!

sigv commented Aug 20, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

mergify bot commented Aug 20, 2024

PR checklist

Uh oh!

This comment was marked as resolved.

sigv left a comment

Choose a reason for hiding this comment

Uh oh!

sigv Aug 20, 2024

Choose a reason for hiding this comment

Uh oh!

sigv Aug 20, 2024

Choose a reason for hiding this comment

Uh oh!

sigv Aug 20, 2024

Choose a reason for hiding this comment

Uh oh!

sigv commented Aug 20, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants