@aztec/txe 0.0.1-commit.993d240 → 0.0.1-commit.9a89641

package/dest/utils/txe_artifact_resolver.d.ts

@@ -0,0 +1,37 @@
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { type ContractInstanceWithAddress } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import type { ContractStore } from '@aztec/pxe/client/lazy';
+import type { ContractArtifactWithHash } from '@aztec/stdlib/contract';
+export interface ResolvedArtifact {
+    artifact: ContractArtifactWithHash;
+    instance: ContractInstanceWithAddress;
+}
+/**
+ * Resolves and caches contract artifacts and their associated instances.
+ *
+ * Artifact hash computation is expensive, so this service deduplicates both completed and in-flight computations.
+ * Two cache levels are kept: full deploys (artifact + computed instance) keyed by the full deploy context, and loaded +
+ * hashed artifacts keyed by the compiled-bytecode hash so deploys of the same contract with different args / salt /
+ * deployer reuse the same `ContractArtifactWithHash`.
+ */
+export declare class TXEArtifactResolver {
+    #private;
+    private readonly contractStore;
+    private readonly schnorrClassId;
+    constructor(contractStore: ContractStore, schnorrClassId: Fr);
+    /** Resolves the Schnorr account contract artifact and instance for the given secret, caching the result. */
+    resolveAccountArtifact(secret: Fr): Promise<ResolvedArtifact>;
+    /** Resolves a contract artifact from disk by path, computes its instance, and caches the result. */
+    resolveDeployArtifact({ rootPath, packageName, contractPath, initializer, args, secret, salt, deployer }: {
+        rootPath: string;
+        packageName: string;
+        contractPath: string;
+        initializer: string;
+        args: Fr[];
+        secret: Fr;
+        salt: Fr;
+        deployer: AztecAddress;
+    }): Promise<ResolvedArtifact>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX2FydGlmYWN0X3Jlc29sdmVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvdHhlX2FydGlmYWN0X3Jlc29sdmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQ0wsS0FBSywyQkFBMkIsRUFFakMsTUFBTSwyQkFBMkIsQ0FBQztBQUNuQyxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHNUMsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQVF2RSxNQUFNLFdBQVcsZ0JBQWdCO0lBQy9CLFFBQVEsRUFBRSx3QkFBd0IsQ0FBQztJQUNuQyxRQUFRLEVBQUUsMkJBQTJCLENBQUM7Q0FDdkM7QUFpQ0Q7Ozs7Ozs7R0FPRztBQUNILHFCQUFhLG1CQUFtQjs7SUFNNUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhO0lBQzlCLE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYztJQUZqQyxZQUNtQixhQUFhLEVBQUUsYUFBYSxFQUM1QixjQUFjLEVBQUUsRUFBRSxFQUNqQztJQUVKLDRHQUE0RztJQUM1RyxzQkFBc0IsQ0FBQyxNQUFNLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUk1RDtJQUVELG9HQUFvRztJQUM5RixxQkFBcUIsQ0FBQyxFQUMxQixRQUFRLEVBQ1IsV0FBVyxFQUNYLFlBQVksRUFDWixXQUFXLEVBQ1gsSUFBSSxFQUNKLE1BQU0sRUFDTixJQUFJLEVBQ0osUUFBUSxFQUNULEVBQUU7UUFDRCxRQUFRLEVBQUUsTUFBTSxDQUFDO1FBQ2pCLFdBQVcsRUFBRSxNQUFNLENBQUM7UUFDcEIsWUFBWSxFQUFFLE1BQU0sQ0FBQztRQUNyQixXQUFXLEVBQUUsTUFBTSxDQUFDO1FBQ3BCLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQztRQUNYLE1BQU0sRUFBRSxFQUFFLENBQUM7UUFDWCxJQUFJLEVBQUUsRUFBRSxDQUFDO1FBQ1QsUUFBUSxFQUFFLFlBQVksQ0FBQztLQUN4QixHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQXdCNUI7Q0E4RkYifQ==

package/dest/utils/txe_artifact_resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"txe_artifact_resolver.d.ts","sourceRoot":"","sources":["../../src/utils/txe_artifact_resolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EACL,KAAK,2BAA2B,EAEjC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAG5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAQvE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,wBAAwB,CAAC;IACnC,QAAQ,EAAE,2BAA2B,CAAC;CACvC;AAiCD;;;;;;;GAOG;AACH,qBAAa,mBAAmB;;IAM5B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAFjC,YACmB,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,EAAE,EACjC;IAEJ,4GAA4G;IAC5G,sBAAsB,CAAC,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAI5D;IAED,oGAAoG;IAC9F,qBAAqB,CAAC,EAC1B,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,WAAW,EACX,IAAI,EACJ,MAAM,EACN,IAAI,EACJ,QAAQ,EACT,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,EAAE,EAAE,EAAE,CAAC;QACX,MAAM,EAAE,EAAE,CAAC;QACX,IAAI,EAAE,EAAE,CAAC;QACT,QAAQ,EAAE,YAAY,CAAC;KACxB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwB5B;CA8FF"}

package/dest/utils/txe_artifact_resolver.js

@@ -0,0 +1,161 @@
+import { loadContractArtifact } from '@aztec/aztec.js/abi';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import { PublicKeys, deriveKeys } from '@aztec/aztec.js/keys';
+import { createLogger } from '@aztec/foundation/log';
+import { computeArtifactHash } from '@aztec/stdlib/contract';
+import { createHash } from 'crypto';
+import { createReadStream } from 'fs';
+import { readFile, readdir } from 'fs/promises';
+import { join, parse } from 'path';
+/**
+ * Cache + in-flight map pair. Lookup hits the cache, then awaits an in-flight `compute()` if one
+ * exists, otherwise starts one and stores it. Guarantees `compute()` runs at most once per `key`
+ * across concurrent callers, which matters because `computeArtifactHash` is expensive.
+ */ class AsyncCache {
+    #cache = new Map();
+    #inFlight = new Map();
+    getOrCompute(key, compute) {
+        const cached = this.#cache.get(key);
+        if (cached !== undefined) {
+            return Promise.resolve(cached);
+        }
+        let pending = this.#inFlight.get(key);
+        if (!pending) {
+            pending = (async ()=>{
+                try {
+                    const value = await compute();
+                    this.#cache.set(key, value);
+                    return value;
+                } finally{
+                    this.#inFlight.delete(key);
+                }
+            })();
+            this.#inFlight.set(key, pending);
+        }
+        return pending;
+    }
+}
+/**
+ * Resolves and caches contract artifacts and their associated instances.
+ *
+ * Artifact hash computation is expensive, so this service deduplicates both completed and in-flight computations.
+ * Two cache levels are kept: full deploys (artifact + computed instance) keyed by the full deploy context, and loaded +
+ * hashed artifacts keyed by the compiled-bytecode hash so deploys of the same contract with different args / salt /
+ * deployer reuse the same `ContractArtifactWithHash`.
+ */ export class TXEArtifactResolver {
+    contractStore;
+    schnorrClassId;
+    #deployments;
+    #artifacts;
+    #logger;
+    constructor(contractStore, schnorrClassId){
+        this.contractStore = contractStore;
+        this.schnorrClassId = schnorrClassId;
+        this.#deployments = new AsyncCache();
+        this.#artifacts = new AsyncCache();
+        this.#logger = createLogger('txe:artifact_resolver');
+    }
+    /** Resolves the Schnorr account contract artifact and instance for the given secret, caching the result. */ resolveAccountArtifact(secret) {
+        return this.#deployments.getOrCompute(`SchnorrAccountContract-${secret}`, ()=>this.#computeAccountArtifact(secret));
+    }
+    /** Resolves a contract artifact from disk by path, computes its instance, and caches the result. */ async resolveDeployArtifact({ rootPath, packageName, contractPath, initializer, args, secret, salt, deployer }) {
+        const publicKeys = secret.equals(Fr.ZERO) ? PublicKeys.default() : (await deriveKeys(secret)).publicKeys;
+        const publicKeysHash = await publicKeys.hash();
+        const artifactPath = await this.#resolveArtifactPath(rootPath, packageName, contractPath);
+        const fileHash = await this.#fastHashFile(artifactPath);
+        const { dir: contractDirectory, base: contractFilename } = parse(contractPath);
+        const cacheKey = `${contractDirectory ?? ''}-${contractFilename}-${initializer}-${args.map((arg)=>arg.toString()).join('-')}-${publicKeysHash}-${salt}-${deployer}-${fileHash}`;
+        return this.#deployments.getOrCompute(cacheKey, ()=>this.#computeDeployArtifact(artifactPath, fileHash, initializer, args, salt, publicKeys, publicKeysHash, deployer));
+    }
+    async #resolveArtifactPath(rootPath, packageName, contractPath) {
+        const { dir: contractDirectory, base: contractFilename } = parse(contractPath);
+        if (contractDirectory) {
+            if (contractDirectory.includes('@')) {
+                // env.deploy("../path/to/workspace/root@packageName/contractName")
+                const [workspace, pkg] = contractDirectory.split('@');
+                const targetPath = join(rootPath, workspace, '/target');
+                this.#logger.debug(`Looking for compiled artifact in workspace ${targetPath}`);
+                return join(targetPath, `${pkg}-${contractFilename}.json`);
+            } else {
+                // env.deploy("../path/to/contract/root/contractName")
+                const targetPath = join(rootPath, contractDirectory, '/target');
+                this.#logger.debug(`Looking for compiled artifact in ${targetPath}`);
+                const [artifactPath] = (await readdir(targetPath)).filter((file)=>file.endsWith(`-${contractFilename}.json`));
+                return artifactPath;
+            }
+        } else {
+            // env.deploy("contractName")
+            return join(rootPath, './target', `${packageName}-${contractFilename}.json`);
+        }
+    }
+    async #computeAccountArtifact(secret) {
+        const [artifactFromStore, classWithPreimage] = await Promise.all([
+            this.contractStore.getContractArtifact(this.schnorrClassId),
+            this.contractStore.getContractClassWithPreimage(this.schnorrClassId)
+        ]);
+        if (!artifactFromStore || !classWithPreimage) {
+            throw new Error(`SchnorrAccount not found in shared contract store at class id ${this.schnorrClassId.toString()}`);
+        }
+        const artifact = {
+            ...artifactFromStore,
+            artifactHash: classWithPreimage.artifactHash
+        };
+        const keys = await deriveKeys(secret);
+        const args = [
+            keys.publicKeys.ivpkM.x,
+            keys.publicKeys.ivpkM.y
+        ];
+        const instance = await getContractInstanceFromInstantiationParams(artifact, {
+            constructorArgs: args,
+            skipArgsDecoding: true,
+            salt: Fr.ONE,
+            publicKeys: keys.publicKeys,
+            constructorArtifact: 'constructor',
+            deployer: AztecAddress.ZERO
+        });
+        return {
+            artifact,
+            instance
+        };
+    }
+    async #computeDeployArtifact(artifactPath, fileHash, initializer, args, salt, publicKeys, publicKeysHash, deployer) {
+        // Inner cache: artifact load + hash depends only on the compiled bytecode (`fileHash`), so subsequent deploys of
+        // the same contract — regardless of constructor args / deployer / salt — reuse the same `ContractArtifactWithHash`.
+        const artifact = await this.#artifacts.getOrCompute(fileHash, async ()=>{
+            this.#logger.debug(`Loading compiled artifact ${artifactPath}`);
+            const artifactJSON = JSON.parse(await readFile(artifactPath, 'utf-8'));
+            const artifactWithoutHash = loadContractArtifact(artifactJSON);
+            return {
+                ...artifactWithoutHash,
+                artifactHash: await computeArtifactHash(artifactWithoutHash)
+            };
+        });
+        this.#logger.debug(`Deploy ${artifact.name} with initializer ${initializer}(${args}) and public keys hash ${publicKeysHash}`);
+        const instance = await getContractInstanceFromInstantiationParams(artifact, {
+            constructorArgs: args,
+            skipArgsDecoding: true,
+            salt,
+            publicKeys,
+            constructorArtifact: initializer || undefined,
+            deployer
+        });
+        return {
+            artifact,
+            instance
+        };
+    }
+    #fastHashFile(path) {
+        return new Promise((resolve)=>{
+            const fd = createReadStream(path);
+            const hash = createHash('sha1');
+            hash.setEncoding('hex');
+            fd.on('end', function() {
+                hash.end();
+                resolve(hash.read());
+            });
+            fd.pipe(hash);
+        });
+    }
+}

package/dest/utils/txe_public_contract_data_source.d.ts

@@ -17,4 +17,4 @@ export declare class TXEPublicContractDataSource implements ContractDataSource {
     getDebugFunctionName(address: AztecAddress, selector: FunctionSelector): Promise<string | undefined>;
     registerContractFunctionSignatures(_signatures: []): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX3B1YmxpY19jb250cmFjdF9kYXRhX3NvdXJjZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3R4ZV9wdWJsaWNfY29udHJhY3RfZGF0YV9zb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzlELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzVFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLGtCQUFrQixFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFbkgscUJBQWEsMkJBQTRCLFlBQVcsa0JBQWtCO0lBRWxFLE9BQU8sQ0FBQyxXQUFXO0lBQ25CLE9BQU8sQ0FBQyxhQUFhO0lBRnZCLFlBQ1UsV0FBVyxFQUFFLFdBQVcsRUFDeEIsYUFBYSxFQUFFLGFBQWEsRUFDbEM7SUFFSixjQUFjLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUVyQztJQUVLLGdCQUFnQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLG1CQUFtQixHQUFHLFNBQVMsQ0FBQyxDQVl2RTtJQUVLLHFCQUFxQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FHM0Q7SUFFSyxXQUFXLENBQUMsT0FBTyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsMkJBQTJCLEdBQUcsU0FBUyxDQUFDLENBR3pGO0lBRUQsbUJBQW1CLElBQUksT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBRW5DO0lBRUssbUJBQW1CLENBQUMsT0FBTyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsZ0JBQWdCLEdBQUcsU0FBUyxDQUFDLENBR3RGO0lBRUssb0JBQW9CLENBQUMsT0FBTyxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsQ0FFekc7SUFFRCxrQ0FBa0MsQ0FBQyxXQUFXLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFakU7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX3B1YmxpY19jb250cmFjdF9kYXRhX3NvdXJjZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3R4ZV9wdWJsaWNfY29udHJhY3RfZGF0YV9zb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzlELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzVFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLGtCQUFrQixFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFbkgscUJBQWEsMkJBQTRCLFlBQVcsa0JBQWtCO0lBRWxFLE9BQU8sQ0FBQyxXQUFXO0lBQ25CLE9BQU8sQ0FBQyxhQUFhO0lBRnZCLFlBQ1UsV0FBVyxFQUFFLFdBQVcsRUFDeEIsYUFBYSxFQUFFLGFBQWEsRUFDbEM7SUFFSixjQUFjLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUVyQztJQUVLLGdCQUFnQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLG1CQUFtQixHQUFHLFNBQVMsQ0FBQyxDQVl2RTtJQUVLLHFCQUFxQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FHM0Q7SUFFSyxXQUFXLENBQUMsT0FBTyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsMkJBQTJCLEdBQUcsU0FBUyxDQUFDLENBSXpGO0lBRUQsbUJBQW1CLElBQUksT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBRW5DO0lBRUssbUJBQW1CLENBQUMsT0FBTyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsZ0JBQWdCLEdBQUcsU0FBUyxDQUFDLENBR3RGO0lBRUssb0JBQW9CLENBQUMsT0FBTyxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsQ0FHekc7SUFFRCxrQ0FBa0MsQ0FBQyxXQUFXLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFakU7Q0FDRiJ9

package/dest/utils/txe_public_contract_data_source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"txe_public_contract_data_source.d.ts","sourceRoot":"","sources":["../../src/utils/txe_public_contract_data_source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,KAAK,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAEnH,qBAAa,2BAA4B,YAAW,kBAAkB;IAElE,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,aAAa;IAFvB,YACU,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,aAAa,EAClC;IAEJ,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAErC;IAEK,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAYvE;IAEK,qBAAqB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAG3D;IAEK,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAGzF;IAED,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAEnC;IAEK,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAGtF;IAEK,oBAAoB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAEzG;IAED,kCAAkC,CAAC,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjE;CACF"}
+{"version":3,"file":"txe_public_contract_data_source.d.ts","sourceRoot":"","sources":["../../src/utils/txe_public_contract_data_source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,KAAK,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAEnH,qBAAa,2BAA4B,YAAW,kBAAkB;IAElE,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,aAAa;IAFvB,YACU,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,aAAa,EAClC;IAEJ,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAErC;IAEK,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAYvE;IAEK,qBAAqB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAG3D;IAEK,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAIzF;IAED,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAEnC;IAEK,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAGtF;IAEK,oBAAoB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAGzG;IAED,kCAAkC,CAAC,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjE;CACF"}

package/dest/utils/txe_public_contract_data_source.js

@@ -27,20 +27,23 @@ export class TXEPublicContractDataSource {
     }
     async getContract(address) {
         const instance = await this.contractStore.getContractInstance(address);
+        // TXE has no contract updates, so the current class always equals the original.
         return instance && {
             ...instance,
-            address
+            address,
+            currentContractClassId: instance.originalContractClassId
         };
     }
     getContractClassIds() {
         throw new Error('Method not implemented.');
     }
     async getContractArtifact(address) {
-        const instance = await this.contractStore.getContractInstance(address);
-        return instance && this.contractStore.getContractArtifact(instance.currentContractClassId);
+        const instance = await this.getContract(address);
+        return instance && this.contractStore.getContractArtifact(instance.originalContractClassId);
     }
     async getDebugFunctionName(address, selector) {
-        return await this.contractStore.getDebugFunctionName(address, selector);
+        const instance = await this.getContract(address);
+        return instance && this.contractStore.getDebugFunctionName(instance.originalContractClassId, selector);
     }
     registerContractFunctionSignatures(_signatures) {
         return Promise.resolve();

package/dest/worker.bundle.js

@@ -1,3 +1,3 @@
 import { createRequire as __txeCreateRequire } from 'node:module';
 const require = __txeCreateRequire(import.meta.url);
-import{TXEDispatcher,activeSessionCount,createLogger}from"./chunk-PPJTNNUG.js";import{__name}from"./chunk-BJVAAXNA.js";import{BackendType,Barretenberg,BarretenbergSync}from"@aztec/bb.js";import{parentPort,workerData}from"node:worker_threads";Barretenberg.initSingleton({backend:BackendType.Wasm,skipSrsInit:!0,threads:1});BarretenbergSync.initSingleton({backend:BackendType.Wasm});if(!parentPort)throw new Error("worker.ts must be loaded as a worker_thread");var port=parentPort,logger=createLogger("txe:worker"),dispatcherOpts={contractStoreSourceDir:workerData.contractStoreSourceDir,schnorrClassId:workerData.schnorrClassId},dispatcher=new TXEDispatcher(logger,dispatcherOpts);function serializeError(err){return err instanceof Error?{message:err.message,name:err.name,stack:err.stack}:{message:String(err)}}__name(serializeError,"serializeError");process.env.TXE_WORKER_MEMSTAT==="1"&&setInterval(()=>{let m=process.memoryUsage();port.postMessage({type:"memstat",sessions:activeSessionCount(),rss:m.rss,heapTotal:m.heapTotal,heapUsed:m.heapUsed,external:m.external,arrayBuffers:m.arrayBuffers})},2e3).unref();port.on("message",msg=>{switch(msg.type){case"foreign-call":(async()=>{try{let value=await dispatcher.resolve_foreign_call(msg.callData);port.postMessage({type:"result",requestId:msg.requestId,ok:!0,value})}catch(err){port.postMessage({type:"result",requestId:msg.requestId,ok:!1,error:serializeError(err)})}})();return;case"dispose-session":dispatcher.disposeSession(msg.sessionId).catch(err=>logger.warn("disposeSession failed",err));return}});
+import{TXEDispatcher,activeSessionCount,createLogger}from"./chunk-XWIMXLKD.js";import{__name}from"./chunk-32UHX7YY.js";import{BackendType,Barretenberg,BarretenbergSync}from"@aztec/bb.js";import{parentPort,workerData}from"node:worker_threads";Barretenberg.initSingleton({backend:BackendType.Wasm,skipSrsInit:!0,threads:1});BarretenbergSync.initSingleton({backend:BackendType.Wasm});if(!parentPort)throw new Error("worker.ts must be loaded as a worker_thread");var port=parentPort,logger=createLogger("txe:worker"),dispatcherOpts={contractStoreSourceDir:workerData.contractStoreSourceDir,schnorrClassId:workerData.schnorrClassId},dispatcher=new TXEDispatcher(logger,dispatcherOpts);function serializeError(err){return err instanceof Error?{message:err.message,name:err.name,stack:err.stack}:{message:String(err)}}__name(serializeError,"serializeError");process.env.TXE_WORKER_MEMSTAT==="1"&&setInterval(()=>{let m=process.memoryUsage();port.postMessage({type:"memstat",sessions:activeSessionCount(),rss:m.rss,heapTotal:m.heapTotal,heapUsed:m.heapUsed,external:m.external,arrayBuffers:m.arrayBuffers})},2e3).unref();port.on("message",msg=>{switch(msg.type){case"foreign-call":(async()=>{try{let value=await dispatcher.resolve_foreign_call(msg.callData);port.postMessage({type:"result",requestId:msg.requestId,ok:!0,value})}catch(err){port.postMessage({type:"result",requestId:msg.requestId,ok:!1,error:serializeError(err)})}})();return;case"dispose-session":dispatcher.disposeSession(msg.sessionId).catch(err=>logger.warn("disposeSession failed",err));return}});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/txe",
-  "version": "0.0.1-commit.993d240",
+  "version": "0.0.1-commit.9a89641",
   "type": "module",
   "exports": {
     "./server": {
@@ -23,6 +23,7 @@
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
     "dev": "LOG_LEVEL=\"debug; trace: simulator:state_manager; info: json-rpc:proxy\" node ./dest/bin/index.js",
     "start": "node --no-warnings ./dest/bin/index.js",
+    "start:oracle-test-resolver": "node --no-warnings ./dest/bin/oracle_test_server.js",
     "check_txe_oracle_version": "node ./dest/bin/check_txe_oracle_version.js"
   },
   "inherits": [
@@ -68,22 +69,22 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.993d240",
-    "@aztec/archiver": "0.0.1-commit.993d240",
-    "@aztec/aztec-node": "0.0.1-commit.993d240",
-    "@aztec/aztec.js": "0.0.1-commit.993d240",
-    "@aztec/bb-prover": "0.0.1-commit.993d240",
-    "@aztec/bb.js": "0.0.1-commit.993d240",
-    "@aztec/constants": "0.0.1-commit.993d240",
-    "@aztec/foundation": "0.0.1-commit.993d240",
-    "@aztec/key-store": "0.0.1-commit.993d240",
-    "@aztec/kv-store": "0.0.1-commit.993d240",
-    "@aztec/protocol-contracts": "0.0.1-commit.993d240",
-    "@aztec/pxe": "0.0.1-commit.993d240",
-    "@aztec/simulator": "0.0.1-commit.993d240",
-    "@aztec/standard-contracts": "0.0.1-commit.993d240",
-    "@aztec/stdlib": "0.0.1-commit.993d240",
-    "@aztec/world-state": "0.0.1-commit.993d240",
+    "@aztec/accounts": "0.0.1-commit.9a89641",
+    "@aztec/archiver": "0.0.1-commit.9a89641",
+    "@aztec/aztec-node": "0.0.1-commit.9a89641",
+    "@aztec/aztec.js": "0.0.1-commit.9a89641",
+    "@aztec/bb-prover": "0.0.1-commit.9a89641",
+    "@aztec/bb.js": "6.0.0-nightly.20260807",
+    "@aztec/constants": "0.0.1-commit.9a89641",
+    "@aztec/foundation": "0.0.1-commit.9a89641",
+    "@aztec/key-store": "0.0.1-commit.9a89641",
+    "@aztec/kv-store": "0.0.1-commit.9a89641",
+    "@aztec/protocol-contracts": "0.0.1-commit.9a89641",
+    "@aztec/pxe": "0.0.1-commit.9a89641",
+    "@aztec/simulator": "0.0.1-commit.9a89641",
+    "@aztec/standard-contracts": "0.0.1-commit.9a89641",
+    "@aztec/stdlib": "0.0.1-commit.9a89641",
+    "@aztec/world-state": "0.0.1-commit.9a89641",
     "msgpackr": "^1.11.2",
     "zod": "^4"
   },

package/src/bin/check_txe_oracle_version.ts

@@ -1,35 +1,29 @@
 import { keccak256String } from '@aztec/foundation/crypto/keccak';
-import { getOracleInterfaceSignature } from '@aztec/pxe/bin';
+import { getOracleRegistrySignature } from '@aztec/pxe/bin';
+import { ORACLE_REGISTRY, type OracleRegistryEntry } from '@aztec/pxe/simulator';
 
-import { dirname, join } from 'path';
-import { fileURLToPath } from 'url';
-
-import { TXE_ORACLE_INTERFACE_HASH } from '../txe_oracle_version.js';
+import { TXE_ORACLE_REGISTRY } from '../oracle/txe_oracle_registry.js';
+import { TXE_ORACLE_INTERFACE_HASH } from '../oracle/txe_oracle_version.js';
 
 /**
  * Verifies that the TXE oracle interfaces match the expected interface hash.
  *
  * The TXE oracle interfaces need to be versioned to ensure compatibility between Aztec.nr tests and TXE. This function
- * computes a hash of the TXE oracle interfaces and compares it against a known hash. If they don't match, it means an
+ * computes a hash of the TXE-specific entries in `TXE_ORACLE_REGISTRY` (the shared PXE entries are covered by the PXE
+ * oracle version check) and compares it against a known hash. If they don't match, it means an
  * interface has changed and the TXE oracle version needs to be bumped:
  *   - If the change is backward-breaking (e.g. removing/renaming an oracle), bump TXE_ORACLE_VERSION_MAJOR.
  *   - If the change is an oracle addition (non-breaking), bump TXE_ORACLE_VERSION_MINOR.
  */
 function assertTxeOracleInterfaceMatches(): void {
-  const currentDir = dirname(fileURLToPath(import.meta.url));
-  const packageRoot = dirname(dirname(currentDir));
-  const interfacesSourcePath = join(packageRoot, 'src/oracle/interfaces.ts');
-
-  const targets = ['IAvmExecutionOracle', 'ITxeExecutionOracle'];
-  // Not an oracle foreign call handler (see TODO(F-335) in interfaces.ts).
-  const excludedMembers = ['syncContractNonOracleMethod'];
-
-  const txeOracleInterfaceSignature = getOracleInterfaceSignature(interfacesSourcePath, targets, excludedMembers);
+  const txeOnlyEntries: Record<string, OracleRegistryEntry> = Object.fromEntries(
+    Object.entries(TXE_ORACLE_REGISTRY).filter(([name]) => !(name in ORACLE_REGISTRY)),
+  );
 
-  const txeOracleInterfaceHash = keccak256String(txeOracleInterfaceSignature);
+  const txeOracleInterfaceHash = keccak256String(getOracleRegistrySignature(txeOnlyEntries));
   if (txeOracleInterfaceHash !== TXE_ORACLE_INTERFACE_HASH) {
     throw new Error(
-      `The TXE oracle interface has changed. Update TXE_ORACLE_INTERFACE_HASH to ${txeOracleInterfaceHash} in txe/src/txe_oracle_version.ts and bump the TXE oracle version (TXE_ORACLE_VERSION_MAJOR for breaking changes, TXE_ORACLE_VERSION_MINOR for oracle additions).`,
+      `The TXE oracle interface has changed. Update TXE_ORACLE_INTERFACE_HASH to ${txeOracleInterfaceHash} in txe/src/oracle/txe_oracle_version.ts and bump the TXE oracle version (TXE_ORACLE_VERSION_MAJOR for breaking changes, TXE_ORACLE_VERSION_MINOR for oracle additions).`,
     );
   }
 }

package/src/bin/oracle_test_server.ts

@@ -0,0 +1,51 @@
+#!/usr/bin/env -S node --no-warnings
+import { createLogger } from '@aztec/aztec.js/log';
+import { startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
+
+import { createOracleTestRpcServer } from '../oracle/test-resolver/index.js';
+
+/**
+ * Starts an HTTP RPC server that resolves oracle foreign calls using auto-synthesized fixture scenarios. Used by
+ * `nargo test --oracle-resolver` to run `#[generate_oracle_tests]` serialization tests against a dedicated resolver.
+ * Logs fixture coverage on shutdown.
+ */
+async function main() {
+  const { ORACLE_TEST_PORT = 14830 } = process.env;
+
+  const logger = createLogger('txe:oracle-test');
+
+  logger.info('Setting up oracle test resolver...');
+  const { server, resolver } = createOracleTestRpcServer(logger);
+
+  function logCoverageAndExit() {
+    const uncalled = resolver.getUncalledFixtures();
+    const missing = resolver.getMissingFixtures();
+    if (uncalled.length > 0) {
+      logger.warn(`Fixtures never called by any test: ${uncalled.join(', ')}`);
+    }
+    if (missing.length > 0) {
+      logger.debug(`Oracles with no fixture defined: ${missing.join(', ')}`);
+    }
+    if (uncalled.length === 0) {
+      logger.info('All fixture oracles were called.');
+    }
+    process.exit(0);
+  }
+
+  process.on('SIGTERM', logCoverageAndExit);
+  process.on('SIGINT', logCoverageAndExit);
+
+  const { port } = await startHttpRpcServer(server, {
+    host: '127.0.0.1',
+    port: ORACLE_TEST_PORT,
+    timeoutMs: 1e3 * 60 * 5,
+  });
+
+  logger.info(`Oracle test resolver listening on port ${port}`);
+}
+
+main().catch(err => {
+  // eslint-disable-next-line no-console
+  console.error(err);
+  process.exit(1);
+});

package/src/constants.ts

@@ -1,9 +1,13 @@
 import { PRIVATE_LOG_CIPHERTEXT_LEN } from '@aztec/constants';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 
-export const DEFAULT_ADDRESS = AztecAddress.fromNumber(42);
+export const DEFAULT_ADDRESS = AztecAddress.fromNumberUnsafe(42);
+
+// This is MAX_MESSAGE_CONTENT_LEN - PRIVATE_EVENT_MSG_PLAINTEXT_RESERVED_FIELDS_LEN
+export const MAX_PRIVATE_EVENT_LEN = 10;
+export const MAX_PRIVATE_EVENTS_PER_TXE_QUERY = 5;
 
 // Arbitrarily set at 64 because we need a bound. Nothing inherent about it.
 export const MAX_OFFCHAIN_EFFECTS_PER_TXE_QUERY = 64;
-// Must match MAX_OFFCHAIN_EFFECT_LEN in noir-projects/aztec-nr/aztec/src/test/helpers/txe_oracles.nr.
+// Must match MAX_OFFCHAIN_EFFECT_LEN in noir-projects/labs/aztec-nr/aztec/src/test/helpers/txe_oracles.nr.
 export const MAX_OFFCHAIN_EFFECT_LEN = 2 + PRIVATE_LOG_CIPHERTEXT_LEN;

package/src/dispatcher_pool.ts

@@ -4,7 +4,8 @@ import type { Logger } from '@aztec/foundation/log';
 import { openEphemeralStore } from '@aztec/kv-store/lmdb-v2';
 import { LazyProtocolContractsProvider } from '@aztec/protocol-contracts/providers/lazy';
 import { ContractStore } from '@aztec/pxe/client/lazy';
-import { getStandardAuthRegistry } from '@aztec/standard-contracts/auth-registry';
+import { getStandardAuthRegistry } from '@aztec/standard-contracts/auth-registry/lazy';
+import { getStandardHandshakeRegistry } from '@aztec/standard-contracts/handshake-registry/lazy';
 import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
 
 import { existsSync } from 'node:fs';
@@ -21,7 +22,7 @@ void BarretenbergSync.initSingleton({ backend: BackendType.Wasm });
 
 /**
  * Opens a fresh LMDB in a tmp dir and writes the protocol contracts in
- * {@link TXE_REQUIRED_PROTOCOL_CONTRACTS} plus the standard AuthRegistry and the SchnorrAccount artifact,
+ * {@link TXE_REQUIRED_PROTOCOL_CONTRACTS} plus the standard AuthRegistry, HandshakeRegistry, and the SchnorrAccount artifact,
  * returning the directory path and the SchnorrAccount class id (hex). The store handle is intentionally kept
  * alive: closing it would trigger the ephemeral-store cleanup hook and remove the tmp
  * directory, so any worker that has not yet cloned would find it missing.
@@ -33,7 +34,7 @@ export async function buildSharedContractStore(): Promise<{ dataDir: string; sch
   const provider = new LazyProtocolContractsProvider();
   const [protocolContracts, standardContracts, schnorrArtifact] = await Promise.all([
     Promise.all(TXE_REQUIRED_PROTOCOL_CONTRACTS.map(name => provider.getProtocolContractArtifact(name))),
-    Promise.all([getStandardAuthRegistry()]),
+    Promise.all([getStandardAuthRegistry(), getStandardHandshakeRegistry()]),
     getSchnorrAccountContractArtifact(),
   ]);
   const schnorrClass = await getContractClassFromArtifact(schnorrArtifact);