Merge rc/v1.6.0 in feat/sync missing trie nodes 3apr #5147
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
…at_multisigner_12.09.2022 # Conflicts: # cmd/node/config/config.toml # config/config.go # factory/heartbeatV2Components.go # factory/heartbeatV2Components_test.go # heartbeat/errors.go # heartbeat/sender/heartbeatSender.go # heartbeat/sender/peerAuthenticationSender.go # heartbeat/sender/sender.go # heartbeat/sender/sender_test.go # integrationTests/testHeartbeatNode.go # integrationTests/testProcessorNode.go # testscommon/generalConfig.go
…igner_12.09.2022 Merge rc into feat multisigner 12.09.2022
…_sender_factory # Conflicts: # heartbeat/sender/sender.go
Heartbeat sender factory
# Conflicts: # integrationTests/testProcessorNode.go
…ation Integrated multikey in consensus
Keys holder renaming
…ltisigner # Conflicts: # consensus/interface.go # consensus/spos/bls/subroundSignature.go # consensus/spos/errors.go # consensus/spos/subround_test.go # errors/errors.go # factory/crypto/cryptoComponents.go # factory/crypto/cryptoComponentsHandler.go # factory/crypto/cryptoComponents_test.go # factory/heartbeatV2Components_test.go # factory/mock/cryptoComponentsMock.go # integrationTests/consensus/testInitializer.go # integrationTests/mock/cryptoComponentsStub.go # integrationTests/testProcessorNode.go # node/mock/factory/cryptoComponentsStub.go # node/nodeTesting_test.go # p2p/crypto/p2pSigner.go # p2p/crypto/p2pSigner_test.go # p2p/libp2p/interface.go # p2p/libp2p/mockMessenger.go # p2p/libp2p/netMessenger.go # p2p/libp2p/netMessenger_test.go # p2p/p2p.go
…igner Merge rc v1.4.0 in multisigner
# Conflicts: # consensus/spos/bls/subroundEndRound.go # consensus/spos/bls/subroundSignature.go
…igner-2022.09.28 Merge rc v1.4.0 in multisigner 2022.09.28
…10.20 # Conflicts: # cmd/node/config/config.toml # common/constants.go # config/config.go # errors/errors.go # factory/heartbeat/heartbeatV2Components_test.go # heartbeat/errors.go # heartbeat/interface.go # heartbeat/mock/messengerStub.go # heartbeat/status/metricsUpdater_test.go # p2p/interface.go
…tisigner-2022.10.20 Update rc/v1.4.0 feat/multikey 2022.10.20
…11.08 # Conflicts: # cmd/node/config/prefs.toml # common/constants.go # errors/errors.go # factory/heartbeat/heartbeatV2Components.go # factory/heartbeat/heartbeatV2Components_test.go # heartbeat/errors.go # heartbeat/interface.go # heartbeat/sender/heartbeatSender.go # heartbeat/sender/sender.go # integrationTests/testConsensusNode.go # node/nodeRunner.go
…tisigner-2022.11.08 Update rc v1.4.0 feat/multisigner 2022.11.08
…-2023.03.10 Merge rc v1.5.0 in rc v1.6.0 2023.03.10
Fix after review pubkeyconverter
Merge branch 'rc/v1.6.0' into pubkey_15Mar
# Conflicts: # go.mod # go.sum # outport/process/transactionsfee/transactionsFeeProcessor_test.go
…bkeyconv-mar15 Merge rc/v1.6.0 into feat/pubkeyconv mar15
New peers rating handler
update core-go, vm-common-go, indexer-go versions
Feat/pubkeyconverter_refactor
…into merge_rc160_into_feat_fix_peers_rating_handler_27.03.2023 # Conflicts: # consensus/spos/bls/subroundEndRound_test.go # errors/errors.go # go.mod # go.sum
…ers_rating_handler_27.03.2023 Merge rc160 into feat fix peers rating handler 27.03.2023
Feat fix peers rating handler
…in-feat/sync-missing-trie-nodes-3apr
iulianpascalau
approved these changes
Apr 3, 2023
sstanculeanu
approved these changes
Apr 3, 2023
ssd04
approved these changes
Apr 3, 2023
raduchis
approved these changes
Apr 3, 2023
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.
Pre-requisites
Based on the Contributing Guidelines the PR author and the reviewers must check the following requirements are met:
featbranch created?featbranch merging, do all satellite projects have a proper tag insidego.mod?