cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-16 02:18:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minimal adaptations to getmemorypool for BIP 34

Browse Source 
- As long as version 1 blocks are valid, provide them to getmemorypool clients (only)
- Include BIP 22 "height" key in getmemorypool output
This commit is contained in:
Luke Dashjr 2012-08-26 21:49:50 +00:00
parent 689b878c33
commit 52153a6e08
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bitcoinrpc.cpp
View File

@ -1744,6 +1744,7 @@ Value getmemorypool(const Array& params, bool fHelp)
" \"coinbasevalue\" : maximum allowable input to coinbase transaction, including the generation award and transaction fees\n"
" \"time\" : timestamp appropriate for next block\n"
" \"bits\" : compressed target of next block\n"
" \"height\" : height of the next block (backported, required by BIP 34)\n"
"If [data] is specified, tries to solve the block and returns true if it was successful.");
if (params.size() == 0)
@ -1779,6 +1780,12 @@ Value getmemorypool(const Array& params, bool fHelp)
pblock = NULL;
}
pblock = CreateNewBlock(reservekey);
if (!((!fTestNet && CBlockIndex::IsSuperMajority(2, pindexBest, 950, 1000)) ||
(fTestNet && CBlockIndex::IsSuperMajority(2, pindexBest, 75, 100))))
{
// As long as version 1 blocks are valid at all, use them to be more compatible with old implementations
pblock->nVersion = 1;
}
if (!pblock)
throw JSONRPCError(-7, "Out of memory");
@ -1814,6 +1821,7 @@ Value getmemorypool(const Array& params, bool fHelp)
} uBits;
uBits.nBits = htonl((int32_t)pblock->nBits);
result.push_back(Pair("bits", HexStr(BEGIN(uBits.cBits), END(uBits.cBits))));
result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight+1)));
return result;
}