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 19 04 22 #4000

Merged
merged 130 commits into from Apr 19, 2022

Conversation

mariusmihaic
Copy link
Contributor

@mariusmihaic mariusmihaic commented Apr 19, 2022

  • Merge dev to feat/liquid-staking 19-04-2022

iulianpascalau and others added 30 commits March 3, 2022 18:10
# Conflicts:
#	facade/initial/disabledStatusMetrics.go
#	integrationTests/testProcessorNodeWithTestWebServer.go
#	node/external/interface.go
#	node/external/nodeApiResolver_test.go
#	node/mock/statusMetricsStub.go
#	testscommon/statusHandler/statusMetricsStub.go
…tstrap-from-storage

small fix for loading data from storage in epoch start bootstrap
iulianpascalau and others added 24 commits April 6, 2022 11:08
Fix system delegation smart contract logs
# Conflicts:
#	epochStart/bootstrap/fromLocalStorage.go
#	epochStart/metachain/systemSCs.go
@mariusmihaic mariusmihaic self-assigned this Apr 19, 2022
@mariusmihaic mariusmihaic merged commit d43dfed into feat/liquid-staking Apr 19, 2022
@mariusmihaic mariusmihaic deleted the merge-dev-into-liquid-staking-19-04-22 branch April 19, 2022 13:34
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