Merge non-wallet transactions support for gettransaction RPC from bitcoin 0.7
[novacoin.git] / src / main.h
index 56ce0e4..7e05562 100644 (file)
@@ -121,13 +121,11 @@ unsigned int ComputeMinWork(unsigned int nBase, int64 nTime);
 int GetNumBlocksOfPeers();
 bool IsInitialBlockDownload();
 std::string GetWarnings(std::string strFor);
+bool GetTransaction(const uint256 &hash, CTransaction &tx, uint256 &hashBlock);
 uint256 WantedByOrphan(const CBlock* pblockOrphan);
 const CBlockIndex* GetLastBlockIndex(const CBlockIndex* pindex, bool fProofOfStake);
 void BitcoinMiner(CWallet *pwallet, bool fProofOfStake);
-
-
-
-
+void ResendWalletTransactions();
 
 
 
@@ -860,7 +858,6 @@ public:
         return !(a == b);
     }
     int GetDepthInMainChain() const;
 };