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

Apply deterministic virtual_op numbering rule #1676

Merged
merged 2 commits into from Apr 10, 2019

Conversation

Projects
2 participants
@abitmore
Copy link
Member

commented Mar 24, 2019

@abitmore abitmore added this to In development in Feature Release (3.1.0) via automation Mar 24, 2019

@@ -61,7 +61,7 @@ namespace graphene { namespace chain {
/** the operation within the transaction */
uint16_t op_in_trx = 0;
/** any virtual operations implied by operation in block */
uint16_t virtual_op = 0;
uint32_t virtual_op = 0;

This comment has been minimized.

Copy link
@abitmore

abitmore Mar 24, 2019

Author Member

Reason for this change: it's not too hard to create more than 65536 virtual operations in a block.

@pmconrad

This comment has been minimized.

Copy link
Contributor

commented Mar 25, 2019

Hm, I think you're resetting to 0 in too many places...
It should be sufficient to reset _current_virtual_op in apply_transaction before each apply_operation, and reset _current_op and _current_virtual_op in apply_block after applying all transactions.

@abitmore abitmore force-pushed the vop-numbering branch from 3dfa222 to f03c207 Mar 25, 2019

@abitmore

This comment has been minimized.

Copy link
Member Author

commented Mar 25, 2019

Force-pushed.

Merge branch 'develop' into vop-numbering
Resolved conflicts:
- libraries/chain/include/graphene/chain/config.hpp : bumped GRAPHENE_CURRENT_DB_VERSION to current date
@abitmore

This comment has been minimized.

Copy link
Member Author

commented Apr 3, 2019

Merged develop branch to resolve conflict on DB_VERSION. Please review again.

@pmconrad pmconrad merged commit 860d241 into develop Apr 10, 2019

3 checks passed

ci/dockercloud Your tests passed in Docker Cloud
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

Feature Release (3.1.0) automation moved this from In development to Done Apr 10, 2019

@pmconrad pmconrad deleted the vop-numbering branch Apr 10, 2019

@abitmore abitmore referenced this pull request Apr 10, 2019

Closed

Deterministic numbering of virtual operations #1675

2 of 17 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.