Fixes #1081

client/flags.go

@@ -17,25 +17,32 @@ const (
 	DefaultGasLimit      = 200000
 	GasFlagSimulate      = "simulate"
 
-	FlagUseLedger      = "ledger"
-	FlagChainID        = "chain-id"
-	FlagNode           = "node"
-	FlagHeight         = "height"
-	FlagGas            = "gas"
-	FlagGasAdjustment  = "gas-adjustment"
-	FlagTrustNode      = "trust-node"
-	FlagFrom           = "from"
-	FlagName           = "name"
-	FlagAccountNumber  = "account-number"
-	FlagSequence       = "sequence"
-	FlagMemo           = "memo"
-	FlagFee            = "fee"
-	FlagAsync          = "async"
-	FlagJson           = "json"
-	FlagPrintResponse  = "print-response"
-	FlagDryRun         = "dry-run"
-	FlagGenerateOnly   = "generate-only"
-	FlagIndentResponse = "indent"
+	FlagUseLedger          = "ledger"
+	FlagChainID            = "chain-id"
+	FlagNode               = "node"
+	FlagHeight             = "height"
+	FlagGas                = "gas"
+	FlagGasAdjustment      = "gas-adjustment"
+	FlagTrustNode          = "trust-node"
+	FlagFrom               = "from"
+	FlagName               = "name"
+	FlagAccountNumber      = "account-number"
+	FlagSequence           = "sequence"
+	FlagMemo               = "memo"
+	FlagFee                = "fee"
+	FlagAsync              = "async"
+	FlagJson               = "json"
+	FlagPrintResponse      = "print-response"
+	FlagDryRun             = "dry-run"
+	FlagGenerateOnly       = "generate-only"
+	FlagIndentResponse     = "indent"
+	FlagListenAddr         = "laddr"
+	FlagCORS               = "cors"
+	FlagMaxOpenConnections = "max-open"
+	FlagInsecure           = "insecure"
+	FlagSSLHosts           = "ssl-hosts"
+	FlagSSLCertFile        = "ssl-certfile"
+	FlagSSLKeyFile         = "ssl-keyfile"
 )
 
 // LineBreak can be included in a command list to provide a blank line
@@ -92,6 +99,26 @@ func PostCommands(cmds ...*cobra.Command) []*cobra.Command {
 	return cmds
 }
 
+// RegisterRestServerFlags registers the flags required for rest server
+func RegisterRestServerFlags(cmd *cobra.Command) *cobra.Command {
+	cmd.Flags().String(FlagListenAddr, "tcp://localhost:1317", "The address for the server to listen on")
+	cmd.Flags().Bool(FlagInsecure, false, "Do not set up SSL/TLS layer")
+	cmd.Flags().String(FlagSSLHosts, "", "Comma-separated hostnames and IPs to generate a certificate for")
+	cmd.Flags().String(FlagSSLCertFile, "", "Path to a SSL certificate file. If not supplied, a self-signed certificate will be generated.")
+	cmd.Flags().String(FlagSSLKeyFile, "", "Path to a key file; ignored if a certificate file is not supplied.")
+	cmd.Flags().String(FlagCORS, "", "Set the domains that can make CORS requests (* for all)")
+	cmd.Flags().String(FlagChainID, "", "Chain ID of Tendermint node")
+	cmd.Flags().String(FlagNode, "tcp://localhost:26657", "Address of the node to connect to")
+	cmd.Flags().Int(FlagMaxOpenConnections, 1000, "The number of maximum open connections")
+	cmd.Flags().Bool(FlagTrustNode, false, "Trust connected full node (don't verify proofs for responses)")
+	cmd.Flags().Bool(FlagIndentResponse, false, "Add indent to JSON response")
+
+	viper.BindPFlag(FlagTrustNode, cmd.Flags().Lookup(FlagTrustNode))
+	viper.BindPFlag(FlagChainID, cmd.Flags().Lookup(FlagChainID))
+	viper.BindPFlag(FlagNode, cmd.Flags().Lookup(FlagNode))
+	return cmd
+}
+
 // Gas flag parsing functions
 
 // GasSetting encapsulates the possible values passed through the --gas flag.

client/keys/utils.go

@@ -2,9 +2,10 @@ package keys
 
 import (
 	"fmt"
-	"github.com/syndtr/goleveldb/leveldb/opt"
 	"path/filepath"
 
+	"github.com/syndtr/goleveldb/leveldb/opt"
+
 	"github.com/spf13/viper"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys"
@@ -13,9 +14,10 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 
+	"net/http"
+
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"net/http"
 )
 
 // KeyDBName is the directory under root where we store the keys