diff options
| author | Forrest Voight <forrest@forre.st> | 2012-01-14 18:51:52 -0500 |
|---|---|---|
| committer | Forrest Voight <forrest@forre.st> | 2012-01-14 19:22:24 -0500 |
| commit | 52a3d2635c417c8e2398d9d4853db938171d406b (patch) | |
| tree | e5cecd765a59dcca04ad96d88ac94f922eb1b12c /src/bitcoinrpc.cpp | |
| parent | 9e8818ec9d01b3cf9e4aa601a96785c4fdc3f9b7 (diff) | |
| download | bitcoin-52a3d2635c417c8e2398d9d4853db938171d406b.tar.xz | |
Separated COINBASE_FLAGS out into main.h and made RPC getmemorypool return it
Diffstat (limited to 'src/bitcoinrpc.cpp')
| -rw-r--r-- | src/bitcoinrpc.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index db595cbf96..50375dd9d9 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -1871,6 +1871,7 @@ Value getmemorypool(const Array& params, bool fHelp) " \"previousblockhash\" : hash of current highest block\n" " \"transactions\" : contents of non-coinbase transactions that should be included in the next block\n" " \"coinbasevalue\" : maximum allowable input to coinbase transaction, including the generation award and transaction fees\n" + " \"coinbaseflags\" : data that should be included in coinbase so support for new features can be judged\n" " \"time\" : timestamp appropriate for next block\n" " \"bits\" : compressed target of next block\n" "If [data] is specified, tries to solve the block and returns true if it was successful."); @@ -1925,6 +1926,7 @@ Value getmemorypool(const Array& params, bool fHelp) result.push_back(Pair("previousblockhash", pblock->hashPrevBlock.GetHex())); result.push_back(Pair("transactions", transactions)); result.push_back(Pair("coinbasevalue", (int64_t)pblock->vtx[0].vout[0].nValue)); + result.push_back(Pair("coinbaseflags", HexStr(COINBASE_FLAGS.begin(), COINBASE_FLAGS.end()))); result.push_back(Pair("time", (int64_t)pblock->nTime)); union { |