diff --git a/.changelog/unreleased/dependencies/3728-update-btcec-v2.md b/.changelog/unreleased/dependencies/3728-update-btcec-v2.md new file mode 100644 index 00000000000..361592b2c9c --- /dev/null +++ b/.changelog/unreleased/dependencies/3728-update-btcec-v2.md @@ -0,0 +1,4 @@ +- `[crypto/secp256k1]` Adjust to breaking interface changes in + `btcec/v2` latest release, while avoiding breaking changes to + local CometBFT functions + ([\#3728](https://github.com/cometbft/cometbft/pull/3728)) diff --git a/crypto/secp256k1/secp256k1.go b/crypto/secp256k1/secp256k1.go index a0e9bc933fb..dc392e69d06 100644 --- a/crypto/secp256k1/secp256k1.go +++ b/crypto/secp256k1/secp256k1.go @@ -118,10 +118,7 @@ func (privKey PrivKey) Sign(msg []byte) ([]byte, error) { priv, _ := secp256k1.PrivKeyFromBytes(privKey) sum := sha256.Sum256(msg) - sig, err := ecdsa.SignCompact(priv, sum[:], false) - if err != nil { - return nil, err - } + sig := ecdsa.SignCompact(priv, sum[:], false) // remove the first byte which is compactSigRecoveryCode return sig[1:], nil diff --git a/go.mod b/go.mod index 984669197db..accfc285b12 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 require ( github.com/Masterminds/semver/v3 v3.2.1 - github.com/btcsuite/btcd/btcec/v2 v2.3.3 + 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 diff --git a/go.sum b/go.sum index 9bf2f337fce..324d5aab23f 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,8 @@ github.com/btcsuite/btcd v0.24.2 h1:aLmxPguqxza+4ag8R1I2nnJjSu2iFn/kqtHTIImswcY= github.com/btcsuite/btcd v0.24.2/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg= github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA= github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= -github.com/btcsuite/btcd/btcec/v2 v2.3.3 h1:6+iXlDKE8RMtKsvK0gshlXIuPbyWM/h84Ensb7o3sC0= -github.com/btcsuite/btcd/btcec/v2 v2.3.3/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= github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A= github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE= github.com/btcsuite/btcd/btcutil v1.1.5/go.mod h1:PSZZ4UitpLBWzxGd5VGOrLnmOjtPP/a6HaFo12zMs00=