Add blockheight to getstakeinfo results (decred#282)

raedah · Jul 27, 2016 · 68bff37 · 68bff37
1 parent a6f2e09
commit 68bff37
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/internal/rpchelp/helpdescs_en_US.go b/internal/rpchelp/helpdescs_en_US.go
@@ -128,6 +128,7 @@ var helpDescsEnUS = map[string]string{
 	"getstakeinfo--synopsis": "Returns statistics about staking from the wallet.",
 
 	// GetStakeInfoResult help.
+	"getstakeinforesult-blockheight":      "Current block height for stake info.",
 	"getstakeinforesult-poolsize":         "Number of live tickets in the ticket pool.",
 	"getstakeinforesult-difficulty":       "Current stake difficulty.",
 	"getstakeinforesult-allmempooltix":    "Number of tickets currently in the mempool",

diff --git a/rpc/legacyrpc/methods.go b/rpc/legacyrpc/methods.go
@@ -1255,6 +1255,7 @@ func getStakeInfo(icmd interface{}, w *wallet.Wallet, chainClient *chain.RPCClie
 	}
 
 	resp := &dcrjson.GetStakeInfoResult{
+		BlockHeight:      stakeInfo.BlockHeight,
 		PoolSize:         stakeInfo.PoolSize,
 		Difficulty:       dcrutil.Amount(stakeDiff).ToCoin(),
 		AllMempoolTix:    stakeInfo.AllMempoolTix,

diff --git a/wallet/wallet.go b/wallet/wallet.go
@@ -2413,6 +2413,7 @@ func (w *Wallet) ImportScript(rs []byte, rescan bool, scanFrom int32) error {
 // StakeInfoData is a struct containing the data that would be returned from
 // a StakeInfo request to the wallet.
 type StakeInfoData struct {
+	BlockHeight   int64
 	PoolSize      uint32
 	AllMempoolTix uint32
 	OwnMempoolTix uint32
@@ -2615,6 +2616,7 @@ func (w *Wallet) StakeInfo() (*StakeInfoData, error) {
 
 	// Bring it all together.
 	resp := &StakeInfoData{
+		BlockHeight:   int64(bs.Height),
 		PoolSize:      poolSize,
 		AllMempoolTix: uint32(len(allMempoolTickets)),
 		OwnMempoolTix: uint32(len(localTicketsInMempool)),