Merge branch 'main' into julien/router-invoke

.github/workflows/lint.yml

@@ -24,6 +24,7 @@ jobs:
         id: git_diff
         with:
           PATTERNS: |
+            **/*.mk
             Makefile
             **/Makefile
             .golangci.yml

.github/workflows/proto.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
-      - uses: bufbuild/buf-setup-action@v1.36.0
+      - uses: bufbuild/buf-setup-action@v1.37.0
       - uses: bufbuild/buf-lint-action@v1
         with:
           input: "proto"
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: bufbuild/buf-setup-action@v1.36.0
+      - uses: bufbuild/buf-setup-action@v1.37.0
       - uses: bufbuild/buf-breaking-action@v1
         with:
           input: "proto"

README.md

@@ -105,4 +105,4 @@ Module Dependencies are the modules that an application may depend on and which
 
 ## Disambiguation
 
-This Cosmos SDK project is not related to the [React-Cosmos](https://github.com/react-cosmos/react-cosmos) project (yet). Many thanks to Evan Coury and Ovidiu (@skidding) for this Github organization name. As per our agreement, this disambiguation notice will stay here.
+This Cosmos SDK project is not related to the [React-Cosmos](https://github.com/react-cosmos/react-cosmos) project (yet). Many thanks to Evan Coury and Ovidiu [(@skidding)](https://github.com/skidding) for this Github organization name. As per our agreement, this disambiguation notice will stay here.

UPGRADING.md

@@ -67,9 +67,9 @@ clientCtx = clientCtx.
 + WithValidatorPrefix("cosmosvaloper")
 ```
 
-**When using `depinject` / `app v2`, the client codecs can be provided directly from application config.**
+**When using `depinject` / `app_di`, the client codecs can be provided directly from application config.**
 
-Refer to SimApp `root_v2.go` and `root.go` for an example with an app v2 and a legacy app.
+Refer to SimApp `root_di.go` and `root.go` for an example with an app di and a legacy app.
 
 Additionally, a simplification of the start command leads to the following change:
 
@@ -467,7 +467,7 @@ for more info.
 A `SetPreBlocker` method has been added to BaseApp. This is essential for BaseApp to run `PreBlock` which runs before begin blocker other modules, and allows to modify consensus parameters, and the changes are visible to the following state machine logics.
 Read more about other use cases [here](https://github.com/cosmos/cosmos-sdk/blob/main/docs/architecture/adr-068-preblock.md).
 
-`depinject` / app v2 users need to add `x/upgrade` in their `app_config.go` / `app.yml`:
+`depinject` / app di users need to add `x/upgrade` in their `app_config.go` / `app.yml`:
 
 ```diff
 + PreBlockers: []string{
@@ -575,7 +575,7 @@ The following modules `NewKeeper` function now take a `KVStoreService` instead o
 * `x/slashing`
 * `x/upgrade`
 
-**Users using `depinject` / app v2 do not need any changes, this is abstracted for them.**
+**Users using `depinject` / app di do not need any changes, this is abstracted for them.**
 
 Users manually wiring their chain need to use the `runtime.NewKVStoreService` method to create a `KVStoreService` from a `StoreKey`:
 
@@ -592,7 +592,7 @@ app.ConsensusParamsKeeper = consensusparamkeeper.NewKeeper(
 
 Replace all your CometBFT logger imports by `cosmossdk.io/log`.
 
-Additionally, `depinject` / app v2 users must now supply a logger through the main `depinject.Supply` function instead of passing it to `appBuilder.Build`.
+Additionally, `depinject` / app di users must now supply a logger through the main `depinject.Supply` function instead of passing it to `appBuilder.Build`.
 
 ```diff
 appConfig = depinject.Configs(
@@ -616,7 +616,7 @@ User manually wiring their chain need to add the logger argument when creating t
 Previously, the `ModuleBasics` was a global variable that was used to register all modules' `AppModuleBasic` implementation.
 The global variable has been removed and the basic module manager can be now created from the module manager.
 
-This is automatically done for `depinject` / app v2 users, however for supplying different app module implementation, pass them via `depinject.Supply` in the main `AppConfig` (`app_config.go`):
+This is automatically done for `depinject` / app di users, however for supplying different app module implementation, pass them via `depinject.Supply` in the main `AppConfig` (`app_config.go`):
 
 ```go
 depinject.Supply(
@@ -727,7 +727,7 @@ When using (legacy) application wiring, the following must be added to `app.go`
 	app.txConfig = txConfig
 ```
 
-When using `depinject` / `app v2`, **it's enabled by default** if there's a bank keeper present.
+When using `depinject` / `app di`, **it's enabled by default** if there's a bank keeper present.
 
 And in the application client (usually `root.go`):
 
@@ -746,7 +746,7 @@ And in the application client (usually `root.go`):
 	}
 ```
 
-When using `depinject` / `app v2`, the tx config should be recreated from the `txConfigOpts` to use `NewGRPCCoinMetadataQueryFn` instead of depending on the bank keeper (that is used in the server).
+When using `depinject` / `app di`, the tx config should be recreated from the `txConfigOpts` to use `NewGRPCCoinMetadataQueryFn` instead of depending on the bank keeper (that is used in the server).
 
 To learn more see the [docs](https://docs.cosmos.network/main/learn/advanced/transactions#sign_mode_textual) and the [ADR-050](https://docs.cosmos.network/main/build/architecture/adr-050-sign-mode-textual).
 

client/v2/README.md

@@ -38,7 +38,7 @@ Here are the steps to use AutoCLI:
 
 1. Ensure your app's modules implements the `appmodule.AppModule` interface.
 2. (optional) Configure how to behave as `autocli` command generation, by implementing the `func (am AppModule) AutoCLIOptions() *autocliv1.ModuleOptions` method on the module.
-3. Use the `autocli.AppOptions` struct to specify the modules you defined. If you are using `depinject` / app v2, it can automatically create an instance of `autocli.AppOptions` based on your app's configuration.
+3. Use the `autocli.AppOptions` struct to specify the modules you defined. If you are using `depinject`, it can automatically create an instance of `autocli.AppOptions` based on your app's configuration.
 4. Use the `EnhanceRootCommand()` method provided by `autocli` to add the CLI commands for the specified modules to your root command.
 
 :::tip

client/v2/autocli/keyring/keyring.go

@@ -10,7 +10,9 @@ import (
 
 // KeyringContextKey is the key used to store the keyring in the context.
 // The keyring must be wrapped using the KeyringImpl.
-var KeyringContextKey struct{}
+var KeyringContextKey keyringContextKey
+
+type keyringContextKey struct{}
 
 var _ Keyring = &KeyringImpl{}
 

client/v2/go.mod

@@ -24,7 +24,7 @@ require (
 	buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.34.2-20240130113600-88ef6483f90f.2 // indirect
 	cosmossdk.io/collections v0.4.0 // indirect
 	cosmossdk.io/errors v1.0.1 // indirect
-	cosmossdk.io/log v1.4.0 // indirect
+	cosmossdk.io/log v1.4.1 // indirect
 	cosmossdk.io/math v1.3.0
 	cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc // indirect
 	cosmossdk.io/x/auth v0.0.0-00010101000000-000000000000

client/v2/go.sum

@@ -10,8 +10,8 @@ cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050=
 cosmossdk.io/depinject v1.0.0/go.mod h1:zxK/h3HgHoA/eJVtiSsoaRaRA2D5U4cJ5thIG4ssbB8=
 cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=
 cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U=
-cosmossdk.io/log v1.4.0 h1:Ttt9d6fQ0GlktwhcysOeNiIjixW7l0rYBocmoXOb11k=
-cosmossdk.io/log v1.4.0/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU=
+cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM=
+cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU=
 cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE=
 cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
 cosmossdk.io/schema v0.1.1 h1:I0M6pgI7R10nq+/HCQfbO6BsGBZA8sQy+duR1Y3aKcA=

docs/Introduction.md

@@ -34,4 +34,4 @@ Check out the docs for the various parts of the Cosmos stack.
 
 * [**GitHub Discussions**](https://github.com/orgs/cosmos/discussions) - Ask questions and discuss SDK development on GitHub.
 * [**Discord**](https://discord.gg/interchain) - Chat with Cosmos developers on Discord.
-* [**Found an issue?**](https://github.com/cosmos/cosmos-sdk/edit/main/docs/docs/README.md) - Help us improve this page by suggesting edits on GitHub.
+* [**Found an issue?**](https://github.com/cosmos/cosmos-sdk/edit/main/docs/Introduction.md) - Help us improve this page by suggesting edits on GitHub.

docs/build/building-apps/03-app-upgrade.md

@@ -53,7 +53,7 @@ be a matter of minutes and not even require them to be awake at that time.
 ## Integrating With An App
 
 :::tip
-The following is not required for users using `depinject` / app v2, this is abstracted for them.
+The following is not required for users using `depinject`, this is abstracted for them.
 :::
 
 In addition to basic module wiring, setup the upgrade Keeper for the app and then define a `PreBlocker` that calls the upgrade

docs/build/building-modules/01-module-manager.md

@@ -260,7 +260,7 @@ Here's an example of a concrete integration within an `simapp`:
 https://github.com/cosmos/cosmos-sdk/blob/v0.50.0-alpha.0/simapp/app.go#L411-L434
 ```
 
-This is the same example from `runtime` (the package that powers app v2):
+This is the same example from `runtime` (the package that powers app di):
 
 ```go reference
 https://github.com/cosmos/cosmos-sdk/blob/v0.50.0-alpha.0/runtime/module.go#L61

go.mod

@@ -9,7 +9,7 @@ require (
 	cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
 	cosmossdk.io/depinject v1.0.0
 	cosmossdk.io/errors v1.0.1
-	cosmossdk.io/log v1.4.0
+	cosmossdk.io/log v1.4.1
 	cosmossdk.io/math v1.3.0
 	cosmossdk.io/schema v0.1.1
 	cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc

go.sum

@@ -8,8 +8,8 @@ cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050=
 cosmossdk.io/depinject v1.0.0/go.mod h1:zxK/h3HgHoA/eJVtiSsoaRaRA2D5U4cJ5thIG4ssbB8=
 cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=
 cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U=
-cosmossdk.io/log v1.4.0 h1:Ttt9d6fQ0GlktwhcysOeNiIjixW7l0rYBocmoXOb11k=
-cosmossdk.io/log v1.4.0/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU=
+cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM=
+cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU=
 cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE=
 cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
 cosmossdk.io/schema v0.1.1 h1:I0M6pgI7R10nq+/HCQfbO6BsGBZA8sQy+duR1Y3aKcA=

log/CHANGELOG.md

@@ -22,6 +22,10 @@ Each entry must include the Github issue reference in the following format:
 
 ## [Unreleased]
 
+## [v1.4.1](https://github.com/cosmos/cosmos-sdk/releases/tag/log/v1.4.1) - 2024-08-16
+
+* [#21326](https://github.com/cosmos/cosmos-sdk/pull/21326) Avoid context key collision.
+
 ## [v1.4.0](https://github.com/cosmos/cosmos-sdk/releases/tag/log/v1.4.0) - 2024-08-07
 
 * [#21045](https://github.com/cosmos/cosmos-sdk/pull/21045) Add `WithContext` method implementations to make all returned loggers compatible with `cosmossdk.io/core/log.Logger` (v1) without a direct dependency.

log/logger.go

@@ -30,7 +30,9 @@ func init() {
 const ModuleKey = "module"
 
 // ContextKey is used to store the logger in the context.
-var ContextKey struct{}
+var ContextKey contextKey
+
+type contextKey struct{}
 
 // Logger is the Cosmos SDK logger interface.
 // It extends cosmossdk.io/core/log.Logger to return a child logger.

runtime/v2/go.mod

@@ -17,7 +17,7 @@ require (
 	cosmossdk.io/api v0.7.5
 	cosmossdk.io/core v1.0.0
 	cosmossdk.io/depinject v1.0.0
-	cosmossdk.io/log v1.4.0
+	cosmossdk.io/log v1.4.1
 	cosmossdk.io/server/v2/appmanager v0.0.0-00010101000000-000000000000
 	cosmossdk.io/server/v2/stf v0.0.0-00010101000000-000000000000
 	cosmossdk.io/store/v2 v2.0.0-00010101000000-000000000000

runtime/v2/go.sum

@@ -6,8 +6,8 @@ cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050=
 cosmossdk.io/depinject v1.0.0/go.mod h1:zxK/h3HgHoA/eJVtiSsoaRaRA2D5U4cJ5thIG4ssbB8=
 cosmossdk.io/errors/v2 v2.0.0-20240731132947-df72853b3ca5 h1:IQNdY2kB+k+1OM2DvqFG1+UgeU1JzZrWtwuWzI3ZfwA=
 cosmossdk.io/errors/v2 v2.0.0-20240731132947-df72853b3ca5/go.mod h1:0CuYKkFHxc1vw2JC+t21THBCALJVROrWVR/3PQ1urpc=
-cosmossdk.io/log v1.4.0 h1:Ttt9d6fQ0GlktwhcysOeNiIjixW7l0rYBocmoXOb11k=
-cosmossdk.io/log v1.4.0/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU=
+cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM=
+cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ=
 github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=

schema/kind.go

@@ -9,81 +9,135 @@ import (
 )
 
 // Kind represents the basic type of a field in an object.
-// Each kind defines the types of go values which should be accepted
-// by listeners and generated by decoders when providing entity updates.
+// Each kind defines the following encodings:
+// Go Encoding: the golang type which should be accepted by listeners and
+// generated by decoders when providing entity updates.
+// JSON Encoding: the JSON encoding which should be used when encoding the field to JSON.
+// When there is some non-determinism in an encoding, kinds should specify what
+// values they accept and also what is the canonical, deterministic encoding which
+// should be preferably emitted by serializers.
 type Kind int
 
 const (
 	// InvalidKind indicates that an invalid type.
 	InvalidKind Kind = iota
 
-	// StringKind is a string type and values of this type must be of the go type string
-	// containing valid UTF-8 and cannot contain null characters.
+	// StringKind is a string type.
+	// Go Encoding: UTF-8 string with no null characters.
+	// JSON Encoding: string
 	StringKind
 
-	// BytesKind is a bytes type and values of this type must be of the go type []byte.
+	// BytesKind is a bytes type.
+	// Go Encoding: []byte
+	// JSON Encoding: base64 encoded string, canonical values should be encoded with standard encoding and padding.
+	// Either standard or URL encoding with or without padding should be accepted.
 	BytesKind
 
-	// Int8Kind is an int8 type and values of this type must be of the go type int8.
+	// Int8Kind represents an 8-bit signed integer.
+	// Go Encoding: int8
+	// JSON Encoding: number
 	Int8Kind
 
-	// Uint8Kind is a uint8 type and values of this type must be of the go type uint8.
+	// Uint8Kind represents an 8-bit unsigned integer.
+	// Go Encoding: uint8
+	// JSON Encoding: number
 	Uint8Kind
 
-	// Int16Kind is an int16 type and values of this type must be of the go type int16.
+	// Int16Kind represents a 16-bit signed integer.
+	// Go Encoding: int16
+	// JSON Encoding: number
 	Int16Kind
 
-	// Uint16Kind is a uint16 type and values of this type must be of the go type uint16.
+	// Uint16Kind represents a 16-bit unsigned integer.
+	// Go Encoding: uint16
+	// JSON Encoding: number
 	Uint16Kind
 
-	// Int32Kind is an int32 type and values of this type must be of the go type int32.
+	// Int32Kind represents a 32-bit signed integer.
+	// Go Encoding: int32
+	// JSON Encoding: number
 	Int32Kind
 
-	// Uint32Kind is a uint32 type and values of this type must be of the go type uint32.
+	// Uint32Kind represents a 32-bit unsigned integer.
+	// Go Encoding: uint32
+	// JSON Encoding: number
 	Uint32Kind
 
-	// Int64Kind is an int64 type and values of this type must be of the go type int64.
+	// Int64Kind represents a 64-bit signed integer.
+	// Go Encoding: int64
+	// JSON Encoding: base10 integer string which matches the IntegerFormat regex
+	// The canonical encoding should include no leading zeros.
 	Int64Kind
 
-	// Uint64Kind is a uint64 type and values of this type must be of the go type uint64.
+	// Uint64Kind represents a 64-bit unsigned integer.
+	// Go Encoding: uint64
+	// JSON Encoding: base10 integer string which matches the IntegerFormat regex
+	// Canonically encoded values should include no leading zeros.
 	Uint64Kind
 
-	// IntegerStringKind represents an arbitrary precision integer number. Values of this type must
-	// be of the go type string and formatted as base10 integers, specifically matching to
-	// the IntegerFormat regex.
+	// IntegerStringKind represents an arbitrary precision integer number.
+	// Go Encoding: string which matches the IntegerFormat regex
+	// JSON Encoding: base10 integer string
+	// Canonically encoded values should include no leading zeros.
 	IntegerStringKind
 
-	// DecimalStringKind represents an arbitrary precision decimal or integer number. Values of this type
-	// must be of the go type string and match the DecimalFormat regex.
+	// DecimalStringKind represents an arbitrary precision decimal or integer number.
+	// Go Encoding: string which matches the DecimalFormat regex
+	// JSON Encoding: base10 decimal string
+	// Canonically encoded values should include no leading zeros or trailing zeros,
+	// and exponential notation with a lowercase 'e' should be used for any numbers
+	// with an absolute value less than or equal to 1e-6 or greater than or equal to 1e6.
 	DecimalStringKind
 
-	// BoolKind is a boolean type and values of this type must be of the go type bool.
+	// BoolKind represents a boolean true or false value.
+	// Go Encoding: bool
+	// JSON Encoding: boolean
 	BoolKind
 
-	// TimeKind is a time type and values of this type must be of the go type time.Time.
+	// TimeKind represents a nanosecond precision UNIX time value (with zero representing January 1, 1970 UTC).
+	// Its valid range is +/- 2^63 (the range of a 64-bit signed integer).
+	// Go Encoding: time.Time
+	// JSON Encoding: Any value IS0 8601 time stamp should be accepted.
+	// Canonical values should be encoded with UTC time zone Z, nanoseconds should
+	// be encoded with no trailing zeros, and T time values should always be present
+	// even at 00:00:00.
 	TimeKind
 
-	// DurationKind is a duration type and values of this type must be of the go type time.Duration.
+	// DurationKind represents the elapsed time between two nanosecond precision time values.
+	// Its valid range is +/- 2^63 (the range of a 64-bit signed integer).
+	// Go Encoding: time.Duration
+	// JSON Encoding: the number of seconds as a decimal string with no trailing zeros followed by
+	// a lowercase 's' character to represent seconds.
 	DurationKind
 
-	// Float32Kind is a float32 type and values of this type must be of the go type float32.
+	// Float32Kind represents an IEEE-754 32-bit floating point number.
+	// Go Encoding: float32
+	// JSON Encoding: number
 	Float32Kind
 
-	// Float64Kind is a float64 type and values of this type must be of the go type float64.
+	// Float64Kind represents an IEEE-754 64-bit floating point number.
+	// Go Encoding: float64
+	// JSON Encoding: number
 	Float64Kind
 
-	// AddressKind represents an account address and must be of type []byte. Addresses usually have a
-	// human-readable rendering, such as bech32, and tooling should provide a way for apps to define a
-	// string encoder for friendly user-facing display.
+	// AddressKind represents an account address which is represented by a variable length array of bytes.
+	// Addresses usually have a human-readable rendering, such as bech32, and tooling should provide
+	// a way for apps to define a string encoder for friendly user-facing display.
+	// Go Encoding: []byte
+	// JSON Encoding: addresses should be encoded as strings using the human-readable address renderer
+	// provided to the JSON encoder.
 	AddressKind
 
-	// EnumKind is an enum type and values of this type must be of the go type string.
+	// EnumKind represents a value of an enum type.
 	// Fields of this type are expected to set the EnumType field in the field definition to the enum
 	// definition.
+	// Go Encoding: string
+	// JSON Encoding: string
 	EnumKind
 
-	// JSONKind is a JSON type and values of this type should be of go type json.RawMessage and represent
-	// valid JSON.
+	// JSONKind represents arbitrary JSON data.
+	// Go Encoding: json.RawMessage
+	// JSON Encoding: any valid JSON value
 	JSONKind
 )