Skip to content

chore: log number of instructions executed for call in AVM. Misc fix. #11110

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

Merged
jeanmon merged 1 commit into from
Jan 9, 2025
Merged

chore: log number of instructions executed for call in AVM. Misc fix. #11110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions yarn-project/simulator/src/avm/avm_simulator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ export class AvmSimulator {
const revertReason = reverted ? await revertReasonFromExplicitRevert(output, this.context) : undefined;
const results = new AvmContractCallResult(reverted, output, machineState.gasLeft, revertReason);
this.log.debug(`Context execution results: ${results.toString()}`);
this.log.debug(`Executed ${instrCounter} instructions`);

this.tallyPrintFunction();
// Return results for processing by calling context
Expand Down
5 changes: 3 additions & 2 deletions yarn-project/simulator/src/avm/journal/journal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,14 @@ export class AvmPersistableStateManager {
this.publicStorage.acceptAndMerge(forkedState.publicStorage);
this.nullifiers.acceptAndMerge(forkedState.nullifiers);
this.trace.merge(forkedState.trace, reverted);
if (!reverted) {
this.merkleTrees = forkedState.merkleTrees;
if (reverted) {
if (this.doMerkleOperations) {
this.log.debug(
`Rolled back nullifier tree to root ${this.merkleTrees.treeMap.get(MerkleTreeId.NULLIFIER_TREE)!.getRoot()}`,
);
}
} else {
this.merkleTrees = forkedState.merkleTrees;
Comment on lines -127 to +134

@dbanks12 dbanks12 Jan 8, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This print was wrong. We rollback on revert.

}
}

Expand Down