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
mariusmihaic
merged 130 commits into
feat/liquid-staking
from
merge-dev-into-liquid-staking-19-04-22
Apr 19, 2022
Merged
Merge dev into liquid staking 19 04 22 #4000
mariusmihaic
merged 130 commits into
feat/liquid-staking
from
merge-dev-into-liquid-staking-19-04-22
Apr 19, 2022
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
Contributor
mariusmihaic
commented
Apr 19, 2022
•
edited
edited
- Merge dev to feat/liquid-staking 19-04-2022
# 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
… into EN-11730-get-all-leaves-context
…tstrap-from-storage small fix for loading data from storage in epoch start bootstrap
Fix system delegation smart contract logs
# Conflicts: # go.mod # go.sum
…022.04.05 Master with compressed flags
Merge master dev 2022.04.06
Master with indexer v1.1.40
Merge master in dev 07.04
backwd-comp-vm
Notifier-go update: version v1.1.0
Remove old trie storage
# Conflicts: # epochStart/bootstrap/fromLocalStorage.go # epochStart/metachain/systemSCs.go
bogdan-rosianu
approved these changes
Apr 19, 2022
ssd04
approved these changes
Apr 19, 2022
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.