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

Author: dbanks12

yarn-project/simulator/src/avm/avm_simulator.ts

@@ -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

yarn-project/simulator/src/avm/journal/journal.ts

@@ -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;
     }
   }