Browse Source

MOVEONLY: Move void UpdateTime() from pow.o to miner.o (plus fix include main.h -> chain.h)

tags/v0.15.1
jtimon 7 years ago
parent
commit
22c4272bf4
4 changed files with 13 additions and 13 deletions
  1. 10
    0
      src/miner.cpp
  2. 2
    0
      src/miner.h
  3. 1
    11
      src/pow.cpp
  4. 0
    2
      src/pow.h

+ 10
- 0
src/miner.cpp View File

@@ -12,6 +12,7 @@
#include "main.h"
#include "net.h"
#include "pow.h"
#include "timedata.h"
#include "util.h"
#include "utilmoneystr.h"
#ifdef ENABLE_WALLET
@@ -78,6 +79,15 @@ public:
}
};

void UpdateTime(CBlockHeader* pblock, const CBlockIndex* pindexPrev)
{
pblock->nTime = std::max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());

// Updating time can change work required on testnet:
if (Params().AllowMinDifficultyBlocks())
pblock->nBits = GetNextWorkRequired(pindexPrev, pblock);
}

CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
{
// Create new block

+ 2
- 0
src/miner.h View File

@@ -9,6 +9,7 @@
#include <stdint.h>

class CBlock;
class CBlockHeader;
class CBlockIndex;
class CReserveKey;
class CScript;
@@ -25,6 +26,7 @@ CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey);
void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce);
/** Check mined block */
bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey);
void UpdateTime(CBlockHeader* block, const CBlockIndex* pindexPrev);

extern double dHashesPerSec;
extern int64_t nHPSTimerStart;

+ 1
- 11
src/pow.cpp View File

@@ -5,10 +5,9 @@

#include "pow.h"

#include "chain.h"
#include "chainparams.h"
#include "core/block.h"
#include "main.h"
#include "timedata.h"
#include "uint256.h"
#include "util.h"

@@ -98,15 +97,6 @@ bool CheckProofOfWork(uint256 hash, unsigned int nBits)
return true;
}

void UpdateTime(CBlockHeader* pblock, const CBlockIndex* pindexPrev)
{
pblock->nTime = std::max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());

// Updating time can change work required on testnet:
if (Params().AllowMinDifficultyBlocks())
pblock->nBits = GetNextWorkRequired(pindexPrev, pblock);
}

uint256 GetProofIncrement(unsigned int nBits)
{
uint256 bnTarget;

+ 0
- 2
src/pow.h View File

@@ -17,8 +17,6 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
/** Check whether a block hash satisfies the proof-of-work requirement specified by nBits */
bool CheckProofOfWork(uint256 hash, unsigned int nBits);

void UpdateTime(CBlockHeader* block, const CBlockIndex* pindexPrev);

uint256 GetProofIncrement(unsigned int nBits);

#endif // BITCOIN_POW_H

Loading…
Cancel
Save