R4R: CoreContext Refactor

PENDING.md

@@ -27,6 +27,7 @@ BREAKING CHANGES
 * [x/gov] Governance parameters are now stored in globalparams store
 * [lcd] \#1866 Updated lcd /slashing/signing_info endpoint to take cosmosvalpub instead of cosmosvaladdr
 * [types] sdk.NewCoin now takes sdk.Int, sdk.NewInt64Coin takes int64
+* [cli] #1551: Officially removed `--name` from CLI commands
 * [cli] Genesis/key creation (`init`) now supports user-provided key passwords
 
 FEATURES
@@ -69,3 +70,14 @@ BUG FIXES
 *  \#1828 Force user to specify amount on create-validator command by removing default
 *  \#1839 Fixed bug where intra-tx counter wasn't set correctly for genesis validators
 * [tests] \#1675 Fix non-deterministic `test_cover` 
+* [client] \#1551: Refactored `CoreContext`
+  * Renamed `CoreContext` to `QueryContext`
+  * Removed all tx related fields and logic (building & signing) to separate
+  structure `TxContext` in `x/auth/client/context`
+  * Cleaned up documentation and API of what used to be `CoreContext`
+  * Implemented `KeyType` enum for key info
+
+BUG FIXES
+*  \#1666 Add intra-tx counter to the genesis validators
+* [tests] \#1551: Fixed invalid LCD test JSON payload in `doIBCTransfer`
+*  \#1787 Fixed bug where Tally fails due to revoked/unbonding validator

client/context/context.go

@@ -0,0 +1,115 @@
+package context
+
+import (
+	"io"
+
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/wire"
+	"github.com/cosmos/cosmos-sdk/x/auth"
+
+	"github.com/spf13/viper"
+
+	rpcclient "github.com/tendermint/tendermint/rpc/client"
+)
+
+const ctxAccStoreName = "acc"
+
+// CLIContext implements a typical CLI context created in SDK modules for
+// transaction handling and queries.
+type CLIContext struct {
+	Codec           *wire.Codec
+	AccDecoder      auth.AccountDecoder
+	Client          rpcclient.Client
+	Logger          io.Writer
+	Height          int64
+	NodeURI         string
+	FromAddressName string
+	AccountStore    string
+	TrustNode       bool
+	UseLedger       bool
+	Async           bool
+	JSON            bool
+	PrintResponse   bool
+}
+
+// NewCLIContext returns a new initialized CLIContext with parameters from the
+// command line using Viper.
+func NewCLIContext() CLIContext {
+	var rpc rpcclient.Client
+
+	nodeURI := viper.GetString(client.FlagNode)
+	if nodeURI != "" {
+		rpc = rpcclient.NewHTTP(nodeURI, "/websocket")
+	}
+
+	return CLIContext{
+		Client:          rpc,
+		NodeURI:         nodeURI,
+		AccountStore:    ctxAccStoreName,
+		FromAddressName: viper.GetString(client.FlagFrom),
+		Height:          viper.GetInt64(client.FlagHeight),
+		TrustNode:       viper.GetBool(client.FlagTrustNode),
+		UseLedger:       viper.GetBool(client.FlagUseLedger),
+		Async:           viper.GetBool(client.FlagAsync),
+		JSON:            viper.GetBool(client.FlagJson),
+		PrintResponse:   viper.GetBool(client.FlagPrintResponse),
+	}
+}
+
+// WithCodec returns a copy of the context with an updated codec.
+func (ctx CLIContext) WithCodec(cdc *wire.Codec) CLIContext {
+	ctx.Codec = cdc
+	return ctx
+}
+
+// WithAccountDecoder returns a copy of the context with an updated account
+// decoder.
+func (ctx CLIContext) WithAccountDecoder(decoder auth.AccountDecoder) CLIContext {
+	ctx.AccDecoder = decoder
+	return ctx
+}
+
+// WithLogger returns a copy of the context with an updated logger.
+func (ctx CLIContext) WithLogger(w io.Writer) CLIContext {
+	ctx.Logger = w
+	return ctx
+}
+
+// WithAccountStore returns a copy of the context with an updated AccountStore.
+func (ctx CLIContext) WithAccountStore(accountStore string) CLIContext {
+	ctx.AccountStore = accountStore
+	return ctx
+}
+
+// WithFromAddressName returns a copy of the context with an updated from
+// address.
+func (ctx CLIContext) WithFromAddressName(addrName string) CLIContext {
+	ctx.FromAddressName = addrName
+	return ctx
+}
+
+// WithTrustNode returns a copy of the context with an updated TrustNode flag.
+func (ctx CLIContext) WithTrustNode(trustNode bool) CLIContext {
+	ctx.TrustNode = trustNode
+	return ctx
+}
+
+// WithNodeURI returns a copy of the context with an updated node URI.
+func (ctx CLIContext) WithNodeURI(nodeURI string) CLIContext {
+	ctx.NodeURI = nodeURI
+	ctx.Client = rpcclient.NewHTTP(nodeURI, "/websocket")
+	return ctx
+}
+
+// WithClient returns a copy of the context with an updated RPC client
+// instance.
+func (ctx CLIContext) WithClient(client rpcclient.Client) CLIContext {
+	ctx.Client = client
+	return ctx
+}
+
+// WithUseLedger returns a copy of the context with an updated UseLedger flag.
+func (ctx CLIContext) WithUseLedger(useLedger bool) CLIContext {
+	ctx.UseLedger = useLedger
+	return ctx
+}

client/context/errors.go

@@ -0,0 +1,13 @@
+package context
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/pkg/errors"
+)
+
+// ErrInvalidAccount returns a standardized error reflecting that a given
+// account address does not exist.
+func ErrInvalidAccount(addr sdk.AccAddress) error {
+	return errors.Errorf(`No account with address %s was found in the state.
+Are you sure there has been a transaction involving it?`, addr)
+}