Merge branch 'main' into julien/deprecate-broadcast-mode-block

.gitignore

@@ -50,12 +50,11 @@ vagrant
 
 # Graphviz
 dependency-graph.png
+debug_container.dot
 
 # Latex
 *.aux
 *.out
 *.synctex.gz
 /x/genutil/config/priv_validator_key.json
-/x/genutil/data/priv_validator_state.json
-
-debug_container.dot
+/x/genutil/data/priv_validator_state.json

CHANGELOG.md

@@ -45,7 +45,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Improvements
 
-* [#12995](https://github.com/cosmos/cosmos-sdk/pull/12995) Add `FormatTime` and `ParseTimeString` methods
+* [#12981](https://github.com/cosmos/cosmos-sdk/pull/12981) Return proper error when parsing telemetry configuration.
+* [#12995](https://github.com/cosmos/cosmos-sdk/pull/12995) Add `FormatTime` and `ParseTimeString` methods.
 * [#12952](https://github.com/cosmos/cosmos-sdk/pull/12952) Replace keyring module to Cosmos fork.
 * [#12352](https://github.com/cosmos/cosmos-sdk/pull/12352) Move the `RegisterSwaggerAPI` logic into a separate helper function in the server package.
 * [#12876](https://github.com/cosmos/cosmos-sdk/pull/12876) Remove proposer-based rewards.
@@ -113,6 +114,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (appModule) Remove `Route`, `QuerierRoute` and `LegacyQuerierHandler` from AppModule Interface. 
 * (x/modules) Remove all LegacyQueries and related code from modules
 * (store) [#11825](https://github.com/cosmos/cosmos-sdk/pull/11825) Make extension snapshotter interface safer to use, renamed the util function `WriteExtensionItem` to `WriteExtensionPayload`.
+* (x/genutil)[#12956](https://github.com/cosmos/cosmos-sdk/pull/12956) `genutil.AppModuleBasic` has a new attribute: genesis transaction validation function. The existing validation logic is implemented in `genutiltypes.DefaultMessageValidator`. Use `genutil.NewAppModuleBasic` to create a new genutil Module Basic.
 * (codec) [#12964](https://github.com/cosmos/cosmos-sdk/pull/12964) `ProtoCodec.MarshalInterface` now returns an error when serializing unregistered types and a subsequent `ProtoCodec.UnmarshalInterface` would fail.
 * (x/staking) [#12973](https://github.com/cosmos/cosmos-sdk/pull/12973) Removed `stakingkeeper.RandomValidator`. Use `testutil.RandSliceElem(r, sk.GetAllValidators(ctx))` instead.
 

Makefile

@@ -430,9 +430,9 @@ proto-check-breaking:
 
 
 TM_URL = https://raw.githubusercontent.com/tendermint/tendermint/v0.34.21/proto/tendermint
-GOGO_PROTO_URL = https://raw.githubusercontent.com/regen-network/protobuf/cosmos
-COSMOS_PROTO_URL = https://raw.githubusercontent.com/regen-network/cosmos-proto/master
-CONFIO_URL = https://raw.githubusercontent.com/confio/ics23/v0.7.0
+GOGO_PROTO_URL = https://raw.githubusercontent.com/regen-network/protobuf/v1.3.3-alpha.regen.1
+COSMOS_PROTO_URL = https://raw.githubusercontent.com/regen-network/cosmos-proto/v0.3.1
+CONFIO_URL = https://raw.githubusercontent.com/confio/ics23/go/v0.7.0
 
 TM_CRYPTO_TYPES = third_party/proto/tendermint/crypto
 TM_ABCI_TYPES = third_party/proto/tendermint/abci

UPGRADING.md

@@ -42,34 +42,6 @@ modified to set the new parameter to the desired value.
 
 ## [v0.46.x](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.46.0)
 
-### Client Changes
-
-### `x/gov`
-
-#### `types/v1`
-
-The `gov` module has been greatly improved. The previous API has been moved to `v1beta1` while the new implementation is called `v1`.
-
-In order to submit a proposal with `submit-proposal` you now need to pass a `proposal.json` file.
-You can still use the old way by using `submit-legacy-proposal`. This is not recommended.
-More information can be found in the gov module [client documentation](https://docs.cosmos.network/v0.46/modules/gov/07_client.html).
-
-### Keyring
-
-The keyring has been refactored in v0.46.
-
-* The `Unsafe*` interfaces have been removed from the keyring package. Please use interface casting if you wish to access those unsafe functions.
-* The keys' implementation has been refactored to be serialized as proto.
-* `keyring.NewInMemory` and `keyring.New` takes now a `codec.Codec`.
-* Take `keyring.Record` instead of `Info` as first argument in:
- * `MkConsKeyOutput`
- * `MkValKeyOutput`
- * `MkAccKeyOutput`
-* Rename:
- * `SavePubKey` to `SaveOfflineKey` and remove the `algo` argument.
- * `NewMultiInfo`, `NewLedgerInfo` to `NewLegacyMultiInfo`, `newLegacyLedgerInfo` respectively.
- * `NewOfflineInfo` to `newLegacyOfflineInfo` and move it to `migration_test.go`.
-
 ### Go API Changes
 
 The `replace google.golang.org/grpc` directive can be removed from the `go.mod`, it is no more required to block the version.
@@ -93,23 +65,37 @@ To improve clarity of the API, some renaming and improvements has been done:
 
 For the exhaustive list of API renaming, please refer to the [CHANGELOG](https://github.com/cosmos/cosmos-sdk/blob/main/CHANGELOG.md).
 
-### new packages
+#### new packages
 
 Additionally, new packages have been introduced in order to further split the codebase. Aliases are available for a new API breaking migration, but it is encouraged to migrate to this new packages:
 
 * `errors` should replace `types/errors` when registering errors or wrapping SDK errors.
 * `math` contains the `Int` or `Uint` types that are used in the SDK.
 
-### `x/authz`
+#### `x/authz`
 
 * `authz.NewMsgGrant` `expiration` is now a pointer. When `nil` is used, then no expiration will be set (grant won't expire).
 * `authz.NewGrant` takes a new argument: block time, to correctly validate expire time.
 
-### State Machine Changes
+### Keyring
 
-#### PostHandler
+The keyring has been refactored in v0.46.
+
+* The `Unsafe*` interfaces have been removed from the keyring package. Please use interface casting if you wish to access those unsafe functions.
+* The keys' implementation has been refactored to be serialized as proto.
+* `keyring.NewInMemory` and `keyring.New` takes now a `codec.Codec`.
+* Take `keyring.Record` instead of `Info` as first argument in:
+ * `MkConsKeyOutput`
+ * `MkValKeyOutput`
+ * `MkAccKeyOutput`
+* Rename:
+ * `SavePubKey` to `SaveOfflineKey` and remove the `algo` argument.
+ * `NewMultiInfo`, `NewLedgerInfo` to `NewLegacyMultiInfo`, `newLegacyLedgerInfo` respectively.
+ * `NewOfflineInfo` to `newLegacyOfflineInfo` and move it to `migration_test.go`.
 
-`postHandler` is like an `antehandler`, but is run _after_ the `runMsgs` execution. It is in the same store branch that `runMsgs`, meaning that both `runMsgs` and `postHandler`. This allows to run a custom logic after the execution of the messages.
+### PostHandler
+
+A `postHandler` is like an `antehandler`, but is run _after_ the `runMsgs` execution. It is in the same store branch that `runMsgs`, meaning that both `runMsgs` and `postHandler`. This allows to run a custom logic after the execution of the messages.
 
 ### IAVL
 
@@ -130,5 +116,23 @@ mistakes.
 
 ### Modules
 
+#### `x/params`
+
 * The `x/param` module has been depreacted in favour of each module housing and providing way to modify their parameters. Each module that has parameters that are changable during runtime have an authority, the authority can be a module or user account. The Cosmos-SDK team recommends migrating modules away from using the param module. An example of how this could look like can be found [here](https://github.com/cosmos/cosmos-sdk/pull/12363). 
- * The Param module will be maintained until April 18, 2022. At this point the module will reach end of life and be removed from the Cosmos SDK.
+* The Param module will be maintained until April 18, 2023. At this point the module will reach end of life and be removed from the Cosmos SDK.
+
+#### `x/gov`
+
+The `gov` module has been greatly improved. The previous API has been moved to `v1beta1` while the new implementation is called `v1`.
+
+In order to submit a proposal with `submit-proposal` you now need to pass a `proposal.json` file.
+You can still use the old way by using `submit-legacy-proposal`. This is not recommended.
+More information can be found in the gov module [client documentation](https://docs.cosmos.network/v0.46/modules/gov/07_client.html).
+
+### Protobuf
+
+The `third_party/proto` folder that existed in [previous version](https://github.com/cosmos/cosmos-sdk/tree/v0.45.3/third_party/proto) now does not contains directly the [proto files](https://github.com/cosmos/cosmos-sdk/tree/release/v0.46.x/third_party/proto).
+
+Instead, the SDK uses [`buf`](https://buf.build). Clients should have their own [`buf.yaml`](https://docs.buf.build/configuration/v1/buf-yaml) with `buf.build/cosmos/cosmos-sdk` as dependency, in order to avoid having to copy paste these files.
+
+The protos can as well be downloaded using `buf export buf.build/cosmos/cosmos-sdk:$(curl -sS https://api.github.com/repos/cosmos/cosmos-sdk/commits/v0.46.0 | jq -r .sha) --output <some_folder>`.

docs/architecture/adr-050-sign-mode-textual-annex1.md

@@ -203,7 +203,20 @@ Object: /cosmos.gov.v1.Vote
 
 ### `google.protobuf.Timestamp`
 
-Rendered as either ISO8601 (`2021-01-01T12:00:00Z`).
+Rendered using [RFC 3339](https://www.rfc-editor.org/rfc/rfc3339) (a
+simplification of ISO 8601), which is the current recommendation for portable
+time values. The rendering always uses "Z" (UTC) as the timezone. It uses only
+the necessary fractional digits of a second, omitting the fractional part
+entirely if the timestamp has no fractional seconds. (The resulting timestamps
+are not automatically sortable by standard lexicographic order, but we favor
+the legibility of the shorter string.)
+
+#### Examples
+
+The timestamp with 1136214245 seconds and 700000000 nanoseconds is rendered
+as `2006-01-02T15:04:05.7Z`.
+The timestamp with 1136214245 seconds and zero nanoseconds is rendered
+as `2006-01-02T15:04:05Z`.
 
 ### `google.protobuf.Duration` (TODO)
 

simapp/app.go

@@ -97,7 +97,7 @@ var (
  // and genesis verification.
  ModuleBasics = module.NewBasicManager(
  auth.AppModuleBasic{},
- genutil.AppModuleBasic{},
+ genutil.NewAppModuleBasic(genutiltypes.DefaultMessageValidator),
  bank.AppModuleBasic{},
  capability.AppModuleBasic{},
  staking.AppModuleBasic{},
@@ -121,17 +121,6 @@ var (
  vesting.AppModuleBasic{},
  nftmodule.AppModuleBasic{},
  )
-
- // module account permissions
- maccPerms = map[string][]string{
- authtypes.FeeCollectorName: nil,
- distrtypes.ModuleName: nil,
- minttypes.ModuleName: {authtypes.Minter},
- stakingtypes.BondedPoolName: {authtypes.Burner, authtypes.Staking},
- stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
- govtypes.ModuleName: {authtypes.Burner},
- nft.ModuleName: nil,
- }
 )
 
 var (
@@ -386,10 +375,30 @@ func (app *SimApp) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APICon
 }
 
 // GetMaccPerms returns a copy of the module account permissions
+//
+// NOTE: This is solely to be used for testing purposes.
 func GetMaccPerms() map[string][]string {
- dupMaccPerms := make(map[string][]string)
- for k, v := range maccPerms {
- dupMaccPerms[k] = v
+ dup := make(map[string][]string)
+ for _, perms := range moduleAccPerms {
+ dup[perms.Account] = perms.Permissions
  }
- return dupMaccPerms
+
+ return dup
+}
+
+// BlockedAddresses returns all the app's blocked account addresses.
+func BlockedAddresses() map[string]bool {
+ result := make(map[string]bool)
+
+ if len(blockAccAddrs) > 0 {
+ for _, addr := range blockAccAddrs {
+ result[addr] = true
+ }
+ } else {
+ for addr := range GetMaccPerms() {
+ result[addr] = true
+ }
+ }
+
+ return result
 }