From: ThomasV <thomasv@gitorious>
Date: Wed, 21 Nov 2012 19:56:03 +0000 (+0400)
Subject: Merge branch 'master' of github.com:spesmilo/electrum-server
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=3d83205a73c236f7e3f2646e67cd573e57244a52;hp=ea4579674d6e742bfd7f533f2aa62fc2e677f780;p=electrum-server.git

Merge branch 'master' of github.com:spesmilo/electrum-server
---

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