Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: reinsert transactions from failed block #4675

Merged
merged 8 commits into from
Sep 16, 2022
Merged

fix: reinsert transactions from failed block #4675

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
97e3dc1
fix: reinsert transactions from failed block
stringhandler Sep 13, 2022
4dc17c0
more logging, removed spawn
stringhandler Sep 14, 2022
f15c29c
more logging, removed spawn
stringhandler Sep 15, 2022
c483af3
Merge branch 'development' into st-reinsert-transactions
stringhandler Sep 15, 2022
519a494
remove message logs by default
stringhandler Sep 15, 2022
180ccd7
clippy
stringhandler Sep 15, 2022
6281058
Update comms/dht/src/outbound/message_params.rs
stringhandler Sep 16, 2022
f8f08d0
fix log
stringhandler Sep 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions base_layer/core/src/mempool/mempool_storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,21 @@ impl MempoolStorage {
failed_block.header.height,
failed_block.hash().to_hex()
);
self.unconfirmed_pool
let txs = self
.unconfirmed_pool
.remove_published_and_discard_deprecated_transactions(failed_block);

// Reinsert them to validate if they are still valid
for tx in txs {
let _result = self.insert(tx).map_err(|e| {
warn!(
target: LOG_TARGET,
"Discarding transaction because it is no longer valid: {}", e
);
});
}
self.unconfirmed_pool.compact();
debug!(target: LOG_TARGET, "{}", self.stats());

Ok(())
}

Expand Down