Skip to content

Release Candidate#427

Merged
oxarbitrage merged 139 commits into
bitshares:masterfrom
pmconrad:testnet_release
Oct 24, 2017
Merged

Release Candidate#427
oxarbitrage merged 139 commits into
bitshares:masterfrom
pmconrad:testnet_release

Conversation

@pmconrad

@pmconrad pmconrad commented Oct 17, 2017

Copy link
Copy Markdown
Contributor

This PR merges everything that went into the last testnet release plus the last-minute-changes into master in preparation for the release.
The hardfork date is set to 2017-11-27 14:40 UTC.
Tested locally with a full replay.

pmconrad and others added 30 commits May 24, 2017 19:16
@pmconrad
Implemented "plugins" config variable
c4527a8
@pmconrad
Use range-based loop instead of iterator
83cc453
@pmconrad
Avoid duplicate options in default config file
cbdb015
@pmconrad
Fixed cryptonomex#284 using API calls
f04c2d4
@pmconrad
Created unit test for cryptonomex#325
6887f55
@oxarbitrage
Merge pull request cryptonomex#326 from pmconrad/develop
6f7fb42 
Created unit test for cryptonomex#325
@oxarbitrage
trying to change block_summary_object index from flat to generic
fa5c92c
@oxarbitrage
for issue 328
854651d
@oxarbitrage
improve performance
50e535e
@oxarbitrage
Merge pull request cryptonomex#330 from oxarbitrage/issue328
74c650d 
for issue 328
@oxarbitrage
Add api-access console log to node startup when present
80d81ac
@oxarbitrage
finish sentence in readme
bf76c59
@pmconrad
Create initial 64k block_summary_objects
3801533
@oxarbitrage
Merge pull request cryptonomex#1 from pmconrad/issue325
3e49787 
Create initial 64k block_summary_objects
@pmconrad
Improved resilience of block database against corruption
67ec792
@pmconrad
Moved reindex logic into database / chain_database, make use of addit…
66cba12 
…ional blocks in block_database

Fixed tests wrt db.open
@pmconrad
Added test case for settlement bug described in cryptonomex#216
5c5424d
@pmconrad
Fixed settlement bug cryptonomex#216
894d5b6
@pmconrad
Allow price feed (for smartcoins) after a black swan
5bd8cc4
@pmconrad
Implemented revival of empty assets + revival when price recovers
55664d2
@pmconrad
Refactored swan-related tests into separate file, added test for revi…
cf048e9 
…val after price recovery
@pmconrad
Refactored common code into swan_fixture
1fe819e
@pmconrad
Removed unused duplicate code
93f01ff
@pmconrad
Implemented bid_collateral_operation + unit test
1bdb651 
Use writable fee parameters for account_create only

Fixed fee calculation
@pmconrad
Fixed compiler warning
eff35c6
@pmconrad
Implemented bid processing + test case
4f8253a
@pmconrad
Implemented wallet api calls "bid_collateral" and "get_collateral_bids"
cbb2e55 
Added missing reflections
@pmconrad
Partial fix for cryptonomex#303
9d301cb
@pmconrad
Log db rewind
165c914
@pmconrad
Enable undo + fork database for final blocks in a replay
84fb99b 
Dont remove blocks from block db when popping blocks, handle edge case in replay wrt fork_db, adapted unit tests
pmconrad and others added 6 commits October 14, 2017 10:59
@pmconrad
Refactored config parsing and config writing into separate methods
0541e4f
@pmconrad
Swap logic: if config file does not exist, create one and parse it
b50fa81 
Previously, a newly written config file was ignored.
For the included plugins that didn't matter though, because all config file
options (and their default values) are also CLI options, and CLI defaults
always apply, no matter if a config file exists or not.

Now, a new config file is written with the default option values (if any),
and parsed immediately after that. In other words, the config defaults
are applied again. This does not result in a different outcome, at least
with the included plugins.
@pmconrad
Refactored option deduplication into a separate class
49a9cc6
@pmconrad
Use different defaults for some options when writing the config file
95097a5
@oxarbitrage
Merge pull request cryptonomex#422 from pmconrad/new_default_config_file
274aaf7 
New default config file
@pmconrad
Merge remote-tracking branch 'origin/develop' into testnet_release
2bb20d4
@oxarbitrage
oxarbitrage self-requested a review October 18, 2017 21:11
oxarbitrage
oxarbitrage approved these changes Oct 19, 2017
View reviewed changes

@oxarbitrage oxarbitrage left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

replied fully from scratch here as well. i say go for it before more last minute changes get in :)

@abitmore

abitmore commented Oct 19, 2017

Copy link
Copy Markdown
Member

Need to merge the new soft fork code?

@pmconrad

pmconrad commented Oct 20, 2017

Copy link
Copy Markdown
Contributor Author

Yes, and possibly your proposed fix as well.

@abitmore

abitmore commented Oct 20, 2017

Copy link
Copy Markdown
Member

OK. For those who have interest in the proposed fix, a PR is created: #435

@pmconrad

pmconrad commented Oct 23, 2017

Copy link
Copy Markdown
Contributor Author

Please stand by - will merge #437 and then update this one.

@pmconrad

pmconrad commented Oct 23, 2017

Copy link
Copy Markdown
Contributor Author

Ok - merged the latest fixes + resolved a conflict with a recent merge into master.
I also reduced the logging for #353 because it has caused a lot of confusion among testnet witnesses.
Please make a final review and merge so we can tag a release at last.

@oxarbitrage

oxarbitrage commented Oct 23, 2017

Copy link
Copy Markdown
Member

i fully synchronized the release candidate, all good. i am about to merge. question: the tests cases for issue443 are still failing, is this expected ?

unknown location(0): fatal error in "issue_433_test": unknown type
/root/bitshares/bitshares-core/tests/common/database_fixture.cpp(216): last checkpoint

*** 1 failure detected in test suite "Master Test Suite"
root@NC-PH-1346-07:~/bitshares/bitshares-core#

@oxarbitrage

oxarbitrage commented Oct 24, 2017

Copy link
Copy Markdown
Member

asked @pmconrad . the issue is the same as in the develop branch and test will succeed again after hardfork date passes. merging the full thing to master.

@oxarbitrage
oxarbitrage merged commit 6d6f5dd into bitshares:master Oct 24, 2017
@julian1

julian1 commented Oct 28, 2017

Copy link
Copy Markdown

It's really great to see people working on this bitshares code again!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@oxarbitrage oxarbitrage oxarbitrage approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

hardfork high priority

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@pmconrad @abitmore @oxarbitrage @julian1 @takaaki7 @TheTaconator @emfrias @theoreticalbts @xeroc