Browse Source

Minor miner fixes (hey hey it's fun to say)

* Fix UpdateCoins() definition in main.h
* Remove pwalletMain reference from BitcoinMiner(), as it is passed
  a wallet argument.

Conflicts:
	src/main.h

Rebased-from: 18946846d5
0.8
Jeff Garzik 11 years ago committed by Warren Togami
parent
commit
0e65e7bd07
  1. 2
      src/main.cpp
  2. 3
      src/main.h

2
src/main.cpp

@ -4606,7 +4606,7 @@ void static LitecoinMiner(CWallet *pwallet) @@ -4606,7 +4606,7 @@ void static LitecoinMiner(CWallet *pwallet)
{
// Found a solution
SetThreadPriority(THREAD_PRIORITY_NORMAL);
CheckWork(pblock, *pwalletMain, reservekey);
CheckWork(pblock, *pwallet, reservekey);
SetThreadPriority(THREAD_PRIORITY_LOWEST);
break;
}

3
src/main.h

@ -621,6 +621,9 @@ public: @@ -621,6 +621,9 @@ public:
return dPriority > COIN * 576 / 250;
}
// Apply the effects of this transaction on the UTXO set represented by view
void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCache &inputs, CTxUndo &txundo, int nHeight, const uint256 &txhash);
int64 GetMinFee(unsigned int nBlockSize=1, bool fAllowFree=true, enum GetMinFee_mode mode=GMF_BLOCK) const;
friend bool operator==(const CTransaction& a, const CTransaction& b)

Loading…
Cancel
Save