From 36b54e190f9e902b8a1610a29bf7ae00920d9bb3 Mon Sep 17 00:00:00 2001
From: Juan Leni <jleni@users.noreply.github.com>
Date: Mon, 13 Aug 2018 18:15:55 +0200
Subject: [PATCH 1/6] Merge PR #2003: Update upstream Ledger Go client

---
 Gopkg.lock | 4 ++--
 Gopkg.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 3383e66598..6e45f42b09 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -490,11 +490,11 @@
   version = "v0.23.0"
 
 [[projects]]
-  digest = "1:2ea7665579c64cda1873a395de97a2af02df1d06f4cb52128caf57f13249303c"
+  digest = "1:4dcb0dd65feecb068ce23a234d1a07c7868a1e39f52a6defcae0bb371d03abf6"
   name = "github.com/zondax/ledger-goclient"
   packages = ["."]
   pruneopts = "UT"
-  revision = "a05312e1c998ad831b70eea41d009654f7f95985"
+  revision = "4296ee5701e945f9b3a7dbe51f402e0b9be57259"
 
 [[projects]]
   branch = "master"
diff --git a/Gopkg.toml b/Gopkg.toml
index 63356c240c..0651fe1f5f 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -65,7 +65,7 @@
 
 [[constraint]]
   name = "github.com/zondax/ledger-goclient"
-  revision = "a05312e1c998ad831b70eea41d009654f7f95985"
+  revision = "4296ee5701e945f9b3a7dbe51f402e0b9be57259"
 
 [prune]
   go-tests = true

From 1854430e7b66381400edf6f965d6a3fe18270393 Mon Sep 17 00:00:00 2001
From: Dev Ojha <ValarDragon@users.noreply.github.com>
Date: Mon, 13 Aug 2018 11:42:38 -0700
Subject: [PATCH 2/6] makefile: Improve error message when LEDGER_ENABLED=True
 & no gcc (#2008)

Closes #2005
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 208b59ade1..a280a5f1f5 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ ci: get_tools get_vendor_deps install test_cover test_lint test
 check-ledger: 
 ifeq ($(LEDGER_ENABLED),true)
 ifndef GCC
-$(error "gcc not installed for ledger support, please install")
+$(error "gcc not installed for ledger support, please install or set LEDGER_ENABLED to false in the Makefile")
 endif
 else
 TMP_BUILD_TAGS := $(BUILD_TAGS)

From 63713c9378b4d6092669c3542ba106470ec7eaf7 Mon Sep 17 00:00:00 2001
From: Federico Kunze <31522760+fedekunze@users.noreply.github.com>
Date: Tue, 14 Aug 2018 00:06:48 +0200
Subject: [PATCH 3/6] Merge pull request #2000: tests for staking lcd

* Added tests for Delegator Validators routes

* Updated tests for undelegations

* Updated Gaia-lite docs

* Updated PENDING.md

* Updated comments

* Deleted more comments

* Add spacing
---
 PENDING.md                     |  17 +++--
 client/lcd/lcd_test.go         | 131 ++++++++++++++++++++-------------
 docs/clients/lcd-rest-api.yaml |  43 +++++++++++
 docs/light/api.md              |  56 ++++++++++++++
 docs/light/specification.md    |   8 ++
 x/stake/client/rest/query.go   |  25 +++++--
 x/stake/client/rest/utils.go   |   4 -
 7 files changed, 214 insertions(+), 70 deletions(-)

diff --git a/PENDING.md b/PENDING.md
index 4ca3e6df54..be173d5311 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -1,15 +1,15 @@
-## v0.24.0 PENDING 
+## v0.24.0 PENDING
 ^--- PENDING wasn't purged on sdk v0.23.0 release.
 
 BREAKING CHANGES
-* Update to tendermint v0.23.0. This involves removing crypto.Pubkey, 
+* Update to tendermint v0.23.0. This involves removing crypto.Pubkey,
 maintaining a validator address to pubkey map, and using time.Time instead of int64 for time. [SDK PR](https://github.com/cosmos/cosmos-sdk/pull/1927)
 
 ## PENDING
 
 BREAKING CHANGES
 * API
-  - \#1880 [x/stake] changed the endpoints to be more REST-ful
+  - \#1880 and \#2000 [x/stake] changed the endpoints to be more REST-ful
 * Update to tendermint v0.22.5. This involves changing all of the cryptography imports. [Ref](https://github.com/tendermint/tendermint/pull/1966)
 * [baseapp] Msgs are no longer run on CheckTx, removed `ctx.IsCheckTx()`
 * [x/gov] CLI flag changed from `proposalID` to `proposal-id`
@@ -32,7 +32,7 @@ BREAKING CHANGES
   * `gaiacli gov submit-proposal --proposer`
   * `gaiacli gov deposit --depositer`
   * `gaiacli gov vote --voter`
-* [x/gov] Added tags sub-package, changed tags to use dash-case 
+* [x/gov] Added tags sub-package, changed tags to use dash-case
 * [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
@@ -46,7 +46,7 @@ FEATURES
   * Modules can test random combinations of their own operations
   * Applications can integrate operations and invariants from modules together for an integrated simulation
 * [baseapp] Initialize validator set on ResponseInitChain
-* [cosmos-sdk-cli] Added support for cosmos-sdk-cli tool under cosmos-sdk/cmd	
+* [cosmos-sdk-cli] Added support for cosmos-sdk-cli tool under cosmos-sdk/cmd
    * This allows SDK users to initialize a new project repository.
 * [tests] Remotenet commands for AWS (awsnet)
 * [networks] Added ansible scripts to upgrade seed nodes on a network
@@ -62,7 +62,7 @@ IMPROVEMENTS
 * [cli] Improve error messages for all txs when the account doesn't exist
 * [tools] Remove `rm -rf vendor/` from `make get_vendor_deps`
 * [x/auth] Recover ErrorOutOfGas panic in order to set sdk.Result attributes correctly
-* [x/stake] Add revoked to human-readable validator 
+* [x/stake] Add revoked to human-readable validator
 * [spec] \#967 Inflation and distribution specs drastically improved
 * [tests] Add tests to example apps in docs
 * [x/gov] Votes on a proposal can now be queried
@@ -70,8 +70,9 @@ IMPROVEMENTS
 * [tests] Fixes ansible scripts to work with AWS too
 * [tests] \#1806 CLI tests are now behind the build flag 'cli_test', so go test works on a new repo
 * [x/gov] Initial governance parameters can now be set in the genesis file
-* [x/stake] \#1815 Sped up the processing of `EditValidator` txs. 
+* [x/stake] \#1815 Sped up the processing of `EditValidator` txs.
 * [server] \#1930 Transactions indexer indexes all tags by default.
+* [x/stake] \#2000 Added tests for new staking endpoints
 
 BUG FIXES
 *  \#1666 Add intra-tx counter to the genesis validators
@@ -83,7 +84,7 @@ 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
 * [staking] [#1858](https://github.com/cosmos/cosmos-sdk/pull/1858) Fixed bug where the cliff validator was not be updated correctly
-* [tests] \#1675 Fix non-deterministic `test_cover` 
+* [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
diff --git a/client/lcd/lcd_test.go b/client/lcd/lcd_test.go
index cbc1a2c20d..9b8c5e4397 100644
--- a/client/lcd/lcd_test.go
+++ b/client/lcd/lcd_test.go
@@ -385,64 +385,70 @@ func TestValidatorQuery(t *testing.T) {
 
 func TestBonding(t *testing.T) {
 	name, password, denom := "test", "1234567890", "steak"
-	addr, seed := CreateAddr(t, "test", password, GetKeyBase(t))
+	addr, seed := CreateAddr(t, name, password, GetKeyBase(t))
 	cleanup, pks, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr})
 	defer cleanup()
 
 	validator1Owner := sdk.AccAddress(pks[0].Address())
+	validator := getValidator(t, port, validator1Owner)
 
-	// create bond TX
-	resultTx := doDelegate(t, port, seed, name, password, addr, validator1Owner)
+	resultTx := doDelegate(t, port, seed, name, password, addr, validator1Owner, 60)
 	tests.WaitForHeight(resultTx.Height+1, port)
 
-	// check if tx was committed
 	require.Equal(t, uint32(0), resultTx.CheckTx.Code)
 	require.Equal(t, uint32(0), resultTx.DeliverTx.Code)
 
-	// query sender
 	acc := getAccount(t, port, addr)
 	coins := acc.GetCoins()
 
 	require.Equal(t, int64(40), coins.AmountOf(denom).Int64())
 
-	// query validator
 	bond := getDelegation(t, port, addr, validator1Owner)
 	require.Equal(t, "60.0000000000", bond.Shares)
 
+	summary := getDelegationSummary(t, port, addr)
+
+	require.Len(t, summary.Delegations, 1, "Delegation summary holds all delegations")
+	require.Equal(t, "60.0000000000", summary.Delegations[0].Shares)
+	require.Len(t, summary.UnbondingDelegations, 0, "Delegation summary holds all unbonding-delegations")
+
+	bondedValidators := getDelegatorValidators(t, port, addr)
+	require.Len(t, bondedValidators, 1)
+	require.Equal(t, validator1Owner, bondedValidators[0].Owner)
+	require.Equal(t, validator.DelegatorShares.Add(sdk.NewRat(60)).FloatString(), bondedValidators[0].DelegatorShares.FloatString())
+
+	bondedValidator := getDelegatorValidator(t, port, addr, validator1Owner)
+	require.Equal(t, validator1Owner, bondedValidator.Owner)
+
 	//////////////////////
 	// testing unbonding
 
-	// create unbond TX
-	resultTx = doBeginUnbonding(t, port, seed, name, password, addr, validator1Owner)
+	resultTx = doBeginUnbonding(t, port, seed, name, password, addr, validator1Owner, 60)
 	tests.WaitForHeight(resultTx.Height+1, port)
 
-	// query validator
-	bond = getDelegation(t, port, addr, validator1Owner)
-	require.Equal(t, "30.0000000000", bond.Shares)
-
-	// check if tx was committed
 	require.Equal(t, uint32(0), resultTx.CheckTx.Code)
 	require.Equal(t, uint32(0), resultTx.DeliverTx.Code)
 
-	// should the sender should have not received any coins as the unbonding has only just begun
-	// query sender
+	// sender should have not received any coins as the unbonding has only just begun
 	acc = getAccount(t, port, addr)
 	coins = acc.GetCoins()
 	require.Equal(t, int64(40), coins.AmountOf("steak").Int64())
 
-	// query unbonding delegation
-	validatorAddr := sdk.AccAddress(pks[0].Address())
-	unbondings := getUndelegations(t, port, addr, validatorAddr)
-	assert.Len(t, unbondings, 1, "Unbondings holds all unbonding-delegations")
-	assert.Equal(t, "30", unbondings[0].Balance.Amount.String())
+	unbondings := getUndelegations(t, port, addr, validator1Owner)
+	require.Len(t, unbondings, 1, "Unbondings holds all unbonding-delegations")
+	require.Equal(t, "60", unbondings[0].Balance.Amount.String())
 
-	// query summary
-	summary := getDelegationSummary(t, port, addr)
+	summary = getDelegationSummary(t, port, addr)
 
-	assert.Len(t, summary.Delegations, 1, "Delegation summary holds all delegations")
-	assert.Equal(t, "30.0000000000", summary.Delegations[0].Shares)
-	assert.Len(t, summary.UnbondingDelegations, 1, "Delegation summary holds all unbonding-delegations")
-	assert.Equal(t, "30", summary.UnbondingDelegations[0].Balance.Amount.String())
+	require.Len(t, summary.Delegations, 0, "Delegation summary holds all delegations")
+	require.Len(t, summary.UnbondingDelegations, 1, "Delegation summary holds all unbonding-delegations")
+	require.Equal(t, "60", summary.UnbondingDelegations[0].Balance.Amount.String())
+
+	bondedValidators = getDelegatorValidators(t, port, addr)
+	require.Len(t, bondedValidators, 0, "There's no delegation as the user withdraw all funds")
+
+	// TODO Undonding status not currently implemented
+	// require.Equal(t, sdk.Unbonding, bondedValidators[0].Status)
 
 	// TODO add redelegation, need more complex capabilities such to mock context and
 	// TODO check summary for redelegation
@@ -757,64 +763,89 @@ func getSigningInfo(t *testing.T, port string, validatorPubKey string) slashing.
 // ============= Stake Module ================
 
 func getDelegation(t *testing.T, port string, delegatorAddr, validatorAddr sdk.AccAddress) rest.DelegationWithoutRat {
-
-	// get the account to get the sequence
 	res, body := Request(t, port, "GET", fmt.Sprintf("/stake/delegators/%s/delegations/%s", delegatorAddr, validatorAddr), nil)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)
+
 	var bond rest.DelegationWithoutRat
+
 	err := cdc.UnmarshalJSON([]byte(body), &bond)
 	require.Nil(t, err)
+
 	return bond
 }
 
 func getUndelegations(t *testing.T, port string, delegatorAddr, validatorAddr sdk.AccAddress) []stake.UnbondingDelegation {
-
-	// get the account to get the sequence
 	res, body := Request(t, port, "GET", fmt.Sprintf("/stake/delegators/%s/unbonding_delegations/%s", delegatorAddr, validatorAddr), nil)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)
+
 	var unbondings []stake.UnbondingDelegation
+
 	err := cdc.UnmarshalJSON([]byte(body), &unbondings)
 	require.Nil(t, err)
+
 	return unbondings
 }
 
 func getDelegationSummary(t *testing.T, port string, delegatorAddr sdk.AccAddress) rest.DelegationSummary {
-
-	// get the account to get the sequence
 	res, body := Request(t, port, "GET", fmt.Sprintf("/stake/delegators/%s", delegatorAddr), nil)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)
+
 	var summary rest.DelegationSummary
+
 	err := cdc.UnmarshalJSON([]byte(body), &summary)
 	require.Nil(t, err)
+
 	return summary
 }
 
 func getBondingTxs(t *testing.T, port string, delegatorAddr sdk.AccAddress, query string) []tx.Info {
-
-	// get the account to get the sequence
 	var res *http.Response
 	var body string
+
 	if len(query) > 0 {
 		res, body = Request(t, port, "GET", fmt.Sprintf("/stake/delegators/%s/txs?type=%s", delegatorAddr, query), nil)
 	} else {
 		res, body = Request(t, port, "GET", fmt.Sprintf("/stake/delegators/%s/txs", delegatorAddr), nil)
 	}
 	require.Equal(t, http.StatusOK, res.StatusCode, body)
+
 	var txs []tx.Info
+
 	err := cdc.UnmarshalJSON([]byte(body), &txs)
 	require.Nil(t, err)
+
 	return txs
 }
 
-func doDelegate(t *testing.T, port, seed, name, password string, delegatorAddr, validatorAddr sdk.AccAddress) (resultTx ctypes.ResultBroadcastTxCommit) {
-	// get the account to get the sequence
+func getDelegatorValidators(t *testing.T, port string, delegatorAddr sdk.AccAddress) []stake.BechValidator {
+	res, body := Request(t, port, "GET", fmt.Sprintf("/stake/delegators/%s/validators", delegatorAddr), nil)
+	require.Equal(t, http.StatusOK, res.StatusCode, body)
+
+	var bondedValidators []stake.BechValidator
+
+	err := cdc.UnmarshalJSON([]byte(body), &bondedValidators)
+	require.Nil(t, err)
+
+	return bondedValidators
+}
+
+func getDelegatorValidator(t *testing.T, port string, delegatorAddr sdk.AccAddress, validatorAddr sdk.AccAddress) stake.BechValidator {
+	res, body := Request(t, port, "GET", fmt.Sprintf("/stake/delegators/%s/validators/%s", delegatorAddr, validatorAddr), nil)
+	require.Equal(t, http.StatusOK, res.StatusCode, body)
+
+	var bondedValidator stake.BechValidator
+	err := cdc.UnmarshalJSON([]byte(body), &bondedValidator)
+	require.Nil(t, err)
+
+	return bondedValidator
+}
+
+func doDelegate(t *testing.T, port, seed, name, password string, delegatorAddr, validatorAddr sdk.AccAddress, amount int64) (resultTx ctypes.ResultBroadcastTxCommit) {
 	acc := getAccount(t, port, delegatorAddr)
 	accnum := acc.GetAccountNumber()
 	sequence := acc.GetSequence()
-
 	chainID := viper.GetString(client.FlagChainID)
 
-	// send
 	jsonStr := []byte(fmt.Sprintf(`{
 		"name": "%s",
 		"password": "%s",
@@ -826,14 +857,15 @@ func doDelegate(t *testing.T, port, seed, name, password string, delegatorAddr,
 			{
 				"delegator_addr": "%s",
 				"validator_addr": "%s",
-				"delegation": { "denom": "%s", "amount": "60" }
+				"delegation": { "denom": "%s", "amount": "%d" }
 			}
 		],
 		"begin_unbondings": [],
 		"complete_unbondings": [],
 		"begin_redelegates": [],
 		"complete_redelegates": []
-	}`, name, password, accnum, sequence, chainID, delegatorAddr, validatorAddr, "steak"))
+	}`, name, password, accnum, sequence, chainID, delegatorAddr, validatorAddr, "steak", amount))
+
 	res, body := Request(t, port, "POST", fmt.Sprintf("/stake/delegators/%s/delegations", delegatorAddr), jsonStr)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)
 
@@ -845,16 +877,13 @@ func doDelegate(t *testing.T, port, seed, name, password string, delegatorAddr,
 }
 
 func doBeginUnbonding(t *testing.T, port, seed, name, password string,
-	delegatorAddr, validatorAddr sdk.AccAddress) (resultTx ctypes.ResultBroadcastTxCommit) {
+	delegatorAddr, validatorAddr sdk.AccAddress, amount int64) (resultTx ctypes.ResultBroadcastTxCommit) {
 
-	// get the account to get the sequence
 	acc := getAccount(t, port, delegatorAddr)
 	accnum := acc.GetAccountNumber()
 	sequence := acc.GetSequence()
-
 	chainID := viper.GetString(client.FlagChainID)
 
-	// send
 	jsonStr := []byte(fmt.Sprintf(`{
 		"name": "%s",
 		"password": "%s",
@@ -867,13 +896,14 @@ func doBeginUnbonding(t *testing.T, port, seed, name, password string,
 			{
 				"delegator_addr": "%s",
 				"validator_addr": "%s",
-				"shares": "30"
+				"shares": "%d"
 			}
 		],
 		"complete_unbondings": [],
 		"begin_redelegates": [],
 		"complete_redelegates": []
-	}`, name, password, accnum, sequence, chainID, delegatorAddr, validatorAddr))
+	}`, name, password, accnum, sequence, chainID, delegatorAddr, validatorAddr, amount))
+
 	res, body := Request(t, port, "POST", fmt.Sprintf("/stake/delegators/%s/delegations", delegatorAddr), jsonStr)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)
 
@@ -887,14 +917,12 @@ func doBeginUnbonding(t *testing.T, port, seed, name, password string,
 func doBeginRedelegation(t *testing.T, port, seed, name, password string,
 	delegatorAddr, validatorSrcAddr, validatorDstAddr sdk.AccAddress) (resultTx ctypes.ResultBroadcastTxCommit) {
 
-	// get the account to get the sequence
 	acc := getAccount(t, port, delegatorAddr)
 	accnum := acc.GetAccountNumber()
 	sequence := acc.GetSequence()
 
 	chainID := viper.GetString(client.FlagChainID)
 
-	// send
 	jsonStr := []byte(fmt.Sprintf(`{
 		"name": "%s",
 		"password": "%s",
@@ -915,6 +943,7 @@ func doBeginRedelegation(t *testing.T, port, seed, name, password string,
 		],
 		"complete_redelegates": []
 	}`, name, password, accnum, sequence, chainID, delegatorAddr, validatorSrcAddr, validatorDstAddr))
+
 	res, body := Request(t, port, "POST", fmt.Sprintf("/stake/delegators/%s/delegations", delegatorAddr), jsonStr)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)
 
@@ -926,7 +955,6 @@ func doBeginRedelegation(t *testing.T, port, seed, name, password string,
 }
 
 func getValidators(t *testing.T, port string) []stake.BechValidator {
-	// get the account to get the sequence
 	res, body := Request(t, port, "GET", "/stake/validators", nil)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)
 	var validators []stake.BechValidator
@@ -936,7 +964,6 @@ func getValidators(t *testing.T, port string) []stake.BechValidator {
 }
 
 func getValidator(t *testing.T, port string, validatorAddr sdk.AccAddress) stake.BechValidator {
-	// get the account to get the sequence
 	res, body := Request(t, port, "GET", fmt.Sprintf("/stake/validators/%s", validatorAddr.String()), nil)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)
 	var validator stake.BechValidator
@@ -1034,7 +1061,7 @@ func getProposalsFilterStatus(t *testing.T, port string, status gov.ProposalStat
 }
 
 func doSubmitProposal(t *testing.T, port, seed, name, password string, proposerAddr sdk.AccAddress) (resultTx ctypes.ResultBroadcastTxCommit) {
-	// get the account to get the sequence
+
 	acc := getAccount(t, port, proposerAddr)
 	accnum := acc.GetAccountNumber()
 	sequence := acc.GetSequence()
@@ -1068,7 +1095,7 @@ func doSubmitProposal(t *testing.T, port, seed, name, password string, proposerA
 }
 
 func doDeposit(t *testing.T, port, seed, name, password string, proposerAddr sdk.AccAddress, proposalID int64) (resultTx ctypes.ResultBroadcastTxCommit) {
-	// get the account to get the sequence
+
 	acc := getAccount(t, port, proposerAddr)
 	accnum := acc.GetAccountNumber()
 	sequence := acc.GetSequence()
diff --git a/docs/clients/lcd-rest-api.yaml b/docs/clients/lcd-rest-api.yaml
index 063e3a55b8..3b8349f4bd 100644
--- a/docs/clients/lcd-rest-api.yaml
+++ b/docs/clients/lcd-rest-api.yaml
@@ -493,6 +493,49 @@ paths:
         500:
           description: Internal Server Error
 
+  /stake/delegators/{delegatorAddr}/validators:
+    parameters:
+      - in: path
+        name: delegatorAddr
+        description: Bech32 AccAddress of Delegator
+        required: true
+        type: string
+    get:
+      summary: Query all validators that a delegator is bonded to
+      tags:
+        - stake
+      produces:
+        - application/json
+      responses:
+        200:
+          description: OK
+        404:
+          description: Not Found
+
+  /stake/delegators/{delegatorAddr}/validators/{validatorAddr}:
+    parameters:
+      - in: path
+        name: delegatorAddr
+        description: Bech32 AccAddress of Delegator
+        required: true
+        type: string
+      - in: path
+        name: validatorAddr
+        description: Bech32 ValAddress of Delegator
+        required: true
+        type: string
+    get:
+      summary: Query a validator that a delegator is bonded to
+      tags:
+        - stake
+      produces:
+        - application/json
+      responses:
+        200:
+          description: OK
+        404:
+          description: Not Found
+
   /stake/delegators/{delegatorAddr}/txs:
     parameters:
       - in: path
diff --git a/docs/light/api.md b/docs/light/api.md
index 41abed5da6..d4e66eaf15 100644
--- a/docs/light/api.md
+++ b/docs/light/api.md
@@ -479,6 +479,62 @@ Returns on error:
 }
 ```
 
+### /stake/delegators/{delegatorAddr}/validators - GET
+
+url: /stake/delegators/{delegatorAddr}/validators
+
+Functionality: Query all validators that a delegator is bonded to.
+
+Returns on success:
+
+```json
+{
+    "rest api":"2.0",
+    "code":200,
+    "error":"",
+    "result":{}
+}
+```
+
+Returns on failure:
+
+```json
+{
+    "rest api":"2.0",
+    "code":500,
+    "error":"TODO",
+    "result":{}
+}
+```
+
+### /stake/delegators/{delegatorAddr}/validators/{validatorAddr} - GET
+
+url: /stake/delegators/{delegatorAddr}/validators/{validatorAddr}
+
+Functionality: Query a validator that a delegator is bonded to
+
+Returns on success:
+
+```json
+{
+    "rest api":"2.0",
+    "code":200,
+    "error":"",
+    "result":{}
+}
+```
+
+Returns on failure:
+
+```json
+{
+    "rest api":"2.0",
+    "code":500,
+    "error":"TODO",
+    "result":{}
+}
+```
+
 ### /stake/delegators/{delegatorAddr}/txs - GET
 
 url: /stake/delegators/{delegatorAddr}/txs
diff --git a/docs/light/specification.md b/docs/light/specification.md
index d8897b2444..15f36b0144 100644
--- a/docs/light/specification.md
+++ b/docs/light/specification.md
@@ -323,6 +323,14 @@ return KeyOutput{
 
 TODO
 
+### [/stake/delegators/{delegatorAddr}/validators](api.md#stakedelegatorsdelegatorAddrvalidators---get)
+
+TODO
+
+### [/stake/delegators/{delegatorAddr}/validators/{validatorAddr}](api.md#stakedelegatorsdelegatorAddrvalidatorsvalidatorAddr---get)
+
+TODO
+
 ### [/stake/delegators/{delegatorAddr}/txs](api.md#stakedelegatorsdelegatorAddrtxs---get)
 
 TODO
diff --git a/x/stake/client/rest/query.go b/x/stake/client/rest/query.go
index ac660f98f6..1741f88234 100644
--- a/x/stake/client/rest/query.go
+++ b/x/stake/client/rest/query.go
@@ -20,41 +20,54 @@ const storeName = "stake"
 
 func registerQueryRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *wire.Codec) {
 
-	// GET /stake/delegators/{delegatorAddr} // Get all delegations (delegation, undelegation and redelegation) from a delegator
+	// Get all delegations (delegation, undelegation and redelegation) from a delegator
 	r.HandleFunc(
 		"/stake/delegators/{delegatorAddr}",
 		delegatorHandlerFn(cliCtx, cdc),
 	).Methods("GET")
 
-	// GET /stake/delegators/{delegatorAddr}/txs?type=<bond/unbond/redelegate> // Get all staking txs (i.e msgs) from a delegator
+	// Get all staking txs (i.e msgs) from a delegator
 	r.HandleFunc(
 		"/stake/delegators/{delegatorAddr}/txs",
 		delegatorTxsHandlerFn(cliCtx, cdc),
 	).Methods("GET")
 
-	// GET /stake/delegators/{delegatorAddr}/delegations/{validatorAddr} // Query a delegation between a delegator and a validator
+	// Query all validators that a delegator is bonded to
+	r.HandleFunc(
+		"/stake/delegators/{delegatorAddr}/validators",
+		delegatorValidatorsHandlerFn(cliCtx, cdc),
+	).Methods("GET")
+
+	// Query a validator that a delegator is bonded to
+	r.HandleFunc(
+		"/stake/delegators/{delegatorAddr}/validators/{validatorAddr}",
+		delegatorValidatorHandlerFn(cliCtx, cdc),
+	).Methods("GET")
+
+	// Query a delegation between a delegator and a validator
 	r.HandleFunc(
 		"/stake/delegators/{delegatorAddr}/delegations/{validatorAddr}",
 		delegationHandlerFn(cliCtx, cdc),
 	).Methods("GET")
 
-	// GET /stake/delegators/{delegatorAddr}/unbonding_delegations/{validatorAddr} // Query all unbonding_delegations between a delegator and a validator
+	// Query all unbonding_delegations between a delegator and a validator
 	r.HandleFunc(
 		"/stake/delegators/{delegatorAddr}/unbonding_delegations/{validatorAddr}",
 		unbondingDelegationsHandlerFn(cliCtx, cdc),
 	).Methods("GET")
 
-	// GET /stake/validators/
+	// Get all validators
 	r.HandleFunc(
 		"/stake/validators",
 		validatorsHandlerFn(cliCtx, cdc),
 	).Methods("GET")
 
-	// GET /stake/validators/{addr}
+	// Get a single validator info
 	r.HandleFunc(
 		"/stake/validators/{addr}",
 		validatorHandlerFn(cliCtx, cdc),
 	).Methods("GET")
+
 }
 
 // already resolve the rational shares to not handle this in the client
diff --git a/x/stake/client/rest/utils.go b/x/stake/client/rest/utils.go
index 86e7146628..da00eda0bd 100644
--- a/x/stake/client/rest/utils.go
+++ b/x/stake/client/rest/utils.go
@@ -29,7 +29,6 @@ func contains(stringSlice []string, txType string) bool {
 func getDelegatorValidator(cliCtx context.CLIContext, cdc *wire.Codec, delegatorAddr sdk.AccAddress, validatorAccAddr sdk.AccAddress) (
 	validator types.BechValidator, httpStatusCode int, errMsg string, err error) {
 
-	// check if the delegator is bonded or redelegated to the validator
 	keyDel := stake.GetDelegationKey(delegatorAddr, validatorAccAddr)
 
 	res, err := cliCtx.QueryStore(keyDel, storeName)
@@ -46,7 +45,6 @@ func getDelegatorValidator(cliCtx context.CLIContext, cdc *wire.Codec, delegator
 		return types.BechValidator{}, http.StatusInternalServerError, "Error: ", err
 	}
 	if len(kvs) == 0 {
-		// the query will return empty if there are no delegations
 		return types.BechValidator{}, http.StatusNoContent, "", nil
 	}
 
@@ -65,7 +63,6 @@ func getDelegatorDelegations(cliCtx context.CLIContext, cdc *wire.Codec, delegat
 		return DelegationWithoutRat{}, http.StatusInternalServerError, "couldn't query delegation. Error: ", err
 	}
 
-	// the query will return empty if there is no data for this record
 	if len(marshalledDelegation) == 0 {
 		return DelegationWithoutRat{}, http.StatusNoContent, "", nil
 	}
@@ -93,7 +90,6 @@ func getDelegatorUndelegations(cliCtx context.CLIContext, cdc *wire.Codec, deleg
 		return types.UnbondingDelegation{}, http.StatusInternalServerError, "couldn't query unbonding-delegation. Error: ", err
 	}
 
-	// the query will return empty if there is no data for this record
 	if len(marshalledUnbondingDelegation) == 0 {
 		return types.UnbondingDelegation{}, http.StatusNoContent, "", nil
 	}

From 8fa2c3b4ea422940628d2813007b8d486b83ca3c Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 14 Aug 2018 01:23:42 -0700
Subject: [PATCH 4/6] Merge PR #1984: Replace _ with - in command names

Closes #1955
---
 PENDING.md                                             |  1 +
 cmd/gaia/cli_test/cli_test.go                          |  6 +++---
 docs/getting-started/full-node.md                      |  2 +-
 docs/sdk/clients.md                                    | 10 +++++-----
 docs/validators/validator-setup.md                     |  6 +++---
 examples/README.md                                     |  2 +-
 .../remote/ansible/roles/upgrade-gaiad/tasks/main.yml  |  2 +-
 server/tm_cmds.go                                      |  6 +++---
 8 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/PENDING.md b/PENDING.md
index be173d5311..a20dac238b 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -38,6 +38,7 @@ BREAKING CHANGES
 * [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
+* [cli] unsafe_reset_all, show_validator, and show_node_id have been renamed to unsafe-reset-all, show-validator, and show-node-id
 
 FEATURES
 * [lcd] Can now query governance proposals by ProposalStatus
diff --git a/cmd/gaia/cli_test/cli_test.go b/cmd/gaia/cli_test/cli_test.go
index 8d652bc435..ea4f2e47de 100644
--- a/cmd/gaia/cli_test/cli_test.go
+++ b/cmd/gaia/cli_test/cli_test.go
@@ -34,7 +34,7 @@ func init() {
 }
 
 func TestGaiaCLISend(t *testing.T) {
-	tests.ExecuteT(t, fmt.Sprintf("gaiad --home=%s unsafe_reset_all", gaiadHome), "")
+	tests.ExecuteT(t, fmt.Sprintf("gaiad --home=%s unsafe-reset-all", gaiadHome), "")
 	executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s foo", gaiacliHome), app.DefaultKeyPass)
 	executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s bar", gaiacliHome), app.DefaultKeyPass)
 
@@ -87,7 +87,7 @@ func TestGaiaCLISend(t *testing.T) {
 }
 
 func TestGaiaCLICreateValidator(t *testing.T) {
-	tests.ExecuteT(t, fmt.Sprintf("gaiad --home=%s unsafe_reset_all", gaiadHome), "")
+	tests.ExecuteT(t, fmt.Sprintf("gaiad --home=%s unsafe-reset-all", gaiadHome), "")
 	executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s foo", gaiacliHome), app.DefaultKeyPass)
 	executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s bar", gaiacliHome), app.DefaultKeyPass)
 	chainID := executeInit(t, fmt.Sprintf("gaiad init -o --name=foo --home=%s --home-client=%s", gaiadHome, gaiacliHome))
@@ -153,7 +153,7 @@ func TestGaiaCLICreateValidator(t *testing.T) {
 }
 
 func TestGaiaCLISubmitProposal(t *testing.T) {
-	tests.ExecuteT(t, fmt.Sprintf("gaiad --home=%s unsafe_reset_all", gaiadHome), "")
+	tests.ExecuteT(t, fmt.Sprintf("gaiad --home=%s unsafe-reset-all", gaiadHome), "")
 	executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s foo", gaiacliHome), app.DefaultKeyPass)
 	executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s bar", gaiacliHome), app.DefaultKeyPass)
 	chainID := executeInit(t, fmt.Sprintf("gaiad init -o --name=foo --home=%s --home-client=%s", gaiadHome, gaiacliHome))
diff --git a/docs/getting-started/full-node.md b/docs/getting-started/full-node.md
index 1add3f8c0b..87c28581b1 100644
--- a/docs/getting-started/full-node.md
+++ b/docs/getting-started/full-node.md
@@ -41,7 +41,7 @@ First, remove the outdated files and reset the data.
 
 ```bash
 rm $HOME/.gaiad/config/addrbook.json $HOME/.gaiad/config/genesis.json
-gaiad unsafe_reset_all
+gaiad unsafe-reset-all
 ```
 
 Your node is now in a pristine state while keeping the original `priv_validator.json` and `config.toml`. If you had any sentry nodes or full nodes setup before,
diff --git a/docs/sdk/clients.md b/docs/sdk/clients.md
index f24f5b46dc..5d02548a27 100644
--- a/docs/sdk/clients.md
+++ b/docs/sdk/clients.md
@@ -29,7 +29,7 @@ There are three types of key representations that are used:
 
 - `cosmosvalpub`
   - Generated when the node is created with `gaiad init`.
-  - Get this value with `gaiad tendermint show_validator`
+  - Get this value with `gaiad tendermint show-validator`
   - e.g. `cosmosvalpub1zcjduc3qcyj09qc03elte23zwshdx92jm6ce88fgc90rtqhjx8v0608qh5ssp0w94c`
 
 ### Generate Keys
@@ -59,7 +59,7 @@ gaiacli keys list
 View the validator pubkey for your node by typing:
 
 ```bash
-gaiad tendermint show_validator
+gaiad tendermint show-validator
 ```
 
 ::: danger Warning
@@ -120,7 +120,7 @@ On the testnet, we delegate `steak` instead of `atom`. Here's how you can bond t
 ```bash
 gaiacli stake delegate \
   --amount=10steak \
-  --address-validator=$(gaiad tendermint show_validator) \
+  --address-validator=$(gaiad tendermint show-validator) \
   --name=<key_name> \
   --chain-id=gaia-7005
 ```
@@ -137,7 +137,7 @@ If for any reason the validator misbehaves, or you want to unbond a certain amou
 
 ```bash
 gaiacli stake unbond begin \
-  --address-validator=$(gaiad tendermint show_validator) \
+  --address-validator=$(gaiad tendermint show-validator) \
   --shares=MAX \
   --name=<key_name> \
   --chain-id=gaia-7005
@@ -152,7 +152,7 @@ gaiacli account <account_cosmosaccaddr>
 
 gaiacli stake delegation \
   --address-delegator=<account_cosmosaccaddr> \
-  --address-validator=$(gaiad tendermint show_validator) \
+  --address-validator=$(gaiad tendermint show-validator) \
   --chain-id=gaia-7005
 ```
 
diff --git a/docs/validators/validator-setup.md b/docs/validators/validator-setup.md
index bac2c441da..dc3bf147f0 100644
--- a/docs/validators/validator-setup.md
+++ b/docs/validators/validator-setup.md
@@ -19,7 +19,7 @@ If you want to become a validator for the Hub's `mainnet`, you should [research
 Your `cosmosvalpub` can be used to create a new validator by staking tokens. You can find your validator pubkey by running:
 
 ```bash
-gaiad tendermint show_validator
+gaiad tendermint show-validator
 ```
 
 Next, craft your `gaiacli stake create-validator` command:
@@ -31,7 +31,7 @@ Don't use more `steak` thank you have! You can always get more by using the [Fau
 ```bash
 gaiacli stake create-validator \
   --amount=5steak \
-  --pubkey=$(gaiad tendermint show_validator) \
+  --pubkey=$(gaiad tendermint show-validator) \
   --address-validator=<account_cosmosaccaddr>
   --moniker="choose a moniker" \
   --chain-id=gaia-7005 \
@@ -70,7 +70,7 @@ gaiacli stake validator \
 Your validator is active if the following command returns anything:
 
 ```bash
-gaiacli advanced tendermint validator-set | grep "$(gaiad tendermint show_validator)"
+gaiacli advanced tendermint validator-set | grep "$(gaiad tendermint show-validator)"
 ```
 
 You should also be able to see your validator on the [Explorer](https://explorecosmos.network/validators). You are looking for the `bech32` encoded `address` in the `~/.gaiad/config/priv_validator.json` file.
diff --git a/examples/README.md b/examples/README.md
index 8625cead6c..33af1b3284 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -179,7 +179,7 @@ starting this tutorial again or trying something new), the following
 commands are run:
 
 ```
-basecoind unsafe_reset_all
+basecoind unsafe-reset-all
 rm -rf ~/.basecoind
 rm -rf ~/.basecli
 ```
diff --git a/networks/remote/ansible/roles/upgrade-gaiad/tasks/main.yml b/networks/remote/ansible/roles/upgrade-gaiad/tasks/main.yml
index 03bdf40e09..ad705ada5d 100644
--- a/networks/remote/ansible/roles/upgrade-gaiad/tasks/main.yml
+++ b/networks/remote/ansible/roles/upgrade-gaiad/tasks/main.yml
@@ -24,6 +24,6 @@
 
 - name: Reset network
   when: UNSAFE_RESET_ALL | default(false) | bool
-  command: "sudo -u gaiad gaiad unsafe_reset_all"
+  command: "sudo -u gaiad gaiad unsafe-reset-all"
   notify: restart gaiad
 
diff --git a/server/tm_cmds.go b/server/tm_cmds.go
index 25d417a666..f852b4029a 100644
--- a/server/tm_cmds.go
+++ b/server/tm_cmds.go
@@ -16,7 +16,7 @@ import (
 // ShowNodeIDCmd - ported from Tendermint, dump node ID to stdout
 func ShowNodeIDCmd(ctx *Context) *cobra.Command {
 	return &cobra.Command{
-		Use:   "show_node_id",
+		Use:   "show-node-id",
 		Short: "Show this node's ID",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cfg := ctx.Config
@@ -34,7 +34,7 @@ func ShowNodeIDCmd(ctx *Context) *cobra.Command {
 func ShowValidatorCmd(ctx *Context) *cobra.Command {
 	flagJSON := "json"
 	cmd := cobra.Command{
-		Use:   "show_validator",
+		Use:   "show-validator",
 		Short: "Show this node's tendermint validator info",
 		RunE: func(cmd *cobra.Command, args []string) error {
 
@@ -68,7 +68,7 @@ func ShowValidatorCmd(ctx *Context) *cobra.Command {
 // UnsafeResetAllCmd - extension of the tendermint command, resets initialization
 func UnsafeResetAllCmd(ctx *Context) *cobra.Command {
 	return &cobra.Command{
-		Use:   "unsafe_reset_all",
+		Use:   "unsafe-reset-all",
 		Short: "Reset blockchain database, priv_validator.json file, and the logger",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cfg := ctx.Config

From 9997ea22439bdaf374a163716e33f5aa09302662 Mon Sep 17 00:00:00 2001
From: Dev Ojha <ValarDragon@users.noreply.github.com>
Date: Tue, 14 Aug 2018 01:35:08 -0700
Subject: [PATCH 5/6] Merge PR #2016: dep: Fix error with scratch directory

If dep already sees its scratch directory (.vendor-new), dep ensure fails. This rm -rf's that directory so make get_vendor_deps doesn't fail.
---
 Makefile   | 1 +
 PENDING.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index a280a5f1f5..e0336aeb47 100644
--- a/Makefile
+++ b/Makefile
@@ -100,6 +100,7 @@ get_dev_tools:
 
 get_vendor_deps:
 	@echo "--> Running dep ensure"
+	@rm -rf .vendor-new
 	@dep ensure -v
 
 draw_deps:
diff --git a/PENDING.md b/PENDING.md
index a20dac238b..d527994968 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -74,6 +74,7 @@ IMPROVEMENTS
 * [x/stake] \#1815 Sped up the processing of `EditValidator` txs.
 * [server] \#1930 Transactions indexer indexes all tags by default.
 * [x/stake] \#2000 Added tests for new staking endpoints
+* [tools] Make get_vendor_deps deletes `.vendor-new` directories, in case scratch files are present.
 
 BUG FIXES
 *  \#1666 Add intra-tx counter to the genesis validators

From 0adbd60dfa9f0e851c1b2d3f7ada5392b5469ff4 Mon Sep 17 00:00:00 2001
From: Avi Saranga <avi@openbsd.org.il>
Date: Tue, 14 Aug 2018 01:39:27 -0700
Subject: [PATCH 6/6] Merge PR #1989: Openbsd support

---
 Makefile   | 17 ++++++++++++-----
 PENDING.md |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index e0336aeb47..28b4256fbf 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ BUILD_TAGS = netgo ledger
 BUILD_FLAGS = -tags "${BUILD_TAGS}" -ldflags "-X github.com/cosmos/cosmos-sdk/version.GitCommit=${COMMIT_HASH}"
 GCC := $(shell command -v gcc 2> /dev/null)
 LEDGER_ENABLED ?= true
+UNAME_S := $(shell uname -s)
 all: get_tools get_vendor_deps install install_examples install_cosmos-sdk-cli test_lint test
 
 ########################################
@@ -17,12 +18,18 @@ ci: get_tools get_vendor_deps install test_cover test_lint test
 
 check-ledger: 
 ifeq ($(LEDGER_ENABLED),true)
-ifndef GCC
-$(error "gcc not installed for ledger support, please install or set LEDGER_ENABLED to false in the Makefile")
-endif
+   	ifeq ($(UNAME_S),OpenBSD)
+   		$(info "OpenBSD detected, disabling ledger support (https://github.com/cosmos/cosmos-sdk/issues/1988)")
+   	   	TMP_BUILD_TAGS := $(BUILD_TAGS)
+   	   	BUILD_TAGS = $(filter-out ledger, $(TMP_BUILD_TAGS))
+   	else
+   	   	ifndef GCC
+   	   	   $(error "gcc not installed for ledger support, please install or set LEDGER_ENABLED to false in the Makefile")
+   	   	endif
+   	endif
 else
-TMP_BUILD_TAGS := $(BUILD_TAGS)
-BUILD_TAGS = $(filter-out ledger, $(TMP_BUILD_TAGS))
+	TMP_BUILD_TAGS := $(BUILD_TAGS)
+	BUILD_TAGS = $(filter-out ledger, $(TMP_BUILD_TAGS))
 endif
 
 build: check-ledger
diff --git a/PENDING.md b/PENDING.md
index d527994968..c9df61865a 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -77,6 +77,7 @@ IMPROVEMENTS
 * [tools] Make get_vendor_deps deletes `.vendor-new` directories, in case scratch files are present.
 
 BUG FIXES
+*  \#1988 Make us compile on OpenBSD (disable ledger) [#1988] (https://github.com/cosmos/cosmos-sdk/issues/1988)
 *  \#1666 Add intra-tx counter to the genesis validators
 *  \#1797 Fix off-by-one error in slashing for downtime
 *  \#1787 Fixed bug where Tally fails due to revoked/unbonding validator