@aztec/simulator 0.0.0-test.1 → 0.0.1-commit.5daedc8

package/dest/public/avm/serialization/bytecode_serialization.js

@@ -1,3 +1,4 @@
+import { serializeToBuffer } from '@aztec/foundation/serialize';
 import { AvmExecutionError, AvmParsingError, InvalidOpcodeError, InvalidProgramCounterError } from '../errors.js';
 import { Add, And, Call, CalldataCopy, Cast, DebugLog, Div, EcAdd, EmitNoteHash, EmitNullifier, EmitUnencryptedLog, Eq, FieldDiv, GetContractInstance, GetEnvVar, Instruction, InternalCall, InternalReturn, Jump, JumpI, KeccakF1600, L1ToL2MessageExists, Lt, Lte, Mov, Mul, Not, NoteHashExists, NullifierExists, Or, Poseidon2, Return, ReturndataCopy, ReturndataSize, Revert, SLoad, SStore, SendL2ToL1Message, Set, Sha256Compression, Shl, Shr, StaticCall, Sub, SuccessCopy, ToRadixBE, Xor } from '../opcodes/index.js';
 import { BufferCursor } from './buffer_cursor.js';
@@ -5,289 +6,289 @@ import { MAX_OPCODE_VALUE, Opcode } from './instruction_serialization.js';
 export const INSTRUCTION_SET = new Map([
     [
         Opcode.ADD_8,
-        Add.as(Add.wireFormat8).deserialize
+        Add.as(Add.wireFormat8).fromBuffer
     ],
     [
         Opcode.ADD_16,
-        Add.as(Add.wireFormat16).deserialize
+        Add.as(Add.wireFormat16).fromBuffer
     ],
     [
         Opcode.SUB_8,
-        Sub.as(Sub.wireFormat8).deserialize
+        Sub.as(Sub.wireFormat8).fromBuffer
     ],
     [
         Opcode.SUB_16,
-        Sub.as(Sub.wireFormat16).deserialize
+        Sub.as(Sub.wireFormat16).fromBuffer
     ],
     [
         Opcode.MUL_8,
-        Mul.as(Mul.wireFormat8).deserialize
+        Mul.as(Mul.wireFormat8).fromBuffer
     ],
     [
         Opcode.MUL_16,
-        Mul.as(Mul.wireFormat16).deserialize
+        Mul.as(Mul.wireFormat16).fromBuffer
     ],
     [
         Opcode.DIV_8,
-        Div.as(Div.wireFormat8).deserialize
+        Div.as(Div.wireFormat8).fromBuffer
     ],
     [
         Opcode.DIV_16,
-        Div.as(Div.wireFormat16).deserialize
+        Div.as(Div.wireFormat16).fromBuffer
     ],
     [
         Opcode.FDIV_8,
-        FieldDiv.as(FieldDiv.wireFormat8).deserialize
+        FieldDiv.as(FieldDiv.wireFormat8).fromBuffer
     ],
     [
         Opcode.FDIV_16,
-        FieldDiv.as(FieldDiv.wireFormat16).deserialize
+        FieldDiv.as(FieldDiv.wireFormat16).fromBuffer
     ],
     [
         Opcode.EQ_8,
-        Eq.as(Eq.wireFormat8).deserialize
+        Eq.as(Eq.wireFormat8).fromBuffer
     ],
     [
         Opcode.EQ_16,
-        Eq.as(Eq.wireFormat16).deserialize
+        Eq.as(Eq.wireFormat16).fromBuffer
     ],
     [
         Opcode.LT_8,
-        Lt.as(Lt.wireFormat8).deserialize
+        Lt.as(Lt.wireFormat8).fromBuffer
     ],
     [
         Opcode.LT_16,
-        Lt.as(Lt.wireFormat16).deserialize
+        Lt.as(Lt.wireFormat16).fromBuffer
     ],
     [
         Opcode.LTE_8,
-        Lte.as(Lte.wireFormat8).deserialize
+        Lte.as(Lte.wireFormat8).fromBuffer
     ],
     [
         Opcode.LTE_16,
-        Lte.as(Lte.wireFormat16).deserialize
+        Lte.as(Lte.wireFormat16).fromBuffer
     ],
     [
         Opcode.AND_8,
-        And.as(And.wireFormat8).deserialize
+        And.as(And.wireFormat8).fromBuffer
     ],
     [
         Opcode.AND_16,
-        And.as(And.wireFormat16).deserialize
+        And.as(And.wireFormat16).fromBuffer
     ],
     [
         Opcode.OR_8,
-        Or.as(Or.wireFormat8).deserialize
+        Or.as(Or.wireFormat8).fromBuffer
     ],
     [
         Opcode.OR_16,
-        Or.as(Or.wireFormat16).deserialize
+        Or.as(Or.wireFormat16).fromBuffer
     ],
     [
         Opcode.XOR_8,
-        Xor.as(Xor.wireFormat8).deserialize
+        Xor.as(Xor.wireFormat8).fromBuffer
     ],
     [
         Opcode.XOR_16,
-        Xor.as(Xor.wireFormat16).deserialize
+        Xor.as(Xor.wireFormat16).fromBuffer
     ],
     [
         Opcode.NOT_8,
-        Not.as(Not.wireFormat8).deserialize
+        Not.as(Not.wireFormat8).fromBuffer
     ],
     [
         Opcode.NOT_16,
-        Not.as(Not.wireFormat16).deserialize
+        Not.as(Not.wireFormat16).fromBuffer
     ],
     [
         Opcode.SHL_8,
-        Shl.as(Shl.wireFormat8).deserialize
+        Shl.as(Shl.wireFormat8).fromBuffer
     ],
     [
         Opcode.SHL_16,
-        Shl.as(Shl.wireFormat16).deserialize
+        Shl.as(Shl.wireFormat16).fromBuffer
     ],
     [
         Opcode.SHR_8,
-        Shr.as(Shr.wireFormat8).deserialize
+        Shr.as(Shr.wireFormat8).fromBuffer
     ],
     [
         Opcode.SHR_16,
-        Shr.as(Shr.wireFormat16).deserialize
+        Shr.as(Shr.wireFormat16).fromBuffer
     ],
     [
         Opcode.CAST_8,
-        Cast.as(Cast.wireFormat8).deserialize
+        Cast.as(Cast.wireFormat8).fromBuffer
     ],
     [
         Opcode.CAST_16,
-        Cast.as(Cast.wireFormat16).deserialize
+        Cast.as(Cast.wireFormat16).fromBuffer
     ],
     // Execution Environment
     [
         Opcode.GETENVVAR_16,
-        GetEnvVar.as(GetEnvVar.wireFormat16).deserialize
+        GetEnvVar.as(GetEnvVar.wireFormat16).fromBuffer
     ],
     [
         CalldataCopy.opcode,
-        Instruction.deserialize.bind(CalldataCopy)
+        Instruction.fromBuffer.bind(CalldataCopy)
     ],
     [
         SuccessCopy.opcode,
-        Instruction.deserialize.bind(SuccessCopy)
+        Instruction.fromBuffer.bind(SuccessCopy)
     ],
     [
         Opcode.RETURNDATASIZE,
-        Instruction.deserialize.bind(ReturndataSize)
+        Instruction.fromBuffer.bind(ReturndataSize)
     ],
     [
         Opcode.RETURNDATACOPY,
-        Instruction.deserialize.bind(ReturndataCopy)
+        Instruction.fromBuffer.bind(ReturndataCopy)
     ],
     // Machine State - Internal Control Flow
     [
         Jump.opcode,
-        Instruction.deserialize.bind(Jump)
+        Instruction.fromBuffer.bind(Jump)
     ],
     [
         JumpI.opcode,
-        Instruction.deserialize.bind(JumpI)
+        Instruction.fromBuffer.bind(JumpI)
     ],
     [
         InternalCall.opcode,
-        Instruction.deserialize.bind(InternalCall)
+        Instruction.fromBuffer.bind(InternalCall)
     ],
     [
         InternalReturn.opcode,
-        Instruction.deserialize.bind(InternalReturn)
+        Instruction.fromBuffer.bind(InternalReturn)
     ],
     [
         Opcode.SET_8,
-        Set.as(Set.wireFormat8).deserialize
+        Set.as(Set.wireFormat8).fromBuffer
     ],
     [
         Opcode.SET_16,
-        Set.as(Set.wireFormat16).deserialize
+        Set.as(Set.wireFormat16).fromBuffer
     ],
     [
         Opcode.SET_32,
-        Set.as(Set.wireFormat32).deserialize
+        Set.as(Set.wireFormat32).fromBuffer
     ],
     [
         Opcode.SET_64,
-        Set.as(Set.wireFormat64).deserialize
+        Set.as(Set.wireFormat64).fromBuffer
     ],
     [
         Opcode.SET_128,
-        Set.as(Set.wireFormat128).deserialize
+        Set.as(Set.wireFormat128).fromBuffer
     ],
     [
         Opcode.SET_FF,
-        Set.as(Set.wireFormatFF).deserialize
+        Set.as(Set.wireFormatFF).fromBuffer
     ],
     [
         Opcode.MOV_8,
-        Mov.as(Mov.wireFormat8).deserialize
+        Mov.as(Mov.wireFormat8).fromBuffer
     ],
     [
         Opcode.MOV_16,
-        Mov.as(Mov.wireFormat16).deserialize
+        Mov.as(Mov.wireFormat16).fromBuffer
     ],
     // World State
     [
         SLoad.opcode,
-        Instruction.deserialize.bind(SLoad)
+        Instruction.fromBuffer.bind(SLoad)
     ],
     [
         SStore.opcode,
-        Instruction.deserialize.bind(SStore)
+        Instruction.fromBuffer.bind(SStore)
     ],
     [
         NoteHashExists.opcode,
-        Instruction.deserialize.bind(NoteHashExists)
+        Instruction.fromBuffer.bind(NoteHashExists)
     ],
     [
         EmitNoteHash.opcode,
-        Instruction.deserialize.bind(EmitNoteHash)
+        Instruction.fromBuffer.bind(EmitNoteHash)
     ],
     [
         NullifierExists.opcode,
-        Instruction.deserialize.bind(NullifierExists)
+        Instruction.fromBuffer.bind(NullifierExists)
     ],
     [
         EmitNullifier.opcode,
-        Instruction.deserialize.bind(EmitNullifier)
+        Instruction.fromBuffer.bind(EmitNullifier)
     ],
     [
         L1ToL2MessageExists.opcode,
-        Instruction.deserialize.bind(L1ToL2MessageExists)
+        Instruction.fromBuffer.bind(L1ToL2MessageExists)
     ],
     // Accrued Substate
     [
         EmitUnencryptedLog.opcode,
-        Instruction.deserialize.bind(EmitUnencryptedLog)
+        Instruction.fromBuffer.bind(EmitUnencryptedLog)
     ],
     [
         SendL2ToL1Message.opcode,
-        Instruction.deserialize.bind(SendL2ToL1Message)
+        Instruction.fromBuffer.bind(SendL2ToL1Message)
     ],
     [
         GetContractInstance.opcode,
-        Instruction.deserialize.bind(GetContractInstance)
+        Instruction.fromBuffer.bind(GetContractInstance)
     ],
     // Control Flow - Contract Calls
     [
         Call.opcode,
-        Instruction.deserialize.bind(Call)
+        Instruction.fromBuffer.bind(Call)
     ],
     [
         StaticCall.opcode,
-        Instruction.deserialize.bind(StaticCall)
+        Instruction.fromBuffer.bind(StaticCall)
     ],
     [
         Return.opcode,
-        Instruction.deserialize.bind(Return)
+        Instruction.fromBuffer.bind(Return)
     ],
     [
         Opcode.REVERT_8,
-        Revert.as(Revert.wireFormat8).deserialize
+        Revert.as(Revert.wireFormat8).fromBuffer
     ],
     [
         Opcode.REVERT_16,
-        Revert.as(Revert.wireFormat16).deserialize
+        Revert.as(Revert.wireFormat16).fromBuffer
     ],
     // Misc
     [
         DebugLog.opcode,
-        Instruction.deserialize.bind(DebugLog)
+        Instruction.fromBuffer.bind(DebugLog)
     ],
     // Gadgets
     [
         EcAdd.opcode,
-        Instruction.deserialize.bind(EcAdd)
+        Instruction.fromBuffer.bind(EcAdd)
     ],
     [
         Poseidon2.opcode,
-        Instruction.deserialize.bind(Poseidon2)
+        Instruction.fromBuffer.bind(Poseidon2)
     ],
     [
         Sha256Compression.opcode,
-        Instruction.deserialize.bind(Sha256Compression)
+        Instruction.fromBuffer.bind(Sha256Compression)
     ],
     [
         KeccakF1600.opcode,
-        Instruction.deserialize.bind(KeccakF1600)
+        Instruction.fromBuffer.bind(KeccakF1600)
     ],
     // Conversions
     [
         ToRadixBE.opcode,
-        Instruction.deserialize.bind(ToRadixBE)
+        Instruction.fromBuffer.bind(ToRadixBE)
     ]
 ]);
 /**
  * Serializes an array of instructions to bytecode.
  */ export function encodeToBytecode(instructions) {
-    return Buffer.concat(instructions.map((i)=>i.serialize()));
+    return serializeToBuffer(instructions);
 }
 // For testing only
 export function decodeFromBytecode(bytecode, instructionSet = INSTRUCTION_SET) {

package/dest/public/avm/serialization/instruction_serialization.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { BufferCursor } from './buffer_cursor.js';
 /**
  * All AVM opcodes. (Keep in sync with cpp counterpart code avm_opcode.hpp and rs in opcodes.rs).
@@ -82,15 +80,25 @@ export declare enum OperandType {
     UINT32 = 2,
     UINT64 = 3,
     UINT128 = 4,
-    FF = 5
+    FF = 5,
+    TAG = 6
 }
+type DeserializedValue = number | bigint;
+/**
+ * Returns the size of an operand in bytes.
+ * Should not be called with unknown operand types.
+ * @param operandType
+ * @returns number size in bytes
+ * @throws AssertionError if the operand type is unknown
+ */
+export declare function getOperandSize(operandType: OperandType): number;
 /**
  * Reads an array of operands from a buffer.
  * @param cursor Buffer to read from. Might be longer than needed.
  * @param operands Specification of the operand types.
  * @returns An array as big as {@code operands}, with the converted TS values.
  */
-export declare function deserialize(cursor: BufferCursor | Buffer, operands: OperandType[]): (number | bigint)[];
+export declare function deserialize(cursor: BufferCursor | Buffer, operands: OperandType[]): DeserializedValue[];
 /**
  * Serializes a class using the specified operand types.
  * More specifically, this serializes {@code [cls.constructor.opcode, ...Object.values(cls)]}.
@@ -102,4 +110,5 @@ export declare function deserialize(cursor: BufferCursor | Buffer, operands: Ope
  * @returns
  */
 export declare function serializeAs(operands: OperandType[], opcode: Opcode, cls: any): Buffer;
-//# sourceMappingURL=instruction_serialization.d.ts.map
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1Y3Rpb25fc2VyaWFsaXphdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vc2VyaWFsaXphdGlvbi9pbnN0cnVjdGlvbl9zZXJpYWxpemF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVsRDs7O0dBR0c7QUFDSCxvQkFBWSxNQUFNO0lBRWhCLEtBQUssSUFBQTtJQUNMLE1BQU0sSUFBQTtJQUNOLEtBQUssSUFBQTtJQUNMLE1BQU0sSUFBQTtJQUNOLEtBQUssSUFBQTtJQUNMLE1BQU0sSUFBQTtJQUNOLEtBQUssSUFBQTtJQUNMLE1BQU0sSUFBQTtJQUNOLE1BQU0sSUFBQTtJQUNOLE9BQU8sSUFBQTtJQUNQLElBQUksS0FBQTtJQUNKLEtBQUssS0FBQTtJQUNMLElBQUksS0FBQTtJQUNKLEtBQUssS0FBQTtJQUNMLEtBQUssS0FBQTtJQUNMLE1BQU0sS0FBQTtJQUNOLEtBQUssS0FBQTtJQUNMLE1BQU0sS0FBQTtJQUNOLElBQUksS0FBQTtJQUNKLEtBQUssS0FBQTtJQUNMLEtBQUssS0FBQTtJQUNMLE1BQU0sS0FBQTtJQUNOLEtBQUssS0FBQTtJQUNMLE1BQU0sS0FBQTtJQUNOLEtBQUssS0FBQTtJQUNMLE1BQU0sS0FBQTtJQUNOLEtBQUssS0FBQTtJQUNMLE1BQU0sS0FBQTtJQUNOLE1BQU0sS0FBQTtJQUNOLE9BQU8sS0FBQTtJQUVQLFlBQVksS0FBQTtJQUNaLFlBQVksS0FBQTtJQUNaLFdBQVcsS0FBQTtJQUNYLGNBQWMsS0FBQTtJQUNkLGNBQWMsS0FBQTtJQUVkLE9BQU8sS0FBQTtJQUNQLFFBQVEsS0FBQTtJQUNSLFlBQVksS0FBQTtJQUNaLGNBQWMsS0FBQTtJQUVkLEtBQUssS0FBQTtJQUNMLE1BQU0sS0FBQTtJQUNOLE1BQU0sS0FBQTtJQUNOLE1BQU0sS0FBQTtJQUNOLE9BQU8sS0FBQTtJQUNQLE1BQU0sS0FBQTtJQUNOLEtBQUssS0FBQTtJQUNMLE1BQU0sS0FBQTtJQUVOLEtBQUssS0FBQTtJQUNMLE1BQU0sS0FBQTtJQUNOLGNBQWMsS0FBQTtJQUNkLFlBQVksS0FBQTtJQUNaLGVBQWUsS0FBQTtJQUNmLGFBQWEsS0FBQTtJQUNiLGVBQWUsS0FBQTtJQUNmLG1CQUFtQixLQUFBO0lBQ25CLGtCQUFrQixLQUFBO0lBQ2xCLGFBQWEsS0FBQTtJQUViLElBQUksS0FBQTtJQUNKLFVBQVUsS0FBQTtJQUNWLE1BQU0sS0FBQTtJQUNOLFFBQVEsS0FBQTtJQUNSLFNBQVMsS0FBQTtJQUVULFFBQVEsS0FBQTtJQUVSLFNBQVMsS0FBQTtJQUNULGlCQUFpQixLQUFBO0lBQ2pCLFdBQVcsS0FBQTtJQUNYLEtBQUssS0FBQTtJQUVMLFNBQVMsS0FBQTtDQUNWO0FBRUQsZUFBTyxNQUFNLGdCQUFnQixRQUk1QixDQUFDO0FBSUYsb0JBQVksV0FBVztJQUNyQixLQUFLLElBQUE7SUFDTCxNQUFNLElBQUE7SUFDTixNQUFNLElBQUE7SUFDTixNQUFNLElBQUE7SUFDTixPQUFPLElBQUE7SUFDUCxFQUFFLElBQUE7SUFDRixHQUFHLElBQUE7Q0FDSjtBQUdELEtBQUssaUJBQWlCLEdBQUcsTUFBTSxHQUFHLE1BQU0sQ0FBQztBQWdCekM7Ozs7OztHQU1HO0FBQ0gsd0JBQWdCLGNBQWMsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE1BQU0sQ0FHL0Q7QUFrREQ7Ozs7O0dBS0c7QUFDSCx3QkFBZ0IsV0FBVyxDQUFDLE1BQU0sRUFBRSxZQUFZLEdBQUcsTUFBTSxFQUFFLFFBQVEsRUFBRSxXQUFXLEVBQUUsR0FBRyxpQkFBaUIsRUFBRSxDQXlCdkc7QUFFRDs7Ozs7Ozs7O0dBU0c7QUFDSCx3QkFBZ0IsV0FBVyxDQUFDLFFBQVEsRUFBRSxXQUFXLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxHQUFHLEdBQUcsTUFBTSxDQW1CckYifQ==

package/dest/public/avm/serialization/instruction_serialization.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instruction_serialization.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/serialization/instruction_serialization.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;GAGG;AACH,oBAAY,MAAM;IAEhB,KAAK,IAAA;IACL,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,MAAM,IAAA;IACN,OAAO,IAAA;IACP,IAAI,KAAA;IACJ,KAAK,KAAA;IACL,IAAI,KAAA;IACJ,KAAK,KAAA;IACL,KAAK,KAAA;IACL,MAAM,KAAA;IACN,KAAK,KAAA;IACL,MAAM,KAAA;IACN,IAAI,KAAA;IACJ,KAAK,KAAA;IACL,KAAK,KAAA;IACL,MAAM,KAAA;IACN,KAAK,KAAA;IACL,MAAM,KAAA;IACN,KAAK,KAAA;IACL,MAAM,KAAA;IACN,KAAK,KAAA;IACL,MAAM,KAAA;IACN,MAAM,KAAA;IACN,OAAO,KAAA;IAEP,YAAY,KAAA;IACZ,YAAY,KAAA;IACZ,WAAW,KAAA;IACX,cAAc,KAAA;IACd,cAAc,KAAA;IAEd,OAAO,KAAA;IACP,QAAQ,KAAA;IACR,YAAY,KAAA;IACZ,cAAc,KAAA;IAEd,KAAK,KAAA;IACL,MAAM,KAAA;IACN,MAAM,KAAA;IACN,MAAM,KAAA;IACN,OAAO,KAAA;IACP,MAAM,KAAA;IACN,KAAK,KAAA;IACL,MAAM,KAAA;IAEN,KAAK,KAAA;IACL,MAAM,KAAA;IACN,cAAc,KAAA;IACd,YAAY,KAAA;IACZ,eAAe,KAAA;IACf,aAAa,KAAA;IACb,eAAe,KAAA;IACf,mBAAmB,KAAA;IACnB,kBAAkB,KAAA;IAClB,aAAa,KAAA;IAEb,IAAI,KAAA;IACJ,UAAU,KAAA;IACV,MAAM,KAAA;IACN,QAAQ,KAAA;IACR,SAAS,KAAA;IAET,QAAQ,KAAA;IAER,SAAS,KAAA;IACT,iBAAiB,KAAA;IACjB,WAAW,KAAA;IACX,KAAK,KAAA;IAEL,SAAS,KAAA;CACV;AAED,eAAO,MAAM,gBAAgB,QAI5B,CAAC;AAMF,oBAAY,WAAW;IACrB,KAAK,IAAA;IACL,MAAM,IAAA;IACN,MAAM,IAAA;IACN,MAAM,IAAA;IACN,OAAO,IAAA;IACP,EAAE,IAAA;CACH;AAmDD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAcvG;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,MAAM,CAmBrF"}
+{"version":3,"file":"instruction_serialization.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/serialization/instruction_serialization.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;GAGG;AACH,oBAAY,MAAM;IAEhB,KAAK,IAAA;IACL,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,MAAM,IAAA;IACN,OAAO,IAAA;IACP,IAAI,KAAA;IACJ,KAAK,KAAA;IACL,IAAI,KAAA;IACJ,KAAK,KAAA;IACL,KAAK,KAAA;IACL,MAAM,KAAA;IACN,KAAK,KAAA;IACL,MAAM,KAAA;IACN,IAAI,KAAA;IACJ,KAAK,KAAA;IACL,KAAK,KAAA;IACL,MAAM,KAAA;IACN,KAAK,KAAA;IACL,MAAM,KAAA;IACN,KAAK,KAAA;IACL,MAAM,KAAA;IACN,KAAK,KAAA;IACL,MAAM,KAAA;IACN,MAAM,KAAA;IACN,OAAO,KAAA;IAEP,YAAY,KAAA;IACZ,YAAY,KAAA;IACZ,WAAW,KAAA;IACX,cAAc,KAAA;IACd,cAAc,KAAA;IAEd,OAAO,KAAA;IACP,QAAQ,KAAA;IACR,YAAY,KAAA;IACZ,cAAc,KAAA;IAEd,KAAK,KAAA;IACL,MAAM,KAAA;IACN,MAAM,KAAA;IACN,MAAM,KAAA;IACN,OAAO,KAAA;IACP,MAAM,KAAA;IACN,KAAK,KAAA;IACL,MAAM,KAAA;IAEN,KAAK,KAAA;IACL,MAAM,KAAA;IACN,cAAc,KAAA;IACd,YAAY,KAAA;IACZ,eAAe,KAAA;IACf,aAAa,KAAA;IACb,eAAe,KAAA;IACf,mBAAmB,KAAA;IACnB,kBAAkB,KAAA;IAClB,aAAa,KAAA;IAEb,IAAI,KAAA;IACJ,UAAU,KAAA;IACV,MAAM,KAAA;IACN,QAAQ,KAAA;IACR,SAAS,KAAA;IAET,QAAQ,KAAA;IAER,SAAS,KAAA;IACT,iBAAiB,KAAA;IACjB,WAAW,KAAA;IACX,KAAK,KAAA;IAEL,SAAS,KAAA;CACV;AAED,eAAO,MAAM,gBAAgB,QAI5B,CAAC;AAIF,oBAAY,WAAW;IACrB,KAAK,IAAA;IACL,MAAM,IAAA;IACN,MAAM,IAAA;IACN,MAAM,IAAA;IACN,OAAO,IAAA;IACP,EAAE,IAAA;IACF,GAAG,IAAA;CACJ;AAGD,KAAK,iBAAiB,GAAG,MAAM,GAAG,MAAM,CAAC;AAgBzC;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAG/D;AAkDD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,iBAAiB,EAAE,CAyBvG;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,MAAM,CAmBrF"}

package/dest/public/avm/serialization/instruction_serialization.js

@@ -1,4 +1,6 @@
+import { Fr } from '@aztec/foundation/fields';
 import { strict as assert } from 'assert';
+import { TaggedMemory } from '../avm_memory_types.js';
 import { BufferCursor } from './buffer_cursor.js';
 /**
  * All AVM opcodes. (Keep in sync with cpp counterpart code avm_opcode.hpp and rs in opcodes.rs).
@@ -84,10 +86,8 @@ import { BufferCursor } from './buffer_cursor.js';
     return Opcode;
 }({});
 export const MAX_OPCODE_VALUE = Math.max(...Object.values(Opcode).map((k)=>+k).filter((k)=>!isNaN(k)));
-// Possible types for an instruction's operand in its wire format. (Keep in sync with CPP code.
-// See vm/avm_trace/deserialization.cpp)
-// Note that cpp code introduced an additional enum value TAG to express the instruction tag. In TS,
-// this one is parsed as UINT8.
+// Possible types for an instruction's operand in its wire format.
+// The counterpart cpp file is: vm2/simulation/lib/serialization.hpp.
 export var OperandType = /*#__PURE__*/ function(OperandType) {
     OperandType[OperandType["UINT8"] = 0] = "UINT8";
     OperandType[OperandType["UINT16"] = 1] = "UINT16";
@@ -95,6 +95,7 @@ export var OperandType = /*#__PURE__*/ function(OperandType) {
     OperandType[OperandType["UINT64"] = 3] = "UINT64";
     OperandType[OperandType["UINT128"] = 4] = "UINT128";
     OperandType[OperandType["FF"] = 5] = "FF";
+    OperandType[OperandType["TAG"] = 6] = "TAG";
     return OperandType;
 }({});
 // Specifies how to read and write each operand type.
@@ -127,58 +128,82 @@ const OPERAND_SPEC = new Map([
         3,
         [
             8,
-            Buffer.prototype.readBigInt64BE,
-            Buffer.prototype.writeBigInt64BE
+            readUint64BE,
+            writeUint64BE
         ]
     ],
     [
         4,
         [
             16,
-            readBigInt128BE,
-            writeBigInt128BE
+            readUint128BE,
+            writeUint128BE
         ]
     ],
     [
         5,
         [
             32,
-            readBigInt254BE,
-            writeBigInt254BE
+            readUint254BE,
+            writeUint254BE
+        ]
+    ],
+    [
+        6,
+        [
+            1,
+            Buffer.prototype.readUint8,
+            Buffer.prototype.writeUint8
         ]
     ]
 ]);
-function readBigInt254BE(offset) {
-    const totalBytes = 32;
-    let ret = 0n;
+/**
+ * Returns the size of an operand in bytes.
+ * Should not be called with unknown operand types.
+ * @param operandType
+ * @returns number size in bytes
+ * @throws AssertionError if the operand type is unknown
+ */ export function getOperandSize(operandType) {
+    assert(OPERAND_SPEC.has(operandType), `Unknown operand type: ${operandType}`);
+    return OPERAND_SPEC.get(operandType)[0];
+}
+function readUintBE(buf, offset, totalBytes) {
+    let value = 0n;
     for(let i = 0; i < totalBytes; ++i){
-        ret <<= 8n;
-        ret |= BigInt(this.readUint8(i + offset));
+        value <<= 8n;
+        value |= BigInt(buf.readUint8(i + offset));
     }
-    return ret;
+    return value;
 }
-function writeBigInt254BE(value) {
-    const totalBytes = 32;
+function writeUintBE(buf, value, totalBytes) {
     for(let offset = totalBytes - 1; offset >= 0; --offset){
-        this.writeUint8(Number(value & 0xffn), offset);
+        buf.writeUint8(Number(value & 0xffn), offset);
         value >>= 8n;
     }
 }
-function readBigInt128BE(offset) {
-    const totalBytes = 16;
-    let ret = 0n;
-    for(let i = 0; i < totalBytes; ++i){
-        ret <<= 8n;
-        ret |= BigInt(this.readUint8(i + offset));
-    }
-    return ret;
+function readUint64BE(offset) {
+    return readUintBE(this, offset, 8);
 }
-function writeBigInt128BE(value) {
-    const totalBytes = 16;
-    for(let offset = totalBytes - 1; offset >= 0; --offset){
-        this.writeUint8(Number(value & 0xffn), offset);
-        value >>= 8n;
+function writeUint64BE(value) {
+    writeUintBE(this, value, 8);
+}
+function readUint254BE(offset) {
+    let value = readUintBE(this, offset, 32);
+    // In circuit, we only support values up to Fr.MODULUS and any deserialized value
+    // would naturally undergo a modulus reduction.
+    if (value >= Fr.MODULUS) {
+        value = value % Fr.MODULUS;
     }
+    return value;
+}
+function writeUint254BE(value) {
+    writeUintBE(this, value, 32);
+}
+function readUint128BE(offset) {
+    return readUintBE(this, offset, 16);
+}
+function writeUint128BE(value) {
+    writeUintBE(this, value, 16);
 }
 /**
  * Reads an array of operands from a buffer.
@@ -190,12 +215,22 @@ function writeBigInt128BE(value) {
     if (Buffer.isBuffer(cursor)) {
         cursor = new BufferCursor(cursor);
     }
-    for (const op of operands){
-        const opType = op;
+    for (const opType of operands){
         const [sizeBytes, reader, _writer] = OPERAND_SPEC.get(opType);
-        argValues.push(reader.call(cursor.buffer(), cursor.position()));
+        const value = reader.call(cursor.buffer(), cursor.position());
+        argValues.push(value);
         cursor.advance(sizeBytes);
     }
+    // We first want to detect other parsing errors (e.g., instruction size
+    // is longer than remaining bytes) first and therefore tag validation is done after completion
+    // of parsing above. Order of errors need to match with circuit.
+    for(let i = 0; i < operands.length; i++){
+        if (operands[i] === 6) {
+            // We parsed a single byte (readUInt8()) and therefore value is of number type (not bigint)
+            // We need to cast to number because checkIsValidTag expects a number.
+            TaggedMemory.checkIsValidTag(Number(argValues[i] ?? 0));
+        }
+    }
     return argValues;
 }
 /**

package/dest/public/avm/test_utils.d.ts

@@ -1,18 +1,15 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
-import { type ContractClassPublic, type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-import type { WorldStateDB } from '../../public/public_db_sources.js';
+import type { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import type { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
 import type { PublicSideEffectTraceInterface } from '../side_effect_trace_interface.js';
-export declare function mockGetBytecode(worldStateDB: WorldStateDB, bytecode: Buffer): Promise<void>;
 export declare function mockTraceFork(trace: PublicSideEffectTraceInterface, nestedTrace?: PublicSideEffectTraceInterface): void;
-export declare function mockStorageRead(worldStateDB: WorldStateDB, value: Fr): void;
+export declare function mockStorageRead(worldStateDB: PublicTreesDB, value: Fr): void;
 export declare function mockNoteHashCount(mockedTrace: PublicSideEffectTraceInterface, count: number): void;
-export declare function mockStorageReadWithMap(worldStateDB: WorldStateDB, mockedStorage: Map<bigint, Fr>): void;
-export declare function mockGetBytecodeCommitment(worldStateDB: WorldStateDB, commitment: Fr): void;
-export declare function mockNoteHashExists(worldStateDB: WorldStateDB, _leafIndex: Fr, value?: Fr): void;
-export declare function mockGetNullifierIndex(worldStateDB: WorldStateDB, leafIndex: Fr, _ignoredValue?: Fr): void;
-export declare function mockL1ToL2MessageExists(worldStateDB: WorldStateDB, leafIndex: Fr, value: Fr, valueAtOtherIndices?: Fr): void;
-export declare function mockGetContractInstance(worldStateDB: WorldStateDB, contractInstance: ContractInstanceWithAddress): void;
-export declare function mockGetContractClass(worldStateDB: WorldStateDB, contractClass: ContractClassPublic): void;
-//# sourceMappingURL=test_utils.d.ts.map
+export declare function mockStorageReadWithMap(worldStateDB: PublicTreesDB, mockedStorage: Map<bigint, Fr>): void;
+export declare function mockGetNoteHash(worldStateDB: PublicTreesDB, _leafIndex: bigint, value?: Fr): void;
+export declare function mockCheckNullifierExists(worldStateDB: PublicTreesDB, exists: boolean, _ignoredValue?: Fr): void;
+export declare function mockGetL1ToL2LeafValue(worldStateDB: PublicTreesDB, leafIndex: bigint, value?: Fr): void;
+export declare function mockGetContractInstance(contractsDB: PublicContractsDB, contractInstance: ContractInstanceWithAddress): void;
+export declare function mockGetContractClass(contractsDB: PublicContractsDB, contractClass: ContractClassPublic): void;
+export declare function mockGetBytecodeCommitment(contractsDB: PublicContractsDB, commitment: Fr): void;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF91dGlscy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vdGVzdF91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUsvRixPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxhQUFhLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNoRixPQUFPLEtBQUssRUFBRSw4QkFBOEIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBRXhGLHdCQUFnQixhQUFhLENBQUMsS0FBSyxFQUFFLDhCQUE4QixFQUFFLFdBQVcsQ0FBQyxFQUFFLDhCQUE4QixRQUloSDtBQUVELHdCQUFnQixlQUFlLENBQUMsWUFBWSxFQUFFLGFBQWEsRUFBRSxLQUFLLEVBQUUsRUFBRSxRQUVyRTtBQUVELHdCQUFnQixpQkFBaUIsQ0FBQyxXQUFXLEVBQUUsOEJBQThCLEVBQUUsS0FBSyxFQUFFLE1BQU0sUUFFM0Y7QUFFRCx3QkFBZ0Isc0JBQXNCLENBQUMsWUFBWSxFQUFFLGFBQWEsRUFBRSxhQUFhLEVBQUUsR0FBRyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsUUFJakc7QUFFRCx3QkFBZ0IsZUFBZSxDQUFDLFlBQVksRUFBRSxhQUFhLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLFFBUTFGO0FBRUQsd0JBQWdCLHdCQUF3QixDQUFDLFlBQVksRUFBRSxhQUFhLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxhQUFhLENBQUMsRUFBRSxFQUFFLFFBRXhHO0FBRUQsd0JBQWdCLHNCQUFzQixDQUFDLFlBQVksRUFBRSxhQUFhLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLFFBUWhHO0FBRUQsd0JBQWdCLHVCQUF1QixDQUFDLFdBQVcsRUFBRSxpQkFBaUIsRUFBRSxnQkFBZ0IsRUFBRSwyQkFBMkIsUUFFcEg7QUFFRCx3QkFBZ0Isb0JBQW9CLENBQUMsV0FBVyxFQUFFLGlCQUFpQixFQUFFLGFBQWEsRUFBRSxtQkFBbUIsUUFFdEc7QUFFRCx3QkFBZ0IseUJBQXlCLENBQUMsV0FBVyxFQUFFLGlCQUFpQixFQUFFLFVBQVUsRUFBRSxFQUFFLFFBRXZGIn0=

package/dest/public/avm/test_utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test_utils.d.ts","sourceRoot":"","sources":["../../../src/public/avm/test_utils.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EAEjC,MAAM,wBAAwB,CAAC;AAKhC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,mCAAmC,CAAC;AAExF,wBAAsB,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,iBAGjF;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,8BAA8B,EAAE,WAAW,CAAC,EAAE,8BAA8B,QAIhH;AAED,wBAAgB,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,QAEpE;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,8BAA8B,EAAE,KAAK,EAAE,MAAM,QAE3F;AAED,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,QAIhG;AAED,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,QAEnF;AAED,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,QASxF;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,EAAE,aAAa,CAAC,EAAE,EAAE,QAElG;AAED,wBAAgB,uBAAuB,CACrC,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,EAAE,EACb,KAAK,EAAE,EAAE,EACT,mBAAmB,CAAC,EAAE,EAAE,QAWzB;AAED,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,YAAY,EAAE,gBAAgB,EAAE,2BAA2B,QAEhH;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,QAElG"}
+{"version":3,"file":"test_utils.d.ts","sourceRoot":"","sources":["../../../src/public/avm/test_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAK/F,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,mCAAmC,CAAC;AAExF,wBAAgB,aAAa,CAAC,KAAK,EAAE,8BAA8B,EAAE,WAAW,CAAC,EAAE,8BAA8B,QAIhH;AAED,wBAAgB,eAAe,CAAC,YAAY,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,QAErE;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,8BAA8B,EAAE,KAAK,EAAE,MAAM,QAE3F;AAED,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,QAIjG;AAED,wBAAgB,eAAe,CAAC,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,QAQ1F;AAED,wBAAgB,wBAAwB,CAAC,YAAY,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,EAAE,QAExG;AAED,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,QAQhG;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,2BAA2B,QAEpH;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,iBAAiB,EAAE,aAAa,EAAE,mBAAmB,QAEtG;AAED,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,iBAAiB,EAAE,UAAU,EAAE,EAAE,QAEvF"}