diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-04-02 13:25:21 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-04-02 14:02:06 +0200 |
| commit | 32ec900850446f60d13c8421c4a91f4fff912d13 (patch) | |
| tree | 7a35f91f61d67cc9295daf467edb52071741552c /src/interfaces/chain.cpp | |
| parent | 7bcf90cb01aa964a54e3450ec5515e67db7088b7 (diff) | |
| parent | 95faffed264cf54a3b3041db2471c10f5011aabe (diff) | |
Merge #15691: 0.18: rc3 backportsv0.18.0rc3
95faffed264cf54a3b3041db2471c10f5011aabe qa: Check unconfirmed balance after loadwallet (João Barbosa)
59716ec395daaf914924fe5c1a4fbeb5d5031907 wallet: Update transactions with current mempool after load (João Barbosa)
ed0498af2827ccf033c9a7c4f46b82424e411083 interfaces: Add Chain::requestMempoolTransactions (João Barbosa)
ebf65666c26b7e2dff1b35b17d8fc466c3f347a6 wallet: Move CWallet::ReacceptWalletTransactions locks to callers (João Barbosa)
a90db2f175f86b78d8edc5c03b7bb351c8f43e5e [tests] Add test for wallet rebroadcasts (John Newbery)
50c56f2fcf00385dbe8f91588af3ee1a89a9d2d0 Interrupt orphan processing after every transaction (Pieter Wuille)
bb60121da1eb3484ecf20c5d1130d9e2f6f8f8c8 [MOVEONLY] Move processing of orphan queue to ProcessOrphanTx (Pieter Wuille)
6355214fd70ce7b44739acb8d546aaaf243f90b3 Simplify orphan processing in preparation for interruptibility (Pieter Wuille)
Pull request description:
Remaining backports for rc3
ACKs for commit 95faff:
promag:
ACK 95faffe, well done in ed0498af2827ccf033c9a7c4f46b82424e411083 - verified all cherry picks.
Tree-SHA512: 597ee45493ac04e8c3149628a357c3238169d4b4f78158f22a3531e5f66289c228ecd6582f99026698883216f1ee7934d6315d19c99fc5f4f33dd1bed4300186
Diffstat (limited to 'src/interfaces/chain.cpp')
| -rw-r--r-- | src/interfaces/chain.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/interfaces/chain.cpp b/src/interfaces/chain.cpp index da810bc5e6..d3d9e86e8d 100644 --- a/src/interfaces/chain.cpp +++ b/src/interfaces/chain.cpp @@ -8,6 +8,7 @@ #include <chainparams.h> #include <primitives/block.h> #include <sync.h> +#include <txmempool.h> #include <uint256.h> #include <util/system.h> #include <validation.h> @@ -177,6 +178,13 @@ public: LOCK(cs_main); return GuessVerificationProgress(Params().TxData(), LookupBlockIndex(block_hash)); } + void requestMempoolTransactions(std::function<void(const CTransactionRef&)> fn) override + { + LOCK2(::cs_main, ::mempool.cs); + for (const CTxMemPoolEntry& entry : ::mempool.mapTx) { + fn(entry.GetSharedTx()); + } + } }; } // namespace |