@ -810,9 +810,6 @@ bool CTxMemPool::accept(CValidationState &state, CTransaction &tx, bool fCheckIn
EraseFromWallets ( ptxOld - > GetHash ( ) ) ;
EraseFromWallets ( ptxOld - > GetHash ( ) ) ;
SyncWithWallets ( hash , tx , NULL , true ) ;
SyncWithWallets ( hash , tx , NULL , true ) ;
printf ( " CTxMemPool::accept() : accepted %s (poolsz % " PRIszu " ) \n " ,
hash . ToString ( ) . c_str ( ) ,
mapTx . size ( ) ) ;
return true ;
return true ;
}
}
@ -3312,7 +3309,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
pfrom - > fSuccessfullyConnected = true ;
pfrom - > fSuccessfullyConnected = true ;
printf ( " 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 ( ) ) ;
printf ( " 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 ( ) ) ;
cPeerBlockCounts . input ( pfrom - > nStartingHeight ) ;
cPeerBlockCounts . input ( pfrom - > nStartingHeight ) ;
}
}
@ -3560,6 +3557,11 @@ 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 ) ;
printf ( " 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 + + )
{
{
@ -3607,8 +3609,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
}
}
int nDoS = 0 ;
int nDoS = 0 ;
if ( state . IsInvalid ( nDoS ) )
if ( state . IsInvalid ( nDoS ) )
{
printf ( " %s from %s %s was not accepted into the memory pool \n " , tx . GetHash ( ) . ToString ( ) . c_str ( ) ,
pfrom - > addr . ToString ( ) . c_str ( ) , pfrom - > strSubVer . c_str ( ) ) ;
if ( nDoS > 0 )
if ( nDoS > 0 )
pfrom - > Misbehaving ( nDoS ) ;
pfrom - > Misbehaving ( nDoS ) ;
}
}
}