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.

Sign up for GitHub

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

Jump to bottom

Merge develop -> hardfork #1487

Merged
merged 92 commits into from Dec 21, 2018
Merged

Merge develop -> hardfork #1487

merged 92 commits into from Dec 21, 2018

Conversation

pmconrad
Copy link
Contributor

...in preparation for testnet release

SahkanDesertHawk and others added 30 commits October 26, 2018 19:08
@SahkanDesertHawk @abitmore
Update application.cpp
7521557 
Seed updates for sahkan
@oxarbitrage
bump fc and fix node
c293b40
@abitmore
Merge pull request #1404 from bitshares/update-seed-1
09a2edb 
Update Sahkan's seed nodes
@oxarbitrage
try to fix dockercloud
3fb6c44
@oxarbitrage
remove DGRAPHENE_DISABLE_UNITY_BUILD
3e1de10 
from cmake command in dockerfile as it will not fix the dockercloud issue.
@oxarbitrage
Merge pull request #1405 from oxarbitrage/fix_rand_bytes
2ed2bc9 
bump fc and fix node
@HarukaMa
Change description of delayed_node option
ca884e2
@pmconrad
Bump fc after re-improving compile time resource usage
9237a71
@oxarbitrage
Merge pull request #1415 from bitshares/release
59105fa 
merge release to develop
@pmconrad
Skip tests if compile time is too long
55aa07e
@pmconrad
Bump fc again for fc#88
1695076
@pmconrad
Fixed travis.yml
3aa689e
@pmconrad
Merge pull request #1417 from bitshares/bump_fc
082f0ef 
Bump fc after re-improving compile time resource usage
@oxarbitrage
refactor es_objects to use templates
15e9037
@nathanielhourt @oxarbitrage
Fix warning
86fb006 
Potential optimization: don't move a temporary as this prevents
copy elision
@nathanielhourt @oxarbitrage
Fix build errors
3d24032 
 - Add missing FC_REFLECT_TYPENAME on account operation extentions
 - Replace deprecated call to fc::rand_pseudo_bytes with
fc::rand_bytes.
@nathanielhourt @oxarbitrage
Include smart_ref_impl from fork_database.cpp
9952121 
Required for build on some configurations
@oxarbitrage
Merge pull request #1426 from oxarbitrage/fix-build-errors
32d8d08 
Fix build errors - replaces #1421
@oxarbitrage
remove not needed include
6225ee4
@oxarbitrage
change variable name
81c2769
@oxarbitrage
Revert "reserve the type id"
9f12023 
This reverts commit e7c95b3.
@oxarbitrage
Revert "move budget_record struct to db_maint"
42c33a7 
This reverts commit 9a4e745.
@oxarbitrage
Revert "remove budget_record_object"
e4d8481 
This reverts commit 53184ba.
@oxarbitrage
Merge pull request #1438 from oxarbitrage/patch_budget_object
1ba4b28 
Reverse #1213
@oxarbitrage
add last_vote_time
5d1c15c
@jmjatlanta
Merge pull request #1446 from bitshares/release
3619a1c 
Merge Release back to develop
@pmconrad
Added unit test for stuck chain
1d866df
@pmconrad
Improved test case - multiple bids
a73d02d
@pmconrad
Fix for stuck chain
10f75dc
@pmconrad
Bump DB version to enforce replay
abd0826
oxarbitrage and others added 27 commits December 14, 2018 11:49
@oxarbitrage
clarify proxy vote test times
115ed51
@pmconrad
Fixed code smell
4a3f45b
@oxarbitrage
Merge branch 'develop' into issue1393
0171861
@pmconrad
Properly initialize inner vectors, support nested modifications
dd6c7fc
@pmconrad
Removed obsolete hardfork code to avoid problems with next commit
69c4011
@pmconrad
Added direct_index-like replacement for by_account_asset subindex
2409104
@oxarbitrage
Merge pull request #1449 from oxarbitrage/issue1393
ae1cbfa 
add last_vote_time to account stats object
@oxarbitrage
add link to hackthedex.io to README
fe4c4e9
@oxarbitrage
change adaptor response to be mutable_variant_object
1e8ccab
@oxarbitrage
Merge pull request #1470 from bitshares/oxarbitrage-patch-3
9dbc880 
add link to hackthedex.io to README
@oxarbitrage
Merge pull request #1474 from bitshares/release
e5978ca 
merge release to develop
@oxarbitrage
Merge pull request #1429 from oxarbitrage/es_objects_templates
5c7fd22 
Add an adaptor to es_objects and template function to reduce code
@pmconrad
Merge pull request #1462 from bitshares/direct_index
d3ba372 
Add new direct index type
@pmconrad
Fix for node crash #1479
f4dcd9b
@pmconrad
Fixed hf date
d3cab53
@pmconrad
Revert fix attempt
80e9664
@pmconrad
Different approach - detect nested proposal_update with invalid id an…
9c7f693 
…d prevent execution before hf / forbid after hf
@pmconrad
Catch nested delete as well
062613c
@pmconrad
Bump db version
46daa67
@pmconrad
Switched impossible authority to null account
36cb35c
@pmconrad
Bumped hf date by 24 hours
5cb908e
@pmconrad
Log as warning not info
b0ada12
@pmconrad
Added self-deletion test case
35bc344
@oxarbitrage
Merge pull request #1458 from oxarbitrage/issue1455
3c76228 
add option elasticsearch-start-es-after-block to es plugin
@pmconrad
Merge pull request #1480 from bitshares/issue_1479
3eb2cfa 
Fix for node crash
@pmconrad
Resolve conflicts release/develop
bc85e17
@pmconrad
Merge pull request #1486 from pmconrad/resolve_conflicts
205dc88 
Backmerge release -> develop
oxarbitrage
oxarbitrage approved these changes Dec 21, 2018
View reviewed changes
Copy link
Member

@oxarbitrage oxarbitrage left a comment

Choose a reason for hiding this comment

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

We can get some conflicts in other consensus related open pull requests. the most important ones now are: #1324 and #1419

If we do, that need to be fixed in those pull requests as this is a needed step.

@pmconrad pmconrad merged commit 6809b8d into hardfork Dec 21, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oxarbitrage oxarbitrage oxarbitrage approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.0.0 - Protocol Upgrade Release
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@pmconrad @oxarbitrage @abitmore @SahkanDesertHawk @HarukaMa @nathanielhourt @jmjatlanta