@aztec/pxe 5.0.0-rc.2 → 5.0.0

package/dest/contract_function_simulator/noir-structs/resolved_tagging_strategy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolved_tagging_strategy.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/noir-structs/resolved_tagging_strategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAMpD;;;GAGG;AACH,MAAM,MAAM,uBAAuB,GAC/B;IACE,4GAA4G;IAC5G,IAAI,EAAE,2BAA2B,CAAC;CACnC,GACD;IACE;;OAEG;IACH,IAAI,EAAE,sBAAsB,CAAC;IAC7B,iDAAiD;IACjD,MAAM,EAAE,EAAE,CAAC;CACZ,CAAC;AAEN,0HAA0H;AAC1H,wBAAgB,+BAA+B,CAAC,QAAQ,EAAE,uBAAuB,GAAG,EAAE,EAAE,CAOvF;AAED,sGAAsG;AACtG,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,GAAG,uBAAuB,CASnG"}
+{"version":3,"file":"resolved_tagging_strategy.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/noir-structs/resolved_tagging_strategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAOpD;;;GAGG;AACH,MAAM,MAAM,uBAAuB,GAC/B;IACE,4GAA4G;IAC5G,IAAI,EAAE,2BAA2B,CAAC;CACnC,GACD;IACE;;;;OAIG;IACH,IAAI,EAAE,uBAAuB,CAAC;CAC/B,GACD;IACE;;OAEG;IACH,IAAI,EAAE,sBAAsB,CAAC;IAC7B,iDAAiD;IACjD,MAAM,EAAE,EAAE,CAAC;CACZ,CAAC;AAEN,0HAA0H;AAC1H,wBAAgB,+BAA+B,CAAC,QAAQ,EAAE,uBAAuB,GAAG,EAAE,EAAE,CASvF;AAED,sGAAsG;AACtG,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,GAAG,uBAAuB,CAanG"}

package/dest/contract_function_simulator/noir-structs/resolved_tagging_strategy.js

@@ -2,6 +2,7 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 // Keep in sync with aztec::messages::delivery::ResolvedTaggingStrategy
 const NON_INTERACTIVE_HANDSHAKE = 1;
 const UNCONSTRAINED_SECRET = 2;
+const INTERACTIVE_HANDSHAKE = 3;
 /** Serializes a {@link ResolvedTaggingStrategy} to its Noir `[kind, secret]` field layout, zero-filling absent fields. */ export function resolvedTaggingStrategyToFields(resolved) {
     switch(resolved.type){
         case 'non-interactive-handshake':
@@ -14,14 +15,25 @@ const UNCONSTRAINED_SECRET = 2;
                 new Fr(UNCONSTRAINED_SECRET),
                 resolved.secret
             ];
+        case 'interactive-handshake':
+            return [
+                new Fr(INTERACTIVE_HANDSHAKE),
+                Fr.ZERO
+            ];
     }
 }
 /** Deserializes a {@link ResolvedTaggingStrategy} from its `kind` discriminant and `secret` field. */ export function resolvedTaggingStrategyFromFields(kind, secret) {
     switch(kind){
         case NON_INTERACTIVE_HANDSHAKE:
+            assertAbsentSecret(kind, secret);
             return {
                 type: 'non-interactive-handshake'
             };
+        case INTERACTIVE_HANDSHAKE:
+            assertAbsentSecret(kind, secret);
+            return {
+                type: 'interactive-handshake'
+            };
         case UNCONSTRAINED_SECRET:
             return {
                 type: 'unconstrained-secret',
@@ -31,3 +43,8 @@ const UNCONSTRAINED_SECRET = 2;
             throw new Error(`Unrecognized resolved tagging strategy kind: ${kind}`);
     }
 }
+function assertAbsentSecret(kind, secret) {
+    if (!secret.isZero()) {
+        throw new Error(`Resolved tagging strategy ${kind} must not include a secret`);
+    }
+}

package/dest/contract_function_simulator/oracle/acir_callback.d.ts

@@ -1,5 +1,7 @@
 import type { ACIRCallback } from '@aztec/simulator/client';
 import type { IMiscOracle, IPrivateExecutionOracle, IUtilityExecutionOracle } from './interfaces.js';
+import { type LegacyOracleEntry } from './legacy_oracle_registry.js';
+import { type OracleRegistryEntry } from './oracle_registry.js';
 export declare class UnavailableOracleError extends Error {
     constructor(oracleName: string);
 }
@@ -10,7 +12,10 @@ export declare class UnavailableOracleError extends Error {
  * `aztec_{scope}_{methodName}` convention to resolve the handler, and calling the method directly. Unknown oracle
  * names produce enhanced error messages based on the contract's oracle version.
  */
-export declare function buildACIRCallback(handler: OracleHandler): ACIRCallback;
+export declare function buildACIRCallback(handler: OracleHandler, registries?: {
+    real?: Record<string, OracleRegistryEntry>;
+    legacy?: Record<string, LegacyOracleEntry>;
+}): ACIRCallback;
 type OracleHandler = IMiscOracle & (IUtilityExecutionOracle | IPrivateExecutionOracle);
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNpcl9jYWxsYmFjay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbnRyYWN0X2Z1bmN0aW9uX3NpbXVsYXRvci9vcmFjbGUvYWNpcl9jYWxsYmFjay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQWEsTUFBTSx5QkFBeUIsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsdUJBQXVCLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUdyRyxxQkFBYSxzQkFBdUIsU0FBUSxLQUFLO0lBQy9DLFlBQVksVUFBVSxFQUFFLE1BQU0sRUFFN0I7Q0FDRjtBQUVEOzs7Ozs7R0FNRztBQUNILHdCQUFnQixpQkFBaUIsQ0FBQyxPQUFPLEVBQUUsYUFBYSxHQUFHLFlBQVksQ0E0RHRFO0FBRUQsS0FBSyxhQUFhLEdBQUcsV0FBVyxHQUFHLENBQUMsdUJBQXVCLEdBQUcsdUJBQXVCLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNpcl9jYWxsYmFjay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbnRyYWN0X2Z1bmN0aW9uX3NpbXVsYXRvci9vcmFjbGUvYWNpcl9jYWxsYmFjay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQWEsTUFBTSx5QkFBeUIsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsdUJBQXVCLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNyRyxPQUFPLEVBQTBCLEtBQUssaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUM3RixPQUFPLEVBQW9DLEtBQUssbUJBQW1CLEVBQWEsTUFBTSxzQkFBc0IsQ0FBQztBQUU3RyxxQkFBYSxzQkFBdUIsU0FBUSxLQUFLO0lBQy9DLFlBQVksVUFBVSxFQUFFLE1BQU0sRUFFN0I7Q0FDRjtBQUVEOzs7Ozs7R0FNRztBQUNILHdCQUFnQixpQkFBaUIsQ0FDL0IsT0FBTyxFQUFFLGFBQWEsRUFDdEIsVUFBVSxHQUFFO0lBQ1YsSUFBSSxDQUFDLEVBQUUsTUFBTSxDQUFDLE1BQU0sRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0lBQzNDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sQ0FBQyxNQUFNLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztDQUN2QyxHQUNMLFlBQVksQ0FzQ2Q7QUErREQsS0FBSyxhQUFhLEdBQUcsV0FBVyxHQUFHLENBQUMsdUJBQXVCLEdBQUcsdUJBQXVCLENBQUMsQ0FBQyJ9

package/dest/contract_function_simulator/oracle/acir_callback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acir_callback.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/oracle/acir_callback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAa,MAAM,yBAAyB,CAAC;AAGvE,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAGrG,qBAAa,sBAAuB,SAAQ,KAAK;IAC/C,YAAY,UAAU,EAAE,MAAM,EAE7B;CACF;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,aAAa,GAAG,YAAY,CA4DtE;AAED,KAAK,aAAa,GAAG,WAAW,GAAG,CAAC,uBAAuB,GAAG,uBAAuB,CAAC,CAAC"}
+{"version":3,"file":"acir_callback.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/oracle/acir_callback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAa,MAAM,yBAAyB,CAAC;AAGvE,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AACrG,OAAO,EAA0B,KAAK,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAC7F,OAAO,EAAoC,KAAK,mBAAmB,EAAa,MAAM,sBAAsB,CAAC;AAE7G,qBAAa,sBAAuB,SAAQ,KAAK;IAC/C,YAAY,UAAU,EAAE,MAAM,EAE7B;CACF;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,aAAa,EACtB,UAAU,GAAE;IACV,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC3C,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;CACvC,GACL,YAAY,CAsCd;AA+DD,KAAK,aAAa,GAAG,WAAW,GAAG,CAAC,uBAAuB,GAAG,uBAAuB,CAAC,CAAC"}

package/dest/contract_function_simulator/oracle/acir_callback.js

@@ -1,5 +1,6 @@
 import { ORACLE_VERSION_MAJOR, ORACLE_VERSION_MINOR } from '../../oracle_version.js';
-import { ORACLE_REGISTRY } from './oracle_registry.js';
+import { LEGACY_ORACLE_REGISTRY } from './legacy_oracle_registry.js';
+import { ORACLE_REGISTRY, makeEntry } from './oracle_registry.js';
 export class UnavailableOracleError extends Error {
     constructor(oracleName){
         super(`${oracleName} oracles not available with the current handler`);
@@ -11,14 +12,11 @@ export class UnavailableOracleError extends Error {
  * Each oracle call is dispatched by matching the oracle name against the registry for serialization, parsing the
  * `aztec_{scope}_{methodName}` convention to resolve the handler, and calling the method directly. Unknown oracle
  * names produce enhanced error messages based on the contract's oracle version.
- */ export function buildACIRCallback(handler) {
+ */ export function buildACIRCallback(handler, registries = {}) {
+    const { real = ORACLE_REGISTRY, legacy: legacyRegistry = LEGACY_ORACLE_REGISTRY } = registries;
     const target = {};
-    for (const [oracleKey, entry] of Object.entries(ORACLE_REGISTRY)){
-        const match = oracleKey.match(/^aztec_(\w+?)_(.+)$/);
-        if (!match) {
-            throw new Error(`Oracle "${oracleKey}" does not follow the aztec_{scope}_{method} convention`);
-        }
-        const [, scope, methodName] = match;
+    for (const [oracleKey, entry] of Object.entries(real)){
+        const { scope, methodName } = parseOracleName(oracleKey, 'Oracle');
         target[oracleKey] = async (...inputs)=>{
             assertHandlerSupportsScope(handler, scope);
             const named = entry.deserializeParams(inputs);
@@ -27,9 +25,55 @@ export class UnavailableOracleError extends Error {
             return entry.serializeReturn(result);
         };
     }
-    return new Proxy(target, {
+    // Legacy oracle names: served for contracts compiled against a retired oracle version. Each reuses the current
+    // handler of its `modernOracle` and reshapes the wire (params and/or return) back to what the old bytecode expects.
+    for (const [legacyKey, legacy] of Object.entries(legacyRegistry)){
+        const { scope } = parseOracleName(legacyKey, 'Legacy oracle');
+        if (legacyKey in target) {
+            throw new Error(`Legacy oracle "${legacyKey}" collides with a live oracle of the same name in the registry`);
+        }
+        const modernEntry = real[legacy.modernOracle];
+        const { methodName } = parseOracleName(legacy.modernOracle, 'Oracle');
+        // Override only the side whose wire changed; inherit the other from the modern entry.
+        const paramOverride = legacy.params;
+        const paramSource = paramOverride ? makeEntry({
+            params: [
+                ...paramOverride.legacyType
+            ]
+        }) : modernEntry;
+        const returnOverride = legacy.returnType;
+        const returnSource = returnOverride ? makeEntry({
+            returnType: returnOverride.legacyType
+        }) : modernEntry;
+        target[legacyKey] = async (...inputs)=>{
+            assertHandlerSupportsScope(handler, scope);
+            const legacyArgs = paramSource.deserializeParams(inputs).map((p)=>p.value);
+            const positional = paramOverride ? await paramOverride.mapping(legacyArgs) : legacyArgs;
+            const result = await handler[methodName](...positional);
+            return returnSource.serializeReturn(returnOverride ? returnOverride.mapping(result) : result);
+        };
+    }
+    return new Proxy(target, makeUnknownOracleTrap(handler));
+}
+/** Parses an `aztec_{scope}_{method}` oracle name into its parts, throwing if it doesn't follow the convention. */ function parseOracleName(key, label) {
+    const match = key.match(/^aztec_(\w+?)_(.+)$/);
+    if (!match) {
+        throw new Error(`${label} "${key}" does not follow the aztec_{scope}_{method} convention`);
+    }
+    return {
+        scope: match[1],
+        methodName: match[2]
+    };
+}
+/**
+ * Proxy trap for the callback table: a known oracle name passes through; an unknown one throws a diagnostic keyed on
+ * the contract's oracle version (version unknown, contract newer than this environment, or a same-version mismatch).
+ */ function makeUnknownOracleTrap(handler) {
+    return {
         get (obj, prop) {
-            if (prop in obj) {
+            // Own-property check only: `in` would match inherited `Object.prototype` keys (e.g. `constructor`, `toString`)
+            // and return the built-in instead of falling through to the unknown-oracle diagnostic below.
+            if (Object.hasOwn(obj, prop)) {
                 return obj[prop];
             }
             return ()=>{
@@ -46,7 +90,7 @@ export class UnavailableOracleError extends Error {
                 }
             };
         }
-    });
+    };
 }
 function assertHandlerSupportsScope(handler, scope) {
     switch(scope){

package/dest/contract_function_simulator/oracle/legacy_oracle_registry.d.ts

@@ -0,0 +1,39 @@
+import { ORACLE_REGISTRY, type RegistryParam } from './oracle_registry.js';
+import { type TypeMapping } from './oracle_type_mappings.js';
+/**
+ * Wire shapes that already-deployed contracts still call by their original oracle name, keyed by that retired name.
+ * New Aztec.nr calls the current name in `ORACLE_REGISTRY`; old bytecode keeps calling the name compiled into it and
+ * is served from here, so versioning an oracle's wire (e.g. adding return fields) stops being a breaking change.
+ *
+ * Append-only. Drop an entry only once the `ORACLE_VERSION_MAJOR` that introduced its successor is retired, since
+ * older contracts can no longer run against this environment.
+ */
+export declare const LEGACY_ORACLE_REGISTRY: Record<string, LegacyOracleEntry>;
+type Registry = typeof ORACLE_REGISTRY;
+/**
+ * A legacy oracle adapter, stored under the retired oracle name that already-deployed contracts still call. It reuses
+ * the handler of `modernOracle` and overrides only the wire side(s) that changed; an omitted side falls back to that
+ * modern entry.
+ */
+export interface LegacyOracleEntry {
+    /** The current oracle whose handler this reuses and whose param/return wire it inherits by default. */
+    modernOracle: keyof Registry;
+    /**
+     * Old param wire. `legacyType` deserializes the old wire; `mapping` bridges the deserialized legacy args to the
+     * modern handler's args. The mapping may be async. Omit when the param wire is unchanged.
+     */
+    params?: {
+        legacyType: readonly RegistryParam[];
+        mapping: (legacyArgs: any) => readonly unknown[] | Promise<readonly unknown[]>;
+    };
+    /**
+     * Old return wire. `legacyType` serializes the subset the old contract reads; `mapping` bridges the handler's
+     * current result to that subset's value type. Omit when the return wire is unchanged.
+     */
+    returnType?: {
+        legacyType: TypeMapping;
+        mapping: (result: any) => unknown;
+    };
+}
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGVnYWN5X29yYWNsZV9yZWdpc3RyeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbnRyYWN0X2Z1bmN0aW9uX3NpbXVsYXRvci9vcmFjbGUvbGVnYWN5X29yYWNsZV9yZWdpc3RyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFTQSxPQUFPLEVBRUwsZUFBZSxFQUdmLEtBQUssYUFBYSxFQUNuQixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFPTCxLQUFLLFdBQVcsRUFDakIsTUFBTSwyQkFBMkIsQ0FBQztBQXNCbkM7Ozs7Ozs7R0FPRztBQUNILGVBQU8sTUFBTSxzQkFBc0IsRUFBRSxNQUFNLENBQUMsTUFBTSxFQUFFLGlCQUFpQixDQW9DcEUsQ0FBQztBQWNGLEtBQUssUUFBUSxHQUFHLE9BQU8sZUFBZSxDQUFDO0FBUXZDOzs7O0dBSUc7QUFDSCxNQUFNLFdBQVcsaUJBQWlCO0lBQ2hDLHVHQUF1RztJQUN2RyxZQUFZLEVBQUUsTUFBTSxRQUFRLENBQUM7SUFDN0I7OztPQUdHO0lBQ0gsTUFBTSxDQUFDLEVBQUU7UUFDUCxVQUFVLEVBQUUsU0FBUyxhQUFhLEVBQUUsQ0FBQztRQUNyQyxPQUFPLEVBQUUsQ0FBQyxVQUFVLEVBQUUsR0FBRyxLQUFLLFNBQVMsT0FBTyxFQUFFLEdBQUcsT0FBTyxDQUFDLFNBQVMsT0FBTyxFQUFFLENBQUMsQ0FBQztLQUNoRixDQUFDO0lBQ0Y7OztPQUdHO0lBQ0gsVUFBVSxDQUFDLEVBQUU7UUFBRSxVQUFVLEVBQUUsV0FBVyxDQUFDO1FBQUMsT0FBTyxFQUFFLENBQUMsTUFBTSxFQUFFLEdBQUcsS0FBSyxPQUFPLENBQUE7S0FBRSxDQUFDO0NBQzdFIn0=

package/dest/contract_function_simulator/oracle/legacy_oracle_registry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"legacy_oracle_registry.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/oracle/legacy_oracle_registry.ts"],"names":[],"mappings":"AASA,OAAO,EAEL,eAAe,EAGf,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAOL,KAAK,WAAW,EACjB,MAAM,2BAA2B,CAAC;AAsBnC;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAoCpE,CAAC;AAcF,KAAK,QAAQ,GAAG,OAAO,eAAe,CAAC;AAQvC;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,uGAAuG;IACvG,YAAY,EAAE,MAAM,QAAQ,CAAC;IAC7B;;;OAGG;IACH,MAAM,CAAC,EAAE;QACP,UAAU,EAAE,SAAS,aAAa,EAAE,CAAC;QACrC,OAAO,EAAE,CAAC,UAAU,EAAE,GAAG,KAAK,SAAS,OAAO,EAAE,GAAG,OAAO,CAAC,SAAS,OAAO,EAAE,CAAC,CAAC;KAChF,CAAC;IACF;;;OAGG;IACH,UAAU,CAAC,EAAE;QAAE,UAAU,EAAE,WAAW,CAAC;QAAC,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,CAAA;KAAE,CAAC;CAC7E"}

package/dest/contract_function_simulator/oracle/legacy_oracle_registry.js

@@ -0,0 +1,107 @@
+/* eslint-disable camelcase */ import { MAX_NOTE_HASHES_PER_TX, PRIVATE_LOG_CIPHERTEXT_LEN, PRIVATE_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
+import { computeFeeJuiceMessageNullifier } from '@aztec/stdlib/messaging';
+import { Option } from '../noir-structs/option.js';
+import { AZTEC_ADDRESS, EPHEMERAL_ARRAY, FIELD, FIXED_BOUNDED_VEC, STRUCT, TX_HASH } from './oracle_type_mappings.js';
+const LEGACY_LOG_RETRIEVAL_RESPONSE = STRUCT([
+    {
+        name: 'logPayload',
+        type: FIXED_BOUNDED_VEC(FIELD, PRIVATE_LOG_CIPHERTEXT_LEN)
+    },
+    {
+        name: 'txHash',
+        type: TX_HASH
+    },
+    {
+        name: 'uniqueNoteHashesInTx',
+        type: FIXED_BOUNDED_VEC(FIELD, MAX_NOTE_HASHES_PER_TX)
+    },
+    {
+        name: 'firstNullifierInTx',
+        type: FIELD
+    }
+]);
+// Block-less transaction context: the prefix of `ResolvedTx`'s wire carried by the original `getPendingTaggedLogs`
+// oracle. Known as `MessageContext` in the Aztec.nr versions that call that oracle.
+const LEGACY_MESSAGE_CONTEXT = STRUCT([
+    {
+        name: 'txHash',
+        type: TX_HASH
+    },
+    {
+        name: 'uniqueNoteHashesInTx',
+        type: FIXED_BOUNDED_VEC(FIELD, MAX_NOTE_HASHES_PER_TX)
+    },
+    {
+        name: 'firstNullifierInTx',
+        type: FIELD
+    }
+]);
+const LEGACY_PENDING_TAGGED_LOG = STRUCT([
+    {
+        name: 'log',
+        type: FIXED_BOUNDED_VEC(FIELD, PRIVATE_LOG_SIZE_IN_FIELDS)
+    },
+    {
+        name: 'context',
+        type: LEGACY_MESSAGE_CONTEXT
+    }
+]);
+/**
+ * Wire shapes that already-deployed contracts still call by their original oracle name, keyed by that retired name.
+ * New Aztec.nr calls the current name in `ORACLE_REGISTRY`; old bytecode keeps calling the name compiled into it and
+ * is served from here, so versioning an oracle's wire (e.g. adding return fields) stops being a breaking change.
+ *
+ * Append-only. Drop an entry only once the `ORACLE_VERSION_MAJOR` that introduced its successor is retired, since
+ * older contracts can no longer run against this environment.
+ */ export const LEGACY_ORACLE_REGISTRY = {
+    aztec_utl_getL1ToL2MembershipWitness: legacyOracle({
+        modernOracle: 'aztec_utl_getL1ToL2MembershipWitnessV2',
+        // The old wire passed the contract address and secret, the modern oracle takes the unsiloed nullifier (plus the
+        // address to silo it with) instead. We derive it here so already-deployed contracts that still emit the old call
+        // keep working.
+        //
+        // This is the fee juice message nullifier derivation: only contracts using that scheme call this retired oracle.
+        params: {
+            legacyType: [
+                {
+                    name: 'contractAddress',
+                    type: AZTEC_ADDRESS
+                },
+                {
+                    name: 'messageHash',
+                    type: FIELD
+                },
+                {
+                    name: 'secret',
+                    type: FIELD
+                }
+            ],
+            mapping: async ([contractAddress, messageHash, secret])=>[
+                    messageHash,
+                    Option.some({
+                        contractAddress,
+                        nullifier: await computeFeeJuiceMessageNullifier(messageHash, secret)
+                    })
+                ]
+        }
+    }),
+    aztec_utl_getLogsByTag: legacyOracle({
+        modernOracle: 'aztec_utl_getLogsByTagV2',
+        returnType: {
+            legacyType: EPHEMERAL_ARRAY(EPHEMERAL_ARRAY(LEGACY_LOG_RETRIEVAL_RESPONSE)),
+            // We can map this directly, since the new type is a superset of the old type
+            mapping: (result)=>result
+        }
+    }),
+    aztec_utl_getPendingTaggedLogs: legacyOracle({
+        modernOracle: 'aztec_utl_getPendingTaggedLogsV2',
+        returnType: {
+            legacyType: EPHEMERAL_ARRAY(LEGACY_PENDING_TAGGED_LOG),
+            // We can map this directly, since `ResolvedTx` carries the legacy context's fields under the same names
+            mapping: (result)=>result
+        }
+    })
+};
+function legacyOracle(entry) {
+    return entry;
+}

package/dest/contract_function_simulator/oracle/oracle_registry.d.ts

@@ -1,4 +1,5 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
+import type { UnsiloedMessageNullifier } from '@aztec/stdlib/messaging';
 import { type InputSlot, type MaybePromise, type OutputSlot, type TypeMapping } from './oracle_type_mappings.js';
 export { ARRAY, AZTEC_ADDRESS, BIGINT, BLOCK_NUMBER, BOOL, BOUNDED_VEC, BUFFER, BYTE, CONTRACT_CLASS_LOG, DELIVERY_MODE, RESOLVED_TAGGING_STRATEGY, EPHEMERAL_ARRAY, EVENT_VALIDATION_REQUEST, FIELD, FUNCTION_SELECTOR, LOG_RETRIEVAL_REQUEST, LOG_RETRIEVAL_RESPONSE, MEMBERSHIP_WITNESS, NOTE_VALIDATION_REQUEST, OPTION, PENDING_TAGGED_LOG, POINT, PROVIDED_SECRET, RESOLVED_TX, STR, U32, slotsOf, type InputSlot, type MaybePromise, type OutputSlot, type SlotShape, type TypeMapping, } from './oracle_type_mappings.js';
 export declare const ORACLE_REGISTRY: {
@@ -7,9 +8,10 @@ export declare const ORACLE_REGISTRY: {
     aztec_misc_log: OracleRegistryEntry<[NamedValue<"level", number>, NamedValue<"message", string>, NamedValue<"fieldsSize", number>, NamedValue<"fields", Fr[]>], any>;
     aztec_utl_getUtilityContext: OracleRegistryEntry<NamedValue<string, any>[], import("../index.js").UtilityContext>;
     aztec_utl_getKeyValidationRequest: OracleRegistryEntry<[NamedValue<"pkMHash", Fr>, NamedValue<"keyIndex", Fr>], import("@aztec/stdlib/kernel").KeyValidationRequest>;
-    aztec_utl_getContractInstance: OracleRegistryEntry<[NamedValue<"address", import("@aztec/stdlib/aztec-address").AztecAddress>], import("./oracle_type_mappings.js").ContractInstance>;
+    aztec_utl_getContractInstance: OracleRegistryEntry<[NamedValue<"address", import("@aztec/stdlib/aztec-address").AztecAddress>], import("./oracle_type_mappings.js").ContractInstancePreimage>;
     aztec_utl_getNoteHashMembershipWitness: OracleRegistryEntry<[NamedValue<"anchorBlockHash", import("./oracle_type_mappings.js").BlockHash>, NamedValue<"noteHash", Fr>], import("./oracle_type_mappings.js").MembershipWitness<42>>;
     aztec_utl_getBlockHashMembershipWitness: OracleRegistryEntry<[NamedValue<"anchorBlockHash", import("./oracle_type_mappings.js").BlockHash>, NamedValue<"blockHash", import("./oracle_type_mappings.js").BlockHash>], import("../index.js").Option<import("./oracle_type_mappings.js").MembershipWitness<30>>>;
+    aztec_utl_areBlockHashesInArchive: OracleRegistryEntry<[NamedValue<"anchorBlockHash", import("./oracle_type_mappings.js").BlockHash>, NamedValue<"blockHashes", import("../index.js").EphemeralArray<import("./oracle_type_mappings.js").BlockHash>>], import("../index.js").EphemeralArray<boolean>>;
     aztec_utl_getNullifierMembershipWitness: OracleRegistryEntry<[NamedValue<"blockHash", import("./oracle_type_mappings.js").BlockHash>, NamedValue<"nullifier", Fr>], import("./oracle_type_mappings.js").NullifierMembershipWitness>;
     aztec_utl_getLowNullifierMembershipWitness: OracleRegistryEntry<[NamedValue<"blockHash", import("./oracle_type_mappings.js").BlockHash>, NamedValue<"nullifier", Fr>], import("./oracle_type_mappings.js").NullifierMembershipWitness>;
     aztec_utl_getPublicDataWitness: OracleRegistryEntry<[NamedValue<"blockHash", import("./oracle_type_mappings.js").BlockHash>, NamedValue<"leafSlot", Fr>], import("./oracle_type_mappings.js").PublicDataWitness>;
@@ -20,12 +22,12 @@ export declare const ORACLE_REGISTRY: {
         partialAddress: Fr;
     }>>;
     aztec_utl_doesNullifierExist: OracleRegistryEntry<[NamedValue<"innerNullifier", Fr>], boolean>;
-    aztec_utl_getL1ToL2MembershipWitness: OracleRegistryEntry<[NamedValue<"contractAddress", import("@aztec/stdlib/aztec-address").AztecAddress>, NamedValue<"messageHash", Fr>, NamedValue<"secret", Fr>], import("./message_load_oracle_inputs.js").MessageLoadOracleInputs<36>>;
+    aztec_utl_getL1ToL2MembershipWitnessV2: OracleRegistryEntry<[NamedValue<"messageHash", Fr>, NamedValue<"nullifier", import("../index.js").Option<UnsiloedMessageNullifier>>], import("./message_load_oracle_inputs.js").MessageLoadOracleInputs<36>>;
     aztec_utl_getFromPublicStorage: OracleRegistryEntry<[NamedValue<"blockHash", import("./oracle_type_mappings.js").BlockHash>, NamedValue<"contractAddress", import("@aztec/stdlib/aztec-address").AztecAddress>, NamedValue<"startStorageSlot", Fr>, NamedValue<"numberOfElements", number>], Fr[]>;
     aztec_utl_getNotes: OracleRegistryEntry<[NamedValue<"owner", import("../index.js").Option<import("@aztec/stdlib/aztec-address").AztecAddress>>, NamedValue<"storageSlot", Fr>, NamedValue<"numSelects", number>, NamedValue<"selectByIndexes", number[]>, NamedValue<"selectByOffsets", number[]>, NamedValue<"selectByLengths", number[]>, NamedValue<"selectValues", Fr[]>, NamedValue<"selectComparators", number[]>, NamedValue<"sortByIndexes", number[]>, NamedValue<"sortByOffsets", number[]>, NamedValue<"sortByLengths", number[]>, NamedValue<"sortOrder", number[]>, NamedValue<"limit", number>, NamedValue<"offset", number>, NamedValue<"status", number>, NamedValue<"maxNotes", number>, NamedValue<"packedHintedNoteLength", number>], import("../index.js").BoundedVec<import("../index.js").NoteData>>;
-    aztec_utl_getPendingTaggedLogs: OracleRegistryEntry<[NamedValue<"scope", import("@aztec/stdlib/aztec-address").AztecAddress>, NamedValue<"providedSecrets", import("../index.js").EphemeralArray<import("../index.js").ProvidedSecret>>], import("../index.js").EphemeralArray<import("./oracle_type_mappings.js").PendingTaggedLog>>;
+    aztec_utl_getPendingTaggedLogsV2: OracleRegistryEntry<[NamedValue<"scope", import("@aztec/stdlib/aztec-address").AztecAddress>, NamedValue<"providedSecrets", import("../index.js").EphemeralArray<import("../index.js").ProvidedSecret>>], import("../index.js").EphemeralArray<import("./oracle_type_mappings.js").PendingTaggedLog>>;
     aztec_utl_validateAndStoreEnqueuedNotesAndEvents: OracleRegistryEntry<[NamedValue<"noteValidationRequests", import("../index.js").EphemeralArray<import("../index.js").NoteValidationRequest>>, NamedValue<"eventValidationRequests", import("../index.js").EphemeralArray<import("../index.js").EventValidationRequest>>, NamedValue<"scope", import("@aztec/stdlib/aztec-address").AztecAddress>], any>;
-    aztec_utl_getLogsByTag: OracleRegistryEntry<[NamedValue<"requests", import("../index.js").EphemeralArray<import("../index.js").LogRetrievalRequest>>], import("../index.js").EphemeralArray<import("../index.js").EphemeralArray<import("../index.js").LogRetrievalResponse>>>;
+    aztec_utl_getLogsByTagV2: OracleRegistryEntry<[NamedValue<"requests", import("../index.js").EphemeralArray<import("../index.js").LogRetrievalRequest>>], import("../index.js").EphemeralArray<import("../index.js").EphemeralArray<import("../index.js").LogRetrievalResponse>>>;
     aztec_utl_getResolvedTxs: OracleRegistryEntry<[NamedValue<"requests", import("../index.js").EphemeralArray<Fr>>], import("../index.js").EphemeralArray<import("../index.js").Option<import("../index.js").ResolvedTx>>>;
     aztec_utl_getTxEffect: OracleRegistryEntry<[NamedValue<"txHash", import("@aztec/stdlib/tx/tx-hash").TxHash>], import("../index.js").Option<import("../index.js").TxEffectData>>;
     aztec_utl_setCapsule: OracleRegistryEntry<[NamedValue<"contractAddress", import("@aztec/stdlib/aztec-address").AztecAddress>, NamedValue<"slot", Fr>, NamedValue<"capsule", Fr[]>, NamedValue<"scope", import("@aztec/stdlib/aztec-address").AztecAddress>], any>;
@@ -73,6 +75,7 @@ export declare const ORACLE_REGISTRY: {
     aztec_prv_getNextTaggingIndex: OracleRegistryEntry<[NamedValue<"secret", Fr>, NamedValue<"deliveryMode", import("./oracle_type_mappings.js").AppTaggingSecretKind>], number>;
     aztec_prv_getSenderForTags: OracleRegistryEntry<NamedValue<string, any>[], import("../index.js").Option<import("@aztec/stdlib/aztec-address").AztecAddress>>;
     aztec_prv_resolveTaggingStrategy: OracleRegistryEntry<[NamedValue<"sender", import("@aztec/stdlib/aztec-address").AztecAddress>, NamedValue<"recipient", import("@aztec/stdlib/aztec-address").AztecAddress>, NamedValue<"deliveryMode", import("./oracle_type_mappings.js").AppTaggingSecretKind>], import("../index.js").ResolvedTaggingStrategy>;
+    aztec_prv_resolveCustomRequest: OracleRegistryEntry<[NamedValue<"kind", Fr>, NamedValue<"payload", Fr[]>], Fr[]>;
 };
 /**
  * A full oracle registry entry describing param and return serialization.
@@ -95,7 +98,7 @@ export declare function makeEntry<const TParams extends RegistryParam[] = [], TR
     returnType?: TypeMapping<TReturnValue>;
 }): OracleRegistryEntry<InferDeserializedParams<TParams>, TReturnValue>;
 /** A named oracle parameter with its TypeMapping. */
-interface RegistryParam<TName extends string = string, T = any> {
+export interface RegistryParam<TName extends string = string, T = any> {
     name: TName;
     type: TypeMapping<T>;
 }
@@ -121,7 +124,7 @@ export type ParamTypes<T extends readonly NamedValue[]> = {
  * @example `InferDeserializedParams<[RegistryParam<'addr', AztecAddress>, RegistryParam<'slot', Fr>]>`
  *        → `[NamedValue<'addr', AztecAddress>, NamedValue<'slot', Fr>]`
  */
-type InferDeserializedParams<T extends RegistryParam[]> = {
+export type InferDeserializedParams<T extends RegistryParam[]> = {
     [K in keyof T]: T[K] extends RegistryParam<infer N, infer V> ? NamedValue<N, V> : never;
 };
 /** Strips the `aztec_{scope}_` prefix from an oracle key to get the handler method name. */
@@ -132,4 +135,4 @@ type HandlerFn<E extends OracleRegistryEntry> = (...args: ParamTypes<ReturnType<
 export type HandlersForPrefix<R extends Record<string, OracleRegistryEntry>, P extends string> = {
     [K in keyof R as K extends `aztec_${P}_${string}` ? StripOraclePrefix<K & string> : never]: HandlerFn<R[K]>;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JhY2xlX3JlZ2lzdHJ5LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3RfZnVuY3Rpb25fc2ltdWxhdG9yL29yYWNsZS9vcmFjbGVfcmVnaXN0cnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBSXBELE9BQU8sRUFtQkwsS0FBSyxTQUFTLEVBTWQsS0FBSyxZQUFZLEVBT2pCLEtBQUssVUFBVSxFQVdmLEtBQUssV0FBVyxFQUtqQixNQUFNLDJCQUEyQixDQUFDO0FBRW5DLE9BQU8sRUFDTCxLQUFLLEVBQ0wsYUFBYSxFQUNiLE1BQU0sRUFDTixZQUFZLEVBQ1osSUFBSSxFQUNKLFdBQVcsRUFDWCxNQUFNLEVBQ04sSUFBSSxFQUNKLGtCQUFrQixFQUNsQixhQUFhLEVBQ2IseUJBQXlCLEVBQ3pCLGVBQWUsRUFDZix3QkFBd0IsRUFDeEIsS0FBSyxFQUNMLGlCQUFpQixFQUNqQixxQkFBcUIsRUFDckIsc0JBQXNCLEVBQ3RCLGtCQUFrQixFQUNsQix1QkFBdUIsRUFDdkIsTUFBTSxFQUNOLGtCQUFrQixFQUNsQixLQUFLLEVBQ0wsZUFBZSxFQUNmLFdBQVcsRUFDWCxHQUFHLEVBQ0gsR0FBRyxFQUNILE9BQU8sRUFDUCxLQUFLLFNBQVMsRUFDZCxLQUFLLFlBQVksRUFDakIsS0FBSyxVQUFVLEVBQ2YsS0FBSyxTQUFTLEVBQ2QsS0FBSyxXQUFXLEdBQ2pCLE1BQU0sMkJBQTJCLENBQUM7QUFFbkMsZUFBTyxNQUFNLGVBQWU7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQXlkbUIsQ0FBQztBQUloRDs7Ozs7R0FLRztBQUNILE1BQU0sV0FBVyxtQkFBbUIsQ0FDbEMsbUJBQW1CLFNBQVMsU0FBUyxVQUFVLEVBQUUsR0FBRyxTQUFTLFVBQVUsRUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JhY2xlX3JlZ2lzdHJ5LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3RfZnVuY3Rpb25fc2ltdWxhdG9yL29yYWNsZS9vcmFjbGVfcmVnaXN0cnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBR3BELE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFeEUsT0FBTyxFQW1CTCxLQUFLLFNBQVMsRUFNZCxLQUFLLFlBQVksRUFPakIsS0FBSyxVQUFVLEVBWWYsS0FBSyxXQUFXLEVBS2pCLE1BQU0sMkJBQTJCLENBQUM7QUFFbkMsT0FBTyxFQUNMLEtBQUssRUFDTCxhQUFhLEVBQ2IsTUFBTSxFQUNOLFlBQVksRUFDWixJQUFJLEVBQ0osV0FBVyxFQUNYLE1BQU0sRUFDTixJQUFJLEVBQ0osa0JBQWtCLEVBQ2xCLGFBQWEsRUFDYix5QkFBeUIsRUFDekIsZUFBZSxFQUNmLHdCQUF3QixFQUN4QixLQUFLLEVBQ0wsaUJBQWlCLEVBQ2pCLHFCQUFxQixFQUNyQixzQkFBc0IsRUFDdEIsa0JBQWtCLEVBQ2xCLHVCQUF1QixFQUN2QixNQUFNLEVBQ04sa0JBQWtCLEVBQ2xCLEtBQUssRUFDTCxlQUFlLEVBQ2YsV0FBVyxFQUNYLEdBQUcsRUFDSCxHQUFHLEVBQ0gsT0FBTyxFQUNQLEtBQUssU0FBUyxFQUNkLEtBQUssWUFBWSxFQUNqQixLQUFLLFVBQVUsRUFDZixLQUFLLFNBQVMsRUFDZCxLQUFLLFdBQVcsR0FDakIsTUFBTSwyQkFBMkIsQ0FBQztBQUVuQyxlQUFPLE1BQU0sZUFBZTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0FnZm1CLENBQUM7QUFJaEQ7Ozs7O0dBS0c7QUFDSCxNQUFNLFdBQVcsbUJBQW1C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

package/dest/contract_function_simulator/oracle/oracle_registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oracle_registry.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/oracle/oracle_registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oracle_registry.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/oracle/oracle_registry.ts"],"names":[],"mappings":"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"}

package/dest/contract_function_simulator/oracle/oracle_registry.js

@@ -2,7 +2,7 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { FieldReader } from '@aztec/foundation/serialize';
 import { toACVMField } from '@aztec/simulator/client';
-import { ARRAY, AZTEC_ADDRESS, BLOCK_HASH, BLOCK_HEADER, BLOCK_NUMBER, BOOL, BOUNDED_VEC, BUFFER, BYTE, CALL_PRIVATE_RESULT, CONTRACT_CLASS_LOG, CONTRACT_INSTANCE, DELIVERY_MODE, EPHEMERAL_ARRAY, EVENT_VALIDATION_REQUEST, FACT_COLLECTION, FIELD, FUNCTION_SELECTOR, KEY_VALIDATION_REQUEST, LOG_RETRIEVAL_REQUEST, LOG_RETRIEVAL_RESPONSE, MEMBERSHIP_WITNESS, MESSAGE_LOAD_ORACLE_INPUTS, NOTE, NOTE_SELECTOR, NOTE_VALIDATION_REQUEST, NULLIFIER_MEMBERSHIP_WITNESS, OPTION, ORIGIN_BLOCK, PENDING_TAGGED_LOG, POINT, PROVIDED_SECRET, PUBLIC_DATA_WITNESS, PUBLIC_KEYS_AND_PARTIAL_ADDRESS, RESOLVED_TAGGING_STRATEGY, RESOLVED_TX, STR, TX_EFFECT, TX_HASH, U32, UTILITY_CONTEXT, assertReadersConsumed, slotsOf } from './oracle_type_mappings.js';
+import { ARRAY, AZTEC_ADDRESS, BLOCK_HASH, BLOCK_HEADER, BLOCK_NUMBER, BOOL, BOUNDED_VEC, BUFFER, BYTE, CALL_PRIVATE_RESULT, CONTRACT_CLASS_LOG, CONTRACT_INSTANCE, DELIVERY_MODE, EPHEMERAL_ARRAY, EVENT_VALIDATION_REQUEST, FACT_COLLECTION, FIELD, FUNCTION_SELECTOR, KEY_VALIDATION_REQUEST, LOG_RETRIEVAL_REQUEST, LOG_RETRIEVAL_RESPONSE, MEMBERSHIP_WITNESS, MESSAGE_LOAD_ORACLE_INPUTS, NOTE, NOTE_SELECTOR, NOTE_VALIDATION_REQUEST, NULLIFIER_MEMBERSHIP_WITNESS, OPTION, ORIGIN_BLOCK, PENDING_TAGGED_LOG, POINT, PROVIDED_SECRET, PUBLIC_DATA_WITNESS, PUBLIC_KEYS_AND_PARTIAL_ADDRESS, RESOLVED_TAGGING_STRATEGY, RESOLVED_TX, STR, STRUCT, TX_EFFECT, TX_HASH, U32, UTILITY_CONTEXT, assertReadersConsumed, slotsOf } from './oracle_type_mappings.js';
 export { ARRAY, AZTEC_ADDRESS, BIGINT, BLOCK_NUMBER, BOOL, BOUNDED_VEC, BUFFER, BYTE, CONTRACT_CLASS_LOG, DELIVERY_MODE, RESOLVED_TAGGING_STRATEGY, EPHEMERAL_ARRAY, EVENT_VALIDATION_REQUEST, FIELD, FUNCTION_SELECTOR, LOG_RETRIEVAL_REQUEST, LOG_RETRIEVAL_RESPONSE, MEMBERSHIP_WITNESS, NOTE_VALIDATION_REQUEST, OPTION, PENDING_TAGGED_LOG, POINT, PROVIDED_SECRET, RESOLVED_TX, STR, U32, slotsOf } from './oracle_type_mappings.js';
 export const ORACLE_REGISTRY = {
     aztec_misc_assertCompatibleOracleVersion: makeEntry({
@@ -91,6 +91,19 @@ export const ORACLE_REGISTRY = {
         ],
         returnType: OPTION(MEMBERSHIP_WITNESS(ARCHIVE_HEIGHT))
     }),
+    aztec_utl_areBlockHashesInArchive: makeEntry({
+        params: [
+            {
+                name: 'anchorBlockHash',
+                type: BLOCK_HASH
+            },
+            {
+                name: 'blockHashes',
+                type: EPHEMERAL_ARRAY(BLOCK_HASH)
+            }
+        ],
+        returnType: EPHEMERAL_ARRAY(BOOL)
+    }),
     aztec_utl_getNullifierMembershipWitness: makeEntry({
         params: [
             {
@@ -166,19 +179,24 @@ export const ORACLE_REGISTRY = {
         ],
         returnType: BOOL
     }),
-    aztec_utl_getL1ToL2MembershipWitness: makeEntry({
+    aztec_utl_getL1ToL2MembershipWitnessV2: makeEntry({
         params: [
-            {
-                name: 'contractAddress',
-                type: AZTEC_ADDRESS
-            },
             {
                 name: 'messageHash',
                 type: FIELD
             },
             {
-                name: 'secret',
-                type: FIELD
+                name: 'nullifier',
+                type: OPTION(STRUCT([
+                    {
+                        name: 'contractAddress',
+                        type: AZTEC_ADDRESS
+                    },
+                    {
+                        name: 'nullifier',
+                        type: FIELD
+                    }
+                ]))
             }
         ],
         returnType: MESSAGE_LOAD_ORACLE_INPUTS
@@ -277,7 +295,7 @@ export const ORACLE_REGISTRY = {
         ],
         returnType: BOUNDED_VEC(NOTE)
     }),
-    aztec_utl_getPendingTaggedLogs: makeEntry({
+    aztec_utl_getPendingTaggedLogsV2: makeEntry({
         params: [
             {
                 name: 'scope',
@@ -306,7 +324,7 @@ export const ORACLE_REGISTRY = {
             }
         ]
     }),
-    aztec_utl_getLogsByTag: makeEntry({
+    aztec_utl_getLogsByTagV2: makeEntry({
         params: [
             {
                 name: 'requests',
@@ -932,6 +950,19 @@ export const ORACLE_REGISTRY = {
             }
         ],
         returnType: RESOLVED_TAGGING_STRATEGY
+    }),
+    aztec_prv_resolveCustomRequest: makeEntry({
+        params: [
+            {
+                name: 'kind',
+                type: FIELD
+            },
+            {
+                name: 'payload',
+                type: ARRAY(FIELD)
+            }
+        ],
+        returnType: ARRAY(FIELD)
     })
 };
 export function makeEntry({ params, returnType } = {}) {