fixes

Author: fcarreiro

barretenberg/cpp/src/barretenberg/vm2/common/avm_inputs.hpp

@@ -395,7 +395,7 @@ struct AvmProvingInputs {
 ////////////////////////////////////////////////////////////////////////////
 struct TxSimulationResult {
     // Simulation.
-    Gas gas_used;
+    GasUsed gas_used;
     RevertCode revert_code;
     std::optional<SimulationError> revert_reason;
     std::optional<std::vector<FF>> app_logic_return_value;

barretenberg/cpp/src/barretenberg/vm2/common/aztec_types.hpp

@@ -209,6 +209,16 @@ struct Gas {
     MSGPACK_FIELDS(l2Gas, daGas);
 };
 
+struct GasUsed {
+    Gas total_gas;
+    Gas teardown_gas;
+    Gas public_gas;
+    Gas billed_gas;
+
+    bool operator==(const GasUsed& other) const = default;
+    MSGPACK_CAMEL_CASE_FIELDS(total_gas, teardown_gas, public_gas, billed_gas);
+};
+
 struct GasSettings {
     Gas gasLimits;
     Gas teardownGasLimits;

barretenberg/cpp/src/barretenberg/vm2/simulation/gadgets/tx_execution.cpp

@@ -235,7 +235,13 @@ TxExecutionResult TxExecution::simulate(const Tx& tx)
     cleanup();
 
     return {
-        .gas_used = tx_context.gas_used,
+        .gas_used = {
+            .total_gas = tx_context.gas_used,
+            // TODO(fcarreiro): complete.
+            .teardown_gas = { 0, 0 },
+            .public_gas = { 0, 0 },
+            .billed_gas = { 0, 0 },
+        },
         .revert_code = tx_context.revert_code,
         .app_logic_return_value = std::move(app_logic_return_value),
     };

barretenberg/cpp/src/barretenberg/vm2/simulation/gadgets/tx_execution.hpp

@@ -18,7 +18,7 @@ namespace bb::avm2::simulation {
 
 // TODO(fcarreiro): Create interface and move there.
 struct TxExecutionResult {
-    Gas gas_used;
+    GasUsed gas_used;
     RevertCode revert_code;
     std::optional<std::vector<FF>> app_logic_return_value;
 };

barretenberg/cpp/src/barretenberg/vm2/simulation_helper.cpp

@@ -437,7 +437,7 @@ TxSimulationResult AvmSimulationHelper::simulate_fast(ContractDBInterface& raw_c
     // TODO(fcarreiro): get these values from somewhere.
     FF transaction_fee = 0;
     public_inputs_builder.extract_outputs(raw_merkle_db,
-                                          tx_execution_result.gas_used,
+                                          tx_execution_result.gas_used.total_gas,
                                           transaction_fee,
                                           tx_execution_result.revert_code != RevertCode::OK,
                                           side_effect_tracker.get_side_effects());

yarn-project/simulator/package.json

@@ -78,7 +78,7 @@
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2",
     "tslib": "^2.4.0",
-    "zod": "^4.1.12"
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@aztec/kv-store": "workspace:^",

yarn-project/simulator/src/public/public_tx_simulator/cpp_public_tx_simulator.ts

@@ -82,11 +82,11 @@ export class CppPublicTxSimulatorHintedDbs extends PublicTxSimulator implements
     }
 
     // Deserialize the msgpack result
-    const cppResultJSON: any = deserializeFromMessagePack(resultBuffer);
-    // TODO(fcarreiro): complete this.
-    // console.log('cppResult', cppResultJSON);
-    const cppResult = PublicTxResult.partialSchema.parse(cppResultJSON);
+    const cppResultJSON: object = deserializeFromMessagePack(resultBuffer);
+    const cppResult = PublicTxResult.fromJSON(cppResultJSON);
+
     assert(cppResult.revertCode.equals(tsResult.revertCode));
+    assert(cppResult.gasUsed.totalGas.equals(tsResult.gasUsed.totalGas));
 
     this.log.debug(`C++ hinted simulation completed for tx ${txHash}`, {
       txHash,

yarn-project/simulator/src/public/public_tx_simulator/public_tx_simulator.ts

@@ -42,29 +42,49 @@ export class PublicTxResult {
     public publicInputs: AvmCircuitPublicInputs,
   ) {}
 
-  static get schema() {
+  /*
+  static get schema(): ZodFor<PublicTxResult> {
     return z
       .object({
         gasUsed: schemas.GasUsed,
         revertCode: RevertCode.schema,
         revertReason: SimulationError.schema.optional(),
-        appLogicReturnValue: z.array(schemas.Fr).optional(),
-        logs: z.array(DebugLog.schema),
+        appLogicReturnValue: Fr.schema.array().optional(),
+        logs: DebugLog.schema.array(),
         hints: AvmExecutionHints.schema.optional(),
         publicInputs: AvmCircuitPublicInputs.schema,
       })
       .transform(
         ({ gasUsed, revertCode, revertReason, appLogicReturnValue, logs, hints, publicInputs }) =>
-          new PublicTxResult(gasUsed, revertCode, revertReason, appLogicReturnValue, logs, hints, publicInputs),
+          new PublicTxResult(
+            gasUsed,
+            revertCode as RevertCode,
+            revertReason,
+            appLogicReturnValue,
+            logs,
+            hints,
+            publicInputs,
+          ),
       );
-  }
+  }*/
 
   // TODO(fcarreiro): complete this.
   static get partialSchema() {
     return z.object({
+      gasUsed: schemas.GasUsed,
       revertCode: RevertCode.schema,
     });
   }
+  static fromJSON(json: any) {
+    console.log('json', json);
+    // console.log('PI.globalVariables.gasFees', json.publicInputs.globalVariables.gasFees);
+    const r = PublicTxResult.partialSchema.parse(json);
+    console.log('after parse', r);
+    return r as {
+      gasUsed: GasUsed;
+      revertCode: RevertCode;
+    };
+  }
 }
 
 export type PublicTxSimulatorConfig = {

yarn-project/stdlib/src/avm/avm.test.ts

@@ -4,6 +4,7 @@ import { readTestData, writeTestData } from '@aztec/foundation/testing/files';
 
 import { makeAvmCircuitInputs } from '../tests/factories.js';
 import { AvmCircuitInputs } from './avm.js';
+import { deserializeFromMessagePack } from './message_pack.js';
 
 describe('Avm circuit inputs', () => {
   // This tests that serde with the orchestrator works.
@@ -31,4 +32,14 @@ describe('Avm circuit inputs', () => {
     // generate the diff. This could otherwise take 10m+ and kill CI.
     expect(buffer.equals(expected)).toBe(true);
   });
+
+  // TODO(fcarreiro): fix this test.
+  it.skip('serializes with MP and deserializes it back', async () => {
+    const avmCircuitInputs = await makeAvmCircuitInputs(/*seed=*/ 0x1234);
+    const buffer = avmCircuitInputs.serializeWithMessagePack();
+    const json = deserializeFromMessagePack(buffer);
+    // Parsing fails.
+    const res = AvmCircuitInputs.schema.parse(json);
+    expect(res).toStrictEqual(avmCircuitInputs);
+  });
 });

yarn-project/stdlib/src/avm/message_pack.ts

@@ -18,7 +18,7 @@ export function serializeWithMessagePack(obj: any): Buffer {
   return encoder.encode(obj);
 }
 
-// This deserializes into a JSON-like object. If you want a specific
+// This deserializes into a JS object. If you want a specific
 // class, you need to use zod to parse it into the specific class.
 // You can use T.schema.parse() for that.
 export function deserializeFromMessagePack(buffer: Buffer): any {