[R4R]: add swagger-ui for gov, stake and slashing

client/keys/delete.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 	keys "github.com/cosmos/cosmos-sdk/crypto/keys"
+	keyerror "github.com/cosmos/cosmos-sdk/crypto/keys/keyerror"
 	"github.com/gorilla/mux"
 
 	"github.com/spf13/cobra"
@@ -81,11 +82,11 @@ func DeleteKeyRequestHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	err = kb.Delete(name, m.Password)
-	if IsKeyNotFoundErr(err, name) {
+	if keyerror.IsErrKeyNotFound(err) {
 		w.WriteHeader(http.StatusNotFound)
 		w.Write([]byte(err.Error()))
 		return
-	} else if IsWrongKeyPasswordErr(err) {
+	} else if keyerror.IsErrWrongPassword(err) {
 		w.WriteHeader(http.StatusUnauthorized)
 		w.Write([]byte(err.Error()))
 		return

client/keys/show.go

@@ -9,6 +9,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/tendermint/tendermint/libs/cli"
+	"github.com/cosmos/cosmos-sdk/crypto/keys/keyerror"
 )
 
 const (
@@ -108,7 +109,7 @@ func GetKeyRequestHandler(indent bool) http.HandlerFunc {
 		}
 
 		info, err := GetKeyInfo(name)
-		if IsKeyNotFoundErr(err, name) {
+		if keyerror.IsErrKeyNotFound(err) {
 			w.WriteHeader(http.StatusNotFound)
 			w.Write([]byte(err.Error()))
 			return

client/keys/update.go

@@ -10,6 +10,7 @@ import (
 	"github.com/gorilla/mux"
 
 	"github.com/spf13/cobra"
+	"github.com/cosmos/cosmos-sdk/crypto/keys/keyerror"
 )
 
 func updateKeyCommand() *cobra.Command {
@@ -84,11 +85,11 @@ func UpdateKeyRequestHandler(w http.ResponseWriter, r *http.Request) {
 	getNewpass := func() (string, error) { return m.NewPassword, nil }
 
 	err = kb.Update(name, m.OldPassword, getNewpass)
-	if IsKeyNotFoundErr(err, name) {
+	if keyerror.IsErrKeyNotFound(err) {
 		w.WriteHeader(http.StatusNotFound)
 		w.Write([]byte(err.Error()))
 		return
-	} else if IsWrongKeyPasswordErr(err) {
+	} else if keyerror.IsErrWrongPassword(err) {
 		w.WriteHeader(http.StatusUnauthorized)
 		w.Write([]byte(err.Error()))
 		return

client/keys/utils.go

@@ -15,7 +15,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"net/http"
-	"strings"
 )
 
 // KeyDBName is the directory under root where we store the keys
@@ -257,19 +256,3 @@ func PostProcessResponse(w http.ResponseWriter, cdc *codec.Codec, response inter
 	w.Header().Set("Content-Type", "application/json")
 	w.Write(output)
 }
-
-// IsKeyNotFoundErr - check if the error means that the specified key doesn't exist
-func IsKeyNotFoundErr(err error, name string) bool {
-	if err != nil && strings.Contains(err.Error(), fmt.Sprintf("Key %s not found", name)) {
-		return true
-	}
-	return false
-}
-
-// IsWrongKeyPasswordErr - check if the error means that the specified key password is wrong
-func IsWrongKeyPasswordErr(err error) bool {
-	if err != nil && strings.Contains(err.Error(), "Ciphertext decryption failed") {
-		return true
-	}
-	return false
-}

client/utils/rest.go

@@ -11,6 +11,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/context"
 	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/crypto/keys/keyerror"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	authtxb "github.com/cosmos/cosmos-sdk/x/auth/client/txbuilder"
@@ -229,14 +230,14 @@ func CompleteAndBroadcastTxREST(w http.ResponseWriter, r *http.Request, cliCtx c
 	}
 
 	txBytes, err := txBldr.BuildAndSign(baseReq.Name, baseReq.Password, msgs)
-	if IsKeyNotFoundErr(err, baseReq.Name) {
+	if keyerror.IsErrKeyNotFound(err) {
 		WriteErrorResponse(w, http.StatusBadRequest, err.Error())
 		return
-	} else if IsWrongKeyPasswordErr(err) {
+	} else if keyerror.IsErrWrongPassword(err) {
 		WriteErrorResponse(w, http.StatusUnauthorized, err.Error())
 		return
 	} else if err != nil {
-		WriteErrorResponse(w, http.StatusUnauthorized, err.Error())
+		WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
 		return
 	}
 
@@ -270,19 +271,3 @@ func PostProcessResponse(w http.ResponseWriter, cdc *codec.Codec, response inter
 	w.Header().Set("Content-Type", "application/json")
 	w.Write(output)
 }
-
-// IsKeyNotFoundErr - check if the error means that the specified key doesn't exist
-func IsKeyNotFoundErr(err error, name string) bool {
-	if err != nil && strings.Contains(err.Error(), fmt.Sprintf("Key %s not found", name)) {
-		return true
-	}
-	return false
-}
-
-// IsWrongKeyPasswordErr - check if the error means that the specified key password is wrong
-func IsWrongKeyPasswordErr(err error) bool {
-	if err != nil && strings.Contains(err.Error(), "Ciphertext decryption failed") {
-		return true
-	}
-	return false
-}

crypto/keys/keybase.go

@@ -19,6 +19,7 @@ import (
 	"github.com/tendermint/tendermint/crypto/encoding/amino"
 	"github.com/tendermint/tendermint/crypto/secp256k1"
 	dbm "github.com/tendermint/tendermint/libs/db"
+	"github.com/cosmos/cosmos-sdk/crypto/keys/keyerror"
 )
 
 var _ Keybase = dbKeybase{}
@@ -217,7 +218,7 @@ func (kb dbKeybase) List() ([]Info, error) {
 func (kb dbKeybase) Get(name string) (Info, error) {
 	bs := kb.db.Get(infoKey(name))
 	if len(bs) == 0 {
-		return nil, fmt.Errorf("Key %s not found", name)
+		return nil, keyerror.NewErrKeyNotFound(name)
 	}
 	return readInfo(bs)
 }

crypto/keys/keyerror/errors.go

@@ -0,0 +1,81 @@
+package keyerror
+
+import (
+	"fmt"
+)
+
+const (
+	codeKeyNotFound   = 1
+	codeWrongPassword = 2
+)
+
+type keybaseError interface {
+	error
+	Code() int
+}
+
+type errKeyNotFound struct {
+	code int
+	name string
+}
+
+func (e errKeyNotFound) Code() int {
+	return e.code
+}
+
+func (e errKeyNotFound) Error() string {
+	return fmt.Sprintf("Key %s not found", e.name)
+}
+
+// NewErrKeyNotFound returns a standardized error reflecting that the specified key doesn't exist
+func NewErrKeyNotFound(name string) error {
+	return errKeyNotFound{
+		code: codeKeyNotFound,
+		name: name,
+	}
+}
+
+// IsErrKeyNotFound returns true if the given error is errKeyNotFound
+func IsErrKeyNotFound(err error) bool {
+	if err == nil {
+		return false
+	}
+	if keyErr, ok := err.(keybaseError); ok {
+		if keyErr.Code() == codeKeyNotFound {
+			return true
+		}
+	}
+	return false
+}
+
+type errWrongPassword struct {
+	code int
+}
+
+func (e errWrongPassword) Code() int {
+	return e.code
+}
+
+func (e errWrongPassword) Error() string {
+	return fmt.Sprintf("Ciphertext decryption failed")
+}
+
+// NewErrWrongPassword returns a standardized error reflecting that the specified password is wrong
+func NewErrWrongPassword() error {
+	return errWrongPassword{
+		code: codeWrongPassword,
+	}
+}
+
+// IsErrWrongPassword returns true if the given error is errWrongPassword
+func IsErrWrongPassword(err error) bool {
+	if err == nil {
+		return false
+	}
+	if keyErr, ok := err.(keybaseError); ok {
+		if keyErr.Code() == codeWrongPassword {
+			return true
+		}
+	}
+	return false
+}

crypto/keys/mintkey/mintkey.go

@@ -12,6 +12,7 @@ import (
 	"github.com/tendermint/tendermint/crypto/xsalsa20symmetric"
 
 	cmn "github.com/tendermint/tendermint/libs/common"
+	"github.com/cosmos/cosmos-sdk/crypto/keys/keyerror"
 )
 
 const (
@@ -144,7 +145,9 @@ func decryptPrivKey(saltBytes []byte, encBytes []byte, passphrase string) (privK
 	}
 	key = crypto.Sha256(key) // Get 32 bytes
 	privKeyBytes, err := xsalsa20symmetric.DecryptSymmetric(encBytes, key)
-	if err != nil {
+	if err != nil && err.Error() == "Ciphertext decryption failed" {
+		return privKey, keyerror.NewErrWrongPassword()
+	} else if err != nil {
 		return privKey, err
 	}
 	privKey, err = cryptoAmino.PrivKeyFromBytes(privKeyBytes)

x/auth/client/rest/sign.go

@@ -9,6 +9,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	authtxb "github.com/cosmos/cosmos-sdk/x/auth/client/txbuilder"
+	"github.com/cosmos/cosmos-sdk/crypto/keys/keyerror"
 )
 
 // SignBody defines the properties of a sign request's body.
@@ -47,10 +48,10 @@ func SignTxRequestHandlerFn(cdc *codec.Codec, cliCtx context.CLIContext) http.Ha
 		}
 
 		signedTx, err := txBldr.SignStdTx(m.LocalAccountName, m.Password, m.Tx, m.AppendSig)
-		if utils.IsKeyNotFoundErr(err, m.LocalAccountName) {
+		if keyerror.IsErrKeyNotFound(err) {
 			utils.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
 			return
-		} else if utils.IsWrongKeyPasswordErr(err) {
+		} else if keyerror.IsErrWrongPassword(err) {
 			utils.WriteErrorResponse(w, http.StatusUnauthorized, err.Error())
 			return
 		} else if err != nil {