maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1297 from patricklodder/1.10-aux-rpc-target

Browse source 
Bring back "target" property of getauxblock
This commit is contained in:
Max K. 2015-10-13 23:10:33 +02:00
parent b8893fe7db 6cee9dcd28
commit 260c78ea9f
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qa/rpc-tests/test_framework/auxpow.py
View file

@ -63,7 +63,7 @@ def mineAuxpowBlock (node):
"""
auxblock = node.getauxblock ()
target = reverseHex (auxblock['_target'])
target = reverseHex (auxblock['target'])
apow = computeAuxpow (auxblock['hash'], target, True)
res = node.getauxblock (auxblock['hash'], apow)
assert res

2
qa/rpc-tests/test_framework/scrypt_auxpow.py
View file

@ -72,7 +72,7 @@ def mineScryptAux (node, chainid, ok):
"""
auxblock = node.getauxblock ()
target = auxpow.reverseHex (auxblock['_target'])
target = auxpow.reverseHex (auxblock['target'])
apow = computeAuxpowWithChainId (auxblock['hash'], target, chainid, ok)
res = node.getauxblock (auxblock['hash'], apow)

4
src/rpcmining.cpp
View file

@ -752,7 +752,7 @@ Value getauxblockbip22(const Array& params, bool fHelp)
" \"coinbasevalue\" (numeric) value of the block's coinbase\n"
" \"bits\" (string) compressed target of the block\n"
" \"height\" (numeric) height of the block\n"
" \"_target\" (string) target in reversed byte order, deprecated\n"
" \"target\" (string) target in reversed byte order\n"
"}\n"
"\nResult (with arguments):\n"
"xxxxx (boolean) whether the submitted block was correct\n"
@ -845,7 +845,7 @@ Value getauxblockbip22(const Array& params, bool fHelp)
result.push_back(Pair("coinbasevalue", (int64_t)block.vtx[0].vout[0].nValue));
result.push_back(Pair("bits", strprintf("%08x", block.nBits)));
result.push_back(Pair("height", static_cast<int64_t> (pindexPrev->nHeight + 1)));
result.push_back(Pair("_target", HexStr(BEGIN(target), END(target))));
result.push_back(Pair("target", HexStr(BEGIN(target), END(target))));
return result;
}