Merge branch 'master' of https://github.com/cosmos/cosmos-sdk into aa…

…ronc/6213-cli-encode

client/tx/tx.go

@@ -355,7 +355,13 @@ func Sign(txf Factory, name string, tx client.TxBuilder) error {
 		return err
 	}
 
-	return txf.txGenerator.TxEncoder()(tx.GetTx())
+	sigData.Signature = sigBytes
+	sig = signing.SignatureV2{
+		PubKey: pubKey,
+		Data:   sigData,
+	}
+
+	return tx.SetSignatures(sig)
 }
 
 // GasEstimateResponse defines a response definition for tx gas estimation.

client/tx_generator.go

@@ -11,26 +11,13 @@ type (
 	// application-defined concrete transaction type. The type returned must
 	// implement TxBuilder.
 	TxGenerator interface {
-		NewTx() TxBuilder
-		NewFee() Fee
-		NewSignature() Signature
+		NewTxBuilder() TxBuilder
+		SignModeHandler() signing.SignModeHandler
 
-		TxEncoder() types.TxEncoder
-		TxDecoder() types.TxDecoder
-		TxJSONEncoder() types.TxEncoder
-		TxJSONDecoder() types.TxDecoder
-	}
-
-	Fee interface {
-		types.Fee
-		SetGas(uint64)
-		SetAmount(types.Coins)
-	}
-
-	Signature interface {
-		types.Signature
-		SetPubKey(crypto.PubKey) error
-		SetSignature([]byte)
+		TxEncoder() sdk.TxEncoder
+		TxDecoder() sdk.TxDecoder
+		TxJSONEncoder() sdk.TxEncoder
+		TxJSONDecoder() sdk.TxDecoder
 	}
 
 	// TxBuilder defines an interface which an application-defined concrete transaction

codec/testdata/test_helper.go

@@ -1,8 +1,9 @@
 package testdata
 
 import (
-	"github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/tendermint/go-amino"
+
+	"github.com/cosmos/cosmos-sdk/codec/types"
 )
 
 func NewTestInterfaceRegistry() types.InterfaceRegistry {

x/auth/client/cli/broadcast.go

@@ -25,7 +25,7 @@ $ <appcli> tx broadcast ./mytxn.json
 `),
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx = clientCtx.Init()
+			clientCtx = clientCtx.Init().WithJSONMarshaler(cdc)
 
 			if clientCtx.Offline {
 				return errors.New("cannot broadcast tx during offline mode")

x/auth/client/cli/encode.go

@@ -22,7 +22,7 @@ Read a transaction from <file>, serialize it to the Amino wire protocol, and out
 If you supply a dash (-) argument in place of an input filename, the command reads from standard input.`,
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			cliCtx := clientCtx.Init()
+			cliCtx := clientCtx.Init().WithJSONMarshaler(cdc)
 
 			tx, err := authclient.ReadTxFromFile(cliCtx, args[0])
 			if err != nil {

x/auth/keeper/keeper_test.go

@@ -107,7 +107,7 @@ func TestSupply_ValidatePermissions(t *testing.T) {
 	maccPerms[randomPerm] = []string{"random"}
 
 	cdc, _ := simapp.MakeCodecs()
-	keeper := auth.NewAccountKeeper(
+	keeper := keeper.NewAccountKeeper(
 		cdc, app.GetKey(types.StoreKey), app.GetSubspace(types.ModuleName),
 		types.ProtoBaseAccount, maccPerms,
 	)