This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Removing transactions that failed to be pushed to block. #752
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
arkpar
added
A8-looksgood 🦄
gavofyork
added
A7-looksgoodcantmerge 🙄
| let gas_limit = *b.block().header().gas_limit(); | ||
| let mut gas_left = gas_limit; | ||
| let mut invalid_transactions = HashSet::new(); | ||
|
|
||
| for tx in transactions { |
There was a problem hiding this comment.
Stop when gas_left < min transaction gas (21000). There should be a constant for it in the Schedule I believe
arkpar
added
A5-grumble 🔥
tomusdrw
added
A0-pleasereview 🤓
arkpar
added
A8-looksgood 🦄
| @@ -132,7 +132,20 @@ impl MinerService for Miner { | |||
| self.extra_data(), | |||
| transactions, | |||
| ); | |||
| *self.sealing_block.lock().unwrap() = b; | |||
|
|
|||
| match b { | |||
There was a problem hiding this comment.
could be done more succinctly as:
*self.sealing_block.lock().unwrap() = b.map(|x| {
let (block, invalid_transactions) = x;
let mut queue ...
block
});
no?
There was a problem hiding this comment.
True - in this case it looks much better. However in general I'm trying to avoid side effects in map.
gavofyork
added
A6-mustntgrumble 💦
gavofyork
added
A7-looksgoodcantmerge 🙄
tomusdrw
added
A0-pleasereview 🤓
|
|
||
| // TODO [todr] It seems that calculating gas_left here doesn't look nice. After moving this function | ||
| // to miner crate we should consider rewriting this logic in some better way. | ||
| if tx.gas > gas_left { |
There was a problem hiding this comment.
any reason to duplicate this check here rather than just checking import later?
There was a problem hiding this comment.
Right, I guess it would be possible to unwrap error, check if it's BlockGasLimitReached, check minimal transaction gas.
Will refactor, because calculating gas here is not particularly appealing.
gavofyork
added
A6-mustntgrumble 💦
gavofyork
removed
the
A6-mustntgrumble 💦
tomusdrw
added
A3-inprogress ⏳
tomusdrw
added
A0-pleasereview 🤓
gavofyork
added a commit
that referenced
this pull request
Mar 18, 2016
Removing transactions that failed to be pushed to block.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
tracemessage)