Fix edge case of set scheduled SCRs at bootstrap #3742
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
Contributor
SebastianMarian
commented
Feb 1, 2022
SebastianMarian
commented
- Fixed some misleading logs
- Fixed an edge case situation which wrongly set scheduled SCRs for the current block when a node starts in epoch
* Fixed an edge case situation which wrongly set scheduled SCRs for the current block when a node starts in epoch
Codecov Report
@@ Coverage Diff @@
## development #3742 +/- ##
===============================================
+ Coverage 74.21% 74.23% +0.02%
===============================================
Files 599 599
Lines 79186 79245 +59
===============================================
+ Hits 58766 58826 +60
+ Misses 15855 15854 -1
Partials 4565 4565
Continue to review full report at Codecov.
|
AdoAdoAdo
previously approved these changes
Feb 2, 2022
| @@ -488,6 +488,15 @@ func (ste *scheduledTxsExecution) IsScheduledTx(txHash []byte) bool { | |||
| return ok | |||
| } | |||
|
|
|||
| func getNumScheduledSCRs(mapScheduledSCRs map[block.Type][]data.TransactionHandler) int { | |||
sasurobert
reviewed
Feb 2, 2022
| for _, txHash := range mb.TxHashes { | ||
| scheduledTxs[string(txHash)] = struct{}{} | ||
| log.Debug("startInEpochWithScheduledDataSyncer.getScheduledTransactionHashesWithDestMe", "hash", txHash) |
There was a problem hiding this comment.
this is a little too much log.debug - please delete
There was a problem hiding this comment.
There is only for scheduled txs, if they exist, from one single block at bootstrap -> start in epoch. So, it is printed only once, but it helps for debugging if needed!
There was a problem hiding this comment.
ah. I missed that it is only start in epoch. alright.
sasurobert
previously approved these changes
Feb 2, 2022
AdoAdoAdo
previously approved these changes
Feb 2, 2022
…th-scheduled process, integrationTests, testscommon: fix total gas provided with scheduled SC calls
…crs-at-bootstrap' into fix-edge-case-of-set-scheduled-scrs-at-bootstrap
AdoAdoAdo
previously approved these changes
Feb 2, 2022
iulianpascalau
previously approved these changes
Feb 2, 2022
| @@ -61,7 +61,7 @@ func (f *feeHandler) GetAccumulatedFees() *big.Int { | |||
| // GetDeveloperFees returns the total accumulated developer fees | |||
| func (f *feeHandler) GetDeveloperFees() *big.Int { | |||
| f.mut.RLock() | |||
| developerFees := f.developerFees | |||
| developerFees := big.NewInt(0).Set(f.developerFees) | |||
sasurobert
previously approved these changes
Feb 2, 2022
| @@ -61,7 +61,7 @@ func (f *feeHandler) GetAccumulatedFees() *big.Int { | |||
| // GetDeveloperFees returns the total accumulated developer fees | |||
| func (f *feeHandler) GetDeveloperFees() *big.Int { | |||
| f.mut.RLock() | |||
| developerFees := f.developerFees | |||
| developerFees := big.NewInt(0).Set(f.developerFees) | |||
SebastianMarian
dismissed stale reviews from sasurobert, iulianpascalau, and AdoAdoAdo
via
15eaa2c
AdoAdoAdo
previously approved these changes
Feb 3, 2022
iulianpascalau
previously approved these changes
Feb 4, 2022
AdoAdoAdo
dismissed stale reviews from gabi-vuls, iulianpascalau, and themself
via
c00f579
gabi-vuls
approved these changes
Feb 4, 2022
iulianpascalau
approved these changes
Feb 4, 2022
sasurobert
approved these changes
Feb 4, 2022
AdoAdoAdo
deleted the
fix-edge-case-of-set-scheduled-scrs-at-bootstrap
branch
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.