@aztec/simulator 0.52.0 → 0.54.0

package/dest/avm/serialization/bytecode_serialization.js

@@ -2,6 +2,7 @@ import { PedersenCommitment } from '../opcodes/commitment.js';
 import { DAGasLeft, L2GasLeft } from '../opcodes/context_getters.js';
 import { EcAdd } from '../opcodes/ec_add.js';
 import { Keccak, KeccakF1600, Pedersen, Poseidon2, Sha256 } from '../opcodes/hashing.js';
+import { Instruction } from '../opcodes/index.js';
 import { Add, Address, And, BlockNumber, CMov, Call, CalldataCopy, Cast, ChainId, DebugLog, Div, EmitNoteHash, EmitNullifier, EmitUnencryptedLog, Eq, FeePerDAGas, FeePerL2Gas, FieldDiv, FunctionSelector, GetContractInstance, InternalCall, InternalReturn, Jump, JumpI, L1ToL2MessageExists, Lt, Lte, Mov, Mul, Not, NoteHashExists, NullifierExists, Or, Return, Revert, SLoad, SStore, SendL2ToL1Message, Sender, Set, Shl, Shr, StaticCall, StorageAddress, Sub, Timestamp, ToRadixLE, TransactionFee, Version, Xor, } from '../opcodes/index.js';
 import { MultiScalarMul } from '../opcodes/multi_scalar_mul.js';
 import { BufferCursor } from './buffer_cursor.js';
@@ -9,84 +10,99 @@ import { Opcode } from './instruction_serialization.js';
 // TODO(4359): This is a function so that Call and StaticCall can be lazily resolved.
 // This is a temporary solution until we solve the dependency cycle.
 const INSTRUCTION_SET = () => new Map([
-    [Add.opcode, Add],
-    [Sub.opcode, Sub],
-    [Mul.opcode, Mul],
-    [Div.opcode, Div],
-    [FieldDiv.opcode, FieldDiv],
-    [Eq.opcode, Eq],
-    [Lt.opcode, Lt],
-    [Lte.opcode, Lte],
-    [And.opcode, And],
-    [Or.opcode, Or],
-    [Xor.opcode, Xor],
-    [Not.opcode, Not],
-    [Shl.opcode, Shl],
-    [Shr.opcode, Shr],
-    [Cast.opcode, Cast],
-    [Address.opcode, Address],
-    [StorageAddress.opcode, StorageAddress],
-    [Sender.opcode, Sender],
-    [FunctionSelector.opcode, FunctionSelector],
-    [TransactionFee.opcode, TransactionFee],
+    [Opcode.ADD_8, Add.as(Add.wireFormat8).deserialize],
+    [Opcode.ADD_16, Add.as(Add.wireFormat16).deserialize],
+    [Opcode.SUB_8, Sub.as(Sub.wireFormat8).deserialize],
+    [Opcode.SUB_16, Sub.as(Sub.wireFormat16).deserialize],
+    [Opcode.MUL_8, Mul.as(Mul.wireFormat8).deserialize],
+    [Opcode.MUL_16, Mul.as(Mul.wireFormat16).deserialize],
+    [Opcode.DIV_8, Div.as(Div.wireFormat8).deserialize],
+    [Opcode.DIV_16, Div.as(Div.wireFormat16).deserialize],
+    [Opcode.FDIV_8, FieldDiv.as(FieldDiv.wireFormat8).deserialize],
+    [Opcode.FDIV_16, FieldDiv.as(FieldDiv.wireFormat16).deserialize],
+    [Opcode.EQ_8, Eq.as(Eq.wireFormat8).deserialize],
+    [Opcode.EQ_16, Eq.as(Eq.wireFormat16).deserialize],
+    [Opcode.LT_8, Lt.as(Lt.wireFormat8).deserialize],
+    [Opcode.LT_16, Lt.as(Lt.wireFormat16).deserialize],
+    [Opcode.LTE_8, Lte.as(Lte.wireFormat8).deserialize],
+    [Opcode.LTE_16, Lte.as(Lte.wireFormat16).deserialize],
+    [Opcode.AND_8, And.as(And.wireFormat8).deserialize],
+    [Opcode.AND_16, And.as(And.wireFormat16).deserialize],
+    [Opcode.OR_8, Or.as(Or.wireFormat8).deserialize],
+    [Opcode.OR_16, Or.as(Or.wireFormat16).deserialize],
+    [Opcode.XOR_8, Xor.as(Xor.wireFormat8).deserialize],
+    [Opcode.XOR_16, Xor.as(Xor.wireFormat16).deserialize],
+    [Not.opcode, Instruction.deserialize.bind(Not)],
+    [Opcode.SHL_8, Shl.as(Shl.wireFormat8).deserialize],
+    [Opcode.SHL_16, Shl.as(Shl.wireFormat16).deserialize],
+    [Opcode.SHR_8, Shr.as(Shr.wireFormat8).deserialize],
+    [Opcode.SHR_16, Shr.as(Shr.wireFormat16).deserialize],
+    [Cast.opcode, Instruction.deserialize.bind(Cast)],
+    [Address.opcode, Instruction.deserialize.bind(Address)],
+    [StorageAddress.opcode, Instruction.deserialize.bind(StorageAddress)],
+    [Sender.opcode, Instruction.deserialize.bind(Sender)],
+    [FunctionSelector.opcode, Instruction.deserialize.bind(FunctionSelector)],
+    [TransactionFee.opcode, Instruction.deserialize.bind(TransactionFee)],
     // Execution Environment - Globals
-    [ChainId.opcode, ChainId],
-    [Version.opcode, Version],
-    [BlockNumber.opcode, BlockNumber],
-    [Timestamp.opcode, Timestamp],
-    //[Coinbase.opcode, Coinbase],
-    [FeePerL2Gas.opcode, FeePerL2Gas],
-    [FeePerDAGas.opcode, FeePerDAGas],
-    //[Blockl2gaslimit.opcode, Blockl2gaslimit],
-    //[Blockdagaslimit.opcode, Blockdagaslimit],
+    [ChainId.opcode, Instruction.deserialize.bind(ChainId)],
+    [Version.opcode, Instruction.deserialize.bind(Version)],
+    [BlockNumber.opcode, Instruction.deserialize.bind(BlockNumber)],
+    [Timestamp.opcode, Instruction.deserialize.bind(Timestamp)],
+    [FeePerL2Gas.opcode, Instruction.deserialize.bind(FeePerL2Gas)],
+    [FeePerDAGas.opcode, Instruction.deserialize.bind(FeePerDAGas)],
     // Execution Environment - Calldata
-    [CalldataCopy.opcode, CalldataCopy],
+    [CalldataCopy.opcode, Instruction.deserialize.bind(CalldataCopy)],
     // Machine State
     // Machine State - Gas
-    [L2GasLeft.opcode, L2GasLeft],
-    [DAGasLeft.opcode, DAGasLeft],
+    [L2GasLeft.opcode, Instruction.deserialize.bind(L2GasLeft)],
+    [DAGasLeft.opcode, Instruction.deserialize.bind(DAGasLeft)],
     // Machine State - Internal Control Flow
-    [Jump.opcode, Jump],
-    [JumpI.opcode, JumpI],
-    [InternalCall.opcode, InternalCall],
-    [InternalReturn.opcode, InternalReturn],
-    [Set.opcode, Set],
-    [Mov.opcode, Mov],
-    [CMov.opcode, CMov],
+    [Jump.opcode, Instruction.deserialize.bind(Jump)],
+    [JumpI.opcode, Instruction.deserialize.bind(JumpI)],
+    [InternalCall.opcode, Instruction.deserialize.bind(InternalCall)],
+    [InternalReturn.opcode, Instruction.deserialize.bind(InternalReturn)],
+    [Opcode.SET_8, Set.as(Set.wireFormat8).deserialize],
+    [Opcode.SET_16, Set.as(Set.wireFormat16).deserialize],
+    [Opcode.SET_32, Set.as(Set.wireFormat32).deserialize],
+    [Opcode.SET_64, Set.as(Set.wireFormat64).deserialize],
+    [Opcode.SET_128, Set.as(Set.wireFormat128).deserialize],
+    [Opcode.SET_FF, Set.as(Set.wireFormatFF).deserialize],
+    [Opcode.MOV_8, Mov.as(Mov.wireFormat8).deserialize],
+    [Opcode.MOV_16, Mov.as(Mov.wireFormat16).deserialize],
+    [CMov.opcode, Instruction.deserialize.bind(CMov)],
     // World State
-    [SLoad.opcode, SLoad], // Public Storage
-    [SStore.opcode, SStore], // Public Storage
-    [NoteHashExists.opcode, NoteHashExists], // Notes & Nullifiers
-    [EmitNoteHash.opcode, EmitNoteHash], // Notes & Nullifiers
-    [NullifierExists.opcode, NullifierExists], // Notes & Nullifiers
-    [EmitNullifier.opcode, EmitNullifier], // Notes & Nullifiers
-    [L1ToL2MessageExists.opcode, L1ToL2MessageExists], // Messages
-    //[HeaderMember.opcode, HeaderMember], // Header
+    [SLoad.opcode, Instruction.deserialize.bind(SLoad)], // Public Storage
+    [SStore.opcode, Instruction.deserialize.bind(SStore)], // Public Storage
+    [NoteHashExists.opcode, Instruction.deserialize.bind(NoteHashExists)], // Notes & Nullifiers
+    [EmitNoteHash.opcode, Instruction.deserialize.bind(EmitNoteHash)], // Notes & Nullifiers
+    [NullifierExists.opcode, Instruction.deserialize.bind(NullifierExists)], // Notes & Nullifiers
+    [EmitNullifier.opcode, Instruction.deserialize.bind(EmitNullifier)], // Notes & Nullifiers
+    [L1ToL2MessageExists.opcode, Instruction.deserialize.bind(L1ToL2MessageExists)], // Messages
     // Accrued Substate
-    [EmitUnencryptedLog.opcode, EmitUnencryptedLog],
-    [SendL2ToL1Message.opcode, SendL2ToL1Message],
-    [GetContractInstance.opcode, GetContractInstance],
+    [EmitUnencryptedLog.opcode, Instruction.deserialize.bind(EmitUnencryptedLog)],
+    [SendL2ToL1Message.opcode, Instruction.deserialize.bind(SendL2ToL1Message)],
+    [GetContractInstance.opcode, Instruction.deserialize.bind(GetContractInstance)],
     // Control Flow - Contract Calls
-    [Call.opcode, Call],
-    [StaticCall.opcode, StaticCall],
-    //[DelegateCall.opcode, DelegateCall],
-    [Return.opcode, Return],
-    [Revert.opcode, Revert],
+    [Call.opcode, Instruction.deserialize.bind(Call)],
+    [StaticCall.opcode, Instruction.deserialize.bind(StaticCall)],
+    //[DelegateCall.opcode, Instruction.deserialize.bind(DelegateCall)],
+    [Return.opcode, Instruction.deserialize.bind(Return)],
+    [Revert.opcode, Instruction.deserialize.bind(Revert)],
     // Misc
-    [DebugLog.opcode, DebugLog],
+    [DebugLog.opcode, Instruction.deserialize.bind(DebugLog)],
     // Gadgets
-    [EcAdd.opcode, EcAdd],
-    [Keccak.opcode, Keccak],
-    [Poseidon2.opcode, Poseidon2],
-    [Sha256.opcode, Sha256],
-    [Pedersen.opcode, Pedersen],
-    [MultiScalarMul.opcode, MultiScalarMul],
-    [PedersenCommitment.opcode, PedersenCommitment],
+    [EcAdd.opcode, Instruction.deserialize.bind(EcAdd)],
+    [Keccak.opcode, Instruction.deserialize.bind(Keccak)],
+    [Poseidon2.opcode, Instruction.deserialize.bind(Poseidon2)],
+    [Sha256.opcode, Instruction.deserialize.bind(Sha256)],
+    [Pedersen.opcode, Instruction.deserialize.bind(Pedersen)],
+    [MultiScalarMul.opcode, Instruction.deserialize.bind(MultiScalarMul)],
+    [PedersenCommitment.opcode, Instruction.deserialize.bind(PedersenCommitment)],
     // Conversions
-    [ToRadixLE.opcode, ToRadixLE],
+    [ToRadixLE.opcode, Instruction.deserialize.bind(ToRadixLE)],
     // Future Gadgets -- pending changes in noir
     // SHA256COMPRESSION,
-    [KeccakF1600.opcode, KeccakF1600],
+    [KeccakF1600.opcode, Instruction.deserialize.bind(KeccakF1600)],
 ]);
 /**
  * Serializes an array of instructions to bytecode.
@@ -110,9 +126,9 @@ export function decodeFromBytecode(bytecode, instructionSet = INSTRUCTION_SET())
             throw new Error(`Opcode ${Opcode[opcode]} (0x${opcode.toString(16)}) not implemented`);
         }
         const instructionDeserializer = instructionDeserializerOrUndef;
-        const i = instructionDeserializer.deserialize(cursor);
+        const i = instructionDeserializer(cursor);
         instructions.push(i);
     }
     return instructions;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnl0ZWNvZGVfc2VyaWFsaXphdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hdm0vc2VyaWFsaXphdGlvbi9ieXRlY29kZV9zZXJpYWxpemF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzlELE9BQU8sRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDckUsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzdDLE9BQU8sRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFekYsT0FBTyxFQUNMLEdBQUcsRUFDSCxPQUFPLEVBQ1AsR0FBRyxFQUNILFdBQVcsRUFDWCxJQUFJLEVBQ0osSUFBSSxFQUNKLFlBQVksRUFDWixJQUFJLEVBQ0osT0FBTyxFQUNQLFFBQVEsRUFDUixHQUFHLEVBQ0gsWUFBWSxFQUNaLGFBQWEsRUFDYixrQkFBa0IsRUFDbEIsRUFBRSxFQUNGLFdBQVcsRUFDWCxXQUFXLEVBQ1gsUUFBUSxFQUNSLGdCQUFnQixFQUNoQixtQkFBbUIsRUFDbkIsWUFBWSxFQUNaLGNBQWMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLG1CQUFtQixFQUNuQixFQUFFLEVBQ0YsR0FBRyxFQUNILEdBQUcsRUFDSCxHQUFHLEVBQ0gsR0FBRyxFQUNILGNBQWMsRUFDZCxlQUFlLEVBQ2YsRUFBRSxFQUNGLE1BQU0sRUFDTixNQUFNLEVBQ04sS0FBSyxFQUNMLE1BQU0sRUFDTixpQkFBaUIsRUFDakIsTUFBTSxFQUNOLEdBQUcsRUFDSCxHQUFHLEVBQ0gsR0FBRyxFQUNILFVBQVUsRUFDVixjQUFjLEVBQ2QsR0FBRyxFQUNILFNBQVMsRUFDVCxTQUFTLEVBQ1QsY0FBYyxFQUNkLE9BQU8sRUFD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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bytecode_serialization.js","sourceRoot":"","sources":["../../../src/avm/serialization/bytecode_serialization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EACL,GAAG,EACH,OAAO,EACP,GAAG,EACH,WAAW,EACX,IAAI,EACJ,IAAI,EACJ,YAAY,EACZ,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,GAAG,EACH,YAAY,EACZ,aAAa,EACb,kBAAkB,EAClB,EAAE,EACF,WAAW,EACX,WAAW,EACX,QAAQ,EACR,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACZ,cAAc,EACd,IAAI,EACJ,KAAK,EACL,mBAAmB,EACnB,EAAE,EACF,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,EACH,cAAc,EACd,eAAe,EACf,EAAE,EACF,MAAM,EACN,MAAM,EACN,KAAK,EACL,MAAM,EACN,iBAAiB,EACjB,MAAM,EACN,GAAG,EACH,GAAG,EACH,GAAG,EACH,UAAU,EACV,cAAc,EACd,GAAG,EACH,SAAS,EACT,SAAS,EACT,cAAc,EACd,OAAO,EACP,GAAG,GACJ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAaxD,qFAAqF;AACrF,oEAAoE;AACpE,MAAM,eAAe,GAAG,GAAG,EAAE,CAC3B,IAAI,GAAG,CAAkC;IACvC,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC;IACnD,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IACrD,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC;IACnD,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IACrD,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC;IACnD,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IACrD,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC;IACnD,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IACrD,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC;IAC9D,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IAChE,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC;IAChD,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IAClD,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC;IAChD,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IAClD,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC;IACnD,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IACrD,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC;IACnD,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IACrD,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC;IAChD,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IAClD,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC;IACnD,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IACrD,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/C,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC;IACnD,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IACrD,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC;IACnD,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IACrD,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvD,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACrE,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrD,CAAC,gBAAgB,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACzE,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACrE,kCAAkC;IAClC,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvD,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvD,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC/D,CAAC,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3D,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC/D,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC/D,mCAAmC;IACnC,CAAC,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAEjE,gBAAgB;IAChB,sBAAsB;IACtB,CAAC,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3D,CAAC,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3D,wCAAwC;IACxC,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACjE,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACrE,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC;IACnD,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IACrD,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IACrD,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IACrD,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,WAAW,CAAC;IACvD,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IACrD,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC;IACnD,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC;IACrD,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEjD,cAAc;IACd,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB;IACtE,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,iBAAiB;IACxE,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,qBAAqB;IAC5F,CAAC,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,qBAAqB;IACxF,CAAC,eAAe,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,qBAAqB;IAC9F,CAAC,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,qBAAqB;IAC1F,CAAC,mBAAmB,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,EAAE,WAAW;IAE5F,mBAAmB;IACnB,CAAC,kBAAkB,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC7E,CAAC,iBAAiB,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC3E,CAAC,mBAAmB,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAE/E,gCAAgC;IAChC,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC,UAAU,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7D,oEAAoE;IACpE,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrD,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAErD,OAAO;IACP,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEzD,UAAU;IACV,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrD,CAAC,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3D,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrD,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzD,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACrE,CAAC,kBAAkB,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC7E,cAAc;IACd,CAAC,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3D,4CAA4C;IAC5C,qBAAqB;IACrB,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;CAChE,CAAC,CAAC;AAEL;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,YAA4B;IAC3D,OAAO,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAChC,QAAgB,EAChB,iBAAiC,eAAe,EAAE;IAElD,MAAM,YAAY,GAAkB,EAAE,CAAC;IACvC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC;IAE1C,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC;QACrB,MAAM,MAAM,GAAW,MAAM,CAAC,gBAAgB,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,QAAQ;QACtE,MAAM,8BAA8B,GAAG,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAClE,IAAI,8BAA8B,KAAK,SAAS,EAAE,CAAC;YACjD,MAAM,IAAI,KAAK,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,OAAO,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC;QACzF,CAAC;QAED,MAAM,uBAAuB,GAA4B,8BAA8B,CAAC;QACxF,MAAM,CAAC,GAAgB,uBAAuB,CAAC,MAAM,CAAC,CAAC;QACvD,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC"}

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

@@ -5,79 +5,95 @@ import { BufferCursor } from './buffer_cursor.js';
  * Source: https://yp-aztec.netlify.app/docs/public-vm/instruction-set
  */
 export declare enum Opcode {
-    ADD = 0,
-    SUB = 1,
-    MUL = 2,
-    DIV = 3,
-    FDIV = 4,
-    EQ = 5,
-    LT = 6,
-    LTE = 7,
-    AND = 8,
-    OR = 9,
-    XOR = 10,
-    NOT = 11,
-    SHL = 12,
-    SHR = 13,
-    CAST = 14,
-    ADDRESS = 15,
-    STORAGEADDRESS = 16,
-    SENDER = 17,
-    FUNCTIONSELECTOR = 18,
-    TRANSACTIONFEE = 19,
-    CHAINID = 20,
-    VERSION = 21,
-    BLOCKNUMBER = 22,
-    TIMESTAMP = 23,
-    COINBASE = 24,
-    FEEPERL2GAS = 25,
-    FEEPERDAGAS = 26,
-    BLOCKL2GASLIMIT = 27,
-    BLOCKDAGASLIMIT = 28,
-    CALLDATACOPY = 29,
-    L2GASLEFT = 30,
-    DAGASLEFT = 31,
-    JUMP = 32,
-    JUMPI = 33,
-    INTERNALCALL = 34,
-    INTERNALRETURN = 35,
-    SET = 36,
-    MOV = 37,
-    CMOV = 38,
-    SLOAD = 39,
-    SSTORE = 40,
-    NOTEHASHEXISTS = 41,
-    EMITNOTEHASH = 42,
-    NULLIFIEREXISTS = 43,
-    EMITNULLIFIER = 44,
-    L1TOL2MSGEXISTS = 45,
-    HEADERMEMBER = 46,
-    GETCONTRACTINSTANCE = 47,
-    EMITUNENCRYPTEDLOG = 48,
-    SENDL2TOL1MSG = 49,
-    CALL = 50,
-    STATICCALL = 51,
-    DELEGATECALL = 52,
-    RETURN = 53,
-    REVERT = 54,
-    DEBUGLOG = 55,
-    KECCAK = 56,
-    POSEIDON2 = 57,
-    SHA256 = 58,// temp - may be removed, but alot of contracts rely on it
-    PEDERSEN = 59,// temp - may be removed, but alot of contracts rely on it
-    ECADD = 60,
-    MSM = 61,
-    PEDERSENCOMMITMENT = 62,
-    TORADIXLE = 63,
-    SHA256COMPRESSION = 64,
-    KECCAKF1600 = 65
+    ADD_8 = 0,
+    ADD_16 = 1,
+    SUB_8 = 2,
+    SUB_16 = 3,
+    MUL_8 = 4,
+    MUL_16 = 5,
+    DIV_8 = 6,
+    DIV_16 = 7,
+    FDIV_8 = 8,
+    FDIV_16 = 9,
+    EQ_8 = 10,
+    EQ_16 = 11,
+    LT_8 = 12,
+    LT_16 = 13,
+    LTE_8 = 14,
+    LTE_16 = 15,
+    AND_8 = 16,
+    AND_16 = 17,
+    OR_8 = 18,
+    OR_16 = 19,
+    XOR_8 = 20,
+    XOR_16 = 21,
+    NOT = 22,
+    SHL_8 = 23,
+    SHL_16 = 24,
+    SHR_8 = 25,
+    SHR_16 = 26,
+    CAST = 27,
+    ADDRESS = 28,
+    STORAGEADDRESS = 29,
+    SENDER = 30,
+    FUNCTIONSELECTOR = 31,
+    TRANSACTIONFEE = 32,
+    CHAINID = 33,
+    VERSION = 34,
+    BLOCKNUMBER = 35,
+    TIMESTAMP = 36,
+    FEEPERL2GAS = 37,
+    FEEPERDAGAS = 38,
+    CALLDATACOPY = 39,
+    L2GASLEFT = 40,
+    DAGASLEFT = 41,
+    JUMP_16 = 42,
+    JUMPI_16 = 43,
+    INTERNALCALL = 44,
+    INTERNALRETURN = 45,
+    SET_8 = 46,
+    SET_16 = 47,
+    SET_32 = 48,
+    SET_64 = 49,
+    SET_128 = 50,
+    SET_FF = 51,
+    MOV_8 = 52,
+    MOV_16 = 53,
+    CMOV = 54,
+    SLOAD = 55,
+    SSTORE = 56,
+    NOTEHASHEXISTS = 57,
+    EMITNOTEHASH = 58,
+    NULLIFIEREXISTS = 59,
+    EMITNULLIFIER = 60,
+    L1TOL2MSGEXISTS = 61,
+    GETCONTRACTINSTANCE = 62,
+    EMITUNENCRYPTEDLOG = 63,
+    SENDL2TOL1MSG = 64,
+    CALL = 65,
+    STATICCALL = 66,
+    DELEGATECALL = 67,
+    RETURN = 68,
+    REVERT = 69,
+    DEBUGLOG = 70,
+    KECCAK = 71,
+    POSEIDON2 = 72,
+    SHA256 = 73,// temp - may be removed, but alot of contracts rely on it
+    PEDERSEN = 74,// temp - may be removed, but alot of contracts rely on it
+    ECADD = 75,
+    MSM = 76,
+    PEDERSENCOMMITMENT = 77,
+    TORADIXLE = 78,
+    SHA256COMPRESSION = 79,
+    KECCAKF1600 = 80
 }
 export declare enum OperandType {
     UINT8 = 0,
     UINT16 = 1,
     UINT32 = 2,
     UINT64 = 3,
-    UINT128 = 4
+    UINT128 = 4,
+    FF = 5
 }
 /**
  * Reads an array of operands from a buffer.
@@ -96,5 +112,5 @@ export declare function deserialize(cursor: BufferCursor | Buffer, operands: Ope
  * @param cls The class to be serialized.
  * @returns
  */
-export declare function serialize(operands: OperandType[], cls: any): Buffer;
+export declare function serializeAs(operands: OperandType[], opcode: Opcode, cls: any): Buffer;
 //# sourceMappingURL=instruction_serialization.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"instruction_serialization.d.ts","sourceRoot":"","sources":["../../../src/avm/serialization/instruction_serialization.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;GAGG;AACH,oBAAY,MAAM;IAEhB,GAAG,IAAA;IACH,GAAG,IAAA;IACH,GAAG,IAAA;IACH,GAAG,IAAA;IACH,IAAI,IAAA;IACJ,EAAE,IAAA;IACF,EAAE,IAAA;IACF,GAAG,IAAA;IACH,GAAG,IAAA;IACH,EAAE,IAAA;IACF,GAAG,KAAA;IACH,GAAG,KAAA;IACH,GAAG,KAAA;IACH,GAAG,KAAA;IACH,IAAI,KAAA;IAEJ,OAAO,KAAA;IACP,cAAc,KAAA;IACd,MAAM,KAAA;IACN,gBAAgB,KAAA;IAChB,cAAc,KAAA;IACd,OAAO,KAAA;IACP,OAAO,KAAA;IACP,WAAW,KAAA;IACX,SAAS,KAAA;IACT,QAAQ,KAAA;IACR,WAAW,KAAA;IACX,WAAW,KAAA;IACX,eAAe,KAAA;IACf,eAAe,KAAA;IACf,YAAY,KAAA;IAEZ,SAAS,KAAA;IACT,SAAS,KAAA;IAET,IAAI,KAAA;IACJ,KAAK,KAAA;IACL,YAAY,KAAA;IACZ,cAAc,KAAA;IAEd,GAAG,KAAA;IACH,GAAG,KAAA;IACH,IAAI,KAAA;IAEJ,KAAK,KAAA;IACL,MAAM,KAAA;IACN,cAAc,KAAA;IACd,YAAY,KAAA;IACZ,eAAe,KAAA;IACf,aAAa,KAAA;IACb,eAAe,KAAA;IACf,YAAY,KAAA;IACZ,mBAAmB,KAAA;IACnB,kBAAkB,KAAA;IAClB,aAAa,KAAA;IAEb,IAAI,KAAA;IACJ,UAAU,KAAA;IACV,YAAY,KAAA;IACZ,MAAM,KAAA;IACN,MAAM,KAAA;IAEN,QAAQ,KAAA;IAER,MAAM,KAAA;IACN,SAAS,KAAA;IACT,MAAM,KAAA,CAAE,0DAA0D;IAClE,QAAQ,KAAA,CAAE,0DAA0D;IACpE,KAAK,KAAA;IACL,GAAG,KAAA;IACH,kBAAkB,KAAA;IAElB,SAAS,KAAA;IAET,iBAAiB,KAAA;IACjB,WAAW,KAAA;CACZ;AAMD,oBAAY,WAAW;IACrB,KAAK,IAAA;IACL,MAAM,IAAA;IACN,MAAM,IAAA;IACN,MAAM,IAAA;IACN,OAAO,IAAA;CACR;AAgCD;;;;;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,SAAS,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,GAAG,EAAE,GAAG,GAAG,MAAM,CAqBnE"}
+{"version":3,"file":"instruction_serialization.d.ts","sourceRoot":"","sources":["../../../src/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,GAAG,KAAA;IACH,KAAK,KAAA;IACL,MAAM,KAAA;IACN,KAAK,KAAA;IACL,MAAM,KAAA;IACN,IAAI,KAAA;IAEJ,OAAO,KAAA;IACP,cAAc,KAAA;IACd,MAAM,KAAA;IACN,gBAAgB,KAAA;IAChB,cAAc,KAAA;IACd,OAAO,KAAA;IACP,OAAO,KAAA;IACP,WAAW,KAAA;IACX,SAAS,KAAA;IACT,WAAW,KAAA;IACX,WAAW,KAAA;IACX,YAAY,KAAA;IAEZ,SAAS,KAAA;IACT,SAAS,KAAA;IAET,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;IACN,IAAI,KAAA;IAEJ,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,YAAY,KAAA;IACZ,MAAM,KAAA;IACN,MAAM,KAAA;IAEN,QAAQ,KAAA;IAER,MAAM,KAAA;IACN,SAAS,KAAA;IACT,MAAM,KAAA,CAAE,0DAA0D;IAClE,QAAQ,KAAA,CAAE,0DAA0D;IACpE,KAAK,KAAA;IACL,GAAG,KAAA;IACH,kBAAkB,KAAA;IAElB,SAAS,KAAA;IAET,iBAAiB,KAAA;IACjB,WAAW,KAAA;CACZ;AAMD,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"}