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 dev into liquid staking 09 06 2022 #4183

Merged

Conversation

mariusmihaic
Copy link
Contributor

@mariusmihaic mariusmihaic commented Jun 9, 2022

  • Merge dev into liquid staking 09 06 2022

miiu96 and others added 30 commits May 3, 2022 16:46
…2022.05.19

Update master in rc june 2022.05.19
…er-and-set-all-roles

Fix token type log for register and set all roles
# Conflicts:
#	config/epochConfig.go
#	config/tomlConfig_test.go
#	integrationTests/testProcessorNode.go
#	node/nodeRunner.go
#	process/errors.go
bogdan-rosianu and others added 21 commits May 31, 2022 17:34
…s-unit-test

fixed Test_getProcessedMiniBlocks that failed from time to time
…oordinator

Fixed the init call in transaction coordinator
…-exec

Integrate indexer to work with partial executed mini-blocks
# Conflicts:
#	cmd/node/config/enableEpochs.toml
#	config/epochConfig.go
#	epochStart/metachain/systemSCs_test.go
#	genesis/process/shardGenesisBlockCreator.go
@mariusmihaic mariusmihaic marked this pull request as ready for review June 9, 2022 12:36
@mariusmihaic mariusmihaic merged commit 05c712d into feat/liquid-staking Jun 9, 2022
@mariusmihaic mariusmihaic deleted the merge-dev-into-liquid-staking-09-06-2022 branch June 9, 2022 14:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants