Skip to content

Commit

Permalink
Merge branch 'main' into sai/rm_crisis
Browse files Browse the repository at this point in the history
  • Loading branch information
gsk967 authored Mar 26, 2024
2 parents 440334b + 41a826e commit 4686af7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,12 @@ Ref: https://keepachangelog.com/en/1.0.0/

### Improvements


Check failure on line 55 in CHANGELOG.md

View workflow job for this annotation

GitHub Actions / markdown-lint

Multiple consecutive blank lines

CHANGELOG.md:55 MD012/no-multiple-blanks Multiple consecutive blank lines [Expected: 1; Actual: 2] https://github.com/DavidAnson/markdownlint/blob/v0.33.0/doc/md012.md
### Bug Fixes

- [2473](https://github.com/umee-network/umee/pull/2462) Correct x/ugov Amino registration for x/ugov messages (they don't have MessageName option).


Check failure on line 60 in CHANGELOG.md

View workflow job for this annotation

GitHub Actions / markdown-lint

Multiple consecutive blank lines

CHANGELOG.md:60 MD012/no-multiple-blanks Multiple consecutive blank lines [Expected: 1; Actual: 2] https://github.com/DavidAnson/markdownlint/blob/v0.33.0/doc/md012.md
## v6.4.0 - 2024-03-21

### Features
Expand Down
2 changes: 1 addition & 1 deletion x/auction/codec.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func init() {
amino.Seal()
}

// RegisterLegacyAminoCodec registers the necessary x/uibc interfaces and
// RegisterLegacyAminoCodec registers the necessary x/auction interfaces and
// concrete types on the provided LegacyAmino codec. These types are used for
// Amino JSON serialization.
func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
Expand Down
6 changes: 2 additions & 4 deletions x/ugov/codec.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package ugov

import (
"github.com/cosmos/gogoproto/proto"

"github.com/cosmos/cosmos-sdk/codec"
cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
Expand All @@ -26,11 +24,11 @@ func init() {
amino.Seal()
}

// RegisterLegacyAminoCodec registers the necessary x/uibc interfaces and
// RegisterLegacyAminoCodec registers the necessary x/ugov interfaces and
// concrete types on the provided LegacyAmino codec. These types are used for
// Amino JSON serialization.
func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
cdc.RegisterConcrete(&MsgGovUpdateMinGasPrice{}, proto.MessageName(&MsgGovUpdateMinGasPrice{}), nil)
cdc.RegisterConcrete(&MsgGovUpdateMinGasPrice{}, "umee/ugov/MsgGovUpdateMinGasPrice", nil)
cdc.RegisterConcrete(&MsgGovSetEmergencyGroup{}, "umee/ugov/MsgGovSetEmergencyGroup", nil)
cdc.RegisterConcrete(&MsgGovUpdateInflationParams{}, "umee/ugov/MsgGovUpdateInflationParams", nil)
}
Expand Down

0 comments on commit 4686af7

Please sign in to comment.