@aztec/simulator 0.0.1-fake-ceab37513c → 0.0.6-commit.a2d1860fe9

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

@@ -1,4 +1,5 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import type { PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GlobalVariables } from '@aztec/stdlib/tx';
 import type { PublicPersistableStateManager } from '../state_manager/state_manager.js';
@@ -6,6 +7,7 @@ import { AvmContext } from './avm_context.js';
 import { AvmContractCallResult } from './avm_contract_call_result.js';
 import type { Gas } from './avm_gas.js';
 import type { AvmSimulatorInterface } from './avm_simulator_interface.js';
+import { type CallData } from './calldata.js';
 import { type InstructionSet } from './serialization/bytecode_serialization.js';
 export declare class AvmSimulator implements AvmSimulatorInterface {
     private context;
@@ -18,7 +20,7 @@ export declare class AvmSimulator implements AvmSimulatorInterface {
     private tallyInstructionFunction;
     constructor(context: AvmContext, instructionSet?: InstructionSet, enableTallying?: boolean);
     static build(context: AvmContext): Promise<AvmSimulator>;
-    static create(stateManager: PublicPersistableStateManager, address: AztecAddress, sender: AztecAddress, transactionFee: Fr, globals: GlobalVariables, isStaticCall: boolean, calldata: Fr[], allocatedGas: Gas, clientInitiatedSimulation?: boolean): Promise<AvmSimulator>;
+    static create(stateManager: PublicPersistableStateManager, address: AztecAddress, sender: AztecAddress, transactionFee: Fr, globals: GlobalVariables, isStaticCall: boolean, calldata: CallData, allocatedGas: Gas, config: PublicSimulatorConfig): Promise<AvmSimulator>;
     /**
      * Fetch the bytecode and execute it in the current context.
      */
@@ -36,4 +38,4 @@ export declare class AvmSimulator implements AvmSimulatorInterface {
     private tallyInstruction;
     private printOpcodeTallies;
 }
-//# sourceMappingURL=avm_simulator.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX3NpbXVsYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vYXZtX3NpbXVsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFHcEQsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUt4RCxPQUFPLEtBQUssRUFBRSw2QkFBNkIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3ZGLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUV0RSxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFeEMsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMxRSxPQUFPLEVBQUUsS0FBSyxRQUFRLEVBQW1CLE1BQU0sZUFBZSxDQUFDO0FBSS9ELE9BQU8sRUFFTCxLQUFLLGNBQWMsRUFFcEIsTUFBTSwyQ0FBMkMsQ0FBQztBQU9uRCxxQkFBYSxZQUFhLFlBQVcscUJBQXFCO0lBYXRELE9BQU8sQ0FBQyxPQUFPO0lBQ2YsT0FBTyxDQUFDLGNBQWM7SUFieEIsT0FBTyxDQUFDLEdBQUcsQ0FBUztJQUNwQixPQUFPLENBQUMsUUFBUSxDQUFxQjtJQUNyQyxPQUFPLENBQUMsYUFBYSxDQUF1QztJQUU1RCxPQUFPLENBQUMsNkJBQTZCLENBQWlEO0lBRXRGLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBWTtJQUN0QyxPQUFPLENBQUMsd0JBQXdCLENBQStCO0lBSS9ELFlBQ1UsT0FBTyxFQUFFLFVBQVUsRUFDbkIsY0FBYyxHQUFFLGNBQWdDLEVBQ3hELGNBQWMsVUFBUSxFQVd2QjtJQUlELE9BQW9CLEtBQUssQ0FBQyxPQUFPLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FNcEU7SUFFRCxPQUFvQixNQUFNLENBQ3hCLFlBQVksRUFBRSw2QkFBNkIsRUFDM0MsT0FBTyxFQUFFLFlBQVksRUFDckIsTUFBTSxFQUFFLFlBQVksRUFDcEIsY0FBYyxFQUFFLEVBQUUsRUFDbEIsT0FBTyxFQUFFLGVBQWUsRUFDeEIsWUFBWSxFQUFFLE9BQU8sRUFDckIsUUFBUSxFQUFFLFFBQVEsRUFDbEIsWUFBWSxFQUFFLEdBQUcsRUFDakIsTUFBTSxFQUFFLHFCQUFxQix5QkFnQjlCO0lBRUQ7O09BRUc7SUFDVSxPQUFPLElBQUksT0FBTyxDQUFDLHFCQUFxQixDQUFDLENBWXJEO0lBRUQ7O09BRUc7SUFDSSxXQUFXLElBQUksTUFBTSxHQUFHLFNBQVMsQ0FFdkM7SUFFRDs7O09BR0c7SUFDVSxlQUFlLENBQUMsUUFBUSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMscUJBQXFCLENBQUMsQ0ErRzdFO1lBRWEsK0JBQStCO0lBdUI3QyxPQUFPLENBQUMsZ0JBQWdCO0lBUXhCLE9BQU8sQ0FBQyxrQkFBa0I7Q0FTM0IifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"avm_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKxD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAI1E,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,2CAA2C,CAAC;AAOnD,qBAAa,YAAa,YAAW,qBAAqB;IAatD,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,cAAc;IAbxB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,QAAQ,CAAqB;IACrC,OAAO,CAAC,aAAa,CAAuC;IAE5D,OAAO,CAAC,6BAA6B,CAAiD;IAEtF,OAAO,CAAC,kBAAkB,CAAY;IACtC,OAAO,CAAC,wBAAwB,CAA+B;gBAKrD,OAAO,EAAE,UAAU,EACnB,cAAc,GAAE,cAAgC,EACxD,cAAc,UAAQ;WAeJ,KAAK,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC;WAQjD,MAAM,CACxB,YAAY,EAAE,6BAA6B,EAC3C,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,YAAY,EACpB,cAAc,EAAE,EAAE,EAClB,OAAO,EAAE,eAAe,EACxB,YAAY,EAAE,OAAO,EACrB,QAAQ,EAAE,EAAE,EAAE,EACd,YAAY,EAAE,GAAG,EACjB,yBAAyB,GAAE,OAAe;IAkB5C;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,qBAAqB,CAAC;IAuBtD;;OAEG;IACI,WAAW,IAAI,MAAM,GAAG,SAAS;IAIxC;;;OAGG;IACU,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;YAmHhE,+BAA+B;IAoB7C,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,kBAAkB;CAS3B"}
+{"version":3,"file":"avm_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKxD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,KAAK,QAAQ,EAAmB,MAAM,eAAe,CAAC;AAI/D,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,2CAA2C,CAAC;AAOnD,qBAAa,YAAa,YAAW,qBAAqB;IAatD,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,cAAc;IAbxB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,QAAQ,CAAqB;IACrC,OAAO,CAAC,aAAa,CAAuC;IAE5D,OAAO,CAAC,6BAA6B,CAAiD;IAEtF,OAAO,CAAC,kBAAkB,CAAY;IACtC,OAAO,CAAC,wBAAwB,CAA+B;IAI/D,YACU,OAAO,EAAE,UAAU,EACnB,cAAc,GAAE,cAAgC,EACxD,cAAc,UAAQ,EAWvB;IAID,OAAoB,KAAK,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAMpE;IAED,OAAoB,MAAM,CACxB,YAAY,EAAE,6BAA6B,EAC3C,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,YAAY,EACpB,cAAc,EAAE,EAAE,EAClB,OAAO,EAAE,eAAe,EACxB,YAAY,EAAE,OAAO,EACrB,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,GAAG,EACjB,MAAM,EAAE,qBAAqB,yBAgB9B;IAED;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,qBAAqB,CAAC,CAYrD;IAED;;OAEG;IACI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEvC;IAED;;;OAGG;IACU,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CA+G7E;YAEa,+BAA+B;IAuB7C,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,kBAAkB;CAS3B"}

package/dest/public/avm/avm_simulator.js

@@ -1,13 +1,14 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { strict as assert } from 'assert';
-import { SideEffectLimitReachedError } from '../side_effect_errors.js';
+import { CheckedPublicExecutionError } from '../public_errors.js';
 import { AvmContext } from './avm_context.js';
 import { AvmContractCallResult } from './avm_contract_call_result.js';
 import { AvmExecutionEnvironment } from './avm_execution_environment.js';
 import { AvmMachineState } from './avm_machine_state.js';
-import { AvmExecutionError, AvmRevertReason, InvalidProgramCounterError } from './errors.js';
+import { ReturnDataArray } from './calldata.js';
+import { AvmRevertReason, InvalidProgramCounterError } from './errors.js';
 import { revertReasonFromExceptionalHalt, revertReasonFromExplicitRevert } from './revert_reason.js';
 import { INSTRUCTION_SET, decodeInstructionFromBytecode } from './serialization/bytecode_serialization.js';
 export class AvmSimulator {
@@ -32,7 +33,7 @@ export class AvmSimulator {
         // This will be used by the CALL opcode to create a new simulator. It is required to
         // avoid a dependency cycle.
         context.provideSimulator = AvmSimulator.build;
-        this.log = createLogger(`simulator:avm(calldata[0]: ${context.environment.calldata[0]})`);
+        this.log = createLogger(`simulator:avm(calldata[0]: ${context.environment.calldata.read(0)})`);
         // Turn on tallying if explicitly enabled or if trace logging
         if (enableTallying || this.log.isLevelEnabled('trace')) {
             this.tallyPrintFunction = this.printOpcodeTallies;
@@ -47,8 +48,8 @@ export class AvmSimulator {
         simulator.log = createLogger(`simulator:avm(f:${fnName})`);
         return simulator;
     }
-    static async create(stateManager, address, sender, transactionFee, globals, isStaticCall, calldata, allocatedGas, clientInitiatedSimulation = false) {
-        const avmExecutionEnv = new AvmExecutionEnvironment(address, sender, /*contractCallDepth=*/ Fr.zero(), transactionFee, globals, isStaticCall, calldata, clientInitiatedSimulation);
+    static async create(stateManager, address, sender, transactionFee, globals, isStaticCall, calldata, allocatedGas, config) {
+        const avmExecutionEnv = new AvmExecutionEnvironment(address, sender, /*contractCallDepth=*/ Fr.zero(), transactionFee, globals, isStaticCall, calldata, config);
         const avmMachineState = new AvmMachineState(allocatedGas);
         const avmContext = new AvmContext(stateManager, avmExecutionEnv, avmMachineState);
         return await AvmSimulator.build(avmContext);
@@ -56,18 +57,11 @@ export class AvmSimulator {
     /**
    * Fetch the bytecode and execute it in the current context.
    */ async execute() {
-        let bytecode;
-        try {
-            bytecode = await this.context.persistableState.getBytecode(this.context.environment.address);
-        } catch (err) {
-            if (!(err instanceof AvmExecutionError || err instanceof SideEffectLimitReachedError)) {
-                this.log.error(`Unknown error thrown by AVM during bytecode retrieval: ${err}`);
-                throw err;
-            }
-            return await this.handleFailureToRetrieveBytecode(`Bytecode retrieval for contract '${this.context.environment.address}' failed with ${err.message}. Reverting...`);
-        }
+        const bytecode = await this.context.persistableState.getBytecode(this.context.environment.address);
+        // getBytecode returns undefined if bytecode is not found or if the limit of contract calls to unique class IDs is reached.
+        // If it throws an error that reaches this point, it is a bug.
         if (!bytecode) {
-            return await this.handleFailureToRetrieveBytecode(`No bytecode found at: ${this.context.environment.address}. Reverting...`);
+            return await this.handleFailureToRetrieveBytecode(`No bytecode found. Contract is not deployed, or limit encountered for max calls to unique contract class IDs. Contract address: ${this.context.environment.address}. Reverting...`);
         }
         return await this.executeBytecode(bytecode);
     }
@@ -83,6 +77,7 @@ export class AvmSimulator {
         const timer = new Timer();
         assert(bytecode.length > 0, "AVM simulator can't execute empty bytecode");
         this.bytecode = bytecode;
+        let instructionName = 'NONE'; // This is used for logging purposes
         const { machineState } = this.context;
         const callStartGas = machineState.gasLeft; // Save gas before executing instruction (for profiling)
         try {
@@ -102,6 +97,7 @@ export class AvmSimulator {
                     this.log.trace(`[PC:${machineState.pc}] [IC:${machineState.instrCounter}] ${instruction.toString()} (gasLeft l2=${machineState.l2GasLeft} da=${machineState.daGasLeft})`);
                 }
                 machineState.nextPc = machineState.pc + bytesRead;
+                instructionName = instruction.constructor.name;
                 // Execute the instruction.
                 // Normal returns and reverts will return normally here.
                 // "Exceptional halts" will throw.
@@ -119,12 +115,12 @@ export class AvmSimulator {
                 this.tallyInstructionFunction(instruction.constructor.name, gasUsed);
                 if (machineState.pc >= bytecode.length) {
                     this.log.warn('Passed end of program');
-                    throw new InvalidProgramCounterError(machineState.pc, /*max=*/ bytecode.length);
+                    throw new InvalidProgramCounterError(machineState.pc, /*max=*/ bytecode.length - 1);
                 }
             }
             const output = machineState.getOutput();
             const reverted = machineState.getReverted();
-            const revertReason = reverted ? await revertReasonFromExplicitRevert(output, this.context) : undefined;
+            const revertReason = reverted ? await revertReasonFromExplicitRevert(output.bestEffortReadAll(), this.context) : undefined;
             const results = new AvmContractCallResult(reverted, output, machineState.gasLeft, revertReason, machineState.instrCounter);
             this.log.debug(`Context execution results: ${results.toString()}`);
             const totalGasUsed = {
@@ -137,12 +133,10 @@ export class AvmSimulator {
             // Return results for processing by calling context
             return results;
         } catch (err) {
-            this.log.verbose('Exceptional halt (revert by something other than REVERT opcode)');
-            // FIXME: weird that we have to do this OutOfGasError check because:
-            // 1. OutOfGasError is an AvmExecutionError, so that check should cover both
-            // 2. We should at least be able to do instanceof OutOfGasError instead of checking the constructor name
-            if (!(err.constructor.name == 'OutOfGasError' || err instanceof AvmExecutionError || err instanceof SideEffectLimitReachedError)) {
-                this.log.error(`Unknown error thrown by AVM: ${err}`);
+            this.log.info(`Exceptional halt (revert by something other than REVERT opcode) for instruction
+         ${instructionName} at pc ${machineState.pc} and instruction counter ${machineState.instrCounter}`);
+            if (!(err instanceof CheckedPublicExecutionError)) {
+                this.log.error(`Unchecked/unknown error thrown by AVM. This is a bug. Error: ${err}`);
                 throw err;
             }
             const revertReason = await revertReasonFromExceptionalHalt(err, this.context);
@@ -152,7 +146,7 @@ export class AvmSimulator {
                 daGas: 0
             };
             // Note: "exceptional halts" cannot return data, hence [].
-            const results = new AvmContractCallResult(/*reverted=*/ true, /*output=*/ [], noGasLeft, revertReason, machineState.instrCounter);
+            const results = new AvmContractCallResult(/*reverted=*/ true, /*output=*/ new ReturnDataArray([]), noGasLeft, revertReason, machineState.instrCounter);
             this.log.debug(`Context execution results: ${results.toString()}`);
             this.tallyPrintFunction();
             // Return results for processing by calling context
@@ -161,13 +155,14 @@ export class AvmSimulator {
     }
     async handleFailureToRetrieveBytecode(message) {
         // revert, consuming all gas
-        const fnName = await this.context.persistableState.getPublicFunctionDebugName(this.context.environment);
+        const { functionSelector, functionName } = await this.context.persistableState.getPublicFunctionSelectorAndName(this.context.environment);
         const revertReason = new AvmRevertReason(message, /*failingFunction=*/ {
             contractAddress: this.context.environment.address,
-            functionName: fnName
+            functionSelector,
+            functionName
         }, /*noirCallStack=*/ []);
         this.log.warn(message);
-        return new AvmContractCallResult(/*reverted=*/ true, /*output=*/ [], /*gasLeft=*/ {
+        return new AvmContractCallResult(/*reverted=*/ true, /*output=*/ new ReturnDataArray([]), /*gasLeft=*/ {
             l2Gas: 0,
             daGas: 0
         }, revertReason);

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

@@ -6,4 +6,4 @@ export interface AvmSimulatorInterface {
     executeBytecode(bytecode: Buffer): Promise<any>;
     getBytecode(): Buffer | undefined;
 }
-//# sourceMappingURL=avm_simulator_interface.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX3NpbXVsYXRvcl9pbnRlcmZhY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvYXZtL2F2bV9zaW11bGF0b3JfaW50ZXJmYWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxXQUFXLHFCQUFxQjtJQUNwQyxPQUFPLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3hCLGVBQWUsQ0FBQyxRQUFRLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNoRCxXQUFXLElBQUksTUFBTSxHQUFHLFNBQVMsQ0FBQztDQUNuQyJ9

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

@@ -0,0 +1,51 @@
+import type { Fr } from '@aztec/foundation/schemas';
+import { TaggedMemory } from './avm_memory_types.js';
+export interface LazyReader {
+    bestEffortReadAll(readCap?: number): Fr[];
+    readAll(): Fr[];
+    read(idx: number): Fr | undefined;
+    slice(start: number, end: number): Fr[];
+    length(): number;
+}
+export declare class LazyReaderMemory implements LazyReader {
+    private memory;
+    private offset;
+    private size;
+    constructor(memory: TaggedMemory, offset: number, size: number);
+    bestEffortReadAll(readCap?: number): Fr[];
+    read(idx: number): Fr | undefined;
+    slice(start: number, end: number): Fr[];
+    readAll(): Fr[];
+    length(): number;
+}
+export declare class LazyReaderArray implements LazyReader {
+    private array;
+    constructor(array: Fr[]);
+    bestEffortReadAll(readCap?: number): Fr[];
+    read(idx: number): Fr | undefined;
+    slice(start: number, end: number): Fr[];
+    readAll(): Fr[];
+    length(): number;
+}
+declare const CallDataBrand: unique symbol;
+declare const ReturnDataBrand: unique symbol;
+export type CallData = LazyReader & {
+    readonly [CallDataBrand]: true;
+};
+export type ReturnData = LazyReader & {
+    readonly [ReturnDataBrand]: true;
+};
+export declare class CallDataArray extends LazyReaderArray implements CallData {
+    readonly [CallDataBrand]: true;
+}
+export declare class CallDataMemory extends LazyReaderMemory implements CallData {
+    readonly [CallDataBrand]: true;
+}
+export declare class ReturnDataArray extends LazyReaderArray implements ReturnData {
+    readonly [ReturnDataBrand]: true;
+}
+export declare class ReturnDataMemory extends LazyReaderMemory implements ReturnData {
+    readonly [ReturnDataBrand]: true;
+}
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FsbGRhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvYXZtL2NhbGxkYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUtyRCxNQUFNLFdBQVcsVUFBVTtJQUN6QixpQkFBaUIsQ0FBQyxPQUFPLENBQUMsRUFBRSxNQUFNLEdBQUcsRUFBRSxFQUFFLENBQUM7SUFDMUMsT0FBTyxJQUFJLEVBQUUsRUFBRSxDQUFDO0lBQ2hCLElBQUksQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLEVBQUUsR0FBRyxTQUFTLENBQUM7SUFDbEMsS0FBSyxDQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLE1BQU0sR0FBRyxFQUFFLEVBQUUsQ0FBQztJQUN4QyxNQUFNLElBQUksTUFBTSxDQUFDO0NBQ2xCO0FBRUQscUJBQWEsZ0JBQWlCLFlBQVcsVUFBVTtJQUUvQyxPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLElBQUk7SUFIZCxZQUNVLE1BQU0sRUFBRSxZQUFZLEVBQ3BCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsSUFBSSxFQUFFLE1BQU0sRUFDbEI7SUFFRyxpQkFBaUIsQ0FBQyxPQUFPLFNBQStCLEdBQUcsRUFBRSxFQUFFLENBR3JFO0lBRU0sSUFBSSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsRUFBRSxHQUFHLFNBQVMsQ0FLdkM7SUFFTSxLQUFLLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsTUFBTSxHQUFHLEVBQUUsRUFBRSxDQUk3QztJQUVNLE9BQU8sSUFBSSxFQUFFLEVBQUUsQ0FFckI7SUFFTSxNQUFNLElBQUksTUFBTSxDQUV0QjtDQUNGO0FBRUQscUJBQWEsZUFBZ0IsWUFBVyxVQUFVO0lBQ3BDLE9BQU8sQ0FBQyxLQUFLO0lBQXpCLFlBQW9CLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBSTtJQUU1QixpQkFBaUIsQ0FBQyxPQUFPLFNBQStCLEdBQUcsRUFBRSxFQUFFLENBRXJFO0lBRU0sSUFBSSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsRUFBRSxHQUFHLFNBQVMsQ0FFdkM7SUFFTSxLQUFLLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsTUFBTSxHQUFHLEVBQUUsRUFBRSxDQUU3QztJQUVNLE9BQU8sSUFBSSxFQUFFLEVBQUUsQ0FFckI7SUFFTSxNQUFNLElBQUksTUFBTSxDQUV0QjtDQUNGO0FBR0QsT0FBTyxDQUFDLE1BQU0sYUFBYSxFQUFFLE9BQU8sTUFBTSxDQUFDO0FBQzNDLE9BQU8sQ0FBQyxNQUFNLGVBQWUsRUFBRSxPQUFPLE1BQU0sQ0FBQztBQUU3QyxNQUFNLE1BQU0sUUFBUSxHQUFHLFVBQVUsR0FBRztJQUNsQyxRQUFRLENBQUMsQ0FBQyxhQUFhLENBQUMsRUFBRSxJQUFJLENBQUM7Q0FDaEMsQ0FBQztBQUVGLE1BQU0sTUFBTSxVQUFVLEdBQUcsVUFBVSxHQUFHO0lBQ3BDLFFBQVEsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxFQUFFLElBQUksQ0FBQztDQUNsQyxDQUFDO0FBRUYscUJBQWEsYUFBYyxTQUFRLGVBQWdCLFlBQVcsUUFBUTtJQUNwRSxTQUFpQixDQUFDLGFBQWEsQ0FBQyxFQUFFLElBQUksQ0FBQztDQUN4QztBQUVELHFCQUFhLGNBQWUsU0FBUSxnQkFBaUIsWUFBVyxRQUFRO0lBQ3RFLFNBQWlCLENBQUMsYUFBYSxDQUFDLEVBQUUsSUFBSSxDQUFDO0NBQ3hDO0FBRUQscUJBQWEsZUFBZ0IsU0FBUSxlQUFnQixZQUFXLFVBQVU7SUFDeEUsU0FBaUIsQ0FBQyxlQUFlLENBQUMsRUFBRSxJQUFJLENBQUM7Q0FDMUM7QUFFRCxxQkFBYSxnQkFBaUIsU0FBUSxnQkFBaUIsWUFBVyxVQUFVO0lBQzFFLFNBQWlCLENBQUMsZUFBZSxDQUFDLEVBQUUsSUFBSSxDQUFDO0NBQzFDIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"calldata.d.ts","sourceRoot":"","sources":["../../../src/public/avm/calldata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,2BAA2B,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAKrD,MAAM,WAAW,UAAU;IACzB,iBAAiB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,EAAE,EAAE,CAAC;IAC1C,OAAO,IAAI,EAAE,EAAE,CAAC;IAChB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,GAAG,SAAS,CAAC;IAClC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,CAAC;IACxC,MAAM,IAAI,MAAM,CAAC;CAClB;AAED,qBAAa,gBAAiB,YAAW,UAAU;IAE/C,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,IAAI;IAHd,YACU,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EAClB;IAEG,iBAAiB,CAAC,OAAO,SAA+B,GAAG,EAAE,EAAE,CAGrE;IAEM,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,GAAG,SAAS,CAKvC;IAEM,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,CAI7C;IAEM,OAAO,IAAI,EAAE,EAAE,CAErB;IAEM,MAAM,IAAI,MAAM,CAEtB;CACF;AAED,qBAAa,eAAgB,YAAW,UAAU;IACpC,OAAO,CAAC,KAAK;IAAzB,YAAoB,KAAK,EAAE,EAAE,EAAE,EAAI;IAE5B,iBAAiB,CAAC,OAAO,SAA+B,GAAG,EAAE,EAAE,CAErE;IAEM,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,GAAG,SAAS,CAEvC;IAEM,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,CAE7C;IAEM,OAAO,IAAI,EAAE,EAAE,CAErB;IAEM,MAAM,IAAI,MAAM,CAEtB;CACF;AAGD,OAAO,CAAC,MAAM,aAAa,EAAE,OAAO,MAAM,CAAC;AAC3C,OAAO,CAAC,MAAM,eAAe,EAAE,OAAO,MAAM,CAAC;AAE7C,MAAM,MAAM,QAAQ,GAAG,UAAU,GAAG;IAClC,QAAQ,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG;IACpC,QAAQ,CAAC,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC;CAClC,CAAC;AAEF,qBAAa,aAAc,SAAQ,eAAgB,YAAW,QAAQ;IACpE,SAAiB,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC;CACxC;AAED,qBAAa,cAAe,SAAQ,gBAAiB,YAAW,QAAQ;IACtE,SAAiB,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC;CACxC;AAED,qBAAa,eAAgB,SAAQ,eAAgB,YAAW,UAAU;IACxE,SAAiB,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC;CAC1C;AAED,qBAAa,gBAAiB,SAAQ,gBAAiB,YAAW,UAAU;IAC1E,SAAiB,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC;CAC1C"}

package/dest/public/avm/calldata.js

@@ -0,0 +1,63 @@
+import { TaggedMemory } from './avm_memory_types.js';
+// Allow reading up to 300 kB of return data when unspecified.
+const DEFAULT_BEST_EFFORT_READ_CAP = 10000;
+export class LazyReaderMemory {
+    memory;
+    offset;
+    size;
+    constructor(memory, offset, size){
+        this.memory = memory;
+        this.offset = offset;
+        this.size = size;
+    }
+    bestEffortReadAll(readCap = DEFAULT_BEST_EFFORT_READ_CAP) {
+        const size = Math.min(this.size, readCap, TaggedMemory.MAX_MEMORY_SIZE - this.offset);
+        return this.memory.getSlice(this.offset, size).map((word)=>word.toFr());
+    }
+    read(idx) {
+        if (idx >= this.size) {
+            return undefined;
+        }
+        return this.memory.get(this.offset + idx).toFr();
+    }
+    slice(start, end) {
+        const clampedEnd = Math.min(end, this.size);
+        const length = Math.max(0, clampedEnd - start);
+        return this.memory.getSlice(this.offset + start, length).map((word)=>word.toFr());
+    }
+    readAll() {
+        return this.memory.getSlice(this.offset, this.size).map((word)=>word.toFr());
+    }
+    length() {
+        return this.size;
+    }
+}
+export class LazyReaderArray {
+    array;
+    constructor(array){
+        this.array = array;
+    }
+    bestEffortReadAll(readCap = DEFAULT_BEST_EFFORT_READ_CAP) {
+        return this.array.slice(0, readCap);
+    }
+    read(idx) {
+        return this.array[idx];
+    }
+    slice(start, end) {
+        return this.array.slice(start, end);
+    }
+    readAll() {
+        return this.array;
+    }
+    length() {
+        return this.array.length;
+    }
+}
+export class CallDataArray extends LazyReaderArray {
+}
+export class CallDataMemory extends LazyReaderMemory {
+}
+export class ReturnDataArray extends LazyReaderArray {
+}
+export class ReturnDataMemory extends LazyReaderMemory {
+}

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

@@ -1,16 +1,13 @@
-import type { Point } from '@aztec/foundation/fields';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { Point } from '@aztec/foundation/curves/grumpkin';
 import type { FailingFunction, NoirCallStack } from '@aztec/stdlib/errors';
 import { ExecutionError } from '../../common/errors.js';
+import { CheckedPublicExecutionError } from '../public_errors.js';
 /**
  * Avm-specific errors should derive from this
  */
-export declare abstract class AvmExecutionError extends Error {
+export declare abstract class AvmExecutionError extends CheckedPublicExecutionError {
     constructor(message: string);
 }
-export declare class NoBytecodeForContractError extends AvmExecutionError {
-    constructor(contractAddress: AztecAddress);
-}
 export declare class ArithmeticError extends AvmExecutionError {
     constructor(message: string);
 }
@@ -50,6 +47,8 @@ export declare class InstructionExecutionError extends AvmExecutionError {
  * Error thrown on failed AVM memory tag check.
  */
 export declare class TagCheckError extends AvmExecutionError {
+    static forBaseAddress(gotTag: string): TagCheckError;
+    static forIndirectAddress(address: number, gotTag: string): TagCheckError;
     static forOffset(offset: number, gotTag: string, expectedTag: string): TagCheckError;
     static forTag(gotTag: string, expectedTag: string): TagCheckError;
     constructor(message: string);
@@ -73,16 +72,10 @@ export declare class OutOfGasError extends AvmExecutionError {
     constructor(dimensions: string[]);
 }
 /**
- * Error is thrown when the supplied points length is not a multiple of 3. Specific for MSM opcode.
- */
-export declare class MSMPointsLengthError extends AvmExecutionError {
-    constructor(pointsReadLength: number);
-}
-/**
- * Error is thrown when one of the supplied points does not lie on the Grumpkin curve. Specific for MSM opcode.
+ * Error is thrown when one of the supplied points does not lie on the Grumpkin curve. Specific for ECADD opcode.
  */
-export declare class MSMPointNotOnCurveError extends AvmExecutionError {
-    constructor(point: Point);
+export declare class EcAddPointNotOnCurveError extends AvmExecutionError {
+    constructor(pointIndex: number, point: Point);
 }
 /**
  * Error is thrown when some inputs of ToRadixBE are not valid.
@@ -104,4 +97,8 @@ export declare class StaticCallAlterationError extends InstructionExecutionError
 export declare class AvmRevertReason extends ExecutionError {
     constructor(message: string, failingFunction: FailingFunction, noirCallStack: NoirCallStack, options?: ErrorOptions);
 }
-//# sourceMappingURL=errors.d.ts.map
+/**
+ * Helper to annotate errors occurring during instruction fetching.
+ */
+export declare function duringInstrFetch(error: Error, pc: number): Error;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL2F2bS9lcnJvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLGFBQWEsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRTNFLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN4RCxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVsRTs7R0FFRztBQUNILDhCQUFzQixpQkFBa0IsU0FBUSwyQkFBMkI7SUFDekUsWUFBWSxPQUFPLEVBQUUsTUFBTSxFQUcxQjtDQUNGO0FBRUQscUJBQWEsZUFBZ0IsU0FBUSxpQkFBaUI7SUFDcEQsWUFBWSxPQUFPLEVBQUUsTUFBTSxFQUcxQjtDQUNGO0FBRUQ7OztHQUdHO0FBQ0gscUJBQWEsMEJBQTJCLFNBQVEsaUJBQWlCO0lBQy9ELFlBQVksRUFBRSxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUdsQztDQUNGO0FBRUQ7OztHQUdHO0FBQ0gscUJBQWEsa0JBQW1CLFNBQVEsaUJBQWlCO0lBQ3ZELFlBQVksR0FBRyxFQUFFLE1BQU0sRUFHdEI7Q0FDRjtBQUVEOztHQUVHO0FBQ0gscUJBQWEsZUFBZ0IsU0FBUSxpQkFBaUI7SUFDcEQsWUFBWSxHQUFHLEVBQUUsTUFBTSxFQUd0QjtDQUNGO0FBRUQ7O0dBRUc7QUFDSCxxQkFBYSxvQkFBcUIsU0FBUSxpQkFBaUI7SUFDekQsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUczQjtDQUNGO0FBRUQ7O0dBRUc7QUFDSCxxQkFBYSx5QkFBMEIsU0FBUSxpQkFBaUI7SUFDOUQsWUFBWSxPQUFPLEVBQUUsTUFBTSxFQUcxQjtDQUNGO0FBRUQ7O0dBRUc7QUFDSCxxQkFBYSxhQUFjLFNBQVEsaUJBQWlCO0lBQ2xELE9BQWMsY0FBYyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsYUFBYSxDQUUxRDtJQUNELE9BQWMsa0JBQWtCLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxHQUFHLGFBQWEsQ0FFL0U7SUFDRCxPQUFjLFNBQVMsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLE1BQU0sR0FBRyxhQUFhLENBRTFGO0lBRUQsT0FBYyxNQUFNLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxHQUFHLGFBQWEsQ0FFdkU7SUFFRCxZQUFZLE9BQU8sRUFBRSxNQUFNLEVBRzFCO0NBQ0Y7QUFFRDs7O0dBR0c7QUFDSCxxQkFBYSw4QkFBK0IsU0FBUSxpQkFBaUI7SUFDbkUsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBRzlDO0NBQ0Y7QUFFRDs7O0dBR0c7QUFDSCxxQkFBYSwwQkFBMkIsU0FBUSxpQkFBaUI7SUFDL0QsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxNQUFNLEVBR3pDO0NBQ0Y7QUFFRCxvQ0FBb0M7QUFDcEMscUJBQWEsYUFBYyxTQUFRLGlCQUFpQjtJQUNsRCxZQUFZLFVBQVUsRUFBRSxNQUFNLEVBQUUsRUFHL0I7Q0FDRjtBQUVEOztHQUVHO0FBQ0gscUJBQWEseUJBQTBCLFNBQVEsaUJBQWlCO0lBQzlELFlBQVksVUFBVSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUczQztDQUNGO0FBRUQ7O0dBRUc7QUFDSCxxQkFBYSx5QkFBMEIsU0FBUSxpQkFBaUI7SUFDOUQsWUFBWSxXQUFXLEVBQUUsTUFBTSxFQUc5QjtDQUNGO0FBRUQ7O0dBRUc7QUFDSCxxQkFBYSx5QkFBMEIsU0FBUSx5QkFBeUI7SUFDdEUsY0FHQztDQUNGO0FBRUQ7Ozs7R0FJRztBQUNILHFCQUFhLGVBQWdCLFNBQVEsY0FBYztJQUNqRCxZQUFZLE9BQU8sRUFBRSxNQUFNLEVBQUUsZUFBZSxFQUFFLGVBQWUsRUFBRSxhQUFhLEVBQUUsYUFBYSxFQUFFLE9BQU8sQ0FBQyxFQUFFLFlBQVksRUFFbEg7Q0FDRjtBQUVEOztHQUVHO0FBQ0gsd0JBQWdCLGdCQUFnQixDQUFDLEtBQUssRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sU0FHeEQifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/public/avm/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE3E,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD;;GAEG;AACH,8BAAsB,iBAAkB,SAAQ,KAAK;gBACvC,OAAO,EAAE,MAAM;CAI5B;AAED,qBAAa,0BAA2B,SAAQ,iBAAiB;gBACnD,eAAe,EAAE,YAAY;CAI1C;AAED,qBAAa,eAAgB,SAAQ,iBAAiB;gBACxC,OAAO,EAAE,MAAM;CAI5B;AAED;;;GAGG;AACH,qBAAa,0BAA2B,SAAQ,iBAAiB;gBACnD,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAIpC;AAED;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,iBAAiB;gBAC3C,GAAG,EAAE,MAAM;CAIxB;AAED;;GAEG;AACH,qBAAa,eAAgB,SAAQ,iBAAiB;gBACxC,GAAG,EAAE,MAAM;CAIxB;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,iBAAiB;gBAC7C,QAAQ,EAAE,MAAM;CAI7B;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,iBAAiB;gBAClD,OAAO,EAAE,MAAM;CAI5B;AAED;;GAEG;AACH,qBAAa,aAAc,SAAQ,iBAAiB;WACpC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,aAAa;WAI7E,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,aAAa;gBAI5D,OAAO,EAAE,MAAM;CAI5B;AAED;;;GAGG;AACH,qBAAa,8BAA+B,SAAQ,iBAAiB;gBACvD,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAIhD;AAED;;;GAGG;AACH,qBAAa,0BAA2B,SAAQ,iBAAiB;gBACnD,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAI3C;AAED,oCAAoC;AACpC,qBAAa,aAAc,SAAQ,iBAAiB;gBACtC,UAAU,EAAE,MAAM,EAAE;CAIjC;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,iBAAiB;gBAC7C,gBAAgB,EAAE,MAAM;CAIrC;AAED;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,iBAAiB;gBAChD,KAAK,EAAE,KAAK;CAIzB;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,iBAAiB;gBAClD,WAAW,EAAE,MAAM;CAIhC;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,yBAAyB;;CAKvE;AAED;;;;GAIG;AACH,qBAAa,eAAgB,SAAQ,cAAc;gBACrC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,YAAY;CAGpH"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/public/avm/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE3E,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAElE;;GAEG;AACH,8BAAsB,iBAAkB,SAAQ,2BAA2B;IACzE,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAED,qBAAa,eAAgB,SAAQ,iBAAiB;IACpD,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAED;;;GAGG;AACH,qBAAa,0BAA2B,SAAQ,iBAAiB;IAC/D,YAAY,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAGlC;CACF;AAED;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,iBAAiB;IACvD,YAAY,GAAG,EAAE,MAAM,EAGtB;CACF;AAED;;GAEG;AACH,qBAAa,eAAgB,SAAQ,iBAAiB;IACpD,YAAY,GAAG,EAAE,MAAM,EAGtB;CACF;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,iBAAiB;IACzD,YAAY,QAAQ,EAAE,MAAM,EAG3B;CACF;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAED;;GAEG;AACH,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,OAAc,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAE1D;IACD,OAAc,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,CAE/E;IACD,OAAc,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,aAAa,CAE1F;IAED,OAAc,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,aAAa,CAEvE;IAED,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAED;;;GAGG;AACH,qBAAa,8BAA+B,SAAQ,iBAAiB;IACnE,YAAY,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAG9C;CACF;AAED;;;GAGG;AACH,qBAAa,0BAA2B,SAAQ,iBAAiB;IAC/D,YAAY,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAGzC;CACF;AAED,oCAAoC;AACpC,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,YAAY,UAAU,EAAE,MAAM,EAAE,EAG/B;CACF;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,YAAY,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAG3C;CACF;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,YAAY,WAAW,EAAE,MAAM,EAG9B;CACF;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,yBAAyB;IACtE,cAGC;CACF;AAED;;;;GAIG;AACH,qBAAa,eAAgB,SAAQ,cAAc;IACjD,YAAY,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,YAAY,EAElH;CACF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,SAGxD"}

package/dest/public/avm/errors.js

@@ -1,18 +1,13 @@
 import { ExecutionError } from '../../common/errors.js';
+import { CheckedPublicExecutionError } from '../public_errors.js';
 /**
  * Avm-specific errors should derive from this
- */ export class AvmExecutionError extends Error {
+ */ export class AvmExecutionError extends CheckedPublicExecutionError {
     constructor(message){
         super(message);
         this.name = 'AvmExecutionError';
     }
 }
-export class NoBytecodeForContractError extends AvmExecutionError {
-    constructor(contractAddress){
-        super(`No bytecode found at: ${contractAddress}`);
-        this.name = 'NoBytecodeFoundInterpreterError';
-    }
-}
 export class ArithmeticError extends AvmExecutionError {
     constructor(message){
         super(message);
@@ -49,7 +44,7 @@ export class ArithmeticError extends AvmExecutionError {
  * Error is thrown when the tag has an invalid value.
  */ export class InvalidTagValueError extends AvmExecutionError {
     constructor(tagValue){
-        super(`Tag value ${tagValue} is invalid.`);
+        super(`Tag check failed: Tag value ${tagValue} is invalid.`);
         this.name = 'InvalidTagValueError';
     }
 }
@@ -64,6 +59,12 @@ export class ArithmeticError extends AvmExecutionError {
 /**
  * Error thrown on failed AVM memory tag check.
  */ export class TagCheckError extends AvmExecutionError {
+    static forBaseAddress(gotTag) {
+        return new TagCheckError(`Base address (mem[0]) is not a valid address (has tag ${gotTag})`);
+    }
+    static forIndirectAddress(address, gotTag) {
+        return new TagCheckError(`Address after indirection is not a valid address (address ${address} has tag ${gotTag})`);
+    }
     static forOffset(offset, gotTag, expectedTag) {
         return new TagCheckError(`Tag mismatch at offset ${offset}, got ${gotTag}, expected ${expectedTag}`);
     }
@@ -80,7 +81,7 @@ export class ArithmeticError extends AvmExecutionError {
  * is out of range, i.e, greater than maxUint32.
  */ export class RelativeAddressOutOfRangeError extends AvmExecutionError {
     constructor(baseAddr, relOffset){
-        super(`Address out of range. Base address ${baseAddr}, relative offset ${relOffset}`);
+        super(`Relative address out of range. Base address ${baseAddr}, relative offset ${relOffset}`);
         this.name = 'RelativeAddressOutOfRangeError';
     }
 }
@@ -100,19 +101,11 @@ export class ArithmeticError extends AvmExecutionError {
     }
 }
 /**
- * Error is thrown when the supplied points length is not a multiple of 3. Specific for MSM opcode.
- */ export class MSMPointsLengthError extends AvmExecutionError {
-    constructor(pointsReadLength){
-        super(`Points vector length should be a multiple of 3, was ${pointsReadLength}`);
-        this.name = 'MSMPointsLengthError';
-    }
-}
-/**
- * Error is thrown when one of the supplied points does not lie on the Grumpkin curve. Specific for MSM opcode.
- */ export class MSMPointNotOnCurveError extends AvmExecutionError {
-    constructor(point){
-        super(`Point ${point.toString()} is not on the curve.`);
-        this.name = 'MSMPointNotOnCurveError';
+ * Error is thrown when one of the supplied points does not lie on the Grumpkin curve. Specific for ECADD opcode.
+ */ export class EcAddPointNotOnCurveError extends AvmExecutionError {
+    constructor(pointIndex, point){
+        super(`EcAdd point${pointIndex} (${point.toString()}) is not on the curve.`);
+        this.name = 'EcAddPointNotOnCurveError';
     }
 }
 /**
@@ -140,3 +133,9 @@ export class ArithmeticError extends AvmExecutionError {
         super(message, failingFunction, noirCallStack, options);
     }
 }
+/**
+ * Helper to annotate errors occurring during instruction fetching.
+ */ export function duringInstrFetch(error, pc) {
+    error.message = `Instruction fetching error at pc ${pc}: ${error.message}`;
+    return error;
+}

package/dest/public/avm/fixtures/account_proof_fetcher.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9wcm9vZl9mZXRjaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcHVibGljL2F2bS9maXh0dXJlcy9hY2NvdW50X3Byb29mX2ZldGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/dest/public/avm/fixtures/account_proof_fetcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"account_proof_fetcher.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/fixtures/account_proof_fetcher.ts"],"names":[],"mappings":""}

package/dest/public/avm/fixtures/account_proof_fetcher.js

@@ -0,0 +1,152 @@
+/**
+ * Fetches an account proof from the Ethereum mainnet and saves it as account_proof.json.
+ * This script is not using any Aztec library code, so it's easily portable.
+ */ import fs from 'fs';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+import { createPublicClient, fromRlp, hexToBytes, http } from 'viem';
+import { mainnet } from 'viem/chains';
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const RPC_URL = process.env.RPC_URL;
+const ADDRESS = process.env.ADDRESS || '0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045';
+const BLOCK_TAG = process.env.BLOCK_NUMBER ? BigInt(process.env.BLOCK_NUMBER) : 'latest';
+const MAX_ACCOUNT_PATH = 15;
+function padTo(arr, len) {
+    return [
+        ...arr,
+        ...Array(len - arr.length).fill(0)
+    ].slice(0, len);
+}
+function toBytes(hex) {
+    return Array.from(hexToBytes(hex));
+}
+function bytesToU64s(bytes) {
+    const paddedBytes = padTo(bytes, 32);
+    return Array.from({
+        length: 4
+    }, (_, i)=>{
+        let val = 0n;
+        for(let j = 0; j < 8; j++){
+            val += BigInt(paddedBytes[i * 8 + j]) << BigInt(j * 8);
+        }
+        return val.toString();
+    });
+}
+function toBytesAndLen(val) {
+    if (val === 0n || val === 0) {
+        return {
+            bytes: [
+                0
+            ],
+            length: 0
+        };
+    }
+    let hex = val.toString(16);
+    if (hex.length % 2) {
+        hex = '0' + hex;
+    }
+    const bytes = toBytes(`0x${hex}`);
+    return {
+        bytes,
+        length: bytes.length
+    };
+}
+function parseNode(rlp) {
+    // Should be safe when working with branches and extensions without embedded children.
+    const decoded = fromRlp(rlp);
+    const node = {
+        rows: Array(16).fill(0).map(()=>Array(32).fill(0)),
+        row_exist: Array(16).fill(false),
+        node_type: 0
+    };
+    if (decoded.length === 17) {
+        for(let i = 0; i < 16; i++){
+            if (decoded[i] !== '0x') {
+                node.row_exist[i] = true;
+                node.rows[i] = padTo(toBytes(decoded[i]), 32);
+            }
+        }
+    } else if (decoded.length === 2) {
+        const keyBytes = toBytes(decoded[0]);
+        const prefix = keyBytes[0];
+        if (prefix >> 4 >= 2) {
+            throw new Error('Unsupported: leaf node in proof path');
+        }
+        node.node_type = 1;
+        // Extension header format expected by the noir code: check out storage_proof types.nr.
+        node.rows[0][0] = prefix >> 4;
+        node.rows[0][8] = prefix & 0x0f;
+        node.rows[0][16] = keyBytes.length - 1;
+        for(let i = 1; i < keyBytes.length && i < 32; i++){
+            node.rows[1][i - 1] = keyBytes[i];
+        }
+        node.rows[2] = padTo(toBytes(decoded[1]), 32);
+        node.row_exist[0] = node.row_exist[1] = node.row_exist[2] = true;
+    }
+    return node;
+}
+function parseProof(proof, maxLen) {
+    const nodes = proof.slice(0, -1).slice(0, maxLen).map(parseNode);
+    while(nodes.length < maxLen){
+        nodes.push({
+            rows: Array(16).fill(0).map(()=>Array(32).fill(0)),
+            row_exist: Array(16).fill(false),
+            node_type: 0
+        });
+    }
+    return nodes;
+}
+function nodeToLibFormat(node) {
+    return {
+        rows: node.rows.map(bytesToU64s),
+        row_exist: node.row_exist,
+        node_type: String(node.node_type)
+    };
+}
+async function main() {
+    if (!RPC_URL) {
+        throw new Error('RPC_URL is not set');
+    }
+    console.log(`Fetching account proof for ${ADDRESS}`);
+    const client = createPublicClient({
+        chain: mainnet,
+        transport: http(RPC_URL)
+    });
+    const [blockNumber, proof, block] = await Promise.all([
+        client.getBlockNumber(),
+        client.getProof({
+            address: ADDRESS,
+            storageKeys: [],
+            blockNumber: BLOCK_TAG === 'latest' ? undefined : BLOCK_TAG
+        }),
+        client.getBlock({
+            blockNumber: BLOCK_TAG === 'latest' ? undefined : BLOCK_TAG
+        })
+    ]);
+    console.log(`Block: ${blockNumber}, Account nodes: ${proof.accountProof.length}`);
+    // The -1 is because the last node in the proof is the leaf, which is excluded from path verification.
+    const accountPathLen = proof.accountProof.length - 1;
+    if (accountPathLen > MAX_ACCOUNT_PATH) {
+        throw new Error(`Account proof path length ${accountPathLen} exceeds MAX_ACCOUNT_PATH ${MAX_ACCOUNT_PATH}. Increase the limit.`);
+    }
+    const nonce = toBytesAndLen(proof.nonce);
+    const balance = toBytesAndLen(proof.balance);
+    const data = {
+        block_number: String(blockNumber),
+        node_length: String(accountPathLen),
+        root: bytesToU64s(toBytes(block.stateRoot)),
+        nodes: parseProof(proof.accountProof, MAX_ACCOUNT_PATH).map(nodeToLibFormat),
+        account: {
+            address: toBytes(ADDRESS).map(String),
+            balance: padTo(balance.bytes, 32).map(String),
+            balance_length: String(balance.length),
+            code_hash: bytesToU64s(toBytes(proof.codeHash)),
+            nonce: padTo(nonce.bytes, 8).map(String),
+            nonce_length: String(nonce.length),
+            storage_hash: bytesToU64s(toBytes(proof.storageHash))
+        }
+    };
+    fs.writeFileSync(join(__dirname, 'account_proof.json'), JSON.stringify(data, null, 2));
+    console.log('account_proof.json generated');
+}
+main().catch(console.error);