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 rc/v1.6.0 in feat/sync missing trie nodes 18may #5251

Conversation

BeniaminDrasovean
Copy link
Contributor

Reasoning behind the pull request

  • Merge PR

Pre-requisites

Based on the Contributing Guidelines the PR author and the reviewers must check the following requirements are met:

  • was the PR targeted to the correct branch?
  • if this is a larger feature that probably needs more than one PR, is there a feat branch created?
  • if this is a feat branch merging, do all satellite projects have a proper tag inside go.mod?

sasurobert and others added 30 commits March 1, 2023 14:38
…on-tests

Semi-integration with cross-shard relayed DNS transaction
# Conflicts:
#	common/enablers/enableEpochsHandler.go
# Conflicts:
#	cmd/node/config/enableEpochs.toml
#	common/enablers/enableEpochsHandler.go
#	common/enablers/enableEpochsHandler_test.go
#	common/enablers/epochFlags.go
#	common/interface.go
#	config/epochConfig.go
#	config/tomlConfig_test.go
#	go.mod
#	go.sum
#	sharding/mock/enableEpochsHandlerMock.go
#	testscommon/enableEpochsHandlerStub.go
# Conflicts:
#	factory/processing/blockProcessorCreator.go
iulianpascalau and others added 25 commits May 10, 2023 14:32
# Conflicts:
#	factory/processing/export_test.go
#	factory/processing/processComponents.go
…upplies

MX-14120: repopulate tokens supplies
…factor

Refactored transaction simulation construction
…in-feat/sync-missing-trie-nodes-18may

# Conflicts:
#	factory/processing/blockProcessorCreator.go
#	factory/processing/export_test.go
#	go.mod
#	go.sum
@BeniaminDrasovean BeniaminDrasovean added the ignore-for-release-notes Do not include item in release notes label May 18, 2023
@BeniaminDrasovean BeniaminDrasovean merged commit e183734 into feat/sync-missing-trie-nodes May 18, 2023
@BeniaminDrasovean BeniaminDrasovean deleted the merge-rc/v1.6.0-in-feat/sync-missing-trie-nodes-18may branch May 18, 2023 09:19
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.

8 participants