highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-22 22:45:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

wallet: remove mempool_sequence from transactionAddedToMempool

Browse Source
This commit is contained in:
w0xlt
2022-12-26 06:14:24 -03:00
parent f3bc1a7282
commit bf19069c53
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/interfaces/chain.h
View File

@@ -268,7 +268,7 @@ public:
{ {
public: public:
virtual ~Notifications() {} virtual ~Notifications() {}
virtual void transactionAddedToMempool(const CTransactionRef& tx, uint64_t mempool_sequence) {} 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, uint64_t mempool_sequence) {}
virtual void blockConnected(const BlockInfo& block) {} virtual void blockConnected(const BlockInfo& block) {}
virtual void blockDisconnected(const BlockInfo& block) {} virtual void blockDisconnected(const BlockInfo& block) {}

4
src/node/interfaces.cpp
View File

@@ -420,7 +420,7 @@ public:
virtual ~NotificationsProxy() = default; virtual ~NotificationsProxy() = default;
void TransactionAddedToMempool(const CTransactionRef& tx, uint64_t mempool_sequence) override void TransactionAddedToMempool(const CTransactionRef& tx, uint64_t mempool_sequence) override
{ {
m_notifications->transactionAddedToMempool(tx, mempool_sequence); m_notifications->transactionAddedToMempool(tx);
} }
void TransactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason, uint64_t mempool_sequence) override void TransactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason, uint64_t mempool_sequence) override
{ {
@@ -779,7 +779,7 @@ public:
if (!m_node.mempool) return; if (!m_node.mempool) return;
LOCK2(::cs_main, m_node.mempool->cs); LOCK2(::cs_main, m_node.mempool->cs);
for (const CTxMemPoolEntry& entry : m_node.mempool->mapTx) { for (const CTxMemPoolEntry& entry : m_node.mempool->mapTx) {
notifications.transactionAddedToMempool(entry.GetSharedTx(), 0 /* mempool_sequence */); notifications.transactionAddedToMempool(entry.GetSharedTx());
} }
} }
bool hasAssumedValidChain() override bool hasAssumedValidChain() override

4
src/wallet/test/wallet_tests.cpp
View File

@@ -946,7 +946,7 @@ BOOST_FIXTURE_TEST_CASE(wallet_sync_tx_invalid_state_test, TestingSetup)
mtx.vin.clear(); mtx.vin.clear();
mtx.vin.push_back(CTxIn(tx_id_to_spend, 0)); mtx.vin.push_back(CTxIn(tx_id_to_spend, 0));
wallet.transactionAddedToMempool(MakeTransactionRef(mtx), 0); wallet.transactionAddedToMempool(MakeTransactionRef(mtx));
const uint256& good_tx_id = mtx.GetHash(); const uint256& good_tx_id = mtx.GetHash();
{ {
@@ -967,7 +967,7 @@ BOOST_FIXTURE_TEST_CASE(wallet_sync_tx_invalid_state_test, TestingSetup)
static_cast<FailDatabase&>(wallet.GetDatabase()).m_pass = false; static_cast<FailDatabase&>(wallet.GetDatabase()).m_pass = false;
mtx.vin.clear(); mtx.vin.clear();
mtx.vin.push_back(CTxIn(good_tx_id, 0)); mtx.vin.push_back(CTxIn(good_tx_id, 0));
BOOST_CHECK_EXCEPTION(wallet.transactionAddedToMempool(MakeTransactionRef(mtx), 0), BOOST_CHECK_EXCEPTION(wallet.transactionAddedToMempool(MakeTransactionRef(mtx)),
std::runtime_error, std::runtime_error,
HasReason("DB error adding transaction to wallet, write failed")); HasReason("DB error adding transaction to wallet, write failed"));
} }

2
src/wallet/wallet.cpp
View File

@@ -1355,7 +1355,7 @@ void CWallet::SyncTransaction(const CTransactionRef& ptx, const SyncTxState& sta
MarkInputsDirty(ptx); MarkInputsDirty(ptx);
} }
void CWallet::transactionAddedToMempool(const CTransactionRef& tx, uint64_t mempool_sequence) { void CWallet::transactionAddedToMempool(const CTransactionRef& tx) {
LOCK(cs_wallet); LOCK(cs_wallet);
SyncTransaction(tx, TxStateInMempool{}); SyncTransaction(tx, TxStateInMempool{});

2
src/wallet/wallet.h
View File

@@ -516,7 +516,7 @@ public:
*/ */
CWalletTx* AddToWallet(CTransactionRef tx, const TxState& state, const UpdateWalletTxFn& update_wtx=nullptr, bool fFlushOnClose=true, bool rescanning_old_block = false); CWalletTx* AddToWallet(CTransactionRef tx, const TxState& state, const UpdateWalletTxFn& update_wtx=nullptr, bool fFlushOnClose=true, bool rescanning_old_block = false);
bool LoadToWallet(const uint256& hash, const UpdateWalletTxFn& fill_wtx) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); bool LoadToWallet(const uint256& hash, const UpdateWalletTxFn& fill_wtx) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
void transactionAddedToMempool(const CTransactionRef& tx, uint64_t mempool_sequence) override; void transactionAddedToMempool(const CTransactionRef& tx) override;
void blockConnected(const interfaces::BlockInfo& block) override; void blockConnected(const interfaces::BlockInfo& block) override;
void blockDisconnected(const interfaces::BlockInfo& block) override; void blockDisconnected(const interfaces::BlockInfo& block) override;
void updatedBlockTip() override; void updatedBlockTip() override;