Merge branch 'main' of https://github.com/cosmos/cosmos-sdk into likh…

…ita/fix-multisig-key-2
cosmos · Jul 13, 2022 · 7dd63e6 · 7dd63e6
2 parents d22c5fe + a2000ff
commit 7dd63e6
Show file tree

Hide file tree

Showing 26 changed files with 4,876 additions and 638 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -53,6 +53,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * [#12153](https://github.com/cosmos/cosmos-sdk/pull/12153) Add a new `NewSimulationManagerFromAppModules` constructor, to simplify simulation wiring.
 * [#12187](https://github.com/cosmos/cosmos-sdk/pull/12187) Add batch operation for x/nft module.
 * [#12453](https://github.com/cosmos/cosmos-sdk/pull/12453) Add `NewInMemoryWithKeyring` function which allows the creation of in memory `keystore` instances with a specified set of existing items.
+* [#11390](https://github.com/cosmos/cosmos-sdk/pull/11390) `LatestBlockResponse` & `BlockByHeightResponse` types' `Block` filed has been deprecated and they now contains new field `sdk_block` with `proposer_address` as `string`
 
 ### State Machine Breaking
 

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,3 @@
-Cosmos SDK
-License: Apache2.0
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -189,6 +186,7 @@ License: Apache2.0
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
+   Copyright Cosmos-SDK Authors
    Copyright 2016 All in Bits, Inc
 
    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/api/cosmos/base/tendermint/v1beta1/query.pulsar.go b/api/cosmos/base/tendermint/v1beta1/query.pulsar.go