This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Fix parallel transactions race-condition #10995
Merged
Merged
Changes from 17 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
48070be
WiP : clear pending txs cache & tick in Miner
ngotchac e9c110f
Fixed pending transactions
ngotchac cc653a0
Revert debugging code
ngotchac 55772a0
Add ToDo comment
ngotchac 75921ed
Remove commented-out code
ngotchac 897eef0
Reverse LTO setting
ngotchac 7b8807e
Merge branch 'master' into ng-tx-queue-fix
ngotchac 9abf8ac
WiP
ngotchac 2d0c706
Merge branch 'master' into ng-tx-queue-fix
ngotchac 6980320
Try to seal a new block if there are pending transactions
ngotchac 8080777
Try resealing only for internal imports
ngotchac 6b5c31d
Remove logging
ngotchac 7004b54
Use AtomicU64 instead of Mutex<BlockNumber>
ngotchac 33e5809
Remove TxQueue cache clear // Update AtomicUint logic
ngotchac eea5d32
Update comments in Miner
ngotchac 40e243a
Revert import of `parking_lot`
ngotchac b633cb8
Merge branch 'master' into ng-tx-queue-fix
ngotchac 47c102b
Update `transaction-pool` dependency
ngotchac 159cc84
Call directly `update_sealing`
ngotchac 51c188d
Call `update_sealing` directly
ngotchac File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure about this. The implementation is very specific for
NullEngine
(i.e. checks local transactions), while we have plenty of other conditions that affect when to seal. Why can't we just callupdate_sealing
instead?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is still valid.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah sorry, I thought you were talking about the next line, where I first used
prepare_and_update_sealing
. I just updated it.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess then there is no point in adding
maybe_update_sealing
to the traits and just callupdate_sealing
directly?