Merge v1.4.0 into load private key for p2p #4502
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
move components mock to testscommon
Refactor factory
- temporary mock for multisigner - unit tests - temp elrond-go-crypto version
# Conflicts: # factory/crypto/cryptoComponentsHandler_test.go # factory/crypto/cryptoComponents_test.go
Update bls multisigner
Update master rc 2022 09 19
…pshot-nodes # Conflicts: # node/nodeRunner.go
# Conflicts: # cmd/node/config/enableEpochs.toml # config/epochConfig.go # config/tomlConfig_test.go # errors/errors.go # factory/bootstrap/bootstrapComponents.go # factory/bootstrap/bootstrapComponentsHandler.go # factory/consensus/consensusComponents.go # factory/consensus/consensusComponents_test.go # factory/core/coreComponents.go # factory/coreComponents_test.go # factory/crypto/cryptoComponents.go # factory/heartbeat/heartbeatComponents.go # factory/heartbeat/heartbeatV2Components.go # factory/heartbeatComponents_test.go # factory/networkComponents_test.go # factory/processComponents_test.go # factory/state/stateComponents.go # factory/stateComponents_test.go # integrationTests/consensus/testInitializer.go # integrationTests/factory/consensusComponents/consensusComponents_test.go # integrationTests/factory/processComponents/processComponents_test.go # integrationTests/factory/statusComponents/statusComponents_test.go # integrationTests/testProcessorNodeWithCoordinator.go # integrationTests/testProcessorNodeWithMultisigner.go # node/nodeRunner.go # process/errors.go # testscommon/mainFactoryMocks/bootstrapComponentsStub.go
Upgrade vm common and indexer
# Conflicts: # cmd/node/config/enableEpochs.toml # config/epochConfig.go # config/tomlConfig_test.go # go.mod # go.sum # integrationTests/multiShard/smartContract/polynetworkbridge/bridge_test.go # node/nodeRunner.go # process/smartContract/process.go # process/smartContract/process_test.go # storage/factory/pruningStorerFactory.go
Merge v1.4 feat kosk
Sync missing snapshot nodes
Update v1.4.0 rc july
# Conflicts: # config/tomlConfig_test.go # factory/consensus/consensusComponents.go
…0922 Merge v1.4.0 feat kosk 210922
Feat/kosk bls multisigner
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.
Description of the reasoning behind the pull request (what feature was missing / how the problem was manifesting itself / what was the motive behind the refactoring)
Testing procedure