From 6c8b23c0b26f124046ef74975a3c6602fcdedff1 Mon Sep 17 00:00:00 2001 From: Evan Duffield Date: Sun, 1 Feb 2015 13:14:31 -0700 Subject: [PATCH] return 0 for incomplete tx locks --- src/instantx.cpp | 1 + src/main.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/instantx.cpp b/src/instantx.cpp index e61974ccf..5148cf435 100644 --- a/src/instantx.cpp +++ b/src/instantx.cpp @@ -119,6 +119,7 @@ void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream& LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) { + printf("relay txlvote to %s : %s\n", pnode->addr.ToString().c_str(), ctx.tx.ToString().c_str()); pnode->PushMessage("txlvote", ctx); } return; diff --git a/src/main.cpp b/src/main.cpp index fb3c4e02c..49e2c1bfd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1168,7 +1168,7 @@ int CMerkleTx::IsTransactionLocked() const return nInstantXDepth; } else { LogPrintf("InstantX::ProcessConsensusVote - Incomplete TX Lock %d %s\n", (*i).second.CountSignatures(), (*i).second.GetHash().ToString().c_str()); - return nInstantXDepth; + return 0; } }