From 4986b66bb602c6044e33cb6bada5b2278837a2ce Mon Sep 17 00:00:00 2001 From: Casey Link Date: Fri, 16 Nov 2012 15:08:05 +0200 Subject: [PATCH] Update patch to work with source after Nov 10 2012 --- patch/patch | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patch/patch b/patch/patch index eadd113..774363a 100644 --- a/patch/patch +++ b/patch/patch @@ -43,18 +43,18 @@ index 43bd5dd..b38ce88 100644 CCoins coins; if (view.GetCoins(hash, coins)) diff --git a/src/main.h b/src/main.h -index d810bff..fba793c 100644 +index 8327141..fa27788 100644 --- a/src/main.h +++ b/src/main.h -@@ -115,7 +115,7 @@ unsigned int ComputeMinWork(unsigned int nBase, int64 nTime); - int GetNumBlocksOfPeers(); - bool IsInitialBlockDownload(); +@@ -156,7 +156,7 @@ bool IsInitialBlockDownload(); + /** Format a string that describes several potential problems detected by the core */ std::string GetWarnings(std::string strFor); + /** Retrieve a transaction (from memory pool, or from disk, if possible) */ -bool GetTransaction(const uint256 &hash, CTransaction &tx, uint256 &hashBlock, bool fAllowSlow = false); +bool GetTransaction(const uint256 &hash, CTransaction &tx, uint256 &hashBlock, bool fAllowSlow = false, int height = -1); + /** Connect/disconnect blocks until pindexNew is the new tip of the active block chain */ bool SetBestChain(CBlockIndex* pindexNew); - bool ConnectBestBlock(); - CBlockIndex * InsertBlockIndex(uint256 hash); + /** Find the best known block, and make it the tip of the block chain */ diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 3fde463..e60b71e 100644 --- a/src/rpcblockchain.cpp -- 1.7.1