@aztec/txe 0.0.1-commit.2ed92850 → 0.0.1-commit.3100065

package/dest/oracle/test-resolver/resolver.js

@@ -0,0 +1,181 @@
+/* eslint-disable camelcase */ import { createLogger } from '@aztec/foundation/log';
+import { withoutHexPrefix } from '@aztec/foundation/string';
+import { BOUNDED_VEC, BYTE, BoundedVec, Option, makeEntry } from '@aztec/pxe/simulator';
+import { toInputSlots } from '../txe_oracle_registry.js';
+import { synthesizeDefaultFixtures } from './default_fixtures.js';
+/** Name of the meta-oracle that Noir tests call to announce the next call's scenario by name. */ const SET_SCENARIO_ORACLE = 'aztec_oracle_test_set_scenario';
+export const SET_SCENARIO_ENTRY = makeEntry({
+    params: [
+        {
+            name: 'name',
+            type: BOUNDED_VEC(BYTE)
+        }
+    ]
+});
+/**
+ * Oracle resolver for serialization tests. Selects a fixture scenario, verifies that the received inputs match, and
+ * returns the corresponding fixture output.
+ *
+ * For oracles with a single scenario, it is selected automatically. For oracles with multiple scenarios, the Noir test
+ * announces the scenario by name via the `aztec_oracle_test_set_scenario` meta-oracle before calling the real oracle.
+ */ export class OracleTestResolver {
+    registry;
+    fixtures;
+    calledOracles;
+    pendingScenario;
+    logger;
+    constructor(registry, fixtures, logger){
+        this.registry = registry;
+        this.fixtures = fixtures;
+        this.calledOracles = new Set();
+        this.pendingScenario = new Map();
+        this.logger = logger ?? createLogger('txe:test-resolver');
+    }
+    /**
+   * Builds a resolver whose fixtures are the default scenarios synthesized from the registry's type mappings. The
+   * matching Noir serialization tests are auto-generated by `#[generate_oracle_tests]` from the same convention.
+   */ static fromRegistry(registry, logger) {
+        return new OracleTestResolver(registry, synthesizeDefaultFixtures(registry), logger);
+    }
+    // eslint-disable-next-line require-await
+    async resolve_foreign_call(callData) {
+        const oracleName = callData.function;
+        this.logger.debug('Resolving oracle', {
+            oracleName
+        });
+        if (oracleName === SET_SCENARIO_ORACLE) {
+            return this.#handleSetScenario(callData);
+        }
+        if (!(oracleName in this.registry)) {
+            throw new Error(`Oracle '${oracleName}' not found in registry`);
+        }
+        const entry = this.registry[oracleName];
+        const scenarios = this.fixtures[oracleName];
+        if (!scenarios || scenarios.length === 0) {
+            throw new Error(`No fixture defined for oracle '${oracleName}'`);
+        }
+        const match = this.#selectScenario(callData.session_id, oracleName, scenarios);
+        this.#verifyInputs(callData.inputs, entry, match, oracleName);
+        this.calledOracles.add(oracleName);
+        this.logger.debug('Verified scenario for oracle', {
+            oracleName
+        });
+        const outputSlots = entry.serializeReturn(match.output);
+        return {
+            values: outputSlots.map((slot)=>Array.isArray(slot) ? slot.map(withoutHexPrefix) : withoutHexPrefix(slot))
+        };
+    }
+    /** Returns oracles that have a fixture defined but were never called during testing. */ getUncalledFixtures() {
+        return Object.keys(this.fixtures).filter((name)=>!this.calledOracles.has(name));
+    }
+    /** Returns oracles in the registry that have no fixture defined at all. */ getMissingFixtures() {
+        return Object.keys(this.registry).filter((name)=>!(name in this.fixtures));
+    }
+    /**
+   * Records the scenario name for the session's next oracle call. A test announces once per multi-scenario position
+   * (param or return), so successive announcements accumulate joined with `+`, matching the names the fixture
+   * synthesizer builds (e.g. `some+some`).
+   */ #handleSetScenario(callData) {
+        const name = decodeScenarioName(callData.inputs);
+        const existing = this.pendingScenario.get(callData.session_id);
+        const scenario = existing !== undefined ? `${existing}+${name}` : name;
+        this.logger.debug('Setting scenario for next oracle call', {
+            sessionId: callData.session_id,
+            scenario
+        });
+        this.pendingScenario.set(callData.session_id, scenario);
+        return {
+            values: []
+        };
+    }
+    /** Selects the fixture by the announced scenario name (for multi-scenario oracles) or returns the single fixture. */ #selectScenario(sessionId, oracleName, fixtures) {
+        const announced = this.pendingScenario.get(sessionId);
+        if (announced !== undefined) {
+            this.pendingScenario.delete(sessionId);
+            const match = fixtures.find((s)=>s.scenario === announced);
+            if (!match) {
+                const available = fixtures.map((s)=>s.scenario ?? '<default>').join(', ');
+                throw new Error(`No scenario '${announced}' for oracle '${oracleName}'. Available: ${available}`);
+            }
+            return match;
+        }
+        if (fixtures.length === 1) {
+            return fixtures[0];
+        }
+        throw new Error(`Oracle '${oracleName}' has ${fixtures.length} scenarios but none was announced before the call.`);
+    }
+    /** Deserializes actual inputs and verifies they match the scenario's expected inputs. */ #verifyInputs(rawInputs, entry, fixture, oracleName) {
+        const expectedInputs = fixture.inputs;
+        if (Object.keys(expectedInputs).length === 0) {
+            return;
+        }
+        const scenarioLabel = fixture.scenario ? ` (scenario '${fixture.scenario}')` : '';
+        const named = entry.deserializeParams(toInputSlots(rawInputs));
+        for (const param of named){
+            if (!(param.name in expectedInputs)) {
+                throw new Error(`Unexpected param '${param.name}' for oracle '${oracleName}'. ` + `Expected: ${Object.keys(expectedInputs).join(', ')}`);
+            }
+            if (!valuesEqual(param.value, expectedInputs[param.name])) {
+                throw new Error(`Input mismatch for oracle '${oracleName}'${scenarioLabel}: ` + `param '${param.name}' expected ${String(expectedInputs[param.name])} ` + `but got ${String(param.value)}. ${versionBumpHint(oracleName)}`);
+            }
+        }
+    }
+}
+/**
+ * Decodes the scenario name announced by `set_oracle_test_scenario`, whose argument is a `BoundedVec<u8, N>`
+ */ function decodeScenarioName(inputs) {
+    const [{ value }] = SET_SCENARIO_ENTRY.deserializeParams(toInputSlots(inputs));
+    return String.fromCharCode(...value.data);
+}
+function valuesEqual(actual, expected) {
+    if (!isNonNullObject(actual) || !isNonNullObject(expected)) {
+        // Primitive scalars; String() bridges bigint vs number representations of the same seed. A primitive compared
+        // against an object is never equal.
+        return isNonNullObject(actual) === isNonNullObject(expected) && String(actual) === String(expected);
+    }
+    if (actual instanceof Option && expected instanceof Option) {
+        return actual.equals(expected, valuesEqual);
+    }
+    if (actual instanceof BoundedVec && expected instanceof BoundedVec) {
+        return actual.equals(expected, valuesEqual);
+    }
+    if (Array.isArray(actual) && Array.isArray(expected)) {
+        return actual.length === expected.length && actual.every((v, i)=>valuesEqual(v, expected[i]));
+    }
+    if (isPlainObject(actual) && isPlainObject(expected)) {
+        const expectedKeys = Object.keys(expected);
+        return Object.keys(actual).length === expectedKeys.length && expectedKeys.every((key)=>valuesEqual(actual[key], expected[key]));
+    }
+    if (actual.constructor !== expected.constructor) {
+        return false;
+    }
+    if (hasEquals(actual)) {
+        return actual.equals(expected);
+    }
+    const actualStr = customStringForm(actual);
+    const expectedStr = customStringForm(expected);
+    if (actualStr !== undefined && expectedStr !== undefined) {
+        return actualStr === expectedStr;
+    }
+    // Comparing blindly here could pass vacuously (e.g. two '[object Object]' strings), so refuse instead.
+    throw new Error(`valuesEqual cannot compare a '${actual.constructor?.name}' against a '${expected.constructor?.name}'. Add a branch for the type.`);
+}
+function isNonNullObject(value) {
+    return typeof value === 'object' && value !== null;
+}
+function isPlainObject(value) {
+    return isNonNullObject(value) && value.constructor === Object;
+}
+function hasEquals(value) {
+    return typeof value.equals === 'function';
+}
+/** The value's string form when its class overrides `toString` (a meaningful representation), undefined otherwise. */ function customStringForm(value) {
+    const { toString } = value;
+    if (typeof toString !== 'function' || toString === Object.prototype.toString) {
+        return undefined;
+    }
+    return toString.call(value);
+}
+function versionBumpHint(oracle) {
+    return oracle.startsWith('aztec_txe_') || oracle.startsWith('aztec_avm_') ? 'If you changed this oracle, consider bumping the TXE oracle version in yarn-project/txe/src/oracle/txe_oracle_version.ts.' : 'If you changed this oracle, consider bumping the PXE oracle version in yarn-project/pxe/src/oracle_version.ts.';
+}

package/dest/oracle/txe_oracle_public_context.d.ts

@@ -1,5 +1,6 @@
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
+import type { ContractStore } from '@aztec/pxe/server';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { L2Block } from '@aztec/stdlib/block';
 import { type MerkleTreeWriteOperations } from '@aztec/stdlib/trees';
@@ -10,25 +11,48 @@ export declare class TXEOraclePublicContext implements IAvmExecutionOracle {
     private forkedWorldTrees;
     private txRequestHash;
     private globalVariables;
+    private contractStore;
     isAvm: true;
     private logger;
     private transientUniqueNoteHashes;
     private transientSiloedNullifiers;
     private publicDataWrites;
-    constructor(contractAddress: AztecAddress, forkedWorldTrees: MerkleTreeWriteOperations, txRequestHash: Fr, globalVariables: GlobalVariables);
-    avmOpcodeAddress(): Promise<AztecAddress>;
-    avmOpcodeSender(): Promise<AztecAddress>;
-    avmOpcodeBlockNumber(): Promise<BlockNumber>;
-    avmOpcodeTimestamp(): Promise<bigint>;
-    avmOpcodeIsStaticCall(): Promise<boolean>;
-    avmOpcodeChainId(): Promise<Fr>;
-    avmOpcodeVersion(): Promise<Fr>;
-    avmOpcodeEmitNullifier(nullifier: Fr): Promise<void>;
-    avmOpcodeEmitNoteHash(noteHash: Fr): Promise<void>;
-    avmOpcodeNullifierExists(innerNullifier: Fr, targetAddress: AztecAddress): Promise<boolean>;
-    avmOpcodeStorageWrite(slot: Fr, value: Fr): Promise<void>;
-    avmOpcodeStorageRead(slot: Fr, contractAddress: AztecAddress): Promise<Fr>;
+    constructor(contractAddress: AztecAddress, forkedWorldTrees: MerkleTreeWriteOperations, txRequestHash: Fr, globalVariables: GlobalVariables, contractStore: ContractStore);
+    address(): Promise<AztecAddress>;
+    sender(): Promise<AztecAddress>;
+    blockNumber(): Promise<BlockNumber>;
+    timestamp(): Promise<bigint>;
+    isStaticCall(): Promise<boolean>;
+    chainId(): Promise<Fr>;
+    version(): Promise<Fr>;
+    emitNullifier(nullifier: Fr): Promise<void>;
+    emitNoteHash(noteHash: Fr): Promise<void>;
+    nullifierExists(siloedNullifier: Fr): Promise<boolean>;
+    storageWrite(slot: Fr, value: Fr): Promise<void>;
+    storageRead(slot: Fr, contractAddress: AztecAddress): Promise<Fr>;
+    getContractInstanceDeployer(address: AztecAddress): Promise<{
+        member: Fr;
+        exists: boolean;
+    }[]>;
+    getContractInstanceClassId(address: AztecAddress): Promise<{
+        member: Fr;
+        exists: boolean;
+    }[]>;
+    getContractInstanceInitializationHash(address: AztecAddress): Promise<{
+        member: Fr;
+        exists: boolean;
+    }[]>;
+    getContractInstanceImmutablesHash(address: AztecAddress): Promise<{
+        member: Fr;
+        exists: boolean;
+    }[]>;
+    private getContractInstanceMember;
+    returndataSize(): Promise<number>;
+    returndataCopy(_rdOffset: number, _copySize: number): Promise<Fr[]>;
+    call(_l2Gas: number, _daGas: number, _address: AztecAddress, _argsLength: number, _args: Fr[]): Promise<void>;
+    staticCall(_l2Gas: number, _daGas: number, _address: AztecAddress, _argsLength: number, _args: Fr[]): Promise<void>;
+    successCopy(): Promise<boolean>;
     close(): Promise<L2Block>;
     private makeTxEffect;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX29yYWNsZV9wdWJsaWNfY29udGV4dC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL29yYWNsZS90eGVfb3JhY2xlX3B1YmxpY19jb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFHcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRW5ELE9BQU8sRUFFTCxLQUFLLHlCQUF5QixFQUcvQixNQUFNLHFCQUFxQixDQUFDO0FBQzdCLE9BQU8sRUFBRSxlQUFlLEVBQW9CLE1BQU0sa0JBQWtCLENBQUM7QUFHckUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUUzRCxxQkFBYSxzQkFBdUIsWUFBVyxtQkFBbUI7SUFTOUQsT0FBTyxDQUFDLGVBQWU7SUFDdkIsT0FBTyxDQUFDLGdCQUFnQjtJQUN4QixPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsZUFBZTtJQVh6QixLQUFLLE9BQWlCO0lBRXRCLE9BQU8sQ0FBQyxNQUFNLENBQVM7SUFDdkIsT0FBTyxDQUFDLHlCQUF5QixDQUFZO0lBQzdDLE9BQU8sQ0FBQyx5QkFBeUIsQ0FBWTtJQUM3QyxPQUFPLENBQUMsZ0JBQWdCLENBQXlCO0lBRWpELFlBQ1UsZUFBZSxFQUFFLFlBQVksRUFDN0IsZ0JBQWdCLEVBQUUseUJBQXlCLEVBQzNDLGFBQWEsRUFBRSxFQUFFLEVBQ2pCLGVBQWUsRUFBRSxlQUFlLEVBU3pDO0lBRUQsZ0JBQWdCLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUV4QztJQUVELGVBQWUsSUFBSSxPQUFPLENBQUMsWUFBWSxDQUFDLENBRXZDO0lBRUQsb0JBQW9CLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUUzQztJQUVELGtCQUFrQixJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFcEM7SUFFRCxxQkFBcUIsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBRXhDO0lBRUQsZ0JBQWdCLElBQUksT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUU5QjtJQUVELGdCQUFnQixJQUFJLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FFOUI7SUFFSyxzQkFBc0IsQ0FBQyxTQUFTLEVBQUUsRUFBRSxpQkFHekM7SUFFSyxxQkFBcUIsQ0FBQyxRQUFRLEVBQUUsRUFBRSxpQkFJdkM7SUFFSyx3QkFBd0IsQ0FBQyxjQUFjLEVBQUUsRUFBRSxFQUFFLGFBQWEsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVNoRztJQUVLLHFCQUFxQixDQUFDLElBQUksRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFFLEVBQUUsaUJBVTlDO0lBRUssb0JBQW9CLENBQUMsSUFBSSxFQUFFLEVBQUUsRUFBRSxlQUFlLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FxQi9FO0lBRUssS0FBSyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FrQjlCO0lBRUQsT0FBTyxDQUFDLFlBQVk7Q0FhckIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX29yYWNsZV9wdWJsaWNfY29udGV4dC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL29yYWNsZS90eGVfb3JhY2xlX3B1YmxpY19jb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFdkQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBR25ELE9BQU8sRUFFTCxLQUFLLHlCQUF5QixFQUcvQixNQUFNLHFCQUFxQixDQUFDO0FBQzdCLE9BQU8sRUFBRSxlQUFlLEVBQW9CLE1BQU0sa0JBQWtCLENBQUM7QUFHckUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUUzRCxxQkFBYSxzQkFBdUIsWUFBVyxtQkFBbUI7SUFTOUQsT0FBTyxDQUFDLGVBQWU7SUFDdkIsT0FBTyxDQUFDLGdCQUFnQjtJQUN4QixPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsZUFBZTtJQUN2QixPQUFPLENBQUMsYUFBYTtJQVp2QixLQUFLLE9BQWlCO0lBRXRCLE9BQU8sQ0FBQyxNQUFNLENBQVM7SUFDdkIsT0FBTyxDQUFDLHlCQUF5QixDQUFZO0lBQzdDLE9BQU8sQ0FBQyx5QkFBeUIsQ0FBWTtJQUM3QyxPQUFPLENBQUMsZ0JBQWdCLENBQXlCO0lBRWpELFlBQ1UsZUFBZSxFQUFFLFlBQVksRUFDN0IsZ0JBQWdCLEVBQUUseUJBQXlCLEVBQzNDLGFBQWEsRUFBRSxFQUFFLEVBQ2pCLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLGFBQWEsRUFBRSxhQUFhLEVBU3JDO0lBRUQsT0FBTyxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FFL0I7SUFFRCxNQUFNLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUU5QjtJQUVELFdBQVcsSUFBSSxPQUFPLENBQUMsV0FBVyxDQUFDLENBRWxDO0lBRUQsU0FBUyxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFM0I7SUFFRCxZQUFZLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUUvQjtJQUVELE9BQU8sSUFBSSxPQUFPLENBQUMsRUFBRSxDQUFDLENBRXJCO0lBRUQsT0FBTyxJQUFJLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FFckI7SUFFSyxhQUFhLENBQUMsU0FBUyxFQUFFLEVBQUUsaUJBR2hDO0lBRUssWUFBWSxDQUFDLFFBQVEsRUFBRSxFQUFFLGlCQUk5QjtJQUVLLGVBQWUsQ0FBQyxlQUFlLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FPM0Q7SUFFSyxZQUFZLENBQUMsSUFBSSxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsRUFBRSxpQkFVckM7SUFFSyxXQUFXLENBQUMsSUFBSSxFQUFFLEVBQUUsRUFBRSxlQUFlLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FxQnRFO0lBRUQsMkJBQTJCLENBQUMsT0FBTyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUM7UUFBRSxNQUFNLEVBQUUsRUFBRSxDQUFDO1FBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQTtLQUFFLEVBQUUsQ0FBQyxDQUU3RjtJQUVELDBCQUEwQixDQUFDLE9BQU8sRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDO1FBQUUsTUFBTSxFQUFFLEVBQUUsQ0FBQztRQUFDLE1BQU0sRUFBRSxPQUFPLENBQUE7S0FBRSxFQUFFLENBQUMsQ0FHNUY7SUFFRCxxQ0FBcUMsQ0FBQyxPQUFPLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQztRQUFFLE1BQU0sRUFBRSxFQUFFLENBQUM7UUFBQyxNQUFNLEVBQUUsT0FBTyxDQUFBO0tBQUUsRUFBRSxDQUFDLENBRXZHO0lBRUQsaUNBQWlDLENBQUMsT0FBTyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUM7UUFBRSxNQUFNLEVBQUUsRUFBRSxDQUFDO1FBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQTtLQUFFLEVBQUUsQ0FBQyxDQUVuRztZQUdhLHlCQUF5QjtJQVd2QyxjQUFjLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUloQztJQUVELGNBQWMsQ0FBQyxTQUFTLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBSWxFO0lBRUQsSUFBSSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJNUc7SUFFRCxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUlsSDtJQUVELFdBQVcsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBSTlCO0lBRUssS0FBSyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FrQjlCO0lBRUQsT0FBTyxDQUFDLFlBQVk7Q0FhckIifQ==

package/dest/oracle/txe_oracle_public_context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"txe_oracle_public_context.d.ts","sourceRoot":"","sources":["../../src/oracle/txe_oracle_public_context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAEL,KAAK,yBAAyB,EAG/B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAoB,MAAM,kBAAkB,CAAC;AAGrE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAE3D,qBAAa,sBAAuB,YAAW,mBAAmB;IAS9D,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,eAAe;IAXzB,KAAK,OAAiB;IAEtB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,yBAAyB,CAAY;IAC7C,OAAO,CAAC,yBAAyB,CAAY;IAC7C,OAAO,CAAC,gBAAgB,CAAyB;IAEjD,YACU,eAAe,EAAE,YAAY,EAC7B,gBAAgB,EAAE,yBAAyB,EAC3C,aAAa,EAAE,EAAE,EACjB,eAAe,EAAE,eAAe,EASzC;IAED,gBAAgB,IAAI,OAAO,CAAC,YAAY,CAAC,CAExC;IAED,eAAe,IAAI,OAAO,CAAC,YAAY,CAAC,CAEvC;IAED,oBAAoB,IAAI,OAAO,CAAC,WAAW,CAAC,CAE3C;IAED,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CAEpC;IAED,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC,CAExC;IAED,gBAAgB,IAAI,OAAO,CAAC,EAAE,CAAC,CAE9B;IAED,gBAAgB,IAAI,OAAO,CAAC,EAAE,CAAC,CAE9B;IAEK,sBAAsB,CAAC,SAAS,EAAE,EAAE,iBAGzC;IAEK,qBAAqB,CAAC,QAAQ,EAAE,EAAE,iBAIvC;IAEK,wBAAwB,CAAC,cAAc,EAAE,EAAE,EAAE,aAAa,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,CAShG;IAEK,qBAAqB,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,iBAU9C;IAEK,oBAAoB,CAAC,IAAI,EAAE,EAAE,EAAE,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC,CAqB/E;IAEK,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC,CAkB9B;IAED,OAAO,CAAC,YAAY;CAarB"}
+{"version":3,"file":"txe_oracle_public_context.d.ts","sourceRoot":"","sources":["../../src/oracle/txe_oracle_public_context.ts"],"names":[],"mappings":"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"}

package/dest/oracle/txe_oracle_public_context.js

@@ -11,16 +11,18 @@ export class TXEOraclePublicContext {
     forkedWorldTrees;
     txRequestHash;
     globalVariables;
+    contractStore;
     isAvm;
     logger;
     transientUniqueNoteHashes;
     transientSiloedNullifiers;
     publicDataWrites;
-    constructor(contractAddress, forkedWorldTrees, txRequestHash, globalVariables){
+    constructor(contractAddress, forkedWorldTrees, txRequestHash, globalVariables, contractStore){
         this.contractAddress = contractAddress;
         this.forkedWorldTrees = forkedWorldTrees;
         this.txRequestHash = txRequestHash;
         this.globalVariables = globalVariables;
+        this.contractStore = contractStore;
         this.isAvm = true;
         this.transientUniqueNoteHashes = [];
         this.transientSiloedNullifiers = [];
@@ -32,45 +34,44 @@ export class TXEOraclePublicContext {
             timestamp: globalVariables.timestamp
         });
     }
-    avmOpcodeAddress() {
+    address() {
         return Promise.resolve(this.contractAddress);
     }
-    avmOpcodeSender() {
+    sender() {
         return Promise.resolve(AztecAddress.ZERO); // todo: change?
     }
-    avmOpcodeBlockNumber() {
+    blockNumber() {
         return Promise.resolve(this.globalVariables.blockNumber);
     }
-    avmOpcodeTimestamp() {
+    timestamp() {
         return Promise.resolve(this.globalVariables.timestamp);
     }
-    avmOpcodeIsStaticCall() {
+    isStaticCall() {
         return Promise.resolve(false);
     }
-    avmOpcodeChainId() {
+    chainId() {
         return Promise.resolve(this.globalVariables.chainId);
     }
-    avmOpcodeVersion() {
+    version() {
         return Promise.resolve(this.globalVariables.version);
     }
-    async avmOpcodeEmitNullifier(nullifier) {
+    async emitNullifier(nullifier) {
         const siloedNullifier = await siloNullifier(this.contractAddress, nullifier);
         this.transientSiloedNullifiers.push(siloedNullifier);
     }
-    async avmOpcodeEmitNoteHash(noteHash) {
+    async emitNoteHash(noteHash) {
         const siloedNoteHash = await siloNoteHash(this.contractAddress, noteHash);
         // TODO: make the note hash unique - they are only siloed right now
         this.transientUniqueNoteHashes.push(siloedNoteHash);
     }
-    async avmOpcodeNullifierExists(innerNullifier, targetAddress) {
-        const nullifier = await siloNullifier(targetAddress, innerNullifier);
+    async nullifierExists(siloedNullifier) {
         const treeIndex = (await this.forkedWorldTrees.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [
-            nullifier.toBuffer()
+            siloedNullifier.toBuffer()
         ]))[0];
-        const transientIndex = this.transientSiloedNullifiers.find((n)=>n.equals(nullifier));
+        const transientIndex = this.transientSiloedNullifiers.find((n)=>n.equals(siloedNullifier));
         return treeIndex !== undefined || transientIndex !== undefined;
     }
-    async avmOpcodeStorageWrite(slot, value) {
+    async storageWrite(slot, value) {
         this.logger.debug('AVM storage write', {
             slot,
             value
@@ -81,7 +82,7 @@ export class TXEOraclePublicContext {
             new PublicDataTreeLeaf(dataWrite.leafSlot, dataWrite.value).toBuffer()
         ]);
     }
-    async avmOpcodeStorageRead(slot, contractAddress) {
+    async storageRead(slot, contractAddress) {
         const leafSlot = await computePublicDataTreeLeafSlot(contractAddress, slot);
         const lowLeafResult = await this.forkedWorldTrees.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot.toBigInt());
         const value = !lowLeafResult || !lowLeafResult.alreadyPresent ? Fr.ZERO : (await this.forkedWorldTrees.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index)).leaf.value;
@@ -92,6 +93,52 @@ export class TXEOraclePublicContext {
         });
         return value;
     }
+    getContractInstanceDeployer(address) {
+        return this.getContractInstanceMember(address, (i)=>i.deployer.toField());
+    }
+    getContractInstanceClassId(address) {
+        // TXE has no contract updates, so the current class always equals the original.
+        return this.getContractInstanceMember(address, (i)=>i.originalContractClassId);
+    }
+    getContractInstanceInitializationHash(address) {
+        return this.getContractInstanceMember(address, (i)=>i.initializationHash);
+    }
+    getContractInstanceImmutablesHash(address) {
+        return this.getContractInstanceMember(address, (i)=>i.immutablesHash);
+    }
+    // The one-element array mirrors the oracles' Noir return type, `[GetContractInstanceResult; 1]`.
+    async getContractInstanceMember(address, accessor) {
+        const instance = await this.contractStore.getContractInstance(address);
+        if (!instance) {
+            return [
+                {
+                    member: Fr.ZERO,
+                    exists: false
+                }
+            ];
+        }
+        return [
+            {
+                member: accessor(instance),
+                exists: true
+            }
+        ];
+    }
+    returndataSize() {
+        throw new Error('Contract calls are forbidden inside a `TestEnvironment::public_context`, use `public_call` instead');
+    }
+    returndataCopy(_rdOffset, _copySize) {
+        throw new Error('Contract calls are forbidden inside a `TestEnvironment::public_context`, use `public_call` instead');
+    }
+    call(_l2Gas, _daGas, _address, _argsLength, _args) {
+        throw new Error('Contract calls are forbidden inside a `TestEnvironment::public_context`, use `public_call` instead');
+    }
+    staticCall(_l2Gas, _daGas, _address, _argsLength, _args) {
+        throw new Error('Contract calls are forbidden inside a `TestEnvironment::public_context`, use `public_call` instead');
+    }
+    successCopy() {
+        throw new Error('Contract calls are forbidden inside a `TestEnvironment::public_context`, use `public_call` instead');
+    }
     async close() {
         this.logger.debug('Exiting Public Context, building block with collected side effects', {
             blockNumber: this.globalVariables.blockNumber