aboutsummaryrefslogtreecommitdiff
path: root/src/miner.h
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2014-10-12 03:26:42 +0000
committerjtimon <jtimon@jtimon.cc>2015-01-12 20:47:44 +0100
commit2ce63d395fe3d71e921ecd9f4263031b25efa14e (patch)
tree1aed1ef597e19f8ec0efcef917c59f152e8890f5 /src/miner.h
parent8e4578af0fc3944bff3c77f93b6aafe3a77e6f8a (diff)
downloadbitcoin-2ce63d395fe3d71e921ecd9f4263031b25efa14e.tar.xz
MOVEONLY: Move struct CBlockTemplate to miner.h (from main.h)
Diffstat (limited to 'src/miner.h')
-rw-r--r--src/miner.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/miner.h b/src/miner.h
index 3c08b030f6..593ddcd371 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -6,16 +6,21 @@
#ifndef BITCOIN_MINER_H
#define BITCOIN_MINER_H
+#include "primitives/block.h"
+
#include <stdint.h>
-class CBlock;
-class CBlockHeader;
class CBlockIndex;
class CReserveKey;
class CScript;
class CWallet;
-struct CBlockTemplate;
+struct CBlockTemplate
+{
+ CBlock block;
+ std::vector<CAmount> vTxFees;
+ std::vector<int64_t> vTxSigOps;
+};
/** Run the miner threads */
void GenerateBitcoins(bool fGenerate, CWallet* pwallet, int nThreads);