Merge hardfork to develop #2169
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
Additional BSIP 40 unit tests
CLI: Unit test of additional signing key when signing a transaction builder
CLI: Change cli_test fixture for faster block skipping
CLI: Specify signing keys
Merge changes on README to release branch
Tests: PR for #2067
Fix mingw build
…tainer-pr Collateral asset fee accumulator for BSIPs 74 and 87
return more useful data in market ticker
P2P improvement: periodically re-check addresses of seed nodes
Resolved conflicts: - libraries/chain/db_init.cpp : develop branch - libraries/net/node.cpp : major changes from develop branch, minor changes from hardfork branch - programs/build_helpers/build_and_test : hardfork branch - programs/build_helpers/build_protocol : hardfork branch
|
Github Autobuild results (so far):
|
|
Debug build reported error: |
abitmore
force-pushed
the
merge-hardfork-to-develop
branch
from
5325958
to
1ae218d
Compare
- Fix quotes when comparing timestamps - Get around the known command line argument issue with boost 1.60 by removing spaces
abitmore
force-pushed
the
merge-hardfork-to-develop
branch
3 times, most recently
from
697e604
to
aad296b
Compare
2 tasks
and fix timing issue about es_test in debug build.
abitmore
force-pushed
the
merge-hardfork-to-develop
branch
from
aad296b
to
60b4a49
Compare
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.
No description provided.