Merge branch 'continuousClose'

This commit is contained in:
JoelKatz
2012-06-29 16:49:02 -07:00
10 changed files with 49 additions and 69 deletions

View File

@@ -137,7 +137,7 @@ public:
const std::vector<unsigned char>& myNode, std::list< std::vector<unsigned char> >& newNodes);
// ledger proposal/close functions
bool recvPropose(uint32 proposeSeq, const uint256& proposeHash,
bool recvPropose(uint32 proposeSeq, const uint256& proposeHash, uint64 closeTime,
const std::string& pubKey, const std::string& signature);
bool gotTXData(boost::shared_ptr<Peer> peer, const uint256& hash,
const std::list<SHAMapNode>& nodeIDs, const std::list< std::vector<unsigned char> >& nodeData);