Clean-up SyncWithWallets/SyncTransaction
This commit is contained in:
parent
b3ec053082
commit
0d27dad845
@ -1022,7 +1022,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
|
||||
pool.addUnchecked(hash, entry);
|
||||
}
|
||||
|
||||
g_signals.SyncTransaction(tx, NULL);
|
||||
SyncWithWallets(tx, NULL);
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -1857,10 +1857,6 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C
|
||||
int64_t nTime3 = GetTimeMicros(); nTimeIndex += nTime3 - nTime2;
|
||||
LogPrint("bench", " - Index writing: %.2fms [%.2fs]\n", 0.001 * (nTime3 - nTime2), nTimeIndex * 0.000001);
|
||||
|
||||
// Watch for transactions paying to me
|
||||
BOOST_FOREACH(const CTransaction& tx, block.vtx)
|
||||
g_signals.SyncTransaction(tx, &block);
|
||||
|
||||
// Watch for changes to the previous coinbase transaction.
|
||||
static uint256 hashPrevBestCoinBase;
|
||||
g_signals.UpdatedTransaction(hashPrevBestCoinBase);
|
||||
|
@ -738,9 +738,7 @@ Value sendrawtransaction(const Array& params, bool fHelp)
|
||||
if (!fHaveMempool && !fHaveChain) {
|
||||
// push to local node and sync with wallets
|
||||
CValidationState state;
|
||||
if (AcceptToMemoryPool(mempool, state, tx, false, NULL, !fOverrideFees))
|
||||
SyncWithWallets(tx, NULL);
|
||||
else {
|
||||
if (!AcceptToMemoryPool(mempool, state, tx, false, NULL, !fOverrideFees)) {
|
||||
if(state.IsInvalid())
|
||||
throw JSONRPCError(RPC_TRANSACTION_REJECTED, strprintf("%i: %s", state.GetRejectCode(), state.GetRejectReason()));
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user