Merge branch 'main' into julien/7809-gaiad-tx-bank-multi-send-cli

Author: julienrbrt

CHANGELOG.md

@@ -88,6 +88,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### API Breaking Changes
 
+* (types) [#11788](https://github.com/cosmos/cosmos-sdk/pull/11788) The `Int` and `Uint` types have been moved to their own dedicated module, `math`. Aliases are kept in the SDK's root `types` package, however, it is encouraged to utilize the new `math` module. As a result, the `Int#ToDec` API has been removed.
 * (grpc) [\#11642](https://github.com/cosmos/cosmos-sdk/pull/11642) The `RegisterTendermintService` method in the `tmservice` package now requires a `abciQueryFn` query function parameter.
 * [\#11496](https://github.com/cosmos/cosmos-sdk/pull/11496) Refactor abstractions for snapshot and pruning; snapshot intervals eventually pruned; unit tests.
 * (types) [\#11689](https://github.com/cosmos/cosmos-sdk/pull/11689) Make `Coins#Sub` and `Coins#SafeSub` consistent with `Coins#Add`.
@@ -173,7 +174,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### CLI Breaking Changes
 
-* [\#9695](https://github.com/cosmos/cosmos-sdk/pull/9695) `<app> keys migrate` CLI command now takes no arguments
+* (cli) [\#11818](https://github.com/cosmos/cosmos-sdk/pull/11818) CLI transactions preview now respect the chosen `--output` flag format (json or text).
+* [\#9695](https://github.com/cosmos/cosmos-sdk/pull/9695) `<app> keys migrate` CLI command now takes no arguments.
 * [\#9246](https://github.com/cosmos/cosmos-sdk/pull/9246) Removed the CLI flag `--setup-config-only` from the `testnet` command and added the subcommand `init-files`.
 * [\#9780](https://github.com/cosmos/cosmos-sdk/pull/9780) Use sigs.k8s.io for yaml, which might lead to minor YAML output changes
 * [\#10625](https://github.com/cosmos/cosmos-sdk/pull/10625) Rename `--fee-account` CLI flag to `--fee-granter`

client/context.go

@@ -2,6 +2,7 @@ package client
 
 import (
 	"bufio"
+	"encoding/json"
 	"fmt"
 	"io"
 	"os"
@@ -305,6 +306,12 @@ func (ctx Context) PrintObjectLegacy(toPrint interface{}) error {
 	return ctx.printOutput(out)
 }
 
+// PrintRaw is a variant of PrintProto that doesn't require a proto.Message type
+// and uses a raw JSON message. No marshaling is performed.
+func (ctx Context) PrintRaw(toPrint json.RawMessage) error {
+	return ctx.printOutput(toPrint)
+}
+
 func (ctx Context) printOutput(out []byte) error {
 	var err error
 	if ctx.OutputFormat == "text" {

client/context_test.go

@@ -3,6 +3,7 @@ package client_test
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"os"
 	"strings"
 	"testing"
@@ -25,7 +26,7 @@ func TestMain(m *testing.M) {
 	os.Exit(m.Run())
 }
 
-func TestContext_PrintObject(t *testing.T) {
+func TestContext_PrintProto(t *testing.T) {
 	ctx := client.Context{}
 
 	animal := &testdata.Dog{
@@ -39,9 +40,7 @@ func TestContext_PrintObject(t *testing.T) {
 		X:      10,
 	}
 
-	//
 	// proto
-	//
 	registry := testdata.NewTestInterfaceRegistry()
 	ctx = ctx.WithCodec(codec.NewProtoCodec(registry))
 
@@ -68,15 +67,28 @@ func TestContext_PrintObject(t *testing.T) {
   size: big
 x: "10"
 `, buf.String())
+}
+
+func TestContext_PrintObjectLegacy(t *testing.T) {
+	ctx := client.Context{}
+
+	animal := &testdata.Dog{
+		Size_: "big",
+		Name:  "Spot",
+	}
+	any, err := types.NewAnyWithValue(animal)
+	require.NoError(t, err)
+	hasAnimal := &testdata.HasAnimal{
+		Animal: any,
+		X:      10,
+	}
 
-	//
 	// amino
-	//
 	amino := testdata.NewTestAmino()
 	ctx = ctx.WithLegacyAmino(&codec.LegacyAmino{Amino: amino})
 
 	// json
-	buf = &bytes.Buffer{}
+	buf := &bytes.Buffer{}
 	ctx = ctx.WithOutput(buf)
 	ctx.OutputFormat = "json"
 	err = ctx.PrintObjectLegacy(hasAnimal)
@@ -103,6 +115,35 @@ value:
 `, buf.String())
 }
 
+func TestContext_PrintRaw(t *testing.T) {
+	ctx := client.Context{}
+	hasAnimal := json.RawMessage(`{"animal":{"@type":"/testdata.Dog","size":"big","name":"Spot"},"x":"10"}`)
+
+	// json
+	buf := &bytes.Buffer{}
+	ctx = ctx.WithOutput(buf)
+	ctx.OutputFormat = "json"
+	err := ctx.PrintRaw(hasAnimal)
+	require.NoError(t, err)
+	require.Equal(t,
+		`{"animal":{"@type":"/testdata.Dog","size":"big","name":"Spot"},"x":"10"}
+`, buf.String())
+
+	// yaml
+	buf = &bytes.Buffer{}
+	ctx = ctx.WithOutput(buf)
+	ctx.OutputFormat = "text"
+	err = ctx.PrintRaw(hasAnimal)
+	require.NoError(t, err)
+	require.Equal(t,
+		`animal:
+  '@type': /testdata.Dog
+  name: Spot
+  size: big
+x: "10"
+`, buf.String())
+}
+
 func TestCLIQueryConn(t *testing.T) {
 	cfg := network.DefaultConfig()
 	cfg.NumValidators = 1

client/tx/tx.go

@@ -3,6 +3,7 @@ package tx
 import (
 	"bufio"
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"os"
@@ -87,12 +88,14 @@ func BroadcastTx(clientCtx client.Context, txf Factory, msgs ...sdk.Msg) error {
 	}
 
 	if !clientCtx.SkipConfirm {
-		out, err := clientCtx.TxConfig.TxJSONEncoder()(tx.GetTx())
+		txBytes, err := clientCtx.TxConfig.TxJSONEncoder()(tx.GetTx())
 		if err != nil {
 			return err
 		}
 
-		_, _ = fmt.Fprintf(os.Stderr, "%s\n\n", out)
+		if err := clientCtx.PrintRaw(json.RawMessage(txBytes)); err != nil {
+			_, _ = fmt.Fprintf(os.Stderr, "%s\n", txBytes)
+		}
 
 		buf := bufio.NewReader(os.Stdin)
 		ok, err := input.GetConfirmation("confirm transaction before signing and broadcasting", buf, os.Stderr)

contrib/images/simd-dlv/Dockerfile

@@ -2,9 +2,13 @@ FROM golang:1.18-alpine AS build
 
 RUN apk add build-base git linux-headers libc-dev
 RUN go install github.com/go-delve/delve/cmd/dlv@latest
+
 WORKDIR /work
 COPY go.mod go.sum /work/
 COPY db/go.mod db/go.sum /work/db/
+COPY errors/go.mod errors/go.sum /work/errors/
+COPY math/go.mod math/go.sum /work/math/
+
 RUN go mod download
 COPY ./ /work
 RUN LEDGER_ENABLED=false make COSMOS_BUILD_OPTIONS="debug,nostrip" clean build

contrib/images/simd-env/Dockerfile

@@ -1,9 +1,12 @@
 FROM golang:1.18-alpine AS build
+
 RUN apk add build-base git linux-headers
+
 WORKDIR /work
 COPY go.mod go.sum /work/
 COPY db/go.mod db/go.sum /work/db/
 COPY errors/go.mod errors/go.sum /work/errors/
+COPY math/go.mod math/go.sum /work/math/
 
 RUN go mod download
 COPY ./ /work

errors/CHANGELOG.md

@@ -15,19 +15,14 @@ Change log entries are to be added to the Unreleased section under the
 appropriate stanza (see below). Each entry should ideally include a tag and
 the Github issue reference in the following format:
 
-* (<tag>) \#<issue-number> message
-
-The issue numbers will later be link-ified during the release process so you do
-not have to worry about including a link manually, but you can if you wish.
+* (<tag>) [#<issue-number>] Changelog message.
 
 Types of changes (Stanzas):
 
 "Features" for new features.
 "Improvements" for changes in existing functionality.
 "Deprecated" for soon-to-be removed features.
 "Bug Fixes" for any bug fixes.
-"Client Breaking" for breaking Protobuf, gRPC and REST routes used by end-users.
-"CLI Breaking" for breaking CLI commands.
 "API Breaking" for breaking exported APIs used by developers building on SDK.
 Ref: https://keepachangelog.com/en/1.0.0/
 -->

go.mod

@@ -15,6 +15,7 @@ require (
 	github.com/cosmos/cosmos-sdk/api v0.1.0
 	github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1
 	github.com/cosmos/cosmos-sdk/errors v1.0.0-beta.5
+	github.com/cosmos/cosmos-sdk/math v1.0.0-beta.1
 	github.com/cosmos/go-bip39 v1.0.0
 	github.com/cosmos/iavl v0.18.0
 	github.com/cosmos/ledger-cosmos-go v0.11.1
@@ -149,14 +150,14 @@ require (
 	nhooyr.io/websocket v1.8.6 // indirect
 )
 
-replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
+replace (
+	github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
+	github.com/cosmos/cosmos-sdk/db => ./db
 
-replace github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
-
-// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
-// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
-replace github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0
-
-replace github.com/cosmos/cosmos-sdk/db => ./db
+	// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
+	// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
+	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0
+	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
+)
 
 retract v0.43.0

go.sum

@@ -244,6 +244,8 @@ github.com/cosmos/cosmos-sdk/api v0.1.0 h1:xfSKM0e9p+EJTMQnf5PbWE6VT8ruxTABIJ64R
 github.com/cosmos/cosmos-sdk/api v0.1.0/go.mod h1:CupqQBskAOiTXO1XDZ/wrtWzN/wTxUvbQmOqdUhR8wI=
 github.com/cosmos/cosmos-sdk/errors v1.0.0-beta.5 h1:9ebZL9/nCkaxer3kWWHs0YT8OOmHd7xohULM8Weep7M=
 github.com/cosmos/cosmos-sdk/errors v1.0.0-beta.5/go.mod h1:wDFkBmFsFolsfsAfsLON7xX0EuWIvNxMO7NDjrijYU8=
+github.com/cosmos/cosmos-sdk/math v1.0.0-beta.1 h1:f2cco+9IQ24jB4Ba8QDeoiXuQSa6D3oOYy5ugM9Y4no=
+github.com/cosmos/cosmos-sdk/math v1.0.0-beta.1/go.mod h1:7jTTC6GESpBoLVYu77g3zPCQORcyZmX2ttXxWmXrQ2U=
 github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
 github.com/cosmos/iavl v0.18.0 h1:02ur4vnalMR2GuWCFNkuseUcl/BCVmg9tOeHOGiZOkE=

math/CHANGELOG.md

@@ -0,0 +1,32 @@
+<!--
+Guiding Principles:
+
+Changelogs are for humans, not machines.
+There should be an entry for every single version.
+The same types of changes should be grouped.
+Versions and sections should be linkable.
+The latest version comes first.
+The release date of each version is displayed.
+Mention whether you follow Semantic Versioning.
+
+Usage:
+
+Change log entries are to be added to the Unreleased section under the
+appropriate stanza (see below). Each entry should ideally include a tag and
+the Github issue reference in the following format:
+
+* (<tag>) [#<issue-number>] Changelog message.
+
+Types of changes (Stanzas):
+
+"Features" for new features.
+"Improvements" for changes in existing functionality.
+"Deprecated" for soon-to-be removed features.
+"Bug Fixes" for any bug fixes.
+"API Breaking" for breaking exported APIs used by developers building on SDK.
+Ref: https://keepachangelog.com/en/1.0.0/
+-->
+
+# Changelog
+
+## [Unreleased]