mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wallet: remove mempool_sequence from transactionRemovedFromMempool

Browse Source
This commit is contained in:
w0xlt committed 2022-12-26 06:17:05 -03:00
1 parent bf19069c53
commit 55696a0ac3
4 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/interfaces/chain.h
+1 -1
View File
@@ -269,7 +269,7 @@ public:
public: public:
virtual ~Notifications() {} virtual ~Notifications() {}
virtual void transactionAddedToMempool(const CTransactionRef& tx) {} virtual void transactionAddedToMempool(const CTransactionRef& tx) {}
virtual void transactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason, uint64_t mempool_sequence) {} virtual void transactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason) {}
virtual void blockConnected(const BlockInfo& block) {} virtual void blockConnected(const BlockInfo& block) {}
virtual void blockDisconnected(const BlockInfo& block) {} virtual void blockDisconnected(const BlockInfo& block) {}
virtual void updatedBlockTip() {} virtual void updatedBlockTip() {}
src/node/interfaces.cpp
+1 -1
View File
@@ -424,7 +424,7 @@ public:
} }
void TransactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason, uint64_t mempool_sequence) override void TransactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason, uint64_t mempool_sequence) override
{ {
m_notifications->transactionRemovedFromMempool(tx, reason, mempool_sequence); m_notifications->transactionRemovedFromMempool(tx, reason);
} }
void BlockConnected(const std::shared_ptr<const CBlock>& block, const CBlockIndex* index) override void BlockConnected(const std::shared_ptr<const CBlock>& block, const CBlockIndex* index) override
{ {
src/wallet/wallet.cpp
+2 -2
View File
@@ -1365,7 +1365,7 @@ void CWallet::transactionAddedToMempool(const CTransactionRef& tx) {
} }
} }
void CWallet::transactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason, uint64_t mempool_sequence) { void CWallet::transactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason) {
LOCK(cs_wallet); LOCK(cs_wallet);
auto it = mapWallet.find(tx->GetHash()); auto it = mapWallet.find(tx->GetHash());
if (it != mapWallet.end()) { if (it != mapWallet.end()) {
@@ -1411,7 +1411,7 @@ void CWallet::blockConnected(const interfaces::BlockInfo& block)
m_last_block_processed = block.hash; m_last_block_processed = block.hash;
for (size_t index = 0; index < block.data->vtx.size(); index++) { for (size_t index = 0; index < block.data->vtx.size(); index++) {
SyncTransaction(block.data->vtx[index], TxStateConfirmed{block.hash, block.height, static_cast<int>(index)}); SyncTransaction(block.data->vtx[index], TxStateConfirmed{block.hash, block.height, static_cast<int>(index)});
transactionRemovedFromMempool(block.data->vtx[index], MemPoolRemovalReason::BLOCK, /*mempool_sequence=*/0); transactionRemovedFromMempool(block.data->vtx[index], MemPoolRemovalReason::BLOCK);
} }
} }
src/wallet/wallet.h
+1 -1
View File
@@ -538,7 +538,7 @@ public:
uint256 last_failed_block; uint256 last_failed_block;
}; };
ScanResult ScanForWalletTransactions(const uint256& start_block, int start_height, std::optional<int> max_height, const WalletRescanReserver& reserver, bool fUpdate, const bool save_progress); ScanResult ScanForWalletTransactions(const uint256& start_block, int start_height, std::optional<int> max_height, const WalletRescanReserver& reserver, bool fUpdate, const bool save_progress);
void transactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason, uint64_t mempool_sequence) override; void transactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason) override;
/** Set the next time this wallet should resend transactions to 12-36 hours from now, ~1 day on average. */ /** Set the next time this wallet should resend transactions to 12-36 hours from now, ~1 day on average. */
void SetNextResend() { m_next_resend = GetDefaultNextResend(); } void SetNextResend() { m_next_resend = GetDefaultNextResend(); }
/** Return true if all conditions for periodically resending transactions are met. */ /** Return true if all conditions for periodically resending transactions are met. */