aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2011-09-29 07:57:22 -0700
committerGavin Andresen <gavinandresen@gmail.com>2011-09-29 07:57:22 -0700
commite8e0e23d203a21037e05d45e082278a3c4dbac95 (patch)
treecfa337e9f484d33d789a306846ad4942070cdf43
parent4dcad1d294e264a81280fd007d1508d9bd4f0273 (diff)
parentf8acc29fca44a0f4a5a6c0e0dc0ac9fed868d127 (diff)
downloadbitcoin-e8e0e23d203a21037e05d45e082278a3c4dbac95.tar.xz
Merge pull request #538 from tcatm/deprecate-midstate
deprecate midstate and hash1 in getwork
-rw-r--r--src/bitcoinrpc.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index 5a1fab6943..5df43c30f2 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -1482,9 +1482,9 @@ Value getwork(const Array& params, bool fHelp)
throw runtime_error(
"getwork [data]\n"
"If [data] is not specified, returns formatted hash data to work on:\n"
- " \"midstate\" : precomputed hash state after hashing the first half of the data\n"
+ " \"midstate\" : precomputed hash state after hashing the first half of the data (DEPRECATED)\n" // deprecated
" \"data\" : block data\n"
- " \"hash1\" : formatted hash buffer for second hash\n"
+ " \"hash1\" : formatted hash buffer for second hash (DEPRECATED)\n" // deprecated
" \"target\" : little endian hash target\n"
"If [data] is specified, tries to solve the block and returns true if it was successful.");
@@ -1548,9 +1548,9 @@ Value getwork(const Array& params, bool fHelp)
uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
Object result;
- result.push_back(Pair("midstate", HexStr(BEGIN(pmidstate), END(pmidstate))));
+ result.push_back(Pair("midstate", HexStr(BEGIN(pmidstate), END(pmidstate)))); // deprecated
result.push_back(Pair("data", HexStr(BEGIN(pdata), END(pdata))));
- result.push_back(Pair("hash1", HexStr(BEGIN(phash1), END(phash1))));
+ result.push_back(Pair("hash1", HexStr(BEGIN(phash1), END(phash1)))); // deprecated
result.push_back(Pair("target", HexStr(BEGIN(hashTarget), END(hashTarget))));
return result;
}