fix: reinsert transactions from failed block #4675
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hansieodendaal
previously approved these changes
Sep 14, 2022
|
This looks fine, but it does kinda seem like what's the point in removing them in the first place. This will only catch the case where the mempool failed to process a mined block, but then again I don't know if this will catch it. |
stringhandler
dismissed stale reviews from hansieodendaal and sdbondi
via
4dc17c0
sdbondi
reviewed
Sep 16, 2022
| header_str, | ||
| self.tag, | ||
| self.body |
comms/dht/src/logging_middleware.rs
Outdated
| @@ -86,7 +91,7 @@ where | |||
| } | |||
|
|
|||
| fn call(&mut self, msg: R) -> Self::Future { | |||
| trace!(target: LOG_TARGET, "{}{}", self.prefix_msg, msg); | |||
| info!(target: LOG_TARGET, "{}{:?}", self.prefix_msg, msg); | |||
There was a problem hiding this comment.
lol, meant debug-level logging (going by the guide of whether a user would be interested in this information)
Co-authored-by: Stan Bondi <sdbondi@users.noreply.github.com>
sdbondi
added a commit
to sdbondi/tari
that referenced
this pull request
Sep 16, 2022
* development: (72 commits) fix: reinsert transactions from failed block (tari-project#4675) fix: stray clippy error (tari-project#4685) fix(wallet): mark mined_height as null when pending outputs are cancelled (tari-project#4686) chore: updated dependancies (tari-project#4684) fix(p2p): remove DETACH flag usage (tari-project#4682) fix(comms): simplify and remove possibility of deadlock from pipelines and substream close (tari-project#4676) feat(ci): add default CI and FFI testing with custom dispatch (tari-project#4672) chore: remove broken test (tari-project#4678) fix: fix potential race condition between add_block and sync (tari-project#4677) fix deadlock (tari-project#4674) fix: add burn funds command to console wallet (see issue tari-project#4547) (tari-project#4655) v0.38.3 fix: fee estimate (tari-project#4656) fix(comms/messaging): fix possible deadlock in outbound pipeline (tari-project#4657) fix: replace Luhn checksum with DammSum (tari-project#4639) fix(core/sync): handle deadline timeouts by changing peer (tari-project#4649) fix(ci): libtor build on Ubuntu (tari-project#4644) chore: fix log (tari-project#4634) v0.38.2 fix(comms/rpc): detect early close in all cases (tari-project#4647) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
After removing transactions from the mempool from a failed validation, reinsert them to keep the valid ones
Motivation and Context
Currently, the implementation discards all transactions when validation fails. This is a pretty heavy approach, because the block may be incorrect in the header. There may even be an attack where a malicious user crafts a bad block and removes all transactions in the mempool.
In this approach, the transactions are reinserted into the mempool. If any of them are now invalid (e.g. double spends) they will be discarded
How Has This Been Tested?
existing tests, CI