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.

Sign up for GitHub

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

Jump to bottom

chore: added changelog for 9793 (secp256r1 tx malleability) (backport #9796) #9798

Merged
merged 5 commits into from
Jul 28, 2021
Merged

chore: added changelog for 9793 (secp256r1 tx malleability) (backport #9796) #9798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69a765b
chore: added changelog for 9793 (secp256r1 tx malleability) (#9796)
robert-zaremba Jul 28, 2021
5b83cc4
Fix merge conflicts
clevinson Jul 28, 2021
af9c990
Re-fix changelog
amaury1093 Jul 28, 2021
5eb98ee
revert fix_registration to what's on master
amaury1093 Jul 28, 2021
7dc723f
Revert all files to master
amaury1093 Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ Ref: https://keepachangelog.com/en/1.0.0/

* (cli) [\#9717](https://github.com/cosmos/cosmos-sdk/pull/9717) Added CLI flag `--output json/text` to `tx` cli commands.

### Bug Fixes

* [\#9793](https://github.com/cosmos/cosmos-sdk/pull/9793) Fixed ECDSA/secp256r1 transaction malleability.

## [v0.43.0-rc2](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.43.0-rc2) - 2021-07-19

### Bug Fixes
Expand Down
8 changes: 1 addition & 7 deletions crypto/keys/internal/ecdsa/privkey.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,7 @@ import (
// p256Order returns the curve order for the secp256r1 curve
// NOTE: this is specific to the secp256r1/P256 curve,
// and not taken from the domain params for the key itself
// (which would be a more generic approach for all EC)
// In *here* we don't need to do it as a method on the key
// since this code is only called for secp256r1
// if called on a key:
// func (sk PrivKey) pCurveOrder() *.big.Int {
// return sk.Curve.Params().N
// }
// (which would be a more generic approach for all EC).
var p256Order = elliptic.P256().Params().N

// p256HalfOrder returns half the curve order
Expand Down
9 changes: 5 additions & 4 deletions server/grpc/gogoreflection/fix_registration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
_ "github.com/gogo/protobuf/gogoproto" // required so it does register the gogoproto file descriptor
gogoproto "github.com/gogo/protobuf/proto"

// nolint: staticcheck
"github.com/golang/protobuf/proto"
dpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
_ "github.com/regen-network/cosmos-proto" // look above
Expand Down Expand Up @@ -85,7 +86,7 @@ func getFileDescriptor(filePath string) []byte {
if len(fd) != 0 {
return fd
}

// nolint: staticcheck
Copy link
Contributor

Choose a reason for hiding this comment

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

This is weird: in #9779 (the backport PR) I removed these nolints because the linter said they were unused. Now two PRs later, linter is shouting again...

It's not the 1st first we see linter errors on untouched files in PRs, I remember some of these happening on release/0.42.x too

Copy link
Contributor

Choose a reason for hiding this comment

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

OK, so:

  • if I don't put nolint, the error is: "proto.FileDescriptor is deprecated..."
  • if I put nolint, the error is " directive // nolint: staticcheck is unused for linter "staticcheck""

Copy link
Contributor

Choose a reason for hiding this comment

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

I reverted all unrelated files changed in #9779 to their master version. If lint doesn't pass, let's just use admin rights for now to force merge.

return proto.FileDescriptor(filePath)
}

Expand All @@ -94,7 +95,7 @@ func getMessageType(name string) reflect.Type {
if typ != nil {
return typ
}

// nolint: staticcheck
return proto.MessageType(name)
}

Expand All @@ -106,7 +107,7 @@ func getExtension(extID int32, m proto.Message) *gogoproto.ExtensionDesc {
}
}
// check into proto registry

// nolint: staticcheck
for id, desc := range proto.RegisteredExtensions(m) {
if id == extID {
return &gogoproto.ExtensionDesc{
Expand All @@ -132,7 +133,7 @@ func getExtensionsNumbers(m proto.Message) []int32 {
if len(out) != 0 {
return out
}

// nolint: staticcheck
protoExts := proto.RegisteredExtensions(m)
out = make([]int32, 0, len(protoExts))
for id := range protoExts {
Expand Down
1 change: 1 addition & 0 deletions server/grpc/gogoreflection/serverreflection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import (
"sort"
"sync"

// nolint: staticcheck
"github.com/golang/protobuf/proto"
dpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
"google.golang.org/grpc"
Expand Down
2 changes: 1 addition & 1 deletion x/auth/tx/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"

gogogrpc "github.com/gogo/protobuf/grpc"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto" // nolint: staticcheck
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
Expand Down