Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge v1.4 feat kosk #4487

Merged
merged 561 commits into from
Sep 21, 2022
Merged

Merge v1.4 feat kosk #4487

merged 561 commits into from
Sep 21, 2022

Conversation

AdoAdoAdo
Copy link
Contributor

Description of the reasoning behind the pull request

merge PR

Proposed Changes

merge rc/v1.4.0 to feat/kosk-bls-multisigner

bogdan-rosianu and others added 30 commits August 11, 2022 11:41
# Conflicts:
#	epochStart/bootstrap/syncValidatorStatus.go
#	errors/errors.go
#	factory/mock/coreComponentsMock.go
#	genesis/process/genesisBlockCreator.go
#	go.mod
#	heartbeat/process/monitor.go
#	integrationTests/testP2PNode.go
#	integrationTests/testProcessorNodeWithCoordinator.go
#	integrationTests/testProcessorNodeWithMultisigner.go
#	node/mock/factory/coreComponentsStub.go
#	process/block/preprocess/transactions.go
#	process/smartContract/hooks/blockChainHook.go
…-if-necessary

# Conflicts:
#	.github/workflows/build_and_test.yml
#	.github/workflows/code-coverage.yml
#	.github/workflows/create_release.yml
…tor-peers-mbs-11.08.2022

Merge dev into feat refactor peers mbs 11.08.2022
…a-proposer-side

# Conflicts:
#	epochStart/bootstrap/process.go
#	epochStart/bootstrap/storageProcess.go
#	epochStart/bootstrap/syncValidatorStatus.go
#	epochStart/errors.go
#	factory/processComponents.go
#	factory/shardingFactory.go
#	integrationTests/consensus/testInitializer.go
#	integrationTests/factory/consensusComponents/consensusComponents_test.go
#	integrationTests/factory/processComponents/processComponents_test.go
#	integrationTests/factory/statusComponents/statusComponents_test.go
#	integrationTests/nodesCoordinatorFactory.go
#	integrationTests/testHeartbeatNode.go
#	integrationTests/testP2PNode.go
#	integrationTests/testProcessorNode.go
#	integrationTests/testProcessorNodeWithCoordinator.go
#	integrationTests/testProcessorNodeWithMultisigner.go
#	node/nodeRunner.go
#	process/errors.go
#	process/factory/shard/preProcessorsContainerFactory.go
#	sharding/nodesCoordinator/errors.go
#	sharding/nodesCoordinator/indexHashedNodesCoordinator.go
#	sharding/nodesCoordinator/indexHashedNodesCoordinatorLite_test.go
#	sharding/nodesCoordinator/indexHashedNodesCoordinatorWithRater_test.go
#	sharding/nodesCoordinator/indexHashedNodesCoordinator_test.go
#	sharding/nodesCoordinator/shardingArgs.go
#	update/factory/exportHandlerFactory.go
#	update/sync/syncTransactions.go
AdoAdoAdo and others added 22 commits September 15, 2022 17:22
# Conflicts:
#	common/constants.go
#	dataRetriever/factory/dataPoolFactory.go
#	dataRetriever/factory/resolverscontainer/args.go
#	epochStart/bootstrap/syncValidatorStatus.go
#	go.mod
#	integrationTests/p2p/antiflood/blacklist/blacklist_test.go
#	integrationTests/testHeartbeatNode.go
#	integrationTests/testP2PNode.go
#	process/block/metablock.go
#	process/block/shardblock.go
#	storage/interface.go
#	storage/leveldb/leveldb.go
#	storage/leveldb/leveldbSerial.go
#	storage/pruning/fullHistoryTriePruningStorer.go
#	storage/pruning/triePruningStorer.go
#	storage/storageUnit/storageunit.go
#	storage/timecache/export_test.go
#	storage/timecache/peerTimeCache_test.go
#	storage/timecache/timeCache.go
#	storage/timecache/timeCache_test.go
#	testscommon/dataRetriever/poolFactory.go
#	testscommon/dataRetriever/poolsHolderMock.go
…o-storage

Merge rc1.4 feat elrond go storage
# Conflicts:
#	integrationTests/consensus/testInitializer.go
…ut-issue

Added request timeout for notifier http client
# 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
@AdoAdoAdo AdoAdoAdo self-assigned this Sep 20, 2022
@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (feat/kosk-bls-multisigner@b0ee408). Click here to learn what that means.
Patch has no changes to coverable lines.

Additional details and impacted files
@@                     Coverage Diff                      @@
##             feat/kosk-bls-multisigner    #4487   +/-   ##
============================================================
  Coverage                             ?   71.26%           
============================================================
  Files                                ?      658           
  Lines                                ?    85654           
  Branches                             ?        0           
============================================================
  Hits                                 ?    61041           
  Misses                               ?    20130           
  Partials                             ?     4483           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Contributor

@gabi-vuls gabi-vuls left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

System test passed.

@gabi-vuls gabi-vuls merged commit 92fa342 into feat/kosk-bls-multisigner Sep 21, 2022
@gabi-vuls gabi-vuls deleted the merge-v1.4-feat-kosk branch September 21, 2022 07:41
@schimih schimih added the ignore-for-release-notes Do not include item in release notes label Feb 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ignore-for-release-notes Do not include item in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.