another major overhaul

cmd/test/tx_utils.go

@@ -45,7 +45,7 @@ func GenTxWithMsg(messages []sdk.Msg) (auth.StdTx, error) {
 	cdc := GetAminoCdc()
 	cliCtx := context.NewCLIContext().WithCodec(cdc).WithAccountDecoder(cdc)
 
-	txBldr := auth.NewTxBuilderFromCLI().WithTxEncoder(utils.GetTxEncoder(cdc)).WithChainID("pylons")
+	txBldr := authtxb.NewTxBuilderFromCLI(&bytes.Buffer{}).WithTxEncoder(utils.GetTxEncoder(cdc)).WithChainID("pylons")
 	if txBldr.SimulateAndExecute() {
 		txBldr, err = utils.EnrichWithGas(txBldr, cliCtx, messages)
 		if err != nil {

go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/google/cel-go v0.3.2
 	github.com/google/uuid v1.1.1
 	github.com/gorilla/mux v1.7.4
+	github.com/micro/go-micro v1.18.0
 	github.com/spf13/cobra v0.0.6
 	github.com/spf13/viper v1.6.2
 	github.com/stretchr/testify v1.5.1

x/pylons/client/cli/query/get_cookbook.go

@@ -18,7 +18,7 @@ func GetCookbook(queryRoute string, cdc *codec.Codec) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cliCtx := context.NewCLIContext().WithCodec(cdc)
 
-			res, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/get_cookbook/%s", queryRoute, args[0]), nil)
+			res, _, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/get_cookbook/%s", queryRoute, args[0]), nil)
 			if err != nil {
 				return fmt.Errorf(err.Error())
 			}

x/pylons/client/cli/query/get_execution.go

@@ -18,7 +18,7 @@ func GetExecution(queryRoute string, cdc *codec.Codec) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cliCtx := context.NewCLIContext().WithCodec(cdc)
 
-			res, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/get_execution/%s", queryRoute, args[0]), nil)
+			res, _, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/get_execution/%s", queryRoute, args[0]), nil)
 			if err != nil {
 				return fmt.Errorf(err.Error())
 			}

x/pylons/client/cli/query/get_item.go

@@ -18,7 +18,7 @@ func GetItem(queryRoute string, cdc *codec.Codec) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cliCtx := context.NewCLIContext().WithCodec(cdc)
 
-			res, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/get_item/%s", queryRoute, args[0]), nil)
+			res, _, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/get_item/%s", queryRoute, args[0]), nil)
 			if err != nil {
 				return fmt.Errorf(err.Error())
 			}

x/pylons/client/cli/query/get_pylons_balance.go

@@ -31,7 +31,7 @@ func GetPylonsBalance(queryRoute string, cdc *codec.Codec) *cobra.Command {
 				return errors.New(err.Error())
 			}
 
-			res, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/balance/%s", queryRoute, info.GetAddress()), nil)
+			res, _, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/balance/%s", queryRoute, info.GetAddress()), nil)
 			if err != nil {
 				return fmt.Errorf(err.Error())
 			}

x/pylons/client/cli/query/get_recipe.go

@@ -18,7 +18,7 @@ func GetRecipe(queryRoute string, cdc *codec.Codec) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cliCtx := context.NewCLIContext().WithCodec(cdc)
 
-			res, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/get_recipe/%s", queryRoute, args[0]), nil)
+			res, _, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/get_recipe/%s", queryRoute, args[0]), nil)
 			if err != nil {
 				return fmt.Errorf(err.Error())
 			}

x/pylons/client/cli/query/list_cookbook.go

@@ -19,7 +19,7 @@ func ListCookbook(queryRoute string, cdc *codec.Codec) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cliCtx := context.NewCLIContext().WithCodec(cdc)
 
-			res, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/list_cookbook/%s", queryRoute, accAddr), nil)
+			res, _, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/list_cookbook/%s", queryRoute, accAddr), nil)
 			if err != nil {
 				return fmt.Errorf(err.Error())
 			}

x/pylons/client/cli/query/list_executions.go

@@ -19,7 +19,7 @@ func ListExecutions(queryRoute string, cdc *codec.Codec) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cliCtx := context.NewCLIContext().WithCodec(cdc)
 
-			res, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/list_executions/%s", queryRoute, accAddr), nil)
+			res, _, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/list_executions/%s", queryRoute, accAddr), nil)
 			if err != nil {
 				return fmt.Errorf(err.Error())
 			}

x/pylons/client/cli/query/list_items.go

@@ -20,7 +20,7 @@ func ItemsBySender(queryRoute string, cdc *codec.Codec) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cliCtx := context.NewCLIContext().WithCodec(cdc)
 
-			res, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/items_by_sender/%s", queryRoute, accAddr), nil)
+			res, _, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/items_by_sender/%s", queryRoute, accAddr), nil)
 			if err != nil {
 				return fmt.Errorf(err.Error())
 			}

x/pylons/client/cli/query/list_recipes.go

@@ -19,7 +19,7 @@ func ListRecipes(queryRoute string, cdc *codec.Codec) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cliCtx := context.NewCLIContext().WithCodec(cdc)
 
-			res, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/list_recipe/%s", queryRoute, accAddr), nil)
+			res, _, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/list_recipe/%s", queryRoute, accAddr), nil)
 			if err != nil {
 				return fmt.Errorf(err.Error())
 			}

x/pylons/client/cli/query/list_trade.go

@@ -19,7 +19,7 @@ func ListTrade(queryRoute string, cdc *codec.Codec) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cliCtx := context.NewCLIContext().WithCodec(cdc)
 
-			res, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/list_trade/%s", queryRoute, accAddr), nil)
+			res, _, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/list_trade/%s", queryRoute, accAddr), nil)
 			if err != nil {
 				return fmt.Errorf(err.Error())
 			}

x/pylons/client/cli/tx/create_cookbook.go

@@ -3,6 +3,8 @@ package tx
 import (
 	// "strconv"
 
+	"bufio"
+
 	"github.com/spf13/cobra"
 
 	"github.com/Pylons-tech/pylons/x/pylons/msgs"
@@ -19,9 +21,6 @@ import (
 func CreateCookbook(cdc *codec.Codec) *cobra.Command {
 
 	var msgCCB msgs.MsgCreateCookbook
-	// var tmpVersion string
-	// var tmpEmail string
-	// var tmpLevel string
 
 	ccb := &cobra.Command{
 		Use:   "create-cookbook [args]",
@@ -32,17 +31,13 @@ func CreateCookbook(cdc *codec.Codec) *cobra.Command {
 			// If we set level, version, support_email, tmp_level name and description separately,
 			// it can be very complex, especially for other commands like create_recipe, fiat_item
 
-			cliCtx := context.NewCLIContext().WithCodec(cdc).WithAccountDecoder(cdc)
-
-			txBldr := auth.NewTxBuilderFromCLI().WithTxEncoder(utils.GetTxEncoder(cdc))
+			cliCtx := context.NewCLIContext().WithCodec(cdc)
+			inBuf := bufio.NewReader(cmd.InOrStdin())
+			txBldr := auth.NewTxBuilderFromCLI(inBuf).WithTxEncoder(utils.GetTxEncoder(cdc))
 
 			if err := cliCtx.EnsureAccountExists(); err != nil {
 				return err
 			}
-			// lvl, err := strconv.Atoi(tmpLevel)
-			// if err != nil {
-			// 	return err
-			// }
 			byteValue, err := ReadFile(args[0])
 			if err != nil {
 				return err
@@ -52,9 +47,6 @@ func CreateCookbook(cdc *codec.Codec) *cobra.Command {
 				return err
 			}
 
-			// msgCCB.Level = types.Level(lvl)
-			// msgCCB.Version = types.SemVer(tmpVersion)
-			// msgCCB.SupportEmail = types.Email(tmpEmail)
 			msgCCB.Sender = cliCtx.GetFromAddress()
 
 			err = msgCCB.ValidateBasic()
@@ -64,17 +56,9 @@ func CreateCookbook(cdc *codec.Codec) *cobra.Command {
 
 			cliCtx.PrintResponse = true
 
-			return utils.GenerateOrBroadcastMsgs(cliCtx, txBldr, []sdk.Msg{msgCCB}, false)
+			return utils.GenerateOrBroadcastMsgs(cliCtx, txBldr, []sdk.Msg{msgCCB})
 		},
 	}
 
-	// Keeping it as commented, in case we need this later
-	// ccb.PersistentFlags().StringVar(&msgCCB.Name, "name", "", "The name of the cookbook")
-	// ccb.PersistentFlags().StringVar(&msgCCB.Description, "desc", "", "The description for the cookbook")
-	// ccb.PersistentFlags().StringVar(&msgCCB.Developer, "developer", "", "The developer of the cookbook")
-	// ccb.PersistentFlags().StringVar(&tmpEmail, "email", "", "The support email")
-	// ccb.PersistentFlags().StringVar(&tmpVersion, "version", "", "The version of the cookbook")
-	// ccb.PersistentFlags().StringVar(&tmpLevel, "level", "", "The level of the cookbook")
-
 	return ccb
 }

x/pylons/client/cli/tx/fiat_item.go

@@ -1,6 +1,8 @@
 package tx
 
 import (
+	"bufio"
+
 	"github.com/spf13/cobra"
 
 	"github.com/Pylons-tech/pylons/x/pylons/msgs"
@@ -21,9 +23,9 @@ func FiatItem(cdc *codec.Codec) *cobra.Command {
 		Short: "create item and assign it to sender",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			cliCtx := context.NewCLIContext().WithCodec(cdc).WithAccountDecoder(cdc)
-
-			txBldr := auth.NewTxBuilderFromCLI().WithTxEncoder(utils.GetTxEncoder(cdc))
+			cliCtx := context.NewCLIContext().WithCodec(cdc)
+			inBuf := bufio.NewReader(cmd.InOrStdin())
+			txBldr := auth.NewTxBuilderFromCLI(inBuf).WithTxEncoder(utils.GetTxEncoder(cdc))
 
 			if err := cliCtx.EnsureAccountExists(); err != nil {
 				return err
@@ -46,7 +48,7 @@ func FiatItem(cdc *codec.Codec) *cobra.Command {
 
 			cliCtx.PrintResponse = true
 
-			return utils.GenerateOrBroadcastMsgs(cliCtx, txBldr, []sdk.Msg{msgFI}, false)
+			return utils.GenerateOrBroadcastMsgs(cliCtx, txBldr, []sdk.Msg{msgFI})
 		},
 	}
 

x/pylons/client/cli/tx/get_pylons.go

@@ -1,6 +1,8 @@
 package tx
 
 import (
+	"bufio"
+
 	"github.com/spf13/cobra"
 
 	"github.com/Pylons-tech/pylons/x/pylons/msgs"
@@ -24,9 +26,9 @@ func GetPylons(cdc *codec.Codec) *cobra.Command {
 		Short: "ask for pylons. 500 pylons per request",
 		Args:  cobra.ExactArgs(0),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			cliCtx := context.NewCLIContext().WithCodec(cdc).WithAccountDecoder(cdc)
-
-			txBldr := auth.NewTxBuilderFromCLI().WithTxEncoder(utils.GetTxEncoder(cdc))
+			cliCtx := context.NewCLIContext().WithCodec(cdc)
+			inBuf := bufio.NewReader(cmd.InOrStdin())
+			txBldr := auth.NewTxBuilderFromCLI(inBuf).WithTxEncoder(utils.GetTxEncoder(cdc))
 
 			if err := cliCtx.EnsureAccountExists(); err != nil {
 				return err
@@ -40,7 +42,7 @@ func GetPylons(cdc *codec.Codec) *cobra.Command {
 
 			cliCtx.PrintResponse = true
 
-			return utils.GenerateOrBroadcastMsgs(cliCtx, txBldr, []sdk.Msg{msg}, false)
+			return utils.GenerateOrBroadcastMsgs(cliCtx, txBldr, []sdk.Msg{msg})
 		},
 	}
 }

x/pylons/client/cli/tx/send_pylons.go

@@ -1,6 +1,7 @@
 package tx
 
 import (
+	"bufio"
 	"errors"
 
 	"github.com/spf13/cobra"
@@ -24,9 +25,10 @@ func SendPylons(cdc *codec.Codec) *cobra.Command {
 		Short: "send pylons of specific amount to the name provided",
 		Args:  cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			cliCtx := context.NewCLIContext().WithCodec(cdc).WithAccountDecoder(cdc)
+			cliCtx := context.NewCLIContext().WithCodec(cdc)
 
-			txBldr := auth.NewTxBuilderFromCLI().WithTxEncoder(utils.GetTxEncoder(cdc))
+			inBuf := bufio.NewReader(cmd.InOrStdin())
+			txBldr := auth.NewTxBuilderFromCLI(inBuf).WithTxEncoder(utils.GetTxEncoder(cdc))
 
 			if err := cliCtx.EnsureAccountExists(); err != nil {
 				return err
@@ -60,7 +62,7 @@ func SendPylons(cdc *codec.Codec) *cobra.Command {
 
 			cliCtx.PrintResponse = true
 
-			return utils.GenerateOrBroadcastMsgs(cliCtx, txBldr, []sdk.Msg{msg}, false)
+			return utils.GenerateOrBroadcastMsgs(cliCtx, txBldr, []sdk.Msg{msg})
 		},
 	}
 }

x/pylons/client/cli/tx/update_cookbook.go

@@ -1,6 +1,8 @@
 package tx
 
 import (
+	"bufio"
+
 	"github.com/spf13/cobra"
 
 	"github.com/Pylons-tech/pylons/x/pylons/msgs"
@@ -25,9 +27,9 @@ func UpdateCookbook(cdc *codec.Codec) *cobra.Command {
 		Short: "update cookbook by providing the args",
 		Args:  cobra.ExactArgs(0),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			cliCtx := context.NewCLIContext().WithCodec(cdc).WithAccountDecoder(cdc)
-
-			txBldr := auth.NewTxBuilderFromCLI().WithTxEncoder(utils.GetTxEncoder(cdc))
+			cliCtx := context.NewCLIContext().WithCodec(cdc)
+			inBuf := bufio.NewReader(cmd.InOrStdin())
+			txBldr := auth.NewTxBuilderFromCLI(inBuf).WithTxEncoder(utils.GetTxEncoder(cdc))
 
 			if err := cliCtx.EnsureAccountExists(); err != nil {
 				return err
@@ -43,7 +45,7 @@ func UpdateCookbook(cdc *codec.Codec) *cobra.Command {
 
 			cliCtx.PrintResponse = true
 
-			return utils.GenerateOrBroadcastMsgs(cliCtx, txBldr, []sdk.Msg{msgCCB}, false)
+			return utils.GenerateOrBroadcastMsgs(cliCtx, txBldr, []sdk.Msg{msgCCB})
 		},
 	}
 

x/pylons/client/rest/address_from_pub_key.go

@@ -21,6 +21,6 @@ func addrFromPubkeyHandler(cdc *codec.Codec, cliCtx context.CLIContext, storeNam
 			return
 		}
 
-		rest.PostProcessResponse(w, cdc, res, cliCtx.Indent)
+		rest.PostProcessResponse(w, cliCtx, res)
 	}
 }

x/pylons/client/rest/items_by_cookbook.go

@@ -21,6 +21,6 @@ func itemsByCookbookHandler(cdc *codec.Codec, cliCtx context.CLIContext, storeNa
 			return
 		}
 
-		rest.PostProcessResponse(w, cdc, res, cliCtx.Indent)
+		rest.PostProcessResponse(w, cliCtx, res)
 	}
 }

x/pylons/client/rest/items_by_sender.go

@@ -21,6 +21,6 @@ func itemsBySenderHandler(cdc *codec.Codec, cliCtx context.CLIContext, storeName
 			return
 		}
 
-		rest.PostProcessResponse(w, cdc, res, cliCtx.Indent)
+		rest.PostProcessResponse(w, cliCtx, res)
 	}
 }

x/pylons/client/rest/list_cookbooks.go

@@ -15,12 +15,12 @@ func listCookbooksHandler(cdc *codec.Codec, cliCtx context.CLIContext, storeName
 		vars := mux.Vars(r)
 		ownerKey := vars[ownerKeyName]
 
-		res, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/list_cookbook/%s", storeName, ownerKey), nil)
+		res, _, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/list_cookbook/%s", storeName, ownerKey), nil)
 		if err != nil {
 			rest.WriteErrorResponse(w, http.StatusNotFound, err.Error())
 			return
 		}
 
-		rest.PostProcessResponse(w, cdc, res, cliCtx.Indent)
+		rest.PostProcessResponse(w, cliCtx, res)
 	}
 }

x/pylons/client/rest/list_executions.go

@@ -21,6 +21,6 @@ func listExecutionsHandler(cdc *codec.Codec, cliCtx context.CLIContext, storeNam
 			return
 		}
 
-		rest.PostProcessResponse(w, cdc, res, cliCtx.Indent)
+		rest.PostProcessResponse(w, cliCtx, res)
 	}
 }

x/pylons/client/rest/list_recipes.go

@@ -21,6 +21,6 @@ func listRecipesHandler(cdc *codec.Codec, cliCtx context.CLIContext, storeName s
 			return
 		}
 
-		rest.PostProcessResponse(w, cdc, res, cliCtx.Indent)
+		rest.PostProcessResponse(w, cliCtx, res)
 	}
 }

x/pylons/client/rest/list_trades.go

@@ -21,6 +21,6 @@ func listTradesHandler(cdc *codec.Codec, cliCtx context.CLIContext, storeName st
 			return
 		}
 
-		rest.PostProcessResponse(w, cdc, res, cliCtx.Indent)
+		rest.PostProcessResponse(w, cliCtx, res)
 	}
 }

x/pylons/client/rest/txbuilder/create_cookbook.go

@@ -3,6 +3,7 @@ package txbuilder
 // this module provides the fixtures to build a transaction
 
 import (
+	"bytes"
 	"net/http"
 
 	"github.com/Pylons-tech/pylons/x/pylons/msgs"
@@ -22,7 +23,7 @@ func CreateCookbookTxBuilder(cdc *codec.Codec, cliCtx context.CLIContext, storeN
 		// requester := vars[TxGPRequesterKey]
 		sender, err := sdk.AccAddressFromBech32("cosmos1y8vysg9hmvavkdxpvccv2ve3nssv5avm0kt337")
 
-		txBldr := auth.NewTxBuilderFromCLI().WithTxEncoder(utils.GetTxEncoder(cdc))
+		txBldr := auth.NewTxBuilderFromCLI(&bytes.Buffer{}).WithTxEncoder(utils.GetTxEncoder(cdc))
 
 		msg := msgs.NewMsgCreateCookbook("name", "", "this has to meet character limits lol", "SketchyCo", "1.0.0", "[email protected]", 0, msgs.DefaultCostPerBlock, sender)
 
@@ -32,6 +33,6 @@ func CreateCookbookTxBuilder(cdc *codec.Codec, cliCtx context.CLIContext, storeN
 			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
 		}
 
-		rest.PostProcessResponse(w, cdc, signMsg.Bytes(), cliCtx.Indent)
+		rest.PostProcessResponse(w, cliCtx, signMsg.Bytes())
 	}
 }