gas consumption vs gas provided #3615
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
…ard txs due to stuck status
AdoAdoAdo
changed the title
Codecov Report
@@ Coverage Diff @@
## development #3615 +/- ##
============================================
Coverage 73.69% 73.69%
============================================
Files 585 585
Lines 75317 75317
============================================
Hits 55503 55503
Misses 15405 15405
Partials 4409 4409
Continue to review full report at Codecov.
|
iulianpascalau
previously approved these changes
Dec 2, 2021
…rd is stuck situation too early, as now could exist many mini blocks (max. 3) from me to the same receiver in one block, because of the recently implemented splitting mechanism from 1.5 bil. to 600 mil. per mini block
iulianpascalau
previously approved these changes
Dec 2, 2021
| @@ -124,8 +124,8 @@ func (gc *gasComputation) GasPenalized(hash []byte) uint64 { | |||
| return gasPenalized | |||
| } | |||
|
|
|||
| // TotalGasConsumed gets the total gas consumed | |||
| func (gc *gasComputation) TotalGasConsumed() uint64 { | |||
| // TotalGasProvided gets the total gas consumed | |||
There was a problem hiding this comment.
...total gas provided
process/block/shardblock.go
Outdated
| @@ -596,7 +596,7 @@ func (sp *shardProcessor) indexBlockIfNeeded( | |||
| return | |||
| } | |||
|
|
|||
| gasConsumedInHeader := sp.baseProcessor.gasConsumedProvider.TotalGasConsumed() | |||
| gasConsumedInHeader := sp.baseProcessor.gasConsumedProvider.TotalGasProvided() | |||
There was a problem hiding this comment.
gasProvidedInHeader, and maybe we should change also in HeaderGasConsumption DTO (L610) from GasConsumed to GasProvided
gabi-vuls
previously approved these changes
Dec 3, 2021
AdoAdoAdo
dismissed stale reviews from gabi-vuls and iulianpascalau
via
b5ebe8f
iulianpascalau
approved these changes
Dec 8, 2021
| @@ -621,7 +621,7 @@ func (mp *metaProcessor) indexBlock( | |||
| Header: metaBlock, | |||
| SignersIndexes: signersIndexes, | |||
| HeaderGasConsumption: indexer.HeaderGasConsumption{ | |||
| GasConsumed: gasConsumedInHeader, | |||
| GasProvided: gasConsumedInHeader, | |||
There was a problem hiding this comment.
gasProvidedInHeader
| func (gc *gasComputation) TotalGasProvided() uint64 { | ||
| totalGasConsumed := uint64(0) | ||
| totalGasProvided := uint64(0) | ||
|
|
||
| gc.mutGasConsumed.RLock() | ||
| for _, gasConsumed := range gc.gasConsumed { |
There was a problem hiding this comment.
gasProvided and gc.gasProvided ?
SebastianMarian
approved these changes
Dec 8, 2021
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.
use the actual gas consumed for txs preselection
don't limit intrashard txs due to stuck status