@aztec/simulator 0.0.1-commit.3469e52 → 0.0.1-commit.350e0a4d

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

@@ -1,261 +0,0 @@
-import { Fr } from '@aztec/foundation/curves/bn254';
-import { strict as assert } from 'assert';
-import { TaggedMemory } from '../avm_memory_types.js';
-import { BufferCursor } from './buffer_cursor.js';
-/**
- * All AVM opcodes. (Keep in sync with cpp counterpart code avm_opcode.hpp and rs in opcodes.rs).
- * Source: https://yp-aztec.netlify.app/docs/public-vm/instruction-set
- */ export var Opcode = /*#__PURE__*/ function(Opcode) {
-    // Compute
-    Opcode[Opcode["ADD_8"] = 0] = "ADD_8";
-    Opcode[Opcode["ADD_16"] = 1] = "ADD_16";
-    Opcode[Opcode["SUB_8"] = 2] = "SUB_8";
-    Opcode[Opcode["SUB_16"] = 3] = "SUB_16";
-    Opcode[Opcode["MUL_8"] = 4] = "MUL_8";
-    Opcode[Opcode["MUL_16"] = 5] = "MUL_16";
-    Opcode[Opcode["DIV_8"] = 6] = "DIV_8";
-    Opcode[Opcode["DIV_16"] = 7] = "DIV_16";
-    Opcode[Opcode["FDIV_8"] = 8] = "FDIV_8";
-    Opcode[Opcode["FDIV_16"] = 9] = "FDIV_16";
-    Opcode[Opcode["EQ_8"] = 10] = "EQ_8";
-    Opcode[Opcode["EQ_16"] = 11] = "EQ_16";
-    Opcode[Opcode["LT_8"] = 12] = "LT_8";
-    Opcode[Opcode["LT_16"] = 13] = "LT_16";
-    Opcode[Opcode["LTE_8"] = 14] = "LTE_8";
-    Opcode[Opcode["LTE_16"] = 15] = "LTE_16";
-    Opcode[Opcode["AND_8"] = 16] = "AND_8";
-    Opcode[Opcode["AND_16"] = 17] = "AND_16";
-    Opcode[Opcode["OR_8"] = 18] = "OR_8";
-    Opcode[Opcode["OR_16"] = 19] = "OR_16";
-    Opcode[Opcode["XOR_8"] = 20] = "XOR_8";
-    Opcode[Opcode["XOR_16"] = 21] = "XOR_16";
-    Opcode[Opcode["NOT_8"] = 22] = "NOT_8";
-    Opcode[Opcode["NOT_16"] = 23] = "NOT_16";
-    Opcode[Opcode["SHL_8"] = 24] = "SHL_8";
-    Opcode[Opcode["SHL_16"] = 25] = "SHL_16";
-    Opcode[Opcode["SHR_8"] = 26] = "SHR_8";
-    Opcode[Opcode["SHR_16"] = 27] = "SHR_16";
-    Opcode[Opcode["CAST_8"] = 28] = "CAST_8";
-    Opcode[Opcode["CAST_16"] = 29] = "CAST_16";
-    // Execution environment
-    Opcode[Opcode["GETENVVAR_16"] = 30] = "GETENVVAR_16";
-    Opcode[Opcode["CALLDATACOPY"] = 31] = "CALLDATACOPY";
-    Opcode[Opcode["SUCCESSCOPY"] = 32] = "SUCCESSCOPY";
-    Opcode[Opcode["RETURNDATASIZE"] = 33] = "RETURNDATASIZE";
-    Opcode[Opcode["RETURNDATACOPY"] = 34] = "RETURNDATACOPY";
-    // Control flow
-    Opcode[Opcode["JUMP_32"] = 35] = "JUMP_32";
-    Opcode[Opcode["JUMPI_32"] = 36] = "JUMPI_32";
-    Opcode[Opcode["INTERNALCALL"] = 37] = "INTERNALCALL";
-    Opcode[Opcode["INTERNALRETURN"] = 38] = "INTERNALRETURN";
-    // Memory
-    Opcode[Opcode["SET_8"] = 39] = "SET_8";
-    Opcode[Opcode["SET_16"] = 40] = "SET_16";
-    Opcode[Opcode["SET_32"] = 41] = "SET_32";
-    Opcode[Opcode["SET_64"] = 42] = "SET_64";
-    Opcode[Opcode["SET_128"] = 43] = "SET_128";
-    Opcode[Opcode["SET_FF"] = 44] = "SET_FF";
-    Opcode[Opcode["MOV_8"] = 45] = "MOV_8";
-    Opcode[Opcode["MOV_16"] = 46] = "MOV_16";
-    // World state
-    Opcode[Opcode["SLOAD"] = 47] = "SLOAD";
-    Opcode[Opcode["SSTORE"] = 48] = "SSTORE";
-    Opcode[Opcode["NOTEHASHEXISTS"] = 49] = "NOTEHASHEXISTS";
-    Opcode[Opcode["EMITNOTEHASH"] = 50] = "EMITNOTEHASH";
-    Opcode[Opcode["NULLIFIEREXISTS"] = 51] = "NULLIFIEREXISTS";
-    Opcode[Opcode["EMITNULLIFIER"] = 52] = "EMITNULLIFIER";
-    Opcode[Opcode["L1TOL2MSGEXISTS"] = 53] = "L1TOL2MSGEXISTS";
-    Opcode[Opcode["GETCONTRACTINSTANCE"] = 54] = "GETCONTRACTINSTANCE";
-    Opcode[Opcode["EMITUNENCRYPTEDLOG"] = 55] = "EMITUNENCRYPTEDLOG";
-    Opcode[Opcode["SENDL2TOL1MSG"] = 56] = "SENDL2TOL1MSG";
-    // External calls
-    Opcode[Opcode["CALL"] = 57] = "CALL";
-    Opcode[Opcode["STATICCALL"] = 58] = "STATICCALL";
-    Opcode[Opcode["RETURN"] = 59] = "RETURN";
-    Opcode[Opcode["REVERT_8"] = 60] = "REVERT_8";
-    Opcode[Opcode["REVERT_16"] = 61] = "REVERT_16";
-    // Misc
-    Opcode[Opcode["DEBUGLOG"] = 62] = "DEBUGLOG";
-    // Gadgets
-    Opcode[Opcode["POSEIDON2"] = 63] = "POSEIDON2";
-    Opcode[Opcode["SHA256COMPRESSION"] = 64] = "SHA256COMPRESSION";
-    Opcode[Opcode["KECCAKF1600"] = 65] = "KECCAKF1600";
-    Opcode[Opcode["ECADD"] = 66] = "ECADD";
-    // Conversion
-    Opcode[Opcode["TORADIXBE"] = 67] = "TORADIXBE";
-    return Opcode;
-}({});
-export const MAX_OPCODE_VALUE = Math.max(...Object.values(Opcode).map((k)=>+k).filter((k)=>!isNaN(k)));
-// Possible types for an instruction's operand in its wire format.
-// The counterpart cpp file is: vm2/simulation/lib/serialization.hpp.
-export var OperandType = /*#__PURE__*/ function(OperandType) {
-    OperandType[OperandType["UINT8"] = 0] = "UINT8";
-    OperandType[OperandType["UINT16"] = 1] = "UINT16";
-    OperandType[OperandType["UINT32"] = 2] = "UINT32";
-    OperandType[OperandType["UINT64"] = 3] = "UINT64";
-    OperandType[OperandType["UINT128"] = 4] = "UINT128";
-    OperandType[OperandType["FF"] = 5] = "FF";
-    OperandType[OperandType["TAG"] = 6] = "TAG";
-    return OperandType;
-}({});
-// Specifies how to read and write each operand type.
-const OPERAND_SPEC = new Map([
-    [
-        0,
-        [
-            1,
-            Buffer.prototype.readUint8,
-            Buffer.prototype.writeUint8
-        ]
-    ],
-    [
-        1,
-        [
-            2,
-            Buffer.prototype.readUint16BE,
-            Buffer.prototype.writeUint16BE
-        ]
-    ],
-    [
-        2,
-        [
-            4,
-            Buffer.prototype.readUint32BE,
-            Buffer.prototype.writeUint32BE
-        ]
-    ],
-    [
-        3,
-        [
-            8,
-            readUint64BE,
-            writeUint64BE
-        ]
-    ],
-    [
-        4,
-        [
-            16,
-            readUint128BE,
-            writeUint128BE
-        ]
-    ],
-    [
-        5,
-        [
-            32,
-            readUint254BE,
-            writeUint254BE
-        ]
-    ],
-    [
-        6,
-        [
-            1,
-            Buffer.prototype.readUint8,
-            Buffer.prototype.writeUint8
-        ]
-    ]
-]);
-/**
- * Returns the size of an operand in bytes.
- * Should not be called with unknown operand types.
- * @param operandType
- * @returns number size in bytes
- * @throws AssertionError if the operand type is unknown
- */ export function getOperandSize(operandType) {
-    assert(OPERAND_SPEC.has(operandType), `Unknown operand type: ${operandType}`);
-    return OPERAND_SPEC.get(operandType)[0];
-}
-function readUintBE(buf, offset, totalBytes) {
-    let value = 0n;
-    for(let i = 0; i < totalBytes; ++i){
-        value <<= 8n;
-        value |= BigInt(buf.readUint8(i + offset));
-    }
-    return value;
-}
-function writeUintBE(buf, value, totalBytes) {
-    for(let offset = totalBytes - 1; offset >= 0; --offset){
-        buf.writeUint8(Number(value & 0xffn), offset);
-        value >>= 8n;
-    }
-}
-function readUint64BE(offset) {
-    return readUintBE(this, offset, 8);
-}
-function writeUint64BE(value) {
-    writeUintBE(this, value, 8);
-}
-function readUint254BE(offset) {
-    let value = readUintBE(this, offset, 32);
-    // In circuit, we only support values up to Fr.MODULUS and any deserialized value
-    // would naturally undergo a modulus reduction.
-    if (value >= Fr.MODULUS) {
-        value = value % Fr.MODULUS;
-    }
-    return value;
-}
-function writeUint254BE(value) {
-    writeUintBE(this, value, 32);
-}
-function readUint128BE(offset) {
-    return readUintBE(this, offset, 16);
-}
-function writeUint128BE(value) {
-    writeUintBE(this, value, 16);
-}
-/**
- * Reads an array of operands from a buffer.
- * @param cursor Buffer to read from. Might be longer than needed.
- * @param operands Specification of the operand types.
- * @returns An array as big as {@code operands}, with the converted TS values.
- */ export function deserialize(cursor, operands) {
-    const argValues = [];
-    if (Buffer.isBuffer(cursor)) {
-        cursor = new BufferCursor(cursor);
-    }
-    for (const opType of operands){
-        const [sizeBytes, reader, _writer] = OPERAND_SPEC.get(opType);
-        const value = reader.call(cursor.buffer(), cursor.position());
-        argValues.push(value);
-        cursor.advance(sizeBytes);
-    }
-    // We first want to detect other parsing errors (e.g., instruction size
-    // is longer than remaining bytes) first and therefore tag validation is done after completion
-    // of parsing above. Order of errors need to match with circuit.
-    for(let i = 0; i < operands.length; i++){
-        if (operands[i] === 6) {
-            // We parsed a single byte (readUInt8()) and therefore value is of number type (not bigint)
-            // We need to cast to number because checkIsValidTag expects a number.
-            TaggedMemory.checkIsValidTag(Number(argValues[i] ?? 0));
-        }
-    }
-    return argValues;
-}
-/**
- * Serializes a class using the specified operand types.
- * More specifically, this serializes {@code [cls.constructor.opcode, ...Object.values(cls)]}.
- * Observe in particular that:
- *   (1) the first operand type specified must correspond to the opcode;
- *   (2) the rest of the operand types must be specified in the order returned by {@code Object.values()}.
- * @param operands Type specification for the values to be serialized.
- * @param cls The class to be serialized.
- * @returns
- */ export function serializeAs(operands, opcode, cls) {
-    const chunks = [];
-    const rawClassValues = [
-        opcode,
-        ...Object.values(cls)
-    ];
-    assert(rawClassValues.length === operands.length, `Got ${rawClassValues.length} values but only ${operands.length} serialization operands are specified!`);
-    const classValues = rawClassValues;
-    for(let i = 0; i < operands.length; i++){
-        const opType = operands[i];
-        const [sizeBytes, _reader, writer] = OPERAND_SPEC.get(opType);
-        const buf = Buffer.alloc(sizeBytes);
-        writer.call(buf, classValues[i]);
-        chunks.push(buf);
-    }
-    return Buffer.concat(chunks);
-}

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

@@ -1,15 +0,0 @@
-import { Fr } from '@aztec/foundation/curves/bn254';
-import type { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-import type { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
-import type { PublicSideEffectTraceInterface } from '../side_effect_trace_interface.js';
-export declare function mockTraceFork(trace: PublicSideEffectTraceInterface, nestedTrace?: PublicSideEffectTraceInterface): void;
-export declare function mockStorageRead(worldStateDB: PublicTreesDB, value: Fr): void;
-export declare function mockNoteHashCount(mockedTrace: PublicSideEffectTraceInterface, count: number): void;
-export declare function mockStorageReadWithMap(worldStateDB: PublicTreesDB, mockedStorage: Map<bigint, Fr>): void;
-export declare function mockGetNoteHash(worldStateDB: PublicTreesDB, _leafIndex: bigint, value?: Fr): void;
-export declare function mockCheckNullifierExists(worldStateDB: PublicTreesDB, exists: boolean, _ignoredValue?: Fr): void;
-export declare function mockGetL1ToL2LeafValue(worldStateDB: PublicTreesDB, leafIndex: bigint, value?: Fr): void;
-export declare function mockGetContractInstance(contractsDB: PublicContractsDB, contractInstance: ContractInstanceWithAddress): void;
-export declare function mockGetContractClass(contractsDB: PublicContractsDB, contractClass: ContractClassPublic): void;
-export declare function mockGetBytecodeCommitment(contractsDB: PublicContractsDB, commitment: Fr): void;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF91dGlscy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vdGVzdF91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUsvRixPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxhQUFhLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNoRixPQUFPLEtBQUssRUFBRSw4QkFBOEIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBRXhGLHdCQUFnQixhQUFhLENBQUMsS0FBSyxFQUFFLDhCQUE4QixFQUFFLFdBQVcsQ0FBQyxFQUFFLDhCQUE4QixRQUloSDtBQUVELHdCQUFnQixlQUFlLENBQUMsWUFBWSxFQUFFLGFBQWEsRUFBRSxLQUFLLEVBQUUsRUFBRSxRQUVyRTtBQUVELHdCQUFnQixpQkFBaUIsQ0FBQyxXQUFXLEVBQUUsOEJBQThCLEVBQUUsS0FBSyxFQUFFLE1BQU0sUUFFM0Y7QUFFRCx3QkFBZ0Isc0JBQXNCLENBQUMsWUFBWSxFQUFFLGFBQWEsRUFBRSxhQUFhLEVBQUUsR0FBRyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsUUFJakc7QUFFRCx3QkFBZ0IsZUFBZSxDQUFDLFlBQVksRUFBRSxhQUFhLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLFFBUTFGO0FBRUQsd0JBQWdCLHdCQUF3QixDQUFDLFlBQVksRUFBRSxhQUFhLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxhQUFhLENBQUMsRUFBRSxFQUFFLFFBRXhHO0FBRUQsd0JBQWdCLHNCQUFzQixDQUFDLFlBQVksRUFBRSxhQUFhLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLFFBUWhHO0FBRUQsd0JBQWdCLHVCQUF1QixDQUFDLFdBQVcsRUFBRSxpQkFBaUIsRUFBRSxnQkFBZ0IsRUFBRSwyQkFBMkIsUUFFcEg7QUFFRCx3QkFBZ0Isb0JBQW9CLENBQUMsV0FBVyxFQUFFLGlCQUFpQixFQUFFLGFBQWEsRUFBRSxtQkFBbUIsUUFFdEc7QUFFRCx3QkFBZ0IseUJBQXlCLENBQUMsV0FBVyxFQUFFLGlCQUFpQixFQUFFLFVBQVUsRUFBRSxFQUFFLFFBRXZGIn0=

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

@@ -1 +0,0 @@
-{"version":3,"file":"test_utils.d.ts","sourceRoot":"","sources":["../../../src/public/avm/test_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAK/F,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,mCAAmC,CAAC;AAExF,wBAAgB,aAAa,CAAC,KAAK,EAAE,8BAA8B,EAAE,WAAW,CAAC,EAAE,8BAA8B,QAIhH;AAED,wBAAgB,eAAe,CAAC,YAAY,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,QAErE;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,8BAA8B,EAAE,KAAK,EAAE,MAAM,QAE3F;AAED,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,QAIjG;AAED,wBAAgB,eAAe,CAAC,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,QAQ1F;AAED,wBAAgB,wBAAwB,CAAC,YAAY,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,EAAE,QAExG;AAED,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,QAQhG;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,2BAA2B,QAEpH;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,iBAAiB,EAAE,aAAa,EAAE,mBAAmB,QAEtG;AAED,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,iBAAiB,EAAE,UAAU,EAAE,EAAE,QAEvF"}

package/dest/public/avm/test_utils.js

@@ -1,44 +0,0 @@
-import { Fr } from '@aztec/foundation/curves/bn254';
-import { mock } from 'jest-mock-extended';
-export function mockTraceFork(trace, nestedTrace) {
-    trace.fork.mockReturnValue(nestedTrace ?? mock());
-}
-export function mockStorageRead(worldStateDB, value) {
-    worldStateDB.storageRead.mockResolvedValue(value);
-}
-export function mockNoteHashCount(mockedTrace, count) {
-    mockedTrace.getNoteHashCount.mockReturnValue(count);
-}
-export function mockStorageReadWithMap(worldStateDB, mockedStorage) {
-    worldStateDB.storageRead.mockImplementation((_address, slot)=>Promise.resolve(mockedStorage.get(slot.toBigInt()) ?? Fr.ZERO));
-}
-export function mockGetNoteHash(worldStateDB, _leafIndex, value) {
-    worldStateDB.getNoteHash.mockImplementation((index)=>{
-        if (index == _leafIndex && value) {
-            return Promise.resolve(value);
-        } else {
-            return Promise.resolve(Fr.ZERO);
-        }
-    });
-}
-export function mockCheckNullifierExists(worldStateDB, exists, _ignoredValue) {
-    worldStateDB.checkNullifierExists.mockResolvedValue(exists);
-}
-export function mockGetL1ToL2LeafValue(worldStateDB, leafIndex, value) {
-    worldStateDB.getL1ToL2LeafValue.mockImplementation((index)=>{
-        if (index == leafIndex && value) {
-            return Promise.resolve(value);
-        } else {
-            return Promise.resolve(Fr.ZERO);
-        }
-    });
-}
-export function mockGetContractInstance(contractsDB, contractInstance) {
-    contractsDB.getContractInstance.mockResolvedValue(contractInstance);
-}
-export function mockGetContractClass(contractsDB, contractClass) {
-    contractsDB.getContractClass.mockResolvedValue(contractClass);
-}
-export function mockGetBytecodeCommitment(contractsDB, commitment) {
-    contractsDB.getBytecodeCommitment.mockResolvedValue(commitment);
-}

package/dest/public/debug_fn_name.d.ts

@@ -1,18 +0,0 @@
-import type { Fr } from '@aztec/foundation/curves/bn254';
-import { FunctionSelector } from '@aztec/stdlib/abi';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { PublicContractsDBInterface } from './db_interfaces.js';
-export declare function getPublicFunctionDebugName(db: PublicContractsDBInterface, contractAddress: AztecAddress, calldata: Fr[]): Promise<string>;
-/**
- * Get the function selector and optional debug name for a public function.
- * Returns the selector and name separately, with name only populated if a debug name is available.
- * @param db - The contracts database
- * @param contractAddress - The contract address
- * @param calldata - The calldata (selector is in calldata[0])
- * @returns An object with functionSelector (always if calldata[0] exists) and functionName (only if debug name found)
- */
-export declare function getPublicFunctionSelectorAndName(db: PublicContractsDBInterface, contractAddress: AztecAddress, calldata: Fr[]): Promise<{
-    functionSelector?: FunctionSelector;
-    functionName?: string;
-}>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVidWdfZm5fbmFtZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9kZWJ1Z19mbl9uYW1lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFckUsd0JBQXNCLDBCQUEwQixDQUM5QyxFQUFFLEVBQUUsMEJBQTBCLEVBQzlCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLFFBQVEsRUFBRSxFQUFFLEVBQUUsR0FDYixPQUFPLENBQUMsTUFBTSxDQUFDLENBV2pCO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixnQ0FBZ0MsQ0FDcEQsRUFBRSxFQUFFLDBCQUEwQixFQUM5QixlQUFlLEVBQUUsWUFBWSxFQUM3QixRQUFRLEVBQUUsRUFBRSxFQUFFLEdBQ2IsT0FBTyxDQUFDO0lBQUUsZ0JBQWdCLENBQUMsRUFBRSxnQkFBZ0IsQ0FBQztJQUFDLFlBQVksQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUFFLENBQUMsQ0FjekUifQ==

package/dest/public/debug_fn_name.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"debug_fn_name.d.ts","sourceRoot":"","sources":["../../src/public/debug_fn_name.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAErE,wBAAsB,0BAA0B,CAC9C,EAAE,EAAE,0BAA0B,EAC9B,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,EAAE,EAAE,GACb,OAAO,CAAC,MAAM,CAAC,CAWjB;AAED;;;;;;;GAOG;AACH,wBAAsB,gCAAgC,CACpD,EAAE,EAAE,0BAA0B,EAC9B,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,EAAE,EAAE,GACb,OAAO,CAAC;IAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAczE"}

package/dest/public/debug_fn_name.js

@@ -1,35 +0,0 @@
-import { FunctionSelector } from '@aztec/stdlib/abi';
-export async function getPublicFunctionDebugName(db, contractAddress, calldata) {
-    // Public function is dispatched and therefore the target function is passed in the first argument.
-    if (!calldata[0]) {
-        return `<calldata[0] undefined> (Contract Address: ${contractAddress})`;
-    }
-    const fallbackName = `<calldata[0]:${calldata[0].toString()}> (Contract Address: ${contractAddress})`;
-    const selector = FunctionSelector.fromFieldOrUndefined(calldata[0]);
-    if (!selector) {
-        return fallbackName;
-    }
-    return await db.getDebugFunctionName(contractAddress, selector) ?? fallbackName;
-}
-/**
- * Get the function selector and optional debug name for a public function.
- * Returns the selector and name separately, with name only populated if a debug name is available.
- * @param db - The contracts database
- * @param contractAddress - The contract address
- * @param calldata - The calldata (selector is in calldata[0])
- * @returns An object with functionSelector (always if calldata[0] exists) and functionName (only if debug name found)
- */ export async function getPublicFunctionSelectorAndName(db, contractAddress, calldata) {
-    // Public function is dispatched and therefore the target function is passed in the first argument.
-    if (!calldata[0]) {
-        return {};
-    }
-    const selector = FunctionSelector.fromFieldOrUndefined(calldata[0]);
-    if (!selector) {
-        return {};
-    }
-    const debugName = await db.getDebugFunctionName(contractAddress, selector);
-    return {
-        functionSelector: selector,
-        functionName: debugName ?? undefined
-    };
-}

package/dest/public/fixtures/custom_bytecode_tests.d.ts

@@ -1,12 +0,0 @@
-import { PublicTxSimulationTester } from './public_tx_simulation_tester.js';
-export declare function addressingWithBaseTagIssueTest(isIndirect: boolean, tester: PublicTxSimulationTester): Promise<import("@aztec/stdlib/avm").PublicTxResult>;
-export declare function addressingWithIndirectTagIssueTest(tester: PublicTxSimulationTester): Promise<import("@aztec/stdlib/avm").PublicTxResult>;
-export declare function addressingWithIndirectThenRelativeTagIssueTest(tester: PublicTxSimulationTester): Promise<import("@aztec/stdlib/avm").PublicTxResult>;
-export declare function addressingWithRelativeOverflowAndIndirectTagIssueTest(tester: PublicTxSimulationTester): Promise<import("@aztec/stdlib/avm").PublicTxResult>;
-export declare function pcOutOfRangeTest(tester: PublicTxSimulationTester): Promise<import("@aztec/stdlib/avm").PublicTxResult>;
-export declare function invalidOpcodeTest(tester: PublicTxSimulationTester): Promise<import("@aztec/stdlib/avm").PublicTxResult>;
-export declare function invalidByteTest(tester: PublicTxSimulationTester): Promise<import("@aztec/stdlib/avm").PublicTxResult>;
-export declare function instructionTruncatedTest(tester: PublicTxSimulationTester): Promise<import("@aztec/stdlib/avm").PublicTxResult>;
-export declare function invalidTagValueTest(tester: PublicTxSimulationTester): Promise<import("@aztec/stdlib/avm").PublicTxResult>;
-export declare function invalidTagValueAndInstructionTruncatedTest(tester: PublicTxSimulationTester): Promise<import("@aztec/stdlib/avm").PublicTxResult>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3VzdG9tX2J5dGVjb2RlX3Rlc3RzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL2ZpeHR1cmVzL2N1c3RvbV9ieXRlY29kZV90ZXN0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFhQSxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUk1RSx3QkFBc0IsOEJBQThCLENBQUMsVUFBVSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsd0JBQXdCLHVEQWN6RztBQUtELHdCQUFzQixrQ0FBa0MsQ0FBQyxNQUFNLEVBQUUsd0JBQXdCLHVEQXNCeEY7QUFPRCx3QkFBc0IsOENBQThDLENBQUMsTUFBTSxFQUFFLHdCQUF3Qix1REF3QnBHO0FBT0Qsd0JBQXNCLHFEQUFxRCxDQUFDLE1BQU0sRUFBRSx3QkFBd0IsdURBeUIzRztBQUVELHdCQUFzQixnQkFBZ0IsQ0FBQyxNQUFNLEVBQUUsd0JBQXdCLHVEQVF0RTtBQUVELHdCQUFzQixpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsd0JBQXdCLHVEQWlCdkU7QUFHRCx3QkFBc0IsZUFBZSxDQUFDLE1BQU0sRUFBRSx3QkFBd0IsdURBT3JFO0FBR0Qsd0JBQXNCLHdCQUF3QixDQUFDLE1BQU0sRUFBRSx3QkFBd0IsdURBVTlFO0FBR0Qsd0JBQXNCLG1CQUFtQixDQUFDLE1BQU0sRUFBRSx3QkFBd0IsdURBWXpFO0FBR0Qsd0JBQXNCLDBDQUEwQyxDQUFDLE1BQU0sRUFBRSx3QkFBd0IsdURBaUJoRyJ9

package/dest/public/fixtures/custom_bytecode_tests.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"custom_bytecode_tests.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/custom_bytecode_tests.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAI5E,wBAAsB,8BAA8B,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,wBAAwB,uDAczG;AAKD,wBAAsB,kCAAkC,CAAC,MAAM,EAAE,wBAAwB,uDAsBxF;AAOD,wBAAsB,8CAA8C,CAAC,MAAM,EAAE,wBAAwB,uDAwBpG;AAOD,wBAAsB,qDAAqD,CAAC,MAAM,EAAE,wBAAwB,uDAyB3G;AAED,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,wBAAwB,uDAQtE;AAED,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,wBAAwB,uDAiBvE;AAGD,wBAAsB,eAAe,CAAC,MAAM,EAAE,wBAAwB,uDAOrE;AAGD,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,wBAAwB,uDAU9E;AAGD,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,wBAAwB,uDAYzE;AAGD,wBAAsB,0CAA0C,CAAC,MAAM,EAAE,wBAAwB,uDAiBhG"}

package/dest/public/fixtures/custom_bytecode_tests.js

@@ -1,174 +0,0 @@
-import { strict as assert } from 'assert';
-import { TypeTag } from '../avm/avm_memory_types.js';
-import { Addressing, AddressingMode } from '../avm/opcodes/addressing_mode.js';
-import { Add, CalldataCopy, Jump, Return, Set } from '../avm/opcodes/index.js';
-import { encodeToBytecode } from '../avm/serialization/bytecode_serialization.js';
-import { MAX_OPCODE_VALUE, Opcode, OperandType, getOperandSize } from '../avm/serialization/instruction_serialization.js';
-import { deployAndExecuteCustomBytecode } from './custom_bytecode_tester.js';
-// First instruction resolved a base address (offset 0) which is uninitialized and therefore
-// of invalid tag (FF). This will trigger an exceptional halt.
-export async function addressingWithBaseTagIssueTest(isIndirect, tester) {
-    const addressingMode = Addressing.fromModes([
-        isIndirect ? AddressingMode.INDIRECT_RELATIVE : AddressingMode.RELATIVE,
-        AddressingMode.DIRECT,
-        AddressingMode.DIRECT
-    ]);
-    const bytecode = encodeToBytecode([
-        new CalldataCopy(/*addressing_mode=*/ addressingMode.toWire(), /*copySize=*/ 1, /*cdOffset=*/ 0, /*dstOffset=*/ 0),
-        new Return(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*returnOffset=*/ 0)
-    ]);
-    const txLabel = isIndirect ? 'AddressingWithBaseTagInvalidIndirect' : 'AddressingWithBaseTagInvalidDirect';
-    return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-// First instruction sets a value with tag U64 at offset 0. Then a CalldataCopy instruction
-// uses INDIRECT addressing to read from offset 0, which should fail because the value at
-// offset 0 has tag U64 (not U32), making it an invalid address tag.
-export async function addressingWithIndirectTagIssueTest(tester) {
-    // Set a U64 value at offset 0 - this will be used as an indirect address
-    const addressingMode = Addressing.fromModes([
-        AddressingMode.INDIRECT,
-        AddressingMode.DIRECT,
-        AddressingMode.DIRECT
-    ]);
-    const bytecode = encodeToBytecode([
-        // Set a U64 value at offset 0 - this has the wrong tag for an address (should be U32)
-        new Set(/*addressing_mode=*/ 0, /*dstOffset=*/ 0, TypeTag.UINT64, /*value=*/ 100n).as(Opcode.SET_64, Set.wireFormat64),
-        // Try to use indirect addressing: read from offset 0, which contains a U64 value
-        // This should fail because U64 is not a valid address tag (must be U32)
-        new CalldataCopy(/*addressing_mode=*/ addressingMode.toWire(), /*copySize=*/ 1, /*cdOffset=*/ 0, /*dstOffset=*/ 1),
-        new Return(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*returnOffset=*/ 0)
-    ]);
-    const txLabel = 'AddressingWithIndirectTagInvalid';
-    return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-// First instruction sets a value 10 with tag U32 at offset 1 (direct, no relative).
-// Then an ADD_16 instruction uses INDIRECT addressing for the first operand (offset 1)
-// and RELATIVE addressing for the second operand (offset 2). The indirect addressing
-// succeeds (reads U32 value 10 from offset 1, uses it as address), but the relative
-// addressing fails because the base address at offset 0 has the wrong tag (uninitialized/invalid).
-export async function addressingWithIndirectThenRelativeTagIssueTest(tester) {
-    const addressingMode = Addressing.fromModes([
-        AddressingMode.INDIRECT,
-        AddressingMode.RELATIVE,
-        AddressingMode.DIRECT
-    ]);
-    const bytecode = encodeToBytecode([
-        // Set a U32 value 10 at offset 1 - this will be used as an indirect address
-        new Set(/*addressing_mode=*/ 0, /*dstOffset=*/ 1, TypeTag.UINT32, /*value=*/ 10).as(Opcode.SET_32, Set.wireFormat32),
-        // ADD_16: first operand uses indirect addressing (reads from offset 1, gets value 10, uses as address - succeeds)
-        //         second operand uses relative addressing (tries to read base from offset 0, but offset 0 has wrong tag - fails)
-        new Add(/*addressing_mode=*/ addressingMode.toWire(), /*aOffset=*/ 1, /*bOffset=*/ 2, /*dstOffset=*/ 3).as(Opcode.ADD_16, Add.wireFormat16),
-        new Return(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*returnOffset=*/ 0)
-    ]);
-    const txLabel = 'AddressingWithIndirectThenRelativeTagInvalid';
-    return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-// First instruction sets UINT32_MAX at offset 0 (base address) with tag U32.
-// Then an ADD_8 instruction uses INDIRECT_RELATIVE addressing for the first operand (offset 1)
-// and INDIRECT addressing for the second operand (offset 2). The relative addressing
-// for the first operand will overflow (UINT32_MAX + 1 >= MAX_MEMORY_SIZE), causing the instruction to fail.
-// The second operand will also fail (indirect addressing from offset 2 which is uninitialized with tag FF).
-export async function addressingWithRelativeOverflowAndIndirectTagIssueTest(tester) {
-    const addressingMode = Addressing.fromModes([
-        AddressingMode.INDIRECT_RELATIVE,
-        AddressingMode.INDIRECT,
-        AddressingMode.DIRECT
-    ]);
-    // UINT32_MAX = 2^32 - 1 = 4294967295
-    const UINT32_MAX = 0xffffffff;
-    const bytecode = encodeToBytecode([
-        // Set UINT32_MAX at offset 0 as base address - this will cause overflow when adding relative offset 1
-        new Set(/*addressing_mode=*/ 0, /*dstOffset=*/ 0, TypeTag.UINT32, /*value=*/ UINT32_MAX).as(Opcode.SET_32, Set.wireFormat32),
-        new Add(/*addressing_mode=*/ addressingMode.toWire(), /*aOffset=*/ 1, /*bOffset=*/ 2, /*dstOffset=*/ 3).as(Opcode.ADD_8, Add.wireFormat8),
-        new Return(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*returnOffset=*/ 0)
-    ]);
-    const txLabel = 'AddressingWithRelativeOverflowAndIndirectTagInvalid';
-    return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-export async function pcOutOfRangeTest(tester) {
-    const bytecode = encodeToBytecode([
-        new Jump(/*jumpOffset=*/ 123),
-        new Return(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*returnOffset=*/ 0)
-    ]);
-    const txLabel = 'PcOutOfRange';
-    return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-export async function invalidOpcodeTest(tester) {
-    let bytecode = encodeToBytecode([
-        new Set(/*addressing_mode=*/ 0, /*dstOffset=*/ 0, TypeTag.UINT32, /*value=*/ 0).as(Opcode.SET_8, Set.wireFormat8)
-    ]);
-    const offsetReturnOpcodeByte = bytecode.length;
-    bytecode = Buffer.concat([
-        bytecode,
-        encodeToBytecode([
-            new Return(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*returnOffset=*/ 0)
-        ])
-    ]);
-    // Manipulate the Return opcode to make the opcode invalid (out of range).
-    bytecode[offsetReturnOpcodeByte] = MAX_OPCODE_VALUE + 1; // opcode is invalid.
-    const txLabel = 'InvalidOpcode';
-    return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-// Single invalid byte in the bytecode.
-export async function invalidByteTest(tester) {
-    const invalidOpcode = MAX_OPCODE_VALUE + 7;
-    assert(invalidOpcode < 256, 'Invalid opcode must fit in a single byte');
-    const bytecode = Buffer.from([
-        invalidOpcode
-    ]);
-    const txLabel = 'InvalidByte';
-    return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-// Truncate the last instruction in the bytecode.
-export async function instructionTruncatedTest(tester) {
-    let bytecode = encodeToBytecode([
-        new Set(/*addressing_mode=*/ 0, /*dstOffset=*/ 0, TypeTag.UINT32, /*value=*/ 0).as(Opcode.SET_8, Set.wireFormat8)
-    ]);
-    // Truncate the bytecode.
-    bytecode = bytecode.subarray(0, -1);
-    const txLabel = 'InstructionTruncated';
-    return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-// Invalid tag value byte in an instruction.
-export async function invalidTagValueTest(tester) {
-    const bytecode = encodeToBytecode([
-        new Set(/*addressing_mode=*/ 0, /*dstOffset=*/ 0, TypeTag.UINT32, /*value=*/ 0).as(Opcode.SET_8, Set.wireFormat8),
-        new Return(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*returnOffset=*/ 0)
-    ]);
-    const tagOffset = getTagOffsetInInstruction(Set.wireFormat8);
-    assert(bytecode[tagOffset].valueOf() == TypeTag.UINT32.valueOf(), 'Set instruction tag should be UINT32 in test');
-    bytecode[tagOffset] = TypeTag.INVALID;
-    const txLabel = 'InvalidTagValue';
-    return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-// Combine an invalid tag in the last instruction that is truncated.
-export async function invalidTagValueAndInstructionTruncatedTest(tester) {
-    let bytecode = encodeToBytecode([
-        // Important: value argument must be a bigint otherwise a type error will be thrown.
-        new Set(/*addressing_mode=*/ 0, /*dstOffset=*/ 0, TypeTag.UINT128, /*value=*/ 0n).as(Opcode.SET_128, Set.wireFormat128)
-    ]);
-    // Truncate the bytecode.
-    bytecode = bytecode.subarray(0, -5);
-    const tagOffset = getTagOffsetInInstruction(Set.wireFormat128);
-    assert(bytecode[tagOffset].valueOf() == TypeTag.UINT128.valueOf(), 'Set instruction tag should be UINT128 in test');
-    bytecode[tagOffset] = 0x6f; // Invalid tag value.
-    const txLabel = 'InvalidTagValueAndInstructionTruncated';
-    return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-/**
- * Returns the offset of the tag in an instruction.
- * @details Loops over the wire format operand type entries until it finds the tag.
- * Returns the byte offset of the tag based on each operand size that is passed.
- *
- * @param wireFormat array of operand types
- * @returns byte offset of the tag
- */ function getTagOffsetInInstruction(wireFormat) {
-    let offset = 0;
-    for (const operand of wireFormat){
-        if (operand === OperandType.TAG) {
-            break;
-        }
-        offset += getOperandSize(operand);
-    }
-    return offset;
-}

package/dest/public/fixtures/minimal_public_tx.d.ts

@@ -1,4 +0,0 @@
-import type { PublicTxResult } from '@aztec/stdlib/avm';
-import { PublicTxSimulationTester } from './public_tx_simulation_tester.js';
-export declare function executeAvmMinimalPublicTx(tester: PublicTxSimulationTester): Promise<PublicTxResult>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWluaW1hbF9wdWJsaWNfdHguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvZml4dHVyZXMvbWluaW1hbF9wdWJsaWNfdHgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFReEQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFFNUUsd0JBQXNCLHlCQUF5QixDQUFDLE1BQU0sRUFBRSx3QkFBd0IsR0FBRyxPQUFPLENBQUMsY0FBYyxDQUFDLENBZXpHIn0=

package/dest/public/fixtures/minimal_public_tx.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"minimal_public_tx.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/minimal_public_tx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAQxD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAE5E,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC,cAAc,CAAC,CAezG"}

package/dest/public/fixtures/minimal_public_tx.js

@@ -1,19 +0,0 @@
-import { ProtocolContracts } from '@aztec/stdlib/tx';
-import { TypeTag } from '../avm/avm_memory_types.js';
-import { Add, Return, Set } from '../avm/opcodes/index.js';
-import { encodeToBytecode } from '../avm/serialization/bytecode_serialization.js';
-import { Opcode } from '../avm/serialization/instruction_serialization.js';
-import { deployAndExecuteCustomBytecode } from './custom_bytecode_tester.js';
-export async function executeAvmMinimalPublicTx(tester) {
-    const minimalBytecode = encodeToBytecode([
-        new Set(/*indirect*/ 0, /*dstOffset*/ 0, TypeTag.UINT32, /*value*/ 1).as(Opcode.SET_8, Set.wireFormat8),
-        new Set(/*indirect*/ 0, /*dstOffset*/ 1, TypeTag.UINT32, /*value*/ 2).as(Opcode.SET_8, Set.wireFormat8),
-        new Add(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 2).as(Opcode.ADD_8, Add.wireFormat8),
-        new Return(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*returnOffset=*/ 2)
-    ]);
-    const result = await deployAndExecuteCustomBytecode(minimalBytecode, tester, 'MinimalTx', 'AvmMinimalContract');
-    // Modify the protocol contracts to be all zeros
-    result.hints.protocolContracts = ProtocolContracts.empty();
-    result.publicInputs.protocolContracts = ProtocolContracts.empty();
-    return result;
-}