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

Simplifications #1789

Merged
merged 14 commits into from
Aug 13, 2019
Merged

Simplifications #1789

merged 14 commits into from
Aug 13, 2019

Conversation

pmconrad
Copy link
Contributor

@pmconrad pmconrad 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 mentioned this pull request Jun 10, 2019
Open
@abitmore abitmore added this to the 3.2.0 - Feature Release milestone Jun 10, 2019
@pmconrad
Copy link
Contributor Author

Snapshot comparison at 38M produces empty diff.

@pmconrad pmconrad mentioned this pull request Jun 10, 2019
Merged
@abitmore
Copy link
Member

Good job. Looks good so far.

@abitmore abitmore mentioned this pull request Jun 12, 2019
Closed
3 tasks
@pmconrad pmconrad marked this pull request as ready for review June 19, 2019 17:10
@pmconrad pmconrad force-pushed the 1584_simplifications branch from 8c45488 to 734562b Compare June 19, 2019 17:48
@pmconrad
Copy link
Contributor Author

Rebase to avoid conflict

@pmconrad pmconrad mentioned this pull request Jun 20, 2019
Closed
@pmconrad pmconrad force-pushed the 1584_simplifications branch from 4fedb1a to 5522da9 Compare July 26, 2019 13:22
@pmconrad
Copy link
Contributor Author

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

abitmore
abitmore reviewed Jul 26, 2019
View reviewed changes
Copy link
Member

@abitmore abitmore left a comment

Choose a reason for hiding this comment

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

Looks good so far.

This was referenced Jul 30, 2019
Merged
Merged
@MichelSantos MichelSantos mentioned this pull request Aug 9, 2019
Closed
jmjatlanta
jmjatlanta previously requested changes Aug 13, 2019
View reviewed changes
Copy link
Contributor

@jmjatlanta jmjatlanta left a comment •
edited
Loading

Choose a reason for hiding this comment

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

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.

libraries/chain/db_maint.cpp
@@ -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 )
Copy link
Contributor

Choose a reason for hiding this comment

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

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

libraries/chain/db_maint.cpp
@@ -497,7 +495,7 @@ void database::process_budget()
if( worker_budget_u128 >= available_funds.value )
Copy link
Contributor

Choose a reason for hiding this comment

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

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

@pmconrad pmconrad force-pushed the 1584_simplifications branch from f96b351 to b9614a4 Compare August 13, 2019 15:00
@jmjatlanta jmjatlanta dismissed their stale review August 13, 2019 16:21

Issues have been fixed

jmjatlanta
jmjatlanta approved these changes Aug 13, 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.

Great work. Thanks!

@jmjatlanta jmjatlanta merged commit 947f0b1 into bitshares:develop Aug 13, 2019
@abitmore abitmore mentioned this pull request Aug 13, 2019
Closed
3 tasks
This was referenced Aug 14, 2019
Closed
Closed
Closed
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abitmore abitmore abitmore left review comments

@jmjatlanta jmjatlanta jmjatlanta approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.3.0 - Feature Release
Development

Successfully merging this pull request may close these issues.
3 participants
@pmconrad @abitmore @jmjatlanta