diff --git a/CHANGELOG.md b/CHANGELOG.md index 21784defaa04..e5d1ce7be6b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -186,6 +186,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i * (server) [#20140](https://github.com/cosmos/cosmos-sdk/pull/20140) Remove embedded grpc-web proxy in favor of standalone grpc-web proxy. [Envoy Proxy](https://www.envoyproxy.io/docs/envoy/latest/start/start) * (client) [#20255](https://github.com/cosmos/cosmos-sdk/pull/20255) Use comet proofOp proto type instead of sdk version to avoid needing to translate to later be proven in the merkle proof runtime. * (all) [#19726](https://github.com/cosmos/cosmos-sdk/pull/19726) Integrate comet v1 +* (client) [#20616](https://github.com/cosmos/cosmos-sdk/pull/20616) gentx subcommand output goes to `cmd.ErrOrStderr()` instead of being hardcoded to `os.Stderr` ### Client Breaking Changes diff --git a/docs/architecture/README.md b/docs/architecture/README.md index 035184c8764d..4c6d342b628d 100644 --- a/docs/architecture/README.md +++ b/docs/architecture/README.md @@ -62,6 +62,7 @@ When writing ADRs, follow the same best practices for writing RFCs. When writing * [ADR 061: Liquid Staking](./adr-061-liquid-staking.md) * [ADR 070: Un-Ordered Transaction Inclusion](./adr-070-unordered-transactions.md) * [ADR 065: Store v2](./adr-065-store-v2.md) +* [ADR 073: Built-in In-process Indexer](./adr-073-indexer.md) ### Proposed diff --git a/docs/architecture/adr-073-indexer.md b/docs/architecture/adr-073-indexer.md index 5be91d358c8b..c751c9b24ac4 100644 --- a/docs/architecture/adr-073-indexer.md +++ b/docs/architecture/adr-073-indexer.md @@ -6,7 +6,7 @@ ## Status -PROPOSED Not Implemented +Accepted Not Implemented ## Abstract diff --git a/x/genutil/client/cli/collect.go b/x/genutil/client/cli/collect.go index 3b0354c1073b..f8e59533f10c 100644 --- a/x/genutil/client/cli/collect.go +++ b/x/genutil/client/cli/collect.go @@ -52,7 +52,7 @@ func CollectGenTxsCmd(genBalIterator types.GenesisBalancesIterator, validator ty toPrint.AppMessage = appMessage - return displayInfo(toPrint) + return displayInfo(cmd.ErrOrStderr(), toPrint) }, } diff --git a/x/genutil/client/cli/init.go b/x/genutil/client/cli/init.go index 920dfcec260f..db9491df5997 100644 --- a/x/genutil/client/cli/init.go +++ b/x/genutil/client/cli/init.go @@ -5,6 +5,7 @@ import ( "encoding/json" "errors" "fmt" + "io" "os" "path/filepath" @@ -58,13 +59,13 @@ func newPrintInfo(moniker, chainID, nodeID, genTxsDir string, appMessage json.Ra } } -func displayInfo(info printInfo) error { +func displayInfo(dst io.Writer, info printInfo) error { out, err := json.MarshalIndent(info, "", " ") if err != nil { return err } - _, err = fmt.Fprintf(os.Stderr, "%s\n", out) + _, err = fmt.Fprintf(dst, "%s\n", out) return err } @@ -175,7 +176,7 @@ func InitCmd(mm *module.Manager) *cobra.Command { toPrint := newPrintInfo(config.Moniker, chainID, nodeID, "", appState) cfg.WriteConfigFile(filepath.Join(config.RootDir, "config", "config.toml"), config) - return displayInfo(toPrint) + return displayInfo(cmd.ErrOrStderr(), toPrint) }, }