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

[1.1.0] Fix account billing on eos-vm-oc interrupt #1160

Merged
merged 2 commits into from
Feb 12, 2025

Conversation

heifner
Copy link
Member

@heifner heifner commented Feb 11, 2025

Do not clear bill_to_accounts in transaction_context::reset() as bill_to_accounts is only modified during transaction_context::init(). This clear() was causing accounts to not be billed for CPU/NET when the transaction was interrupted by oc compile. This difference in recorded resource usage caused a difference in the integrity hash between a node that was interrupted vs one that was not.

Clean chicken-dance run with this PR.

Resolves #1152

@heifner heifner added bug The product is not working as was intended. OCI Work exclusive to OCI team labels Feb 11, 2025
@heifner heifner linked an issue Feb 11, 2025 that may be closed by this pull request
@@ -64,7 +64,7 @@ namespace eosio::chain {

auto sw = executed_action_receipts.store_which();
executed_action_receipts = action_digests_t{sw};
bill_to_accounts.clear();
// bill_to_accounts is only updated in init()
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// bill_to_accounts is only updated in init()
// bill_to_accounts should only be updated in init()

Copy link
Member

@linh2931 linh2931 left a comment

Choose a reason for hiding this comment

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

Should we add a unit or integration test in regard to resource usages for OC interrupt?

@heifner heifner merged commit 3fe4125 into release/1.1 Feb 12, 2025
36 checks passed
@heifner heifner deleted the GH-1152-hash-mismatch-1.1 branch February 12, 2025 13:54
@ericpassmore
Copy link
Contributor

Note:start
category: Other
component: Internal
summary: Fix account billing on eos-vm-oc interrupt.
Note:end

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug The product is not working as was intended. OCI Work exclusive to OCI team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Spring 1.1 chicken-dance integrity hash mismatch
4 participants