Merge branch 'develop' into davekaj/set-fee-collection-keeper

client/context/helpers.go

@@ -3,7 +3,7 @@ package context
 import (
 	"fmt"
 
-	"github.com/tendermint/tmlibs/common"
+	"github.com/tendermint/tendermint/libs/common"
 
 	"github.com/pkg/errors"
 
@@ -11,7 +11,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	rpcclient "github.com/tendermint/tendermint/rpc/client"
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/keys"
@@ -44,6 +44,22 @@ func (ctx CoreContext) BroadcastTx(tx []byte) (*ctypes.ResultBroadcastTxCommit,
 	return res, err
 }
 
+// Broadcast the transaction bytes to Tendermint
+func (ctx CoreContext) BroadcastTxAsync(tx []byte) (*ctypes.ResultBroadcastTx, error) {
+
+	node, err := ctx.GetNode()
+	if err != nil {
+		return nil, err
+	}
+
+	res, err := node.BroadcastTxAsync(tx)
+	if err != nil {
+		return res, err
+	}
+
+	return res, err
+}
+
 // Query information about the connected node
 func (ctx CoreContext) Query(path string) (res []byte, err error) {
 	return ctx.query(path, nil)
@@ -110,7 +126,7 @@ func (ctx CoreContext) GetFromAddress() (from sdk.Address, err error) {
 		return nil, errors.Errorf("no key for: %s", name)
 	}
 
-	return info.PubKey.Address(), nil
+	return info.GetPubKey().Address(), nil
 }
 
 // sign and build the transaction from the msg
@@ -136,8 +152,8 @@ func (ctx CoreContext) SignAndBuild(name, passphrase string, msgs []sdk.Msg, cdc
 
 	signMsg := auth.StdSignMsg{
 		ChainID:       chainID,
-		AccountNumber: int64(accnum),
-		Sequence:      int64(sequence),
+		AccountNumber: accnum,
+		Sequence:      sequence,
 		Msgs:          msgs,
 		Memo:          memo,
 		Fee:           auth.NewStdFee(ctx.Gas, fee), // TODO run simulate to estimate gas?
@@ -169,8 +185,7 @@ func (ctx CoreContext) SignAndBuild(name, passphrase string, msgs []sdk.Msg, cdc
 }
 
 // sign and build the transaction from the msg
-func (ctx CoreContext) EnsureSignBuildBroadcast(name string, msgs []sdk.Msg, cdc *wire.Codec) (res *ctypes.ResultBroadcastTxCommit, err error) {
-
+func (ctx CoreContext) ensureSignBuild(name string, msgs []sdk.Msg, cdc *wire.Codec) (tyBytes []byte, err error) {
 	ctx, err = EnsureAccountNumber(ctx)
 	if err != nil {
 		return nil, err
@@ -181,12 +196,37 @@ func (ctx CoreContext) EnsureSignBuildBroadcast(name string, msgs []sdk.Msg, cdc
 		return nil, err
 	}
 
-	passphrase, err := ctx.GetPassphraseFromStdin(name)
+	var txBytes []byte
+
+	keybase, err := keys.GetKeyBase()
 	if err != nil {
 		return nil, err
 	}
 
-	txBytes, err := ctx.SignAndBuild(name, passphrase, msgs, cdc)
+	info, err := keybase.Get(name)
+	if err != nil {
+		return nil, err
+	}
+	var passphrase string
+	// Only need a passphrase for locally-stored keys
+	if info.GetType() == "local" {
+		passphrase, err = ctx.GetPassphraseFromStdin(name)
+		if err != nil {
+			return nil, fmt.Errorf("Error fetching passphrase: %v", err)
+		}
+	}
+	txBytes, err = ctx.SignAndBuild(name, passphrase, msgs, cdc)
+	if err != nil {
+		return nil, fmt.Errorf("Error signing transaction: %v", err)
+	}
+
+	return txBytes, err
+}
+
+// sign and build the transaction from the msg
+func (ctx CoreContext) EnsureSignBuildBroadcast(name string, msgs []sdk.Msg, cdc *wire.Codec) (res *ctypes.ResultBroadcastTxCommit, err error) {
+
+	txBytes, err := ctx.ensureSignBuild(name, msgs, cdc)
 	if err != nil {
 		return nil, err
 	}
@@ -194,6 +234,17 @@ func (ctx CoreContext) EnsureSignBuildBroadcast(name string, msgs []sdk.Msg, cdc
 	return ctx.BroadcastTx(txBytes)
 }
 
+// sign and build the async transaction from the msg
+func (ctx CoreContext) EnsureSignBuildBroadcastAsync(name string, msgs []sdk.Msg, cdc *wire.Codec) (res *ctypes.ResultBroadcastTx, err error) {
+
+	txBytes, err := ctx.ensureSignBuild(name, msgs, cdc)
+	if err != nil {
+		return nil, err
+	}
+
+	return ctx.BroadcastTxAsync(txBytes)
+}
+
 // get the next sequence for the account address
 func (ctx CoreContext) GetAccountNumber(address []byte) (int64, error) {
 	if ctx.Decoder == nil {

client/context/types.go

@@ -21,6 +21,7 @@ type CoreContext struct {
 	Client          rpcclient.Client
 	Decoder         auth.AccountDecoder
 	AccountStore    string
+	UseLedger       bool
 }
 
 // WithChainID - return a copy of the context with an updated chainID
@@ -101,3 +102,9 @@ func (c CoreContext) WithAccountStore(accountStore string) CoreContext {
 	c.AccountStore = accountStore
 	return c
 }
+
+// WithUseLedger - return a copy of the context with an updated UseLedger
+func (c CoreContext) WithUseLedger(useLedger bool) CoreContext {
+	c.UseLedger = useLedger
+	return c
+}

client/context/viper.go

@@ -41,6 +41,7 @@ func NewCoreContextFromViper() CoreContext {
 		Client:          rpc,
 		Decoder:         nil,
 		AccountStore:    "acc",
+		UseLedger:       viper.GetBool(client.FlagUseLedger),
 	}
 }
 
@@ -57,7 +58,7 @@ func defaultChainID() (string, error) {
 	return doc.ChainID, nil
 }
 
-// EnsureSequence - automatically set sequence number if none provided
+// EnsureAccount - automatically set account number if none provided
 func EnsureAccountNumber(ctx CoreContext) (CoreContext, error) {
 	// Should be viper.IsSet, but this does not work - https://github.com/spf13/viper/pull/331
 	if viper.GetInt64(client.FlagAccountNumber) != 0 {