@aztec/simulator 0.0.0-test.1 → 0.0.1-fake-ceab37513c

package/dest/public/avm/opcodes/memory.js

@@ -1,3 +1,5 @@
+import { Fr } from '@aztec/foundation/fields';
+import { strict as assert } from 'assert';
 import { Field, TaggedMemory, TypeTag, Uint32 } from '../avm_memory_types.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
 import { Addressing } from './addressing_mode.js';
@@ -14,57 +16,58 @@ export class Set extends Instruction {
         OperandType.UINT8,
         OperandType.UINT8,
         OperandType.UINT8,
-        OperandType.UINT8,
+        OperandType.TAG,
         OperandType.UINT8
     ];
     static wireFormat16 = [
         OperandType.UINT8,
         OperandType.UINT8,
         OperandType.UINT16,
-        OperandType.UINT8,
+        OperandType.TAG,
         OperandType.UINT16
     ];
     static wireFormat32 = [
         OperandType.UINT8,
         OperandType.UINT8,
         OperandType.UINT16,
-        OperandType.UINT8,
+        OperandType.TAG,
         OperandType.UINT32
     ];
     static wireFormat64 = [
         OperandType.UINT8,
         OperandType.UINT8,
         OperandType.UINT16,
-        OperandType.UINT8,
+        OperandType.TAG,
         OperandType.UINT64
     ];
     static wireFormat128 = [
         OperandType.UINT8,
         OperandType.UINT8,
         OperandType.UINT16,
-        OperandType.UINT8,
+        OperandType.TAG,
         OperandType.UINT128
     ];
     static wireFormatFF = [
         OperandType.UINT8,
         OperandType.UINT8,
         OperandType.UINT16,
-        OperandType.UINT8,
+        OperandType.TAG,
         OperandType.FF
     ];
     constructor(indirect, dstOffset, inTag, value){
         super(), this.indirect = indirect, this.dstOffset = dstOffset, this.inTag = inTag, this.value = value;
-        TaggedMemory.checkIsValidTag(inTag);
+        assert(this.value >= 0, `Value ${this.value} is negative`);
+        assert(this.value < Fr.MODULUS, `Value ${this.value} is larger than Fr.MODULUS`);
     }
     async execute(context) {
         // Constructor ensured that this.inTag is a valid tag
         const res = TaggedMemory.buildFromTagTruncating(this.value, this.inTag);
         const memory = context.machineState.memory;
-        context.machineState.consumeGas(this.gasCost());
+        const addressing = Addressing.fromWire(this.indirect);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
             this.dstOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [dstOffset] = addressing.resolve(operands, memory);
         memory.set(dstOffset, res);
     }
@@ -81,27 +84,26 @@ export class Cast extends Instruction {
         OperandType.UINT8,
         OperandType.UINT8,
         OperandType.UINT8,
-        OperandType.UINT8
+        OperandType.TAG
     ];
     static wireFormat16 = [
         OperandType.UINT8,
         OperandType.UINT8,
         OperandType.UINT16,
         OperandType.UINT16,
-        OperandType.UINT8
+        OperandType.TAG
     ];
     constructor(indirect, srcOffset, dstOffset, dstTag){
         super(), this.indirect = indirect, this.srcOffset = srcOffset, this.dstOffset = dstOffset, this.dstTag = dstTag;
-        TaggedMemory.checkIsValidTag(dstTag);
     }
     async execute(context) {
         const memory = context.machineState.memory;
-        context.machineState.consumeGas(this.gasCost());
+        const addressing = Addressing.fromWire(this.indirect);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
             this.srcOffset,
             this.dstOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [srcOffset, dstOffset] = addressing.resolve(operands, memory);
         const a = memory.get(srcOffset);
         // Constructor ensured that this.dstTag is a valid tag
@@ -133,12 +135,12 @@ export class Mov extends Instruction {
     }
     async execute(context) {
         const memory = context.machineState.memory;
-        context.machineState.consumeGas(this.gasCost());
+        const addressing = Addressing.fromWire(this.indirect);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
             this.srcOffset,
             this.dstOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [srcOffset, dstOffset] = addressing.resolve(operands, memory);
         const a = memory.get(srcOffset);
         memory.set(dstOffset, a);
@@ -146,8 +148,8 @@ export class Mov extends Instruction {
 }
 export class CalldataCopy extends Instruction {
     indirect;
-    cdStartOffset;
     copySizeOffset;
+    cdStartOffset;
     dstOffset;
     static type = 'CALLDATACOPY';
     static opcode = Opcode.CALLDATACOPY;
@@ -159,22 +161,23 @@ export class CalldataCopy extends Instruction {
         OperandType.UINT16,
         OperandType.UINT16
     ];
-    constructor(indirect, cdStartOffset, copySizeOffset, dstOffset){
-        super(), this.indirect = indirect, this.cdStartOffset = cdStartOffset, this.copySizeOffset = copySizeOffset, this.dstOffset = dstOffset;
+    constructor(indirect, copySizeOffset, cdStartOffset, dstOffset){
+        super(), this.indirect = indirect, this.copySizeOffset = copySizeOffset, this.cdStartOffset = cdStartOffset, this.dstOffset = dstOffset;
     }
     async execute(context) {
         const memory = context.machineState.memory;
+        const addressing = Addressing.fromWire(this.indirect);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
-            this.cdStartOffset,
             this.copySizeOffset,
+            this.cdStartOffset,
             this.dstOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
-        const [cdStartOffset, copySizeOffset, dstOffset] = addressing.resolve(operands, memory);
+        const [copySizeOffset, cdStartOffset, dstOffset] = addressing.resolve(operands, memory);
         memory.checkTags(TypeTag.UINT32, cdStartOffset, copySizeOffset);
         const cdStart = memory.get(cdStartOffset).toNumber();
         const copySize = memory.get(copySizeOffset).toNumber();
-        context.machineState.consumeGas(this.gasCost(copySize));
+        context.machineState.consumeGas(this.dynamicGasCost(copySize));
         // Values which are out-of-range of the calldata array will be set with Field(0);
         const slice = context.environment.calldata.slice(cdStart, cdStart + copySize).map((f)=>new Field(f));
         // slice has size = MIN(copySize, calldata.length - cdStart) as TS truncates out-of-range portion
@@ -201,19 +204,19 @@ export class ReturndataSize extends Instruction {
     }
     async execute(context) {
         const memory = context.machineState.memory;
+        const addressing = Addressing.fromWire(this.indirect);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
             this.dstOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [dstOffset] = addressing.resolve(operands, memory);
-        context.machineState.consumeGas(this.gasCost());
         memory.set(dstOffset, new Uint32(context.machineState.nestedReturndata.length));
     }
 }
 export class ReturndataCopy extends Instruction {
     indirect;
-    rdStartOffset;
     copySizeOffset;
+    rdStartOffset;
     dstOffset;
     static type = 'RETURNDATACOPY';
     static opcode = Opcode.RETURNDATACOPY;
@@ -225,22 +228,23 @@ export class ReturndataCopy extends Instruction {
         OperandType.UINT16,
         OperandType.UINT16
     ];
-    constructor(indirect, rdStartOffset, copySizeOffset, dstOffset){
-        super(), this.indirect = indirect, this.rdStartOffset = rdStartOffset, this.copySizeOffset = copySizeOffset, this.dstOffset = dstOffset;
+    constructor(indirect, copySizeOffset, rdStartOffset, dstOffset){
+        super(), this.indirect = indirect, this.copySizeOffset = copySizeOffset, this.rdStartOffset = rdStartOffset, this.dstOffset = dstOffset;
     }
     async execute(context) {
         const memory = context.machineState.memory;
+        const addressing = Addressing.fromWire(this.indirect);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
-            this.rdStartOffset,
             this.copySizeOffset,
+            this.rdStartOffset,
             this.dstOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
-        const [rdStartOffset, copySizeOffset, dstOffset] = addressing.resolve(operands, memory);
+        const [copySizeOffset, rdStartOffset, dstOffset] = addressing.resolve(operands, memory);
         memory.checkTags(TypeTag.UINT32, rdStartOffset, copySizeOffset);
-        const rdStart = memory.get(rdStartOffset).toNumber();
         const copySize = memory.get(copySizeOffset).toNumber();
-        context.machineState.consumeGas(this.gasCost(copySize));
+        const rdStart = memory.get(rdStartOffset).toNumber();
+        context.machineState.consumeGas(this.dynamicGasCost(copySize));
         // Values which are out-of-range of the returndata array will be set with Field(0);
         const slice = context.machineState.nestedReturndata.slice(rdStart, rdStart + copySize).map((f)=>new Field(f));
         // slice has size = MIN(copySize, returndata.length - rdStart) as TS truncates out-of-range portion

package/dest/public/avm/opcodes/misc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/misc.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,QAAS,SAAQ,WAAW;IAgBrC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,WAAW;IAnBrB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAc;IACjC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAmB;IACjD,MAAM,CAAC,QAAQ,CAAC,MAAM,yCAA2C;IAGjE,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAOvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,WAAW,EAAE,MAAM;IAKhB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CA0BzD"}
+{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/misc.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,QAAS,SAAQ,WAAW;IAgBrC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,WAAW;IAnBrB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAc;IACjC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAmB;IACjD,MAAM,CAAC,QAAQ,CAAC,MAAM,yCAA2C;IAGjE,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAOvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,WAAW,EAAE,MAAM;IAKhB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAkCzD"}

package/dest/public/avm/opcodes/misc.js

@@ -26,23 +26,28 @@ export class DebugLog extends Instruction {
     }
     async execute(context) {
         const memory = context.machineState.memory;
+        const addressing = Addressing.fromWire(this.indirect);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
             this.messageOffset,
             this.fieldsOffset,
             this.fieldsSizeOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [messageOffset, fieldsOffset, fieldsSizeOffset] = addressing.resolve(operands, memory);
-        memory.checkTag(TypeTag.UINT32, fieldsSizeOffset);
-        const fieldsSize = memory.get(fieldsSizeOffset).toNumber();
-        const rawMessage = memory.getSlice(messageOffset, this.messageSize);
-        const fields = memory.getSlice(fieldsOffset, fieldsSize);
-        memory.checkTagsRange(TypeTag.UINT8, messageOffset, this.messageSize);
-        memory.checkTagsRange(TypeTag.FIELD, fieldsOffset, fieldsSize);
-        context.machineState.consumeGas(this.gasCost(this.messageSize + fieldsSize));
-        // Interpret str<N> = [u8; N] to string.
-        const messageAsStr = rawMessage.map((field)=>String.fromCharCode(field.toNumber())).join('');
-        const formattedStr = applyStringFormatting(messageAsStr, fields.map((field)=>field.toFr()));
-        DebugLog.logger.verbose(formattedStr);
+        // DebugLog is a no-op except when doing client-initiated simulation with debug logging enabled.
+        // Note that we still do address resolution and basic tag-checking (above)
+        // To avoid a special-case in the witness generator and circuit.
+        if (context.environment.clientInitiatedSimulation && DebugLog.logger.isLevelEnabled('verbose')) {
+            memory.checkTag(TypeTag.UINT32, fieldsSizeOffset);
+            const fieldsSize = memory.get(fieldsSizeOffset).toNumber();
+            const rawMessage = memory.getSlice(messageOffset, this.messageSize);
+            const fields = memory.getSlice(fieldsOffset, fieldsSize);
+            memory.checkTagsRange(TypeTag.UINT8, messageOffset, this.messageSize);
+            memory.checkTagsRange(TypeTag.FIELD, fieldsOffset, fieldsSize);
+            // Interpret str<N> = [u8; N] to string.
+            const messageAsStr = rawMessage.map((field)=>String.fromCharCode(field.toNumber())).join('');
+            const formattedStr = applyStringFormatting(messageAsStr, fields.map((field)=>field.toFr()));
+            DebugLog.logger.verbose(formattedStr);
+        }
     }
 }

package/dest/public/avm/opcodes/storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,uBAAe,sBAAuB,SAAQ,WAAW;IAS3C,SAAS,CAAC,QAAQ,EAAE,MAAM;IAAE,SAAS,CAAC,OAAO,EAAE,MAAM;IAAE,SAAS,CAAC,OAAO,EAAE,MAAM;IAP5F,gBAAuB,UAAU,EAAE,WAAW,EAAE,CAK9C;gBAEoB,QAAQ,EAAE,MAAM,EAAY,OAAO,EAAE,MAAM,EAAY,OAAO,EAAE,MAAM;CAG7F;AAED,qBAAa,MAAO,SAAQ,sBAAsB;IAChD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAY;IACxC,MAAM,CAAC,QAAQ,CAAC,MAAM,iBAAiB;gBAE3B,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAItD,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAkBzD;AAED,qBAAa,KAAM,SAAQ,sBAAsB;IAC/C,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAW;IACvC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;gBAE1B,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAItD,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAazD"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,uBAAe,sBAAuB,SAAQ,WAAW;IAUrD,SAAS,CAAC,QAAQ,EAAE,MAAM;IAC1B,SAAS,CAAC,OAAO,EAAE,MAAM;IACzB,SAAS,CAAC,OAAO,EAAE,MAAM;IAV3B,gBAAuB,UAAU,EAAE,WAAW,EAAE,CAK9C;gBAGU,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM;CAI5B;AAED,qBAAa,MAAO,SAAQ,sBAAsB;IAChD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAY;IACxC,MAAM,CAAC,QAAQ,CAAC,MAAM,iBAAiB;gBAE3B,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAItD,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BzD;AAED,qBAAa,KAAM,SAAQ,sBAAsB;IAC/C,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAW;IACvC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;gBAE1B,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAItD,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAgBzD"}

package/dest/public/avm/opcodes/storage.js

@@ -29,16 +29,18 @@ export class SStore extends BaseStorageInstruction {
             throw new StaticCallAlterationError();
         }
         const memory = context.machineState.memory;
-        context.machineState.consumeGas(this.gasCost());
+        const addressing = Addressing.fromWire(this.indirect);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
             this.aOffset,
             this.bOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [srcOffset, slotOffset] = addressing.resolve(operands, memory);
+        // We read before tag checking since it's needed for gas cost calculation
+        const slot = memory.get(slotOffset).toFr();
+        context.machineState.consumeGas(this.dynamicGasCost(Number(context.persistableState.isStorageCold(context.environment.address, slot))));
         memory.checkTag(TypeTag.FIELD, slotOffset);
         memory.checkTag(TypeTag.FIELD, srcOffset);
-        const slot = memory.get(slotOffset).toFr();
         const value = memory.get(srcOffset).toFr();
         await context.persistableState.writeStorage(context.environment.address, slot, value);
     }
@@ -51,12 +53,12 @@ export class SLoad extends BaseStorageInstruction {
     }
     async execute(context) {
         const memory = context.machineState.memory;
-        context.machineState.consumeGas(this.gasCost());
+        const addressing = Addressing.fromWire(this.indirect);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
             this.aOffset,
             this.bOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [slotOffset, dstOffset] = addressing.resolve(operands, memory);
         memory.checkTag(TypeTag.FIELD, slotOffset);
         const slot = memory.get(slotOffset).toFr();

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

@@ -0,0 +1,18 @@
+import type { Fr } from '@aztec/foundation/fields';
+import type { AvmContext } from './avm_context.js';
+import { type AvmExecutionError, AvmRevertReason } from './errors.js';
+/**
+ * Create a "revert reason" error for an exceptional halt.
+ *
+ * @param haltingError - the lower-level error causing the exceptional halt
+ * @param context - the context of the AVM execution used to extract the failingFunction and noirCallStack
+ */
+export declare function revertReasonFromExceptionalHalt(haltingError: AvmExecutionError, context: AvmContext): Promise<AvmRevertReason>;
+/**
+ * Create a "revert reason" error for an explicit revert (a root cause).
+ *
+ * @param revertData - output data of the explicit REVERT instruction
+ * @param context - the context of the AVM execution used to extract the failingFunction and noirCallStack
+ */
+export declare function revertReasonFromExplicitRevert(revertData: Fr[], context: AvmContext): Promise<AvmRevertReason>;
+//# sourceMappingURL=revert_reason.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"revert_reason.d.ts","sourceRoot":"","sources":["../../../src/public/avm/revert_reason.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,KAAK,iBAAiB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AA8BtE;;;;;GAKG;AACH,wBAAsB,+BAA+B,CACnD,YAAY,EAAE,iBAAiB,EAC/B,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,eAAe,CAAC,CAE1B;AAED;;;;;GAKG;AACH,wBAAsB,8BAA8B,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,CAEpH"}

package/dest/public/avm/revert_reason.js

@@ -0,0 +1,38 @@
+import { AvmRevertReason } from './errors.js';
+async function createRevertReason(message, revertData, context) {
+    // We drop the returnPc information.
+    const internalCallStack = context.machineState.internalCallStack.map((entry)=>entry.callPc);
+    // If we are reverting due to the same error that we have been tracking, we use the nested error as the cause.
+    let nestedError = undefined;
+    const revertDataEquals = (a, b)=>a.length === b.length && a.every((v, i)=>v.equals(b[i]));
+    if (context.machineState.collectedRevertInfo && revertDataEquals(context.machineState.collectedRevertInfo.revertDataRepresentative, revertData)) {
+        nestedError = context.machineState.collectedRevertInfo.recursiveRevertReason;
+        message = context.machineState.collectedRevertInfo.recursiveRevertReason.message;
+    }
+    const fnName = await context.persistableState.getPublicFunctionDebugName(context.environment);
+    return new AvmRevertReason(message, /*failingFunction=*/ {
+        contractAddress: context.environment.address,
+        functionName: fnName
+    }, /*noirCallStack=*/ [
+        ...internalCallStack,
+        context.machineState.pc
+    ].map((pc)=>`0.${pc}`), /*options=*/ {
+        cause: nestedError
+    });
+}
+/**
+ * Create a "revert reason" error for an exceptional halt.
+ *
+ * @param haltingError - the lower-level error causing the exceptional halt
+ * @param context - the context of the AVM execution used to extract the failingFunction and noirCallStack
+ */ export async function revertReasonFromExceptionalHalt(haltingError, context) {
+    return await createRevertReason(haltingError.message, [], context);
+}
+/**
+ * Create a "revert reason" error for an explicit revert (a root cause).
+ *
+ * @param revertData - output data of the explicit REVERT instruction
+ * @param context - the context of the AVM execution used to extract the failingFunction and noirCallStack
+ */ export async function revertReasonFromExplicitRevert(revertData, context) {
+    return await createRevertReason('Assertion failed: ', revertData, context);
+}

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

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 export declare class BufferCursor {
     private _buffer;
     private _position;

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

@@ -1 +1 @@
-{"version":3,"file":"buffer_cursor.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/serialization/buffer_cursor.ts"],"names":[],"mappings":";;AAGA,qBAAa,YAAY;IACX,OAAO,CAAC,OAAO;IAAU,OAAO,CAAC,SAAS;gBAAlC,OAAO,EAAE,MAAM,EAAU,SAAS,GAAE,MAAU;IAE3D,QAAQ,IAAI,MAAM;IAIlB,MAAM,IAAI,MAAM;IAIhB,GAAG,IAAI,OAAO;IAId,gBAAgB,IAAI,MAAM;IAI1B,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI;IAIxB,SAAS,IAAI,MAAM;IAKnB,SAAS,IAAI,MAAM;IAMnB,YAAY,IAAI,MAAM;IAMtB,YAAY,IAAI,MAAM;IAMtB,YAAY,IAAI,MAAM;IAMtB,YAAY,IAAI,MAAM;IAMtB,cAAc,IAAI,MAAM;IAMxB,cAAc,IAAI,MAAM;IAMxB,UAAU,CAAC,CAAC,EAAE,MAAM;IAMpB,aAAa,CAAC,CAAC,EAAE,MAAM;IAMvB,aAAa,CAAC,CAAC,EAAE,MAAM;IAMvB,aAAa,CAAC,CAAC,EAAE,MAAM;IAMvB,aAAa,CAAC,CAAC,EAAE,MAAM;IAMvB,eAAe,CAAC,CAAC,EAAE,MAAM;IAMzB,eAAe,CAAC,CAAC,EAAE,MAAM;CAKjC"}
+{"version":3,"file":"buffer_cursor.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/serialization/buffer_cursor.ts"],"names":[],"mappings":"AAGA,qBAAa,YAAY;IAErB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,SAAS;gBADT,OAAO,EAAE,MAAM,EACf,SAAS,GAAE,MAAU;IAGxB,QAAQ,IAAI,MAAM;IAIlB,MAAM,IAAI,MAAM;IAIhB,GAAG,IAAI,OAAO;IAId,gBAAgB,IAAI,MAAM;IAI1B,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI;IAIxB,SAAS,IAAI,MAAM;IAKnB,SAAS,IAAI,MAAM;IAMnB,YAAY,IAAI,MAAM;IAMtB,YAAY,IAAI,MAAM;IAMtB,YAAY,IAAI,MAAM;IAMtB,YAAY,IAAI,MAAM;IAMtB,cAAc,IAAI,MAAM;IAMxB,cAAc,IAAI,MAAM;IAMxB,UAAU,CAAC,CAAC,EAAE,MAAM;IAMpB,aAAa,CAAC,CAAC,EAAE,MAAM;IAMvB,aAAa,CAAC,CAAC,EAAE,MAAM;IAMvB,aAAa,CAAC,CAAC,EAAE,MAAM;IAMvB,aAAa,CAAC,CAAC,EAAE,MAAM;IAMvB,eAAe,CAAC,CAAC,EAAE,MAAM;IAMzB,eAAe,CAAC,CAAC,EAAE,MAAM;CAKjC"}

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

@@ -1,12 +1,8 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
+import { type Bufferable } from '@aztec/foundation/serialize';
 import { Instruction } from '../opcodes/index.js';
 import { BufferCursor } from './buffer_cursor.js';
 import { Opcode } from './instruction_serialization.js';
 export type InstructionDeserializer = (buf: BufferCursor | Buffer) => Instruction;
-export interface Serializable {
-    serialize(): Buffer;
-}
 export interface Deserializable {
     deserialize: InstructionDeserializer;
 }
@@ -15,7 +11,7 @@ export declare const INSTRUCTION_SET: Map<Opcode, InstructionDeserializer>;
 /**
  * Serializes an array of instructions to bytecode.
  */
-export declare function encodeToBytecode(instructions: Serializable[]): Buffer;
+export declare function encodeToBytecode(instructions: Bufferable[]): Buffer;
 export declare function decodeFromBytecode(bytecode: Buffer, instructionSet?: InstructionSet): Instruction[];
 export declare function decodeInstructionFromBytecode(bytecode: Buffer, pc: number, instructionSet?: InstructionSet): [Instruction, number];
 //# sourceMappingURL=bytecode_serialization.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"bytecode_serialization.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/serialization/bytecode_serialization.ts"],"names":[],"mappings":";;AACA,OAAO,EAgBL,WAAW,EAgCZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAoB,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAE1E,MAAM,MAAM,uBAAuB,GAAG,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,KAAK,WAAW,CAAC;AAElF,MAAM,WAAW,YAAY;IAC3B,SAAS,IAAI,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,uBAAuB,CAAC;CACtC;AAED,MAAM,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;AAClE,eAAO,MAAM,eAAe,sCAoF1B,CAAC;AAEH;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,MAAM,CAErE;AAGD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,GAAE,cAAgC,GAAG,WAAW,EAAE,CASpH;AAGD,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,MAAM,EACV,cAAc,GAAE,cAAgC,GAC/C,CAAC,WAAW,EAAE,MAAM,CAAC,CA+BvB"}
+{"version":3,"file":"bytecode_serialization.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/serialization/bytecode_serialization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAqB,MAAM,6BAA6B,CAAC;AAGjF,OAAO,EAgBL,WAAW,EAgCZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAoB,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAE1E,MAAM,MAAM,uBAAuB,GAAG,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,KAAK,WAAW,CAAC;AAElF,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,uBAAuB,CAAC;CACtC;AAED,MAAM,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;AAClE,eAAO,MAAM,eAAe,sCAoF1B,CAAC;AAEH;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,UAAU,EAAE,GAAG,MAAM,CAEnE;AAGD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,GAAE,cAAgC,GAAG,WAAW,EAAE,CASpH;AAGD,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,MAAM,EACV,cAAc,GAAE,cAAgC,GAC/C,CAAC,WAAW,EAAE,MAAM,CAAC,CA+BvB"}