Ledger integration (#931)

Merges the keybase and Ledger code from go-crypto (which is no more) into the SDK Adds support for Ledger into gaiacli Cherry-picks updated error handling from #1158
2018-06-29 02:54:47 +02:00
parent ac3adff1e8
commit 59aadf42aa
143 changed files with 2699 additions and 424 deletions
@@ -2,7 +2,6 @@ package lcd

 import (
 	"encoding/hex"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"regexp"
@@ -12,8 +11,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

-	abci "github.com/tendermint/abci/types"
-	cryptoKeys "github.com/tendermint/go-crypto/keys"
+	cryptoKeys "github.com/cosmos/cosmos-sdk/crypto/keys"
+	abci "github.com/tendermint/tendermint/abci/types"
 	p2p "github.com/tendermint/tendermint/p2p"
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tmlibs/common"
@@ -23,6 +22,7 @@ import (
 	rpc "github.com/cosmos/cosmos-sdk/client/rpc"
 	tests "github.com/cosmos/cosmos-sdk/tests"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/wire"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/gov"
 	"github.com/cosmos/cosmos-sdk/x/stake"
@@ -36,9 +36,9 @@ func TestKeys(t *testing.T) {
 	defer cleanup()

 	// get seed
+	// TODO Do we really need this endpoint?
 	res, body := Request(t, port, "GET", "/keys/seed", nil)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)
-	newSeed := body
 	reg, err := regexp.Compile(`([a-z]+ ){12}`)
 	require.Nil(t, err)
 	match := reg.MatchString(seed)
@@ -48,16 +48,14 @@ func TestKeys(t *testing.T) {
 	newPassword := "0987654321"

 	// add key
-	var jsonStr = []byte(fmt.Sprintf(`{"name":"test_fail", "password":"%s"}`, password))
-	res, body = Request(t, port, "POST", "/keys", jsonStr)
-
-	assert.Equal(t, http.StatusBadRequest, res.StatusCode, "Account creation should require a seed "+body)
-
-	jsonStr = []byte(fmt.Sprintf(`{"name":"%s", "password":"%s", "seed": "%s"}`, newName, newPassword, newSeed))
+	jsonStr := []byte(fmt.Sprintf(`{"name":"%s", "password":"%s"}`, newName, newPassword))
 	res, body = Request(t, port, "POST", "/keys", jsonStr)

 	require.Equal(t, http.StatusOK, res.StatusCode, body)
-	addr2 := body
+	var resp keys.NewKeyResponse
+	err = wire.Cdc.UnmarshalJSON([]byte(body), &resp)
+	require.Nil(t, err)
+	addr2 := resp.Address
 	assert.Len(t, addr2, 40, "Returned address has wrong format", addr2)

 	// existing keys
@@ -171,7 +169,7 @@ func TestBlock(t *testing.T) {
 	res, body = Request(t, port, "GET", "/blocks/1", nil)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)

-	err = json.Unmarshal([]byte(body), &resultBlock)
+	err = wire.Cdc.UnmarshalJSON([]byte(body), &resultBlock)
 	require.Nil(t, err, "Couldn't parse block")

 	assert.NotEqual(t, ctypes.ResultBlock{}, resultBlock)
@@ -604,9 +602,9 @@ func doSend(t *testing.T, port, seed, name, password string, addr sdk.Address) (

 	// create receive address
 	kb := client.MockKeyBase()
-	receiveInfo, _, err := kb.Create("receive_address", "1234567890", cryptoKeys.CryptoAlgo("ed25519"))
+	receiveInfo, _, err := kb.CreateMnemonic("receive_address", cryptoKeys.English, "1234567890", cryptoKeys.SigningAlgo("secp256k1"))
 	require.Nil(t, err)
-	receiveAddr = receiveInfo.PubKey.Address()
+	receiveAddr = receiveInfo.GetPubKey().Address()
 	receiveAddrBech := sdk.MustBech32ifyAcc(receiveAddr)

 	acc := getAccount(t, port, addr)
@@ -615,7 +613,7 @@ func doSend(t *testing.T, port, seed, name, password string, addr sdk.Address) (
 	chainID := viper.GetString(client.FlagChainID)

 	// send
-	coinbz, err := json.Marshal(sdk.NewCoin("steak", 1))
+	coinbz, err := cdc.MarshalJSON(sdk.NewCoin("steak", 1))
 	if err != nil {
 		panic(err)
 	}
@@ -623,9 +621,9 @@ func doSend(t *testing.T, port, seed, name, password string, addr sdk.Address) (
 	jsonStr := []byte(fmt.Sprintf(`{
 		"name":"%s",
 		"password":"%s",
-		"account_number":%d,
-		"sequence":%d,
-		"gas": 10000,
+		"account_number":"%d",
+		"sequence":"%d",
+		"gas": "10000",
 		"amount":[%s],
 		"chain_id":"%s"
 	}`, name, password, accnum, sequence, coinbz, chainID))
@@ -641,9 +639,9 @@ func doSend(t *testing.T, port, seed, name, password string, addr sdk.Address) (
 func doIBCTransfer(t *testing.T, port, seed, name, password string, addr sdk.Address) (resultTx ctypes.ResultBroadcastTxCommit) {
 	// create receive address
 	kb := client.MockKeyBase()
-	receiveInfo, _, err := kb.Create("receive_address", "1234567890", cryptoKeys.CryptoAlgo("ed25519"))
+	receiveInfo, _, err := kb.CreateMnemonic("receive_address", cryptoKeys.English, "1234567890", cryptoKeys.SigningAlgo("secp256k1"))
 	require.Nil(t, err)
-	receiveAddr := receiveInfo.PubKey.Address()
+	receiveAddr := receiveInfo.GetPubKey().Address()
 	receiveAddrBech := sdk.MustBech32ifyAcc(receiveAddr)

 	chainID := viper.GetString(client.FlagChainID)
@@ -657,14 +655,14 @@ func doIBCTransfer(t *testing.T, port, seed, name, password string, addr sdk.Add
 	jsonStr := []byte(fmt.Sprintf(`{
 		"name":"%s",
 		"password": "%s",
-		"account_number":%d,
-		"sequence": %d,
-		"gas": 100000,
+		"account_number":"%d",
+		"sequence": "%d",
+		"gas": "100000",
 		"chain_id": "%s",
 		"amount":[
 			{
 				"denom": "%s",
-				"amount": 1
+				"amount": "1"
 			}
 		]
 	}`, name, password, accnum, sequence, chainID, "steak"))
@@ -706,15 +704,15 @@ func doDelegate(t *testing.T, port, seed, name, password string, delegatorAddr,
 	jsonStr := []byte(fmt.Sprintf(`{
 		"name": "%s",
 		"password": "%s",
-		"account_number": %d,
-		"sequence": %d,
-		"gas": 10000,
+		"account_number": "%d",
+		"sequence": "%d",
+		"gas": "10000",
 		"chain_id": "%s",
 		"delegations": [
 			{
 				"delegator_addr": "%s",
 				"validator_addr": "%s",
-				"bond": { "denom": "%s", "amount": 60 }
+				"bond": { "denom": "%s", "amount": "60" }
 			}
 		],
 		"begin_unbondings": [],
@@ -749,9 +747,9 @@ func doBeginUnbonding(t *testing.T, port, seed, name, password string,
 	jsonStr := []byte(fmt.Sprintf(`{
 		"name": "%s",
 		"password": "%s",
-		"account_number": %d,
-		"sequence": %d,
-		"gas": 10000,
+		"account_number": "%d",
+		"sequence": "%d",
+		"gas": "10000",
 		"chain_id": "%s",
 		"delegations": [],
 		"begin_unbondings": [
@@ -793,9 +791,9 @@ func doBeginRedelegation(t *testing.T, port, seed, name, password string,
 	jsonStr := []byte(fmt.Sprintf(`{
 		"name": "%s",
 		"password": "%s",
-		"account_number": %d,
-		"sequence": %d,
-		"gas": 10000,
+		"account_number": "%d",
+		"sequence": "%d",
+		"gas": "10000",
 		"chain_id": "%s",
 		"delegations": [],
 		"begin_unbondings": [],
@@ -922,18 +920,17 @@ func doSubmitProposal(t *testing.T, port, seed, name, password string, proposerA
 		"description": "test",
 		"proposal_type": "Text",
 		"proposer": "%s",
-		"initial_deposit": [{ "denom": "steak", "amount": 5 }],
+		"initial_deposit": [{ "denom": "steak", "amount": "5" }],
 		"base_req": {
 			"name": "%s",
 			"password": "%s",
 			"chain_id": "%s",
-			"account_number": %d,
-			"sequence": %d,
-			"gas": 100000
+			"account_number":"%d",
+			"sequence":"%d",
+			"gas":"100000"
 		}
 	}`, bechProposerAddr, name, password, chainID, accnum, sequence))
 	res, body := Request(t, port, "POST", "/gov/proposals", jsonStr)
-	fmt.Println(res)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)

 	var results ctypes.ResultBroadcastTxCommit
@@ -956,18 +953,17 @@ func doDeposit(t *testing.T, port, seed, name, password string, proposerAddr sdk
 	// deposit on proposal
 	jsonStr := []byte(fmt.Sprintf(`{
 		"depositer": "%s",
-		"amount": [{ "denom": "steak", "amount": 5 }],
+		"amount": [{ "denom": "steak", "amount": "5" }],
 		"base_req": {
 			"name": "%s",
 			"password": "%s",
 			"chain_id": "%s",
-			"account_number": %d,
-			"sequence": %d,
-			"gas": 100000
+			"account_number":"%d",
+			"sequence": "%d",
+			"gas":"100000"
 		}
 	}`, bechProposerAddr, name, password, chainID, accnum, sequence))
 	res, body := Request(t, port, "POST", fmt.Sprintf("/gov/proposals/%d/deposits", proposalID), jsonStr)
-	fmt.Println(res)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)

 	var results ctypes.ResultBroadcastTxCommit
@@ -995,9 +991,9 @@ func doVote(t *testing.T, port, seed, name, password string, proposerAddr sdk.Ad
 			"name": "%s",
 			"password": "%s",
 			"chain_id": "%s",
-			"account_number": %d,
-			"sequence": %d,
-			"gas": 100000
+			"account_number": "%d",
+			"sequence": "%d",
+			"gas":"100000"
 		}
 	}`, bechProposerAddr, name, password, chainID, accnum, sequence))
 	res, body := Request(t, port, "POST", fmt.Sprintf("/gov/proposals/%d/votes", proposalID), jsonStr)
@@ -31,6 +31,7 @@ import (
 func ServeCommand(cdc *wire.Codec) *cobra.Command {
 	flagListenAddr := "laddr"
 	flagCORS := "cors"
+	flagMaxOpenConnections := "max-open"

 	cmd := &cobra.Command{
 		Use:   "rest-server",
@@ -40,7 +41,8 @@ func ServeCommand(cdc *wire.Codec) *cobra.Command {
 			handler := createHandler(cdc)
 			logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)).
 				With("module", "rest-server")
-			listener, err := tmserver.StartHTTPServer(listenAddr, handler, logger)
+			maxOpen := viper.GetInt(flagMaxOpenConnections)
+			listener, err := tmserver.StartHTTPServer(listenAddr, handler, logger, tmserver.Config{MaxOpenConnections: maxOpen})
 			if err != nil {
 				return err
 			}
@@ -58,6 +60,7 @@ func ServeCommand(cdc *wire.Codec) *cobra.Command {
 	cmd.Flags().String(flagCORS, "", "Set to domains that can make CORS requests (* for all)")
 	cmd.Flags().StringP(client.FlagChainID, "c", "", "ID of chain we connect to")
 	cmd.Flags().StringP(client.FlagNode, "n", "tcp://localhost:26657", "Node to connect to")
+	cmd.Flags().IntP(flagMaxOpenConnections, "o", 1000, "Maximum open connections")
 	return cmd
 }

@@ -15,10 +15,10 @@ import (
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"

-	abci "github.com/tendermint/abci/types"
-	crypto "github.com/tendermint/go-crypto"
-	crkeys "github.com/tendermint/go-crypto/keys"
+	crkeys "github.com/cosmos/cosmos-sdk/crypto/keys"
+	abci "github.com/tendermint/tendermint/abci/types"
 	tmcfg "github.com/tendermint/tendermint/config"
+	"github.com/tendermint/tendermint/crypto"
 	nm "github.com/tendermint/tendermint/node"
 	pvm "github.com/tendermint/tendermint/privval"
 	"github.com/tendermint/tendermint/proxy"
@@ -83,9 +83,9 @@ func GetKB(t *testing.T) crkeys.Keybase {
 func CreateAddr(t *testing.T, name, password string, kb crkeys.Keybase) (addr sdk.Address, seed string) {
 	var info crkeys.Info
 	var err error
-	info, seed, err = kb.Create(name, password, crkeys.AlgoEd25519)
+	info, seed, err = kb.CreateMnemonic(name, crkeys.English, password, crkeys.Secp256k1)
 	require.NoError(t, err)
-	addr = info.PubKey.Address()
+	addr = info.GetPubKey().Address()
 	return
 }

@@ -193,6 +193,7 @@ func startTM(tmcfg *tmcfg.Config, logger log.Logger, genDoc *tmtypes.GenesisDoc,
 		proxy.NewLocalClientCreator(app),
 		genDocProvider,
 		dbProvider,
+		nm.DefaultMetricsProvider,
 		logger.With("module", "node"))
 	if err != nil {
 		return nil, err
@@ -213,7 +214,7 @@ func startTM(tmcfg *tmcfg.Config, logger log.Logger, genDoc *tmtypes.GenesisDoc,
 // start the LCD. note this blocks!
 func startLCD(logger log.Logger, listenAddr string, cdc *wire.Codec) (net.Listener, error) {
 	handler := createHandler(cdc)
-	return tmrpc.StartHTTPServer(listenAddr, handler, logger)
+	return tmrpc.StartHTTPServer(listenAddr, handler, logger, tmrpc.Config{})
 }

 // make a test lcd test request