aboutsummaryrefslogtreecommitdiff
path: root/src/main.h
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2013-01-10 13:09:51 -0800
committerPieter Wuille <pieter.wuille@gmail.com>2013-01-10 13:09:51 -0800
commit45a1ec51b14aae32397a5e3e3d67ff9137855137 (patch)
tree09dc93d5c5be23976abff12687a67cf38b200a14 /src/main.h
parent429915bd0dfcdb03b13d9a3c2fb82d5401ef70ce (diff)
parentf3d872d1eabeb5c999162f709626ee20c8789c42 (diff)
downloadbitcoin-45a1ec51b14aae32397a5e3e3d67ff9137855137.tar.xz
Merge pull request #2115 from forrestv/getblocktemplate_allfees
Provide fee data for all txs in RPC getblocktemplate response
Diffstat (limited to 'src/main.h')
-rw-r--r--src/main.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h
index 8bceffbaf9..d34778d12f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -108,6 +108,8 @@ class CTxUndo;
class CCoinsView;
class CCoinsViewCache;
+struct CBlockTemplate;
+
/** Register a wallet to receive updates from core */
void RegisterWallet(CWallet* pwalletIn);
/** Unregister a wallet from core */
@@ -139,7 +141,7 @@ void ThreadImport(void *parg);
/** Run the miner threads */
void GenerateBitcoins(bool fGenerate, CWallet* pwallet);
/** Generate a new block, without valid proof-of-work */
-CBlock* CreateNewBlock(CReserveKey& reservekey);
+CBlockTemplate* CreateNewBlock(CReserveKey& reservekey);
/** Modify the extranonce in a block */
void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce);
/** Do mining precalculation */
@@ -1975,4 +1977,11 @@ extern CCoinsViewCache *pcoinsTip;
/** Global variable that points to the active block tree (protected by cs_main) */
extern CBlockTreeDB *pblocktree;
+struct CBlockTemplate
+{
+ CBlock block;
+ std::vector<int64_t> vTxFees;
+ std::vector<int64_t> vTxSigOps;
+};
+
#endif