@aztec/aztec 5.0.0-private.20260319 → 5.0.0-rc.1

package/dest/cli/cmds/start_prover_agent.js

@@ -1,15 +1,15 @@
 import { times } from '@aztec/foundation/collection';
 import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
 import { buildServerCircuitProver } from '@aztec/prover-client';
-import { ProvingAgent, createProofStore, createProvingJobBrokerClient, proverAgentConfigMappings } from '@aztec/prover-client/broker';
+import { ProvingAgent, createProofStore, createProvingJobBrokerClient, proverAgentConfigMappings, proverBrokerBackoff } from '@aztec/prover-client/broker';
 import { getProverNodeAgentConfigFromEnv } from '@aztec/prover-node';
 import { ProverAgentApiSchema } from '@aztec/stdlib/interfaces/server';
 import { initTelemetryClient, makeTracedFetch, telemetryClientConfigMappings } from '@aztec/telemetry-client';
 import { extractRelevantOptions, preloadCrsDataForServerSideProving } from '../util.js';
 import { getVersions } from '../versioning.js';
 export async function startProverAgent(options, signalHandlers, services, userLog) {
-    if (options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
-        userLog(`Starting a prover agent with --node, --sequencer, --pxe, --p2p-bootstrap, or --txe is not supported.`);
+    if (options.node || options.sequencer || options.p2pBootstrap || options.txe) {
+        userLog(`Starting a prover agent with --node, --sequencer, --p2p-bootstrap, or --txe is not supported.`);
         process.exit(1);
     }
     const config = {
@@ -25,20 +25,8 @@ export async function startProverAgent(options, signalHandlers, services, userLo
         process.exit(1);
     }
     await preloadCrsDataForServerSideProving(config, userLog);
-    const fetch = makeTracedFetch(// retry connections every 3s, up to 30s before giving up
-    [
-        1,
-        2,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3
-    ], false, makeUndiciFetch(new Agent({
+    // Retry indefinitely until the epoch proving times out and the chain reorgs
+    const fetch = makeTracedFetch(proverBrokerBackoff, false, makeUndiciFetch(new Agent({
         connections: 10
     })));
     const broker = createProvingJobBrokerClient(config.proverBrokerUrl, getVersions(), fetch);

package/dest/cli/cmds/start_prover_broker.d.ts

@@ -6,4 +6,4 @@ export declare function startProverBroker(options: any, signalHandlers: (() => P
     broker: ProvingJobBroker;
     config: ProverBrokerConfig;
 }>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfcHJvdmVyX2Jyb2tlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X3Byb3Zlcl9icm9rZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUMvRSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUduRCxPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFLeEIsTUFBTSw2QkFBNkIsQ0FBQztBQUVyQyxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBTXhFLHdCQUFzQixpQkFBaUIsQ0FDckMsT0FBTyxFQUFFLEdBQUcsRUFDWixjQUFjLEVBQUUsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQ3ZDLFFBQVEsRUFBRSxxQkFBcUIsRUFDL0IsT0FBTyxFQUFFLEtBQUssR0FDYixPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsZ0JBQWdCLENBQUM7SUFBQyxNQUFNLEVBQUUsa0JBQWtCLENBQUE7Q0FBRSxDQUFDLENBNENuRSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfcHJvdmVyX2Jyb2tlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X3Byb3Zlcl9icm9rZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUMvRSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUduRCxPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFLeEIsTUFBTSw2QkFBNkIsQ0FBQztBQUVyQyxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBTXhFLHdCQUFzQixpQkFBaUIsQ0FDckMsT0FBTyxFQUFFLEdBQUcsRUFDWixjQUFjLEVBQUUsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQ3ZDLFFBQVEsRUFBRSxxQkFBcUIsRUFDL0IsT0FBTyxFQUFFLEtBQUssR0FDYixPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsZ0JBQWdCLENBQUM7SUFBQyxNQUFNLEVBQUUsa0JBQWtCLENBQUE7Q0FBRSxDQUFDLENBMkNuRSJ9

package/dest/cli/cmds/start_prover_broker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_prover_broker.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_broker.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAMxE,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,kBAAkB,CAAA;CAAE,CAAC,CA4CnE"}
+{"version":3,"file":"start_prover_broker.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_broker.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAMxE,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,kBAAkB,CAAA;CAAE,CAAC,CA2CnE"}

package/dest/cli/cmds/start_prover_broker.js

@@ -8,27 +8,30 @@ import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } fro
 import { extractRelevantOptions } from '../util.js';
 import { computeExpectedGenesisRoot, waitForCompatibleRollup } from './standby.js';
 export async function startProverBroker(options, signalHandlers, services, userLog) {
-    if (options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
-        userLog(`Starting a prover broker with --node, --sequencer, --pxe, --p2p-bootstrap, or --txe is not supported.`);
+    if (options.node || options.sequencer || options.p2pBootstrap || options.txe) {
+        userLog(`Starting a prover broker with --node, --sequencer, --p2p-bootstrap, or --txe is not supported.`);
         process.exit(1);
     }
-    const config = {
+    const baseConfig = {
         ...getProverNodeBrokerConfigFromEnv(),
         ...extractRelevantOptions(options, proverBrokerConfigMappings, 'proverBroker')
     };
-    if (!config.l1Contracts.registryAddress || config.l1Contracts.registryAddress.isZero()) {
+    if (!baseConfig.registryAddress || baseConfig.registryAddress.isZero()) {
         throw new Error('L1 registry address is required to start Aztec Node without --deploy-aztec-contracts option');
     }
     const genesisConfig = getGenesisStateConfigEnvVars();
     const { genesisArchiveRoot } = await computeExpectedGenesisRoot(genesisConfig, userLog);
-    await waitForCompatibleRollup(config, {
+    await waitForCompatibleRollup(baseConfig, {
         genesisArchiveRoot,
         vkTreeRoot: getVKTreeRoot(),
         protocolContractsHash
     }, options.port, userLog);
-    const { addresses, config: rollupConfig } = await getL1Config(config.l1Contracts.registryAddress, config.l1RpcUrls, config.l1ChainId, config.rollupVersion);
-    config.l1Contracts = addresses;
-    config.rollupVersion = rollupConfig.rollupVersion;
+    const { addresses, config: rollupConfig } = await getL1Config(baseConfig.registryAddress, baseConfig.l1RpcUrls, baseConfig.l1ChainId, baseConfig.rollupVersion);
+    const config = {
+        ...baseConfig,
+        ...addresses,
+        rollupVersion: rollupConfig.rollupVersion
+    };
     const client = await initTelemetryClient(getTelemetryClientConfig());
     const broker = await createAndStartProvingBroker(config, client);
     services.proverBroker = [

package/dest/cli/cmds/start_txe.d.ts

@@ -1,3 +1,3 @@
 import type { Logger } from '@aztec/foundation/log';
-export declare function startTXE(options: any, debugLogger: Logger): Promise<void>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfdHhlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2NtZHMvc3RhcnRfdHhlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3BELHdCQUFzQixRQUFRLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxXQUFXLEVBQUUsTUFBTSxpQkFVL0QifQ==
+export declare function startTXE(options: any, signalHandlers: Array<() => Promise<void>>, debugLogger: Logger): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfdHhlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2NtZHMvc3RhcnRfdHhlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3BELHdCQUFzQixRQUFRLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxjQUFjLEVBQUUsS0FBSyxDQUFDLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBWTNHIn0=

package/dest/cli/cmds/start_txe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_txe.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_txe.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,wBAAsB,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,iBAU/D"}
+{"version":3,"file":"start_txe.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_txe.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,wBAAsB,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,iBAY3G"}

package/dest/cli/cmds/start_txe.js

@@ -1,11 +1,12 @@
 import { startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
-import { createTXERpcServer } from '@aztec/txe';
-export async function startTXE(options, debugLogger) {
+import { createTXERpcServer } from '@aztec/txe/server';
+export async function startTXE(options, signalHandlers, debugLogger) {
     debugLogger.info(`Setting up TXE...`);
-    const txeServer = createTXERpcServer(debugLogger);
-    const { port } = await startHttpRpcServer(txeServer, {
+    const txeServer = await createTXERpcServer(debugLogger);
+    const httpServer = await startHttpRpcServer(txeServer, {
         port: options.port,
         timeoutMs: 1e3 * 60 * 5
     });
-    debugLogger.info(`TXE listening on port ${port}`);
+    signalHandlers.push(()=>new Promise((resolve)=>httpServer.close(()=>resolve())));
+    debugLogger.info(`TXE listening on port ${httpServer.port}`);
 }

package/dest/cli/cmds/utils/collect_crate_dirs.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Recursively collects crate directories starting from startCrateDir by following dependencies declared in Nargo.toml
+ * files.
+ *
+ * When `skipGitDeps` is false (default), git-based deps are followed and fetched into the nargo cache
+ * (`$HOME/nargo/<domain>/<repo-path>/<tag>`) if not already present.
+ *
+ * When `skipGitDeps` is true, git-based deps are ignored entirely.
+ */
+export declare function collectCrateDirs(startCrateDir: string, opts?: {
+    skipGitDeps?: boolean;
+}): Promise<string[]>;
+/**
+ * Computes the local nargo cache path for a git dependency, mirroring nargo's own `git_dep_location` function.
+ * Path format: `$HOME/nargo/<domain>/<repo-path>/<tag>`
+ * e.g. `~/nargo/github.com/AztecProtocol/aztec-packages/v0.82.0`
+ *
+ * Source: noir/noir-repo/tooling/nargo_toml/src/git.rs
+ */
+export declare function nargoGitDepPath(gitUrl: string, tag: string): string;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdF9jcmF0ZV9kaXJzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY2xpL2NtZHMvdXRpbHMvY29sbGVjdF9jcmF0ZV9kaXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVFBOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLGdCQUFnQixDQUFDLGFBQWEsRUFBRSxNQUFNLEVBQUUsSUFBSSxDQUFDLEVBQUU7SUFBRSxXQUFXLENBQUMsRUFBRSxPQUFPLENBQUE7Q0FBRSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQWlFakg7QUFFRDs7Ozs7O0dBTUc7QUFDSCx3QkFBZ0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLE1BQU0sR0FBRyxNQUFNLENBS25FIn0=

package/dest/cli/cmds/utils/collect_crate_dirs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"collect_crate_dirs.d.ts","sourceRoot":"","sources":["../../../../src/cli/cmds/utils/collect_crate_dirs.ts"],"names":[],"mappings":"AAQA;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAiEjH;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAKnE"}

package/dest/cli/cmds/utils/collect_crate_dirs.js

@@ -0,0 +1,114 @@
+import TOML from '@iarna/toml';
+import { existsSync } from 'fs';
+import { mkdir, readFile, stat } from 'fs/promises';
+import { homedir } from 'os';
+import { dirname, join, resolve } from 'path';
+import { run } from './spawn.js';
+/**
+ * Recursively collects crate directories starting from startCrateDir by following dependencies declared in Nargo.toml
+ * files.
+ *
+ * When `skipGitDeps` is false (default), git-based deps are followed and fetched into the nargo cache
+ * (`$HOME/nargo/<domain>/<repo-path>/<tag>`) if not already present.
+ *
+ * When `skipGitDeps` is true, git-based deps are ignored entirely.
+ */ export async function collectCrateDirs(startCrateDir, opts) {
+    const { skipGitDeps = false } = opts ?? {};
+    const visited = new Set();
+    async function visit(crateDir) {
+        const absDir = resolve(crateDir);
+        if (visited.has(absDir)) {
+            return;
+        }
+        visited.add(absDir);
+        const tomlPath = join(absDir, 'Nargo.toml');
+        const content = await readFile(tomlPath, 'utf-8').catch(()=>{
+            throw new Error(`Incorrectly defined dependency. Nargo.toml not found in ${absDir}`);
+        });
+        const parsed = TOML.parse(content);
+        const members = parsed.workspace?.members;
+        // A Nargo.toml is either a workspace root (has workspace.members) or a single crate (has dependencies).
+        if (Array.isArray(members)) {
+            // The crate is a workspace root and has members defined so we visit the members
+            for (const member of members){
+                await visit(resolve(absDir, member));
+            }
+        } else {
+            // Single crate — follow its deps
+            const deps = parsed.dependencies ?? {};
+            for (const dep of Object.values(deps)){
+                if (!dep || typeof dep !== 'object') {
+                    continue;
+                }
+                if (typeof dep.path === 'string') {
+                    // Dependency contains "path" hence it's a local dependency. We just check it's a real directory and then we
+                    // recursively search through it
+                    const depPath = resolve(absDir, dep.path);
+                    const s = await stat(depPath);
+                    if (!s.isDirectory()) {
+                        throw new Error(`Dependency path "${dep.path}" in ${tomlPath} resolves to ${depPath} which is not a directory`);
+                    }
+                    await visit(depPath);
+                } else if (!skipGitDeps && typeof dep.git === 'string' && typeof dep.tag === 'string') {
+                    // Dependency contains "git" hence it's a git dependency. We ensure it has been fetched and fetch it if
+                    // it's not the case and then we recursively search through it.
+                    await fetchAndVisit(dep.git, dep.tag, dep.directory);
+                }
+            }
+        }
+    }
+    async function fetchAndVisit(gitUrl, tag, directory) {
+        // `directory` is set when the dep lives in a subdirectory of a repository, e.g.:
+        //   aztec = { git = "https://github.com/AztecProtocol/aztec-packages", tag = "v0.82.0",
+        //             directory = "noir-projects/aztec-nr/aztec" }
+        // In that case nargo clones the whole repo and the crate root is <cachePath>/<directory>.
+        const cachePath = nargoGitDepPath(gitUrl, tag);
+        const crateDir = directory ? join(cachePath, directory) : cachePath;
+        await ensureGitDepCached(gitUrl, tag, cachePath);
+        await visit(crateDir);
+    }
+    await visit(startCrateDir);
+    return [
+        ...visited
+    ];
+}
+/**
+ * Computes the local nargo cache path for a git dependency, mirroring nargo's own `git_dep_location` function.
+ * Path format: `$HOME/nargo/<domain>/<repo-path>/<tag>`
+ * e.g. `~/nargo/github.com/AztecProtocol/aztec-packages/v0.82.0`
+ *
+ * Source: noir/noir-repo/tooling/nargo_toml/src/git.rs
+ */ export function nargoGitDepPath(gitUrl, tag) {
+    const url = new URL(gitUrl);
+    const domain = url.hostname;
+    const repoPath = url.pathname.replace(/^\//, '');
+    return join(process.env.HOME ?? homedir(), 'nargo', domain, repoPath, tag);
+}
+/**
+ * Ensures a git dep is present in the nargo cache, cloning it if it isn't. Mirrors nargo's `clone_git_repo`.
+ * If cloning fails (e.g. no network), throws with a message suggesting `nargo check` to prime the cache.
+ *
+ * Source: noir/noir-repo/tooling/nargo_toml/src/git.rs
+ */ async function ensureGitDepCached(gitUrl, tag, cachePath) {
+    if (existsSync(cachePath)) {
+        return;
+    }
+    await mkdir(dirname(cachePath), {
+        recursive: true
+    });
+    try {
+        await run('git', [
+            '-c',
+            'advice.detachedHead=false',
+            'clone',
+            '--depth',
+            '1',
+            '--branch',
+            tag,
+            gitUrl,
+            cachePath
+        ]);
+    } catch (err) {
+        throw new Error(`Failed to fetch git dependency ${gitUrl}@${tag}: ${err?.message ?? err}.\n` + `Try running \`nargo check\` first to prime the dependency cache.`);
+    }
+}

package/dest/cli/cmds/utils/needs_recompile.d.ts

@@ -7,4 +7,4 @@
  * Note: The above implies that if there is a random json file in the target dir we would be always recompiling.
  */
 export declare function needsRecompile(): Promise<boolean>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmVlZHNfcmVjb21waWxlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY2xpL2NtZHMvdXRpbHMvbmVlZHNfcmVjb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBOzs7Ozs7O0dBT0c7QUFDSCx3QkFBc0IsY0FBYyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FRdkQifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmVlZHNfcmVjb21waWxlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY2xpL2NtZHMvdXRpbHMvbmVlZHNfcmVjb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBOzs7Ozs7O0dBT0c7QUFDSCx3QkFBc0IsY0FBYyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FXdkQifQ==

package/dest/cli/cmds/utils/needs_recompile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"needs_recompile.d.ts","sourceRoot":"","sources":["../../../../src/cli/cmds/utils/needs_recompile.ts"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAQvD"}
+{"version":3,"file":"needs_recompile.d.ts","sourceRoot":"","sources":["../../../../src/cli/cmds/utils/needs_recompile.ts"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAWvD"}

package/dest/cli/cmds/utils/needs_recompile.js

@@ -1,6 +1,6 @@
-import TOML from '@iarna/toml';
-import { readFile, readdir, stat } from 'fs/promises';
-import { join, resolve } from 'path';
+import { readdir, stat } from 'fs/promises';
+import { join } from 'path';
+import { collectCrateDirs } from './collect_crate_dirs.js';
 /**
  * Returns true if recompilation is needed: either no artifacts exist in target/ or any .nr or Nargo.toml source file
  * (including path-based dependencies) is newer than the oldest artifact. We compare against the oldest artifact so
@@ -13,7 +13,12 @@ import { join, resolve } from 'path';
     if (oldestArtifactMs === undefined) {
         return true;
     }
-    const crateDirs = await collectCrateDirs('.');
+    // Git deps are pinned to a specific tag in Nargo.toml and nargo always fetches an exact tag, so their contents never
+    // change without Nargo.toml itself changing — and Nargo.toml is already tracked as a source file. Hence we can
+    // safely ignore checking source files of git deps.
+    const crateDirs = await collectCrateDirs('.', {
+        skipGitDeps: true
+    });
     return hasNewerSourceFile(crateDirs, oldestArtifactMs);
 }
 /**
@@ -41,55 +46,6 @@ import { join, resolve } from 'path';
     }
     return oldest;
 }
-/**
- * Recursively collects crate directories starting from startCrateDir by following path-based dependencies declared in
- * Nargo.toml files. Git-based deps are ignored (they only change when Nargo.toml itself is modified since the deps are
- * tagged).
- */ async function collectCrateDirs(startCrateDir) {
-    // We have a set of visited dirs we check against when entering a new dir because we could stumble upon a directory
-    // multiple times in case multiple deps shared a dep (e.g. dep A and dep B both sharing dep C).
-    const visited = new Set();
-    async function visit(crateDir) {
-        const absDir = resolve(crateDir);
-        if (visited.has(absDir)) {
-            return;
-        }
-        visited.add(absDir);
-        // Every dep is its own crate and every crate needs to have Nargo.toml defined in the root so we try to load it and
-        // error out if it's not the case.
-        const tomlPath = join(absDir, 'Nargo.toml');
-        const content = await readFile(tomlPath, 'utf-8').catch(()=>{
-            throw new Error(`Incorrectly defined dependency. Nargo.toml not found in ${absDir}`);
-        });
-        const parsed = TOML.parse(content);
-        const members = parsed.workspace?.members;
-        // A Nargo.toml is either a workspace root (has workspace.members) or a single crate (has dependencies).
-        if (Array.isArray(members)) {
-            // The crate is a workspace root and has members defined so we visit the members
-            for (const member of members){
-                const memberPath = resolve(absDir, member);
-                await visit(memberPath);
-            }
-        } else {
-            // The crate is not a workspace root so we check for dependencies
-            const deps = parsed.dependencies ?? {};
-            for (const dep of Object.values(deps)){
-                if (dep && typeof dep === 'object' && typeof dep.path === 'string') {
-                    const depPath = resolve(absDir, dep.path);
-                    const s = await stat(depPath);
-                    if (!s.isDirectory()) {
-                        throw new Error(`Dependency path "${dep.path}" in ${tomlPath} resolves to ${depPath} which is not a directory`);
-                    }
-                    await visit(depPath);
-                }
-            }
-        }
-    }
-    await visit(startCrateDir);
-    return [
-        ...visited
-    ];
-}
 /**
  * Walks crate dirs looking for .nr and Nargo.toml files newer than thresholdMs. Short-circuits on the first match.
  */ async function hasNewerSourceFile(crateDirs, thresholdMs) {

package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts

@@ -0,0 +1,4 @@
+import type { LogFn } from '@aztec/foundation/log';
+/** Warns if any aztec-nr git dependency in a crate's Nargo.toml has a tag that doesn't match the CLI version. */
+export declare function warnIfAztecVersionMismatch(log: LogFn, cliVersion?: string): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2Fybl9pZl9henRlY192ZXJzaW9uX21pc21hdGNoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY2xpL2NtZHMvdXRpbHMvd2Fybl9pZl9henRlY192ZXJzaW9uX21pc21hdGNoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBMkJuRCxpSEFBaUg7QUFDakgsd0JBQXNCLDBCQUEwQixDQUFDLEdBQUcsRUFBRSxLQUFLLEVBQUUsVUFBVSxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0ErQy9GIn0=

package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"warn_if_aztec_version_mismatch.d.ts","sourceRoot":"","sources":["../../../../src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AA2BnD,iHAAiH;AACjH,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+C/F"}

package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.js

@@ -0,0 +1,61 @@
+import { DEV_VERSION, getPackageVersion } from '@aztec/stdlib/update-checker';
+import TOML from '@iarna/toml';
+import { readFile } from 'fs/promises';
+import { join } from 'path';
+import { collectCrateDirs } from './collect_crate_dirs.js';
+/** Returns true if the given git URL points to the AztecProtocol/aztec-nr repository. */ function isAztecNrGitUrl(gitUrl) {
+    let url;
+    try {
+        url = new URL(gitUrl);
+    } catch  {
+        return false;
+    }
+    if (url.hostname !== 'github.com') {
+        return false;
+    }
+    const repoPath = url.pathname.replace(/^\//, '').replace(/\.git$/, '').replace(/\/$/, '');
+    return repoPath === 'AztecProtocol/aztec-nr';
+}
+/** Warns if any aztec-nr git dependency in a crate's Nargo.toml has a tag that doesn't match the CLI version. */ export async function warnIfAztecVersionMismatch(log, cliVersion) {
+    const version = cliVersion ?? getPackageVersion();
+    if (version === DEV_VERSION) {
+        return;
+    }
+    const expectedTag = `v${version}`;
+    const mismatches = [];
+    const crateDirs = await collectCrateDirs('.', {
+        skipGitDeps: true
+    });
+    for (const dir of crateDirs){
+        const tomlPath = join(dir, 'Nargo.toml');
+        let content;
+        try {
+            content = await readFile(tomlPath, 'utf-8');
+        } catch  {
+            continue;
+        }
+        const parsed = TOML.parse(content);
+        const deps = parsed.dependencies ?? {};
+        for (const [depName, dep] of Object.entries(deps)){
+            // Skip non-object deps (e.g. malformed entries) and anything that isn't a tagged git dep.
+            if (!dep || typeof dep !== 'object' || typeof dep.git !== 'string' || typeof dep.tag !== 'string') {
+                continue;
+            }
+            // Only flag deps that are sourced from the aztec-nr repo.
+            if (!isAztecNrGitUrl(dep.git)) {
+                continue;
+            }
+            if (dep.tag !== expectedTag) {
+                mismatches.push({
+                    file: tomlPath,
+                    depName,
+                    tag: dep.tag
+                });
+            }
+        }
+    }
+    if (mismatches.length > 0) {
+        const details = mismatches.map((m)=>`  ${m.file} — ${m.depName} (${m.tag})`).join('\n');
+        log(`WARNING: Aztec dependency version mismatch detected.\n` + `The following aztec-nr dependencies do not match the CLI version (${expectedTag}):\n` + `${details}\n\n` + `See https://docs.aztec.network/errors/9 for how to update your dependencies.`);
+    }
+}

package/dest/cli/util.js

@@ -80,10 +80,12 @@ export const installSignalHandlers = (logFn, cb)=>{
             accountLogStrings.push(` Address: ${completeAddress.address.toString()}\n`);
             accountLogStrings.push(` Partial Address: ${completeAddress.partialAddress.toString()}\n`);
             accountLogStrings.push(` Secret Key: ${account.getSecretKey().toString()}\n`);
-            accountLogStrings.push(` Master nullifier public key: ${completeAddress.publicKeys.masterNullifierPublicKey.toString()}\n`);
-            accountLogStrings.push(` Master incoming viewing public key: ${completeAddress.publicKeys.masterIncomingViewingPublicKey.toString()}\n\n`);
-            accountLogStrings.push(` Master outgoing viewing public key: ${completeAddress.publicKeys.masterOutgoingViewingPublicKey.toString()}\n\n`);
-            accountLogStrings.push(` Master tagging public key: ${completeAddress.publicKeys.masterTaggingPublicKey.toString()}\n\n`);
+            accountLogStrings.push(` Master nullifier public key hash: ${completeAddress.publicKeys.npkMHash.toString()}\n`);
+            accountLogStrings.push(` Master incoming viewing public key: ${completeAddress.publicKeys.ivpkM.toString()}\n\n`);
+            accountLogStrings.push(` Master outgoing viewing public key hash: ${completeAddress.publicKeys.ovpkMHash.toString()}\n\n`);
+            accountLogStrings.push(` Master tagging public key hash: ${completeAddress.publicKeys.tpkMHash.toString()}\n\n`);
+            accountLogStrings.push(` Master message-signing public key hash: ${completeAddress.publicKeys.mspkMHash.toString()}\n\n`);
+            accountLogStrings.push(` Master fallback public key hash: ${completeAddress.publicKeys.fbpkMHash.toString()}\n\n`);
         }
     }
     return accountLogStrings;
@@ -250,7 +252,7 @@ export async function setupVersionChecker(network, followsCanonicalRollup, publi
     const checks = [];
     checks.push({
         name: 'node',
-        currentVersion: getPackageVersion() ?? 'unknown',
+        currentVersion: getPackageVersion(),
         getLatestVersion: async ()=>{
             const cfg = await getNetworkConfig(network, cacheDir);
             return cfg?.nodeVersion;

package/dest/examples/token.js

@@ -13,10 +13,10 @@ const TRANSFER_AMOUNT = 33n;
  */ async function main() {
     logger.info('Running token contract test on HTTP interface.');
     const wallet = await EmbeddedWallet.create(node);
-    // During local network setup we deploy a few accounts. Below we add them to our wallet.
+    // During local network setup we create a few initializerless accounts. Below we add them to our wallet.
     const [aliceInitialAccountData, bobInitialAccountData] = await getInitialTestAccountsData();
-    await wallet.createSchnorrAccount(aliceInitialAccountData.secret, aliceInitialAccountData.salt);
-    await wallet.createSchnorrAccount(bobInitialAccountData.secret, bobInitialAccountData.salt);
+    await wallet.createSchnorrInitializerlessAccount(aliceInitialAccountData.secret, aliceInitialAccountData.salt);
+    await wallet.createSchnorrInitializerlessAccount(bobInitialAccountData.secret, bobInitialAccountData.salt);
     const alice = aliceInitialAccountData.address;
     const bob = bobInitialAccountData.address;
     logger.info(`Fetched Alice and Bob accounts: ${alice.toString()}, ${bob.toString()}`);

package/dest/local-network/auth_registry.d.ts

@@ -0,0 +1,5 @@
+import type { WaitOpts } from '@aztec/aztec.js/contracts';
+import type { Wallet } from '@aztec/aztec.js/wallet';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+export declare function publishStandardAuthRegistry(wallet: Wallet, from: AztecAddress, waitOpts?: WaitOpts): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aF9yZWdpc3RyeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvYXV0aF9yZWdpc3RyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUUxRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVyRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVoRSx3QkFBc0IsMkJBQTJCLENBQy9DLE1BQU0sRUFBRSxNQUFNLEVBQ2QsSUFBSSxFQUFFLFlBQVksRUFDbEIsUUFBUSxDQUFDLEVBQUUsUUFBUSxHQUNsQixPQUFPLENBQUMsSUFBSSxDQUFDLENBUWYifQ==

package/dest/local-network/auth_registry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth_registry.d.ts","sourceRoot":"","sources":["../../src/local-network/auth_registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAE1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,YAAY,EAClB,QAAQ,CAAC,EAAE,QAAQ,GAClB,OAAO,CAAC,IAAI,CAAC,CAQf"}

package/dest/local-network/auth_registry.js

@@ -0,0 +1,17 @@
+import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
+import { AuthRegistryArtifact, getStandardAuthRegistry } from '@aztec/standard-contracts/auth-registry';
+export async function publishStandardAuthRegistry(wallet, from, waitOpts) {
+    const { instance, contractClass } = await getStandardAuthRegistry();
+    if (!(await wallet.getContractClassMetadata(contractClass.id)).isContractClassPubliclyRegistered) {
+        await (await publishContractClass(wallet, AuthRegistryArtifact)).send({
+            from,
+            wait: waitOpts
+        });
+    }
+    if (!(await wallet.getContractMetadata(instance.address)).isContractPublished) {
+        await publishInstance(wallet, instance).send({
+            from,
+            wait: waitOpts
+        });
+    }
+}

package/dest/local-network/banana_fpc.d.ts

@@ -1,10 +1,11 @@
 import { type InitialAccountData } from '@aztec/accounts/testing';
+import type { WaitOpts } from '@aztec/aztec.js/contracts';
 import type { Wallet } from '@aztec/aztec.js/wallet';
 import type { LogFn } from '@aztec/foundation/log';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 export declare function getBananaCoinAddress(initialAccounts: InitialAccountData[]): Promise<AztecAddress>;
 export declare function getBananaFPCAddress(initialAccounts: InitialAccountData[]): Promise<AztecAddress>;
-export declare function setupBananaFPC(initialAccounts: InitialAccountData[], wallet: Wallet, log: LogFn): Promise<void>;
+export declare function setupBananaFPC(initialAccounts: InitialAccountData[], wallet: Wallet, log: LogFn, waitOpts?: WaitOpts): Promise<void>;
 export declare function registerDeployedBananaCoinInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress>;
 export declare function registerDeployedBananaFPCInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFuYW5hX2ZwYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvYmFuYW5hX2ZwYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxrQkFBa0IsRUFBOEIsTUFBTSx5QkFBeUIsQ0FBQztBQUM5RixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVyRCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUduRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUF3QjNELHdCQUFzQixvQkFBb0IsQ0FBQyxlQUFlLEVBQUUsa0JBQWtCLEVBQUUseUJBRS9FO0FBV0Qsd0JBQXNCLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxrQkFBa0IsRUFBRSx5QkFFOUU7QUFFRCx3QkFBc0IsY0FBYyxDQUFDLGVBQWUsRUFBRSxrQkFBa0IsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLEtBQUssaUJBa0JyRztBQUVELHdCQUFzQiwrQ0FBK0MsQ0FBQyxNQUFNLEVBQUUsTUFBTSx5QkFNbkY7QUFFRCx3QkFBc0IsOENBQThDLENBQUMsTUFBTSxFQUFFLE1BQU0seUJBTWxGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFuYW5hX2ZwYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvYmFuYW5hX2ZwYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxrQkFBa0IsRUFBOEIsTUFBTSx5QkFBeUIsQ0FBQztBQUM5RixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVyRCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUduRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUF3QjNELHdCQUFzQixvQkFBb0IsQ0FBQyxlQUFlLEVBQUUsa0JBQWtCLEVBQUUseUJBRS9FO0FBV0Qsd0JBQXNCLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxrQkFBa0IsRUFBRSx5QkFFOUU7QUFFRCx3QkFBc0IsY0FBYyxDQUNsQyxlQUFlLEVBQUUsa0JBQWtCLEVBQUUsRUFDckMsTUFBTSxFQUFFLE1BQU0sRUFDZCxHQUFHLEVBQUUsS0FBSyxFQUNWLFFBQVEsQ0FBQyxFQUFFLFFBQVEsaUJBaUJwQjtBQUVELHdCQUFzQiwrQ0FBK0MsQ0FBQyxNQUFNLEVBQUUsTUFBTSx5QkFNbkY7QUFFRCx3QkFBc0IsOENBQThDLENBQUMsTUFBTSxFQUFFLE1BQU0seUJBTWxGIn0=

package/dest/local-network/banana_fpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"banana_fpc.d.ts","sourceRoot":"","sources":["../../src/local-network/banana_fpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA8B,MAAM,yBAAyB,CAAC;AAC9F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAwB3D,wBAAsB,oBAAoB,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAE/E;AAWD,wBAAsB,mBAAmB,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAE9E;AAED,wBAAsB,cAAc,CAAC,eAAe,EAAE,kBAAkB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAkBrG;AAED,wBAAsB,+CAA+C,CAAC,MAAM,EAAE,MAAM,yBAMnF;AAED,wBAAsB,8CAA8C,CAAC,MAAM,EAAE,MAAM,yBAMlF"}
+{"version":3,"file":"banana_fpc.d.ts","sourceRoot":"","sources":["../../src/local-network/banana_fpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA8B,MAAM,yBAAyB,CAAC;AAC9F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAwB3D,wBAAsB,oBAAoB,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAE/E;AAWD,wBAAsB,mBAAmB,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAE9E;AAED,wBAAsB,cAAc,CAClC,eAAe,EAAE,kBAAkB,EAAE,EACrC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,EACV,QAAQ,CAAC,EAAE,QAAQ,iBAiBpB;AAED,wBAAsB,+CAA+C,CAAC,MAAM,EAAE,MAAM,yBAMnF;AAED,wBAAsB,8CAA8C,CAAC,MAAM,EAAE,MAAM,yBAMlF"}

package/dest/local-network/banana_fpc.js

@@ -43,19 +43,23 @@ async function getBananaFPCInstance(initialAccounts) {
 export async function getBananaFPCAddress(initialAccounts) {
     return (await getBananaFPCInstance(initialAccounts)).address;
 }
-export async function setupBananaFPC(initialAccounts, wallet, log) {
+export async function setupBananaFPC(initialAccounts, wallet, log, waitOpts) {
     const bananaCoinAddress = await getBananaCoinAddress(initialAccounts);
     const admin = getBananaAdmin(initialAccounts);
     const [{ contract: bananaCoin }, { contract: fpc }] = await Promise.all([
-        TokenContract.deploy(wallet, admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal).send({
-            from: admin,
-            contractAddressSalt: BANANA_COIN_SALT,
+        TokenContract.deploy(wallet, admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal, {
+            salt: BANANA_COIN_SALT,
             universalDeploy: true
-        }),
-        FPCContract.deploy(wallet, bananaCoinAddress, admin).send({
+        }).send({
             from: admin,
-            contractAddressSalt: BANANA_FPC_SALT,
+            wait: waitOpts
+        }),
+        FPCContract.deploy(wallet, bananaCoinAddress, admin, {
+            salt: BANANA_FPC_SALT,
             universalDeploy: true
+        }).send({
+            from: admin,
+            wait: waitOpts
         })
     ]);
     log(`BananaCoin: ${bananaCoin.address}`);