diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-11 04:24:58 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-11 04:24:58 +0000 |
| commit | fbf99a9cdc3293b05ccc18c2f2dc6ae45da4258c (patch) | |
| tree | 8e8e0626342e55d852b6040fb04a08df54adc965 /src/main.h | |
| parent | 232393e3bda19392d1a9727c81bad1796b6061a8 (diff) | |
| parent | 3cd01fdf0e540c4e06cd27b6c0d6b6abc00767d1 (diff) | |
| download | bitcoin-fbf99a9cdc3293b05ccc18c2f2dc6ae45da4258c.tar.xz | |
Merge branch 'checknewblock_0.6.0' into checknewblock
Conflicts:
src/main.cpp
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h index b3cc9ab40e..fc8d459923 100644 --- a/src/main.h +++ b/src/main.h @@ -1016,11 +1016,11 @@ public: bool DisconnectBlock(CTxDB& txdb, CBlockIndex* pindex); - bool ConnectBlock(CTxDB& txdb, CBlockIndex* pindex); + bool ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck=false); bool ReadFromDisk(const CBlockIndex* pindex, bool fReadTransactions=true); bool SetBestChain(CTxDB& txdb, CBlockIndex* pindexNew); bool AddToBlockIndex(unsigned int nFile, unsigned int nBlockPos); - bool CheckBlock() const; + bool CheckBlock(bool fCheckPOW=true, bool fCheckMerkleRoot=true) const; bool AcceptBlock(); private: |