Merge rc into stakingv4 21 mar 2023 #5114
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
Integration test multi key
Load private keys
Update testnet scripts for multikey
…snapshots-enabled Merge 1.4.0 into cli for snapshots enabled
…factor Refactored private keys usage in consensus
# Conflicts: # cmd/node/config/config.toml # factory/heartbeat/heartbeatV2Components.go # heartbeat/sender/sender.go # heartbeat/sender/sender_test.go
Merge rcv1.5.0 2022.12.07
# Conflicts: # consensus/mock/consensusDataContainerMock.go # consensus/mock/mockTestInitializer.go # consensus/spos/bls/export_test.go # consensus/spos/bls/subroundBlock.go # consensus/spos/bls/subroundEndRound.go # consensus/spos/bls/subroundEndRound_test.go # consensus/spos/bls/subroundSignature.go # consensus/spos/consensusCore.go # consensus/spos/consensusCoreValidator.go # consensus/spos/consensusCoreValidator_test.go # consensus/spos/consensusCore_test.go # consensus/spos/interface.go # factory/consensus/consensusComponents.go # factory/crypto/cryptoComponents.go # factory/crypto/cryptoComponentsHandler.go # factory/crypto/signatureHolder_test.go # factory/interface.go # factory/mock/cryptoComponentsMock.go # integrationTests/consensus/consensus_test.go # integrationTests/mock/cryptoComponentsStub.go # integrationTests/testConsensusNode.go # node/mock/factory/cryptoComponentsStub.go
- adaptation + refactoring
…3.10 # Conflicts: # cmd/keygenerator/converter/errors.go # cmd/keygenerator/converter/pidPubkeyConverter.go # cmd/keygenerator/converter/pidPubkeyConverter_test.go # cmd/keygenerator/main.go # common/enablers/enableEpochsHandler.go # common/factory/pubkeyConverterFactory.go # config/tomlConfig_test.go # examples/construction_test.go # factory/addressDecoder_test.go # factory/crypto/cryptoComponents.go # genesis/checking/nodesSetupChecker.go # genesis/checking/nodesSetupChecker_test.go # genesis/parsing/accountsParser.go # genesis/parsing/accountsParser_test.go # go.mod # go.sum # integrationTests/consensus/consensus_test.go # integrationTests/frontend/wallet/dataField_test.go # integrationTests/multiShard/txScenarios/moveBalance_test.go # integrationTests/testConsensusNode.go # integrationTests/vm/txsFee/scCalls_test.go # node/external/nodeApiResolver.go # node/external/transactionAPI/apiTransactionProcessor.go # node/external/transactionAPI/apiTransactionProcessor_test.go # node/external/transactionAPI/apiTransactionResults.go # node/external/transactionAPI/gasUsedAndFeeProcessor_test.go # node/external/transactionAPI/unmarshaller.go # node/external/transactionAPI/unmarshaller_test.go # node/trieIterators/delegatedListProcessor_test.go # node/trieIterators/directStakedListProcessor.go # node/trieIterators/directStakedListProcessor_test.go # node/trieIterators/factory/delegatedListHandlerFactory_test.go # node/trieIterators/factory/directStakedListHandlerFactory_test.go # node/trieIterators/factory/stakeValuesHandlerFactory_test.go # node/trieIterators/stakeValuesProcessor_test.go # outport/factory/outportFactory_test.go # outport/process/alteredaccounts/alteredAccountsProvider.go # outport/process/transactionsfee/transactionsFeeProcessor.go # outport/process/transactionsfee/transactionsFeeProcessor_test.go # process/block/postprocess/intermediateResults_test.go # process/block/preprocess/transactions_test.go # process/dataValidators/txValidator.go # process/factory/metachain/intermediateProcessorsContainerFactory_test.go # process/peer/validatorsProvider_test.go # process/rewardTransaction/interceptedRewardTransaction_test.go # process/smartContract/process.go # process/txsimulator/txSimulator.go # process/unsigned/interceptedUnsignedTransaction_test.go # testscommon/addresses.go # testscommon/integrationtests/stringers.go # testscommon/integrationtests/stringers_test.go # update/genesis/export_test.go # vm/systemSmartContracts/esdt_test.go
….0-2023.03.09 Update polaris fixes rc v1.5.0 2023.03.09
…conv-2023.03.10 Merge rc v1.6.0 feat pubkey conv 2023.03.10
extracted configuration value for vm-queries delay
…-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
update core-go, vm-common-go, indexer-go versions
Feat/pubkeyconverter_refactor
# Conflicts: # common/enablers/enableEpochsHandler.go # common/enablers/enableEpochsHandler_test.go # epochStart/bootstrap/common.go # epochStart/bootstrap/metaStorageHandler.go # epochStart/bootstrap/metaStorageHandler_test.go # epochStart/bootstrap/process.go # epochStart/bootstrap/shardStorageHandler.go # epochStart/bootstrap/shardStorageHandler_test.go # epochStart/errors.go # go.mod # go.sum # integrationTests/testConsensusNode.go # process/block/displayMetaBlock.go # process/peer/validatorsProvider.go # process/peer/validatorsProvider_test.go # update/genesis/export.go
BeniaminDrasovean
approved these changes
Mar 21, 2023
schimih
approved these changes
Mar 21, 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.
Merge rc into stakingv4 21 mar 2023