Merge dev liquid staking v2 #3872
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
* Removed invalid txs from scheduled mini blocks added in scheduledTxsExecution component
… the new approach with invalid txs
…proposer starts to create it (shard and meta as well) * Refactored some methods/variables names in scheduledTxsExecution component * Fixed selection of transactions which should not be added in scheduled mini blocks (SCRs and receipts intra shard) * Fixed a situation when in meta chain the intermediate scheduled txs from the last block would not be added in the next block when time is out (anyway for now we don't have scheduled txs in meta chain)
…-sc-invalid-txs-unit-tests
…c-execution-with-invalid-txs
…lid-txs' into scheduled-sc-execution-with-invalid-txs
…th-invalid-txs [WIP] Scheduled sc execution with invalid txs
…c-invalid-txs-unit-tests
…unit-tests added unit tests for new methods for scheduled
… which are not final * Adapted start in epoch scheduled component for the new approach
… delayBlockBroadcaster component * Adapted block validity checks done by meta proposer/validators to the new scheduled sc execution approach
* Fixed verifyGasLimit and verifyFees methods, by excluding not final mini blocks
…ifyGasLimit and verifyFees methods * Added a missed set in SetScheduledInfo * Changed some logs level from Debug to Trace
…ethod * Fixed getting scheduled transaction hashes in start in epoch scheduled component
…uled-txs' into fix-sending-of-cross-shard-scheduled-txs
Convert "known" WARN messages to DEBUG
* Added unit tests
… the proposer side
… schedule v5 is now v6
…d-scheduled-txs Fix sending of cross shard scheduled transactions
Gas schedule v5 & v6
# Conflicts: # errors/errors.go # genesis/mock/blockChainHookHandlerMock.go # go.mod # go.sum # integrationTests/mock/blockChainHookHandlerMock.go # integrationTests/vm/arwen/arwenvm/arwenVM_test.go # integrationTests/vm/arwen/delegation/delegation_test.go # integrationTests/vm/mockVM/vmGet/vmGet_test.go # integrationTests/vm/testInitializer.go # node/mock/blockChainHandlerStub.go # process/block/export_test.go # process/errors.go # process/interface.go # process/mock/blockChainHookHandlerMock.go # process/smartContract/hooks/blockChainHook_test.go # process/smartContract/scQueryService_test.go
…03.01 Merge master in dev 2022.03.01
…first Close network components first
# Conflicts: # cmd/node/config/enableEpochs.toml # config/epochConfig.go # epochStart/mock/nodesCoordinatorStub.go # genesis/process/shardGenesisBlockCreator.go
bogdan-rosianu
approved these changes
Mar 4, 2022
ccorcoveanu
approved these changes
Mar 4, 2022
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.
Merge dev to liquid staking 04.03.2022