Merge dev into block-merge #3365
Merged
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
3341: Fix CI release with latest tag r=tgrospic a=tgrospic Co-authored-by: Tomislav Grospic <grospic@gmail.com>
3338: Fix generation of bonds and wallets file r=nzpr a=nzpr Some old PR refactoring config rchain@e2bbe2f broken autogeneration of bonds file and made node require wallets file without any fallback. This PR fixes user experience. **The rule for bonds:** if no bonds file at path specified (or default `genesis_path/bonds.txt` if nothing specified) does not exist - node will generate one for user. If bonds file exists but is empty node will report error and exit. **The rule for wallets:** if no wallets file - node reports that genesis won't have any genesis vault. No exception possibly thrown. Empty wallets file is allowed. closes rchain#3008 Co-authored-by: nutzipper <1746367+nzpr@users.noreply.github.com>
3342: Migrate file-based blockstore to key-value implementation r=zsluedem a=zsluedem Co-authored-by: Will Qiu <zsluedem06@gmail.com>
3348: Update build.sbt with fixed Java version r=tgrospic a=tgrospic Co-authored-by: Tomislav Grospic <grospic@gmail.com>
3353: Fix memory leak in RSpace r=tgrospic a=tgrospic Co-authored-by: Tomislav Grospic <grospic@gmail.com>
3361: Validate content of genesis block against local config r=nzpr a=nzpr Co-authored-by: nutzipper <1746367+nzpr@users.noreply.github.com>
3363: Remove legacy file based block dag store r=nzpr a=nzpr Co-authored-by: nutzipper <1746367+nzpr@users.noreply.github.com> Co-authored-by: Tomislav Grospic <grospic@gmail.com>
nzpr
commented
Apr 1, 2021
| @@ -158,22 +156,6 @@ class NodeRuntime[F[_]: Monixable: ConcurrentEffect: Parallel: Timer: ContextShi | |||
| */ | |||
| _ <- mkDirs(dataDir) | |||
|
|
|||
| dagConfig = BlockDagFileStorage.Config( | |||
There was a problem hiding this comment.
Additional commit is to apply changes from #3363 due to NodeRuntime has been split and moved to different package in block-merge branch
Closed
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.
Merge recent dev to block merge feature branch