aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-08-25 14:11:44 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-08-25 15:04:28 +0200
commit49f954f154e3576a6a8270e00ab95f52dd02c667 (patch)
tree733c71125ac90c5f10fb344cc8ccc9ff069a0a39 /src/main.cpp
parent26f3a05cf1b1ed4940844994d370e90068fb775c (diff)
parent0d27dad8452704fa849832a0d28bf3e1b564d7b7 (diff)
downloadbitcoin-49f954f154e3576a6a8270e00ab95f52dd02c667.tar.xz
Merge pull request #4716
0d27dad Clean-up SyncWithWallets/SyncTransaction (Cozz Lovan)
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp
index d8d3096c46..947494ce62 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1023,7 +1023,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
pool.addUnchecked(hash, entry);
}
- g_signals.SyncTransaction(tx, NULL);
+ SyncWithWallets(tx, NULL);
return true;
}
@@ -1858,10 +1858,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);