@ -797,9 +797,6 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
g_signals . EraseTransaction ( ptxOld - > GetHash ( ) ) ;
g_signals . EraseTransaction ( ptxOld - > GetHash ( ) ) ;
g_signals . SyncTransaction ( hash , tx , NULL ) ;
g_signals . SyncTransaction ( hash , tx , NULL ) ;
LogPrint ( " mempool " , " AcceptToMemoryPool: : accepted %s (poolsz % " PRIszu " ) \n " ,
hash . ToString ( ) . c_str ( ) ,
pool . mapTx . size ( ) ) ;
return true ;
return true ;
}
}
@ -3168,7 +3165,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
pfrom - > fSuccessfullyConnected = true ;
pfrom - > fSuccessfullyConnected = true ;
LogPrintf ( " receive version message: version %d, blocks=%d, us=%s, them=%s, peer=%s \n " , pfrom - > nVersion , pfrom - > nStartingHeight , addrMe . ToString ( ) . c_str ( ) , addrFrom . ToString ( ) . c_str ( ) , pfrom - > addr . ToString ( ) . c_str ( ) ) ;
LogPrintf ( " receive version message: %s: version %d, blocks=%d, us=%s, them=%s, peer=%s \n " , pfrom - > strSubVer . c_str ( ) , pfrom - > nVersion , pfrom - > nStartingHeight , addrMe . ToString ( ) . c_str ( ) , addrFrom . ToString ( ) . c_str ( ) , pfrom - > addr . ToString ( ) . c_str ( ) ) ;
AddTimeData ( pfrom - > addr , nTime ) ;
AddTimeData ( pfrom - > addr , nTime ) ;
@ -3427,6 +3424,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
vWorkQueue . push_back ( inv . hash ) ;
vWorkQueue . push_back ( inv . hash ) ;
vEraseQueue . push_back ( inv . hash ) ;
vEraseQueue . push_back ( inv . hash ) ;
LogPrint ( " mempool " , " AcceptToMemoryPool: %s %s : accepted %s (poolsz % " PRIszu " ) \n " ,
pfrom - > addr . ToString ( ) . c_str ( ) , pfrom - > strSubVer . c_str ( ) ,
tx . GetHash ( ) . ToString ( ) . c_str ( ) ,
mempool . mapTx . size ( ) ) ;
// Recursively process any orphan transactions that depended on this one
// Recursively process any orphan transactions that depended on this one
for ( unsigned int i = 0 ; i < vWorkQueue . size ( ) ; i + + )
for ( unsigned int i = 0 ; i < vWorkQueue . size ( ) ; i + + )
{
{
@ -3475,7 +3478,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
}
}
int nDoS = 0 ;
int nDoS = 0 ;
if ( state . IsInvalid ( nDoS ) )
if ( state . IsInvalid ( nDoS ) )
{
{
LogPrint ( " mempool " , " %s from %s %s was not accepted into the memory pool: %s \n " , tx . GetHash ( ) . ToString ( ) . c_str ( ) ,
pfrom - > addr . ToString ( ) . c_str ( ) , pfrom - > strSubVer . c_str ( ) ,
state . GetRejectReason ( ) . c_str ( ) ) ;
pfrom - > PushMessage ( " reject " , strCommand , state . GetRejectCode ( ) ,
pfrom - > PushMessage ( " reject " , strCommand , state . GetRejectCode ( ) ,
state . GetRejectReason ( ) , inv . hash ) ;
state . GetRejectReason ( ) , inv . hash ) ;
if ( nDoS > 0 )
if ( nDoS > 0 )