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 16032022 #3910

Merged
merged 268 commits into from Mar 16, 2022

Conversation

mariusmihaic
Copy link
Contributor

@mariusmihaic mariusmihaic commented Mar 16, 2022

Merge dev into feat/liquid staking 16.03.2022

- move everything related to Nodes Coordinator, to a separate package inside sharding
ssd04 and others added 23 commits March 10, 2022 09:34
…ification-10-03-2022

Merge dev into header verification 10 03 2022
# Conflicts:
#	config/epochConfig.go
#	go.mod
#	node/nodeRunner.go
…ification-11-03-2022

Merge dev into header verification 11 03 2022
# Conflicts:
#	cmd/node/config/enableEpochs.toml
#	config/epochConfig.go
#	epochStart/metachain/systemSCs.go
#	genesis/process/shardGenesisBlockCreator.go
#	node/nodeRunner.go
#	testscommon/shardingMocks/nodesCoordinatorStub.go
@mariusmihaic mariusmihaic self-assigned this Mar 16, 2022
@mariusmihaic mariusmihaic merged commit db19da6 into feat/liquid-staking Mar 16, 2022
@mariusmihaic mariusmihaic deleted the merge-dev-into-liquid-staking-16032022 branch March 16, 2022 15:04
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