Merge dev feat scheduled 19apr #3026
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
prevent too much mint
Merge master in dev 2021.03.31
…-from-meta-to-shards Fix stuck situation created by too many scrs generated in one single mini block
# Conflicts: # genesis/process/metaGenesisBlockCreator.go
…t-2021.04.03 Merge master feat esdt nft 2021.04.03
…s and their ammounts and the delegators addresses and their amounts on each delegation system sc
make test smaller
…ore-get Gas check on transfer before get
fix/reset un jail index
…into limit-miniblocks-to-shardlimit
…into limit-miniblocks-to-shardlimit # Conflicts: # integrationTests/vm/esdt/process/esdtProcess_test.go
…limit Limit miniblocks to shardlimit
…lid-transfer integration test for invalid nft transfer
Merge master to dev 2021.04.19
# Conflicts: # cmd/storer2elastic/dataprocessor/interface.go # cmd/storer2elastic/dataprocessor/ratingsProcessor.go # config/epochConfig.go # consensus/mock/indexer.go # core/constants.go # epochStart/bootstrap/baseStorageHandler.go # factory/blockProcessorCreator.go # factory/processComponents.go # integrationTests/factory/cryptoComponents/cryptoComponents_test.go # integrationTests/factory/processComponents/processComponents_test.go # integrationTests/factory/statusComponents/statusComponents_test.go # integrationTests/testProcessorNode.go # integrationTests/testSyncNode.go # node/mock/indexerMock.go # node/nodeRunner.go # process/block/argProcessor.go # process/block/baseProcess_test.go # process/block/export_test.go # process/block/metablock.go # process/block/metablock_test.go # process/block/preprocess/transactions.go # process/block/shardblock.go # process/block/shardblock_test.go # process/errors.go
sasurobert
previously approved these changes
Apr 20, 2021
bogdan-rosianu
previously approved these changes
Apr 20, 2021
Codecov Report
@@ Coverage Diff @@
## feat/scheduled-sc-execution #3026 +/- ##
===============================================================
- Coverage 72.08% 71.32% -0.76%
===============================================================
Files 644 666 +22
Lines 63897 67648 +3751
===============================================================
+ Hits 46060 48251 +2191
- Misses 13512 14807 +1295
- Partials 4325 4590 +265
Continue to review full report at Codecov.
|
SebastianMarian
previously approved these changes
Apr 20, 2021
AdoAdoAdo
dismissed stale reviews from SebastianMarian, bogdan-rosianu, and sasurobert
via
39b84a8
bogdan-rosianu
approved these changes
Apr 20, 2021
sasurobert
approved these changes
Apr 20, 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.
No description provided.