diff options
| author | Jeff Garzik <jgarzik@bitpay.com> | 2013-07-31 08:45:49 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@bitpay.com> | 2013-07-31 08:45:49 -0400 |
| commit | 18946846d5c321d2afc11445580874c9a8bb0733 (patch) | |
| tree | f7f74b189fa9d1f17279160fb18d3d81655ff811 | |
| parent | 8351d55cd3955c95c5e3fe065a456db08cc8a559 (diff) | |
| download | bitcoin-18946846d5c321d2afc11445580874c9a8bb0733.tar.xz | |
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.
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/main.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 39e1a51599..1d72ef16e9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4681,7 +4681,7 @@ void static BitcoinMiner(CWallet *pwallet) assert(hash == pblock->GetHash()); SetThreadPriority(THREAD_PRIORITY_NORMAL); - CheckWork(pblock, *pwalletMain, reservekey); + CheckWork(pblock, *pwallet, reservekey); SetThreadPriority(THREAD_PRIORITY_LOWEST); // In regression test mode, stop mining after a block is found. This diff --git a/src/main.h b/src/main.h index 8ad2437c63..a42f7968fd 100644 --- a/src/main.h +++ b/src/main.h @@ -318,7 +318,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, CCoinsViewCach std::vector<CScriptCheck> *pvChecks = NULL); // Apply the effects of this transaction on the UTXO set represented by view -bool UpdateCoins(const CTransaction& tx, CCoinsViewCache &view, CTxUndo &txundo, int nHeight, const uint256 &txhash); +void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCache &inputs, CTxUndo &txundo, int nHeight, const uint256 &txhash); // Context-independent validity checks bool CheckTransaction(const CTransaction& tx, CValidationState& state); |