Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into marko/6787-remove-custom-marshal
Browse files Browse the repository at this point in the history
tac0turtle authored Sep 6, 2022

Verified

This commit was signed with the committer’s verified signature.
eljamm Fedi Jamoussi
2 parents 839dd3a + d47970d commit 9693bbe
Showing 4 changed files with 34 additions and 31 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -133,6 +133,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

### Bug Fixes

* [#13145](https://github.com/cosmos/cosmos-sdk/pull/13145) Fix panic when calling `String()` to a Record struct type.
* [#13116](https://github.com/cosmos/cosmos-sdk/pull/13116) Fix a dead-lock in the `Group-TotalWeight` `x/group` invariant.
* [#13046](https://github.com/cosmos/cosmos-sdk/pull/13046) Fix missing return statement in BaseApp.Query.
* [#12548](https://github.com/cosmos/cosmos-sdk/pull/12548) Prevent signing from wrong key while using multisig.
5 changes: 3 additions & 2 deletions api/cosmos/crypto/keyring/v1/record.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 29 additions & 29 deletions crypto/keyring/record.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions proto/cosmos/crypto/keyring/v1/record.proto
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ import "cosmos/crypto/hd/v1/hd.proto";

option go_package = "github.com/cosmos/cosmos-sdk/crypto/keyring";
option (gogoproto.goproto_getters_all) = false;
option (gogoproto.gogoproto_import) = false;

// Record is used for representing a key in the keyring.
message Record {

0 comments on commit 9693bbe

Please sign in to comment.