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.

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

Simplifications #1789

Merged
merged 14 commits into from Aug 13, 2019

Conversation

@pmconrad
Copy link
Contributor

commented Jun 9, 2019

Resolves #1584 and #998
Requires additional changes in FC: bitshares/bitshares-fc#137

Measured 8% speedup for replaying 33M blocks

@abitmore abitmore added this to In development in Feature Release (3.2.0) via automation Jun 10, 2019

@abitmore abitmore added this to the 3.2.0 - Feature Release milestone Jun 10, 2019

@pmconrad

This comment has been minimized.

Copy link
Contributor Author

commented Jun 10, 2019

Snapshot comparison at 38M produces empty diff.

@pmconrad pmconrad referenced this pull request Jun 10, 2019
@abitmore

This comment has been minimized.

Copy link
Member

commented Jun 10, 2019

Good job. Looks good so far.

@abitmore abitmore referenced this pull request Jun 12, 2019
0 of 3 tasks complete

@pmconrad pmconrad moved this from In development to In testing in Feature Release (3.2.0) Jun 19, 2019

@pmconrad pmconrad marked this pull request as ready for review Jun 19, 2019

@pmconrad pmconrad force-pushed the pmconrad:1584_simplifications branch from 8c45488 to 734562b Jun 19, 2019

@pmconrad

This comment has been minimized.

Copy link
Contributor Author

commented Jun 19, 2019

Rebase to avoid conflict

@pmconrad pmconrad added this to In development in Feature Release (3.3.0) via automation Jun 21, 2019

@pmconrad pmconrad removed this from In testing in Feature Release (3.2.0) Jun 21, 2019

@pmconrad pmconrad moved this from In development to In testing in Feature Release (3.3.0) Jun 21, 2019

@pmconrad pmconrad force-pushed the pmconrad:1584_simplifications branch from 4fedb1a to 5522da9 Jul 26, 2019

@pmconrad

This comment has been minimized.

Copy link
Contributor Author

commented Jul 26, 2019

Rebased.
Apparently Mac and Windows builds require additional changes, see bitshares/bitshares-fc#140

@abitmore
Copy link
Member

left a comment

Looks good so far.

@jmjatlanta
Copy link
Contributor

left a comment

Note: the new "sign_message" formatter in libraries/wallet/wallet.cpp uses r.signature->data, which will not compile with these changes. The same problem exists in tests/cli/main.cpp. Perhaps rebase?

Now that FC changes are merged in, I believe an FC bump is in order.

@@ -442,7 +440,7 @@ void database::initialize_budget_record( fc::time_point_sec now, budget_record&
budget_u128 += ((uint64_t(1) << GRAPHENE_CORE_ASSET_CYCLE_RATE_BITS) - 1);
budget_u128 >>= GRAPHENE_CORE_ASSET_CYCLE_RATE_BITS;
if( budget_u128 < reserve.value )

This comment has been minimized.

Copy link
@jmjatlanta

jmjatlanta Aug 13, 2019

Contributor

This generates a signed/unsigned comparison warning on gcc 7.4.0, not the fault of this PR though.

@@ -497,7 +495,7 @@ void database::process_budget()
if( worker_budget_u128 >= available_funds.value )

This comment has been minimized.

Copy link
@jmjatlanta

jmjatlanta Aug 13, 2019

Contributor

This generates a signed/unsigned comparison warning on gcc 7.4.0, not the fault of this PR though.

@pmconrad pmconrad force-pushed the pmconrad:1584_simplifications branch from f96b351 to b9614a4 Aug 13, 2019

Issues have been fixed

@jmjatlanta
Copy link
Contributor

left a comment

Great work. Thanks!

@jmjatlanta jmjatlanta merged commit 947f0b1 into bitshares:develop Aug 13, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

Feature Release (3.3.0) automation moved this from In testing to Done Aug 13, 2019

@abitmore abitmore referenced this pull request Aug 13, 2019
0 of 3 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
3 participants
You can’t perform that action at this time.