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

Preliminary hf release #1651

Merged
merged 192 commits into from
Mar 26, 2019
Merged

Preliminary hf release #1651

merged 192 commits into from
Mar 26, 2019

Conversation

pmconrad
Copy link
Contributor

Merge hardfork into release, with DB_VERSION bump + preliminary mainnet hardfork dates

abitmore and others added 30 commits September 13, 2018 11:59
@abitmore
BitAsset obj: added maintenance_collateralization
84c7218
@abitmore
Refactored feed_price::max_short_squeeze_price()
6254076
@abitmore
Updated comment in price::call_price()
9b41a92
@abitmore
Iterates by collateral in globally_settle_asset()
5308ea0
@abitmore
Iterate call orders by collateral in apply_order()
c912886
@abitmore
Iterate calls by collateral in check_call_orders()
469a499
@abitmore
db_market: stop using call_price after hf #1270
cb7bd0c
@abitmore
Do not update current_maint_collateral before hf
0ba6cb1
@abitmore
check revive: stop using call_price after hf #1270
92a3b71
@abitmore
update call: stop using call_price after hf #1270
077f4e0
@abitmore
Update and match call orders at hf #1270
68c702b
@abitmore
Check for blackswan by collateral after hf #1270
8bcf38d
@abitmore
get_call_orders() database API: use by_collateral
fd1c091 
Note: this should not break compatibility in production because the result should be the same after hard fork #343.
@abitmore
Minor coding style update
129e89c
@abitmore
Bump DB_VERSION due to call_order_object change
9af57a8
@abitmore
Target CR: stop using call_price after hf #1270
b5e63a3
@jmjatlanta
Initial HTLC commit
c6ca2c8
@jmjatlanta
Fix compile errors
bab9fb7
@jmjatlanta
Fix tests
81996c4
@jmjatlanta
added signature test
3afa87e
@jmjatlanta
Intermediate commit for adding htlc to wallet api
6e960ef
@jmjatlanta
Improvements to cli_wallet test
f470aa3
@jmjatlanta
Added update_htlc to wallet api
b5510ac
@jmjatlanta
Removed debugging code
40d22aa
@jmjatlanta
add htlc to switch-case
eb1225e
@jmjatlanta
Change method names to match spec
d367c2c
@jmjatlanta
Boost 1.58 compatibility
6ded688
@jmjatlanta
add get_typename for enum
9a502a3
@jmjatlanta
Addition of SHA1 and committee parameters
dc82610
@jmjatlanta
Refactor committee parameters
49822e1
jmjatlanta added 14 commits March 15, 2019 14:02
@abitmore
Copy link
Member

abitmore commented Mar 23, 2019 •
edited
Loading

Please merge latest hardfork.

@pmconrad pmconrad force-pushed the preliminary_hf_release branch from 656fffa to b799b55 Compare March 23, 2019 08:37
@pmconrad
Copy link
Contributor Author

Rebased + force-pushed

@pmconrad pmconrad marked this pull request as ready for review March 26, 2019 12:05
@pmconrad pmconrad force-pushed the preliminary_hf_release branch from b799b55 to 8dcb644 Compare March 26, 2019 12:38
@jmjatlanta jmjatlanta force-pushed the preliminary_hf_release branch from 167b355 to 8dcb644 Compare March 26, 2019 13:24
@abitmore
Copy link
Member

@jmjatlanta why a new commit? It should be in hardfork branch already.

@jmjatlanta jmjatlanta force-pushed the preliminary_hf_release branch from c7f331a to 8dcb644 Compare March 26, 2019 13:50
jmjatlanta
jmjatlanta approved these changes Mar 26, 2019
View reviewed changes
Copy link
Contributor

@jmjatlanta jmjatlanta left a comment

Choose a reason for hiding this comment

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

Compiled on Ubuntu 18.04LTS with Boost 1.69 and OpenSSL 1.1.0. Also ran chain_test with no errors.

Also compiled on Ubuntu 18.10 with Boost 1.69 and OpenSSL 1.1.0.

@pmconrad pmconrad merged commit 768e318 into release Mar 26, 2019
@pmconrad pmconrad deleted the preliminary_hf_release branch March 26, 2019 21:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmjatlanta jmjatlanta jmjatlanta 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.
5 participants
@pmconrad @abitmore @jmjatlanta @OpenLedgerApp @oxarbitrage