@aztec/aztec 3.0.0-canary.a9708bd → 3.0.0-devnet.3

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

@@ -1,11 +1,8 @@
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import type { LogFn } from '@aztec/foundation/log';
-import type { AztecNode, PXE } from '@aztec/stdlib/interfaces/client';
+import { type AztecNode, type AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import type { TelemetryClient } from '@aztec/telemetry-client';
+import { TestWallet } from '@aztec/test-wallet/server';
 export declare function startBot(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, userLog: LogFn): Promise<void>;
-export declare function addBot(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, deps: {
-    pxe?: PXE;
-    node?: AztecNode;
-    telemetry: TelemetryClient;
-}): Promise<void>;
+export declare function addBot(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, wallet: TestWallet, aztecNode: AztecNode, telemetry: TelemetryClient, aztecNodeAdmin?: AztecNodeAdmin): Promise<void>;
 //# sourceMappingURL=start_bot.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"start_bot.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_bot.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAK/D,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,iBAkBf;AAED,wBAAgB,MAAM,CACpB,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,IAAI,EAAE;IAAE,GAAG,CAAC,EAAE,GAAG,CAAC;IAAC,IAAI,CAAC,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,eAAe,CAAA;CAAE,iBAWlE"}
+{"version":3,"file":"start_bot.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_bot.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,cAAc,EAAyB,MAAM,iCAAiC,CAAC;AAC7G,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAM/D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAKvD,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,iBAuBf;AAED,wBAAsB,MAAM,CAC1B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,eAAe,EAC1B,cAAc,CAAC,EAAE,cAAc,iBAkBhC"}

package/dest/cli/cmds/start_bot.js

@@ -1,27 +1,38 @@
-import { BotRunner, botConfigMappings, getBotRunnerApiHandler } from '@aztec/bot';
-import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
+import { BotRunner, BotStore, botConfigMappings, getBotRunnerApiHandler } from '@aztec/bot';
+import { createStore, openTmpStore } from '@aztec/kv-store/lmdb-v2';
+import { allPxeConfigMappings } from '@aztec/pxe/config';
+import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
+import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient, makeTracedFetch } from '@aztec/telemetry-client';
+import { TestWallet } from '@aztec/test-wallet/server';
 import { extractRelevantOptions } from '../util.js';
+import { getVersions } from '../versioning.js';
 export async function startBot(options, signalHandlers, services, userLog) {
     const { proverNode, archiver, sequencer, p2pBootstrap, txe, prover } = options;
     if (proverNode || archiver || sequencer || p2pBootstrap || txe || prover) {
         userLog(`Starting a bot with --prover-node, --prover, --archiver, --sequencer, --p2p-bootstrap, or --txe is not supported.`);
         process.exit(1);
     }
-    // Start a PXE client that is used by the bot if required
-    let pxe;
-    if (options.pxe) {
-        const { addPXE } = await import('./start_pxe.js');
-        ({ pxe } = await addPXE(options, signalHandlers, services, userLog));
+    const fetch = makeTracedFetch([
+        1,
+        2,
+        3
+    ], true);
+    const config = extractRelevantOptions(options, botConfigMappings, 'bot');
+    if (!config.nodeUrl) {
+        throw new Error('The bot requires access to a Node');
     }
+    const aztecNode = createAztecNodeClient(config.nodeUrl, getVersions(), fetch);
+    const pxeConfig = extractRelevantOptions(options, allPxeConfigMappings, 'pxe');
+    const wallet = await TestWallet.create(aztecNode, pxeConfig);
     const telemetry = initTelemetryClient(getTelemetryClientConfig());
-    await addBot(options, signalHandlers, services, {
-        pxe,
-        telemetry
-    });
+    await addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, undefined);
 }
-export function addBot(options, signalHandlers, services, deps) {
+export async function addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, aztecNodeAdmin) {
     const config = extractRelevantOptions(options, botConfigMappings, 'bot');
-    const botRunner = new BotRunner(config, deps);
+    const db = await (config.dataDirectory ? createStore('bot', BotStore.SCHEMA_VERSION, config) : openTmpStore('bot', true, config.dataStoreMapSizeKb));
+    const store = new BotStore(db);
+    await store.cleanupOldClaims();
+    const botRunner = new BotRunner(config, wallet, aztecNode, telemetry, aztecNodeAdmin, store);
     if (!config.noStart) {
         void botRunner.start(); // Do not block since bot setup takes time
     }

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

@@ -1 +1 @@
-{"version":3,"file":"start_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAA6C,MAAM,mBAAmB,CAAC;AAKpG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAmBnD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB,EACpC,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CAsItC"}
+{"version":3,"file":"start_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAA6C,MAAM,mBAAmB,CAAC;AAMpG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAoBnD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB,EACpC,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CAyHtC"}

package/dest/cli/cmds/start_node.js

@@ -1,15 +1,17 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { aztecNodeConfigMappings, getConfigEnvVars } from '@aztec/aztec-node';
-import { Fr } from '@aztec/aztec.js';
+import { Fr } from '@aztec/aztec.js/fields';
 import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
+import { getL1Config } from '@aztec/cli/config';
 import { getPublicClient } from '@aztec/ethereum';
 import { SecretValue } from '@aztec/foundation/config';
+import { allPxeConfigMappings } from '@aztec/pxe/config';
 import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
 import { P2PApiSchema } from '@aztec/stdlib/interfaces/server';
 import { initTelemetryClient, telemetryClientConfigMappings } from '@aztec/telemetry-client';
+import { TestWallet } from '@aztec/test-wallet/server';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import { createAztecNode } from '../../sandbox/index.js';
-import { getL1Config } from '../get_l1_config.js';
 import { extractNamespacedOptions, extractRelevantOptions, preloadCrsDataForVerifying, setupUpdateMonitor } from '../util.js';
 export async function startNode(options, signalHandlers, services, adminServices, userLog) {
     // All options set from environment variables
@@ -26,7 +28,7 @@ export async function startNode(options, signalHandlers, services, adminServices
         process.exit(1);
     }
     await preloadCrsDataForVerifying(nodeConfig, userLog);
-    const testAccounts = nodeConfig.testAccounts ? (await getInitialTestAccounts()).map((a)=>a.address) : [];
+    const testAccounts = nodeConfig.testAccounts ? (await getInitialTestAccountsData()).map((a)=>a.address) : [];
     const sponsoredFPCAccounts = nodeConfig.sponsoredFPC ? [
         await getSponsoredFPCAddress()
     ] : [];
@@ -52,15 +54,6 @@ export async function startNode(options, signalHandlers, services, adminServices
         },
         ...config
     };
-    if (!options.archiver) {
-        // expect archiver url in node config
-        const archiverUrl = nodeConfig.archiverUrl;
-        if (!archiverUrl) {
-            userLog('Archiver Service URL is required to start Aztec Node without --archiver option');
-            throw new Error('Archiver Service URL is required to start Aztec Node without --archiver option');
-        }
-        nodeConfig.archiverUrl = archiverUrl;
-    }
     if (!options.sequencer) {
         nodeConfig.disableValidator = true;
     } else {
@@ -107,22 +100,12 @@ export async function startNode(options, signalHandlers, services, adminServices
     ];
     // Add node stop function to signal handlers
     signalHandlers.push(node.stop.bind(node));
-    // Add a PXE client that connects to this node if requested
-    let pxe;
-    if (options.pxe) {
-        const { addPXE } = await import('./start_pxe.js');
-        ({ pxe } = await addPXE(options, signalHandlers, services, userLog, {
-            node
-        }));
-    }
     // Add a txs bot if requested
     if (options.bot) {
         const { addBot } = await import('./start_bot.js');
-        await addBot(options, signalHandlers, services, {
-            pxe,
-            node,
-            telemetry
-        });
+        const pxeConfig = extractRelevantOptions(options, allPxeConfigMappings, 'pxe');
+        const wallet = await TestWallet.create(node, pxeConfig);
+        await addBot(options, signalHandlers, services, wallet, node, telemetry, undefined);
     }
     if (nodeConfig.autoUpdate !== 'disabled' && nodeConfig.autoUpdateUrl) {
         await setupUpdateMonitor(nodeConfig.autoUpdate, new URL(nodeConfig.autoUpdateUrl), followsCanonicalRollup, getPublicClient(nodeConfig), nodeConfig.l1Contracts.registryAddress, signalHandlers, async (config)=>node.setConfig((await AztecNodeAdminApiSchema.setConfig.parameters().parseAsync([

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

@@ -1 +1 @@
-{"version":3,"file":"start_prover_agent.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_agent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAgBnD,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,iBA2Df"}
+{"version":3,"file":"start_prover_agent.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_agent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAgBnD,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,iBAgEf"}

package/dest/cli/cmds/start_prover_agent.js

@@ -25,9 +25,18 @@ export async function startProverAgent(options, signalHandlers, services, userLo
         process.exit(1);
     }
     await preloadCrsDataForServerSideProving(config, userLog);
-    const fetch = makeTracedFetch([
+    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({
         connections: 10

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":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EACL,KAAK,kBAAkB,EAIxB,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,CA+BnE"}
+{"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;AACnD,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAKxE,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"}

package/dest/cli/cmds/start_prover_broker.js

@@ -1,8 +1,9 @@
+import { getL1Config } from '@aztec/cli/config';
+import { getPublicClient } from '@aztec/ethereum';
 import { ProvingJobBrokerSchema, createAndStartProvingBroker, proverBrokerConfigMappings } from '@aztec/prover-client/broker';
 import { getProverNodeBrokerConfigFromEnv } from '@aztec/prover-node';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
-import { getL1Config } from '../get_l1_config.js';
-import { extractRelevantOptions } from '../util.js';
+import { extractRelevantOptions, setupUpdateMonitor } from '../util.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.`);
@@ -15,11 +16,15 @@ export async function startProverBroker(options, signalHandlers, services, userL
     if (!config.l1Contracts.registryAddress || config.l1Contracts.registryAddress.isZero()) {
         throw new Error('L1 registry address is required to start Aztec Node without --deploy-aztec-contracts option');
     }
+    const followsCanonicalRollup = typeof config.rollupVersion !== 'number';
     const { addresses, config: rollupConfig } = await getL1Config(config.l1Contracts.registryAddress, config.l1RpcUrls, config.l1ChainId, config.rollupVersion);
     config.l1Contracts = addresses;
     config.rollupVersion = rollupConfig.rollupVersion;
     const client = initTelemetryClient(getTelemetryClientConfig());
     const broker = await createAndStartProvingBroker(config, client);
+    if (options.autoUpdate !== 'disabled' && options.autoUpdateUrl) {
+        await setupUpdateMonitor(options.autoUpdate, new URL(options.autoUpdateUrl), followsCanonicalRollup, getPublicClient(config), config.l1Contracts.registryAddress, signalHandlers);
+    }
     services.proverBroker = [
         broker,
         ProvingJobBrokerSchema

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

@@ -1 +1 @@
-{"version":3,"file":"start_prover_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_node.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EACL,KAAK,gBAAgB,EAItB,MAAM,oBAAoB,CAAC;AAU5B,wBAAsB,eAAe,CACnC,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,CAAA;CAAE,CAAC,CA+FvC"}
+{"version":3,"file":"start_prover_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_node.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EACL,KAAK,gBAAgB,EAItB,MAAM,oBAAoB,CAAC;AAS5B,wBAAsB,eAAe,CACnC,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,CAAA;CAAE,CAAC,CA+FvC"}

package/dest/cli/cmds/start_prover_node.js

@@ -1,6 +1,7 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
-import { Fr } from '@aztec/aztec.js';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import { Fr } from '@aztec/aztec.js/fields';
 import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
+import { getL1Config } from '@aztec/cli/config';
 import { getPublicClient } from '@aztec/ethereum';
 import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
 import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker';
@@ -8,7 +9,6 @@ import { createProverNode, getProverNodeConfigFromEnv, proverNodeConfigMappings
 import { P2PApiSchema, ProverNodeApiSchema } from '@aztec/stdlib/interfaces/server';
 import { initTelemetryClient, makeTracedFetch, telemetryClientConfigMappings } from '@aztec/telemetry-client';
 import { getGenesisValues } from '@aztec/world-state/testing';
-import { getL1Config } from '../get_l1_config.js';
 import { extractRelevantOptions, preloadCrsDataForVerifying, setupUpdateMonitor } from '../util.js';
 import { getVersions } from '../versioning.js';
 import { startProverBroker } from './start_prover_broker.js';
@@ -21,12 +21,8 @@ export async function startProverNode(options, signalHandlers, services, userLog
         ...getProverNodeConfigFromEnv(),
         ...extractRelevantOptions(options, proverNodeConfigMappings, 'proverNode')
     };
-    if (!options.archiver && !proverConfig.archiverUrl) {
-        userLog('--archiver.archiverUrl is required to start a Prover Node without --archiver option');
-        process.exit(1);
-    }
     if (!proverConfig.l1Contracts.registryAddress || proverConfig.l1Contracts.registryAddress.isZero()) {
-        throw new Error('L1 registry address is required to start a Prover Node with --archiver option');
+        throw new Error('L1 registry address is required to start a Prover Node');
     }
     const followsCanonicalRollup = typeof proverConfig.rollupVersion !== 'number';
     const { addresses, config } = await getL1Config(proverConfig.l1Contracts.registryAddress, proverConfig.l1RpcUrls, proverConfig.l1ChainId, proverConfig.rollupVersion);
@@ -36,7 +32,7 @@ export async function startProverNode(options, signalHandlers, services, userLog
         ...proverConfig,
         ...config
     };
-    const testAccounts = proverConfig.testAccounts ? (await getInitialTestAccounts()).map((a)=>a.address) : [];
+    const testAccounts = proverConfig.testAccounts ? (await getInitialTestAccountsData()).map((a)=>a.address) : [];
     const sponsoredFPCAccounts = proverConfig.sponsoredFPC ? [
         await getSponsoredFPCAddress()
     ] : [];
@@ -52,9 +48,18 @@ export async function startProverNode(options, signalHandlers, services, userLog
     if (proverConfig.proverBrokerUrl) {
         // at 1TPS we'd enqueue ~1k tube proofs and ~1k AVM proofs immediately
         // set a lower connection limit such that we don't overload the server
+        // Keep retrying up to 30s
         const fetch = makeTracedFetch([
             1,
             2,
+            3,
+            3,
+            3,
+            3,
+            3,
+            3,
+            3,
+            3,
             3
         ], false, makeUndiciFetch(new Agent({
             connections: 100

package/dest/cli/util.d.ts

@@ -1,11 +1,13 @@
 import type { AztecNodeConfig } from '@aztec/aztec-node';
-import type { AccountManager, EthAddress, Fr } from '@aztec/aztec.js';
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import { Fr } from '@aztec/aztec.js/fields';
+import { AccountManager } from '@aztec/aztec.js/wallet';
 import type { ViemClient } from '@aztec/ethereum';
 import type { ConfigMappingsType } from '@aztec/foundation/config';
 import { type LogFn } from '@aztec/foundation/log';
 import type { SharedNodeConfig } from '@aztec/node-lib/config';
-import type { PXEService } from '@aztec/pxe/server';
 import type { ProverConfig } from '@aztec/stdlib/interfaces/server';
+import type { TestWallet } from '@aztec/test-wallet/server';
 import type { Command } from 'commander';
 import { type AztecStartOption } from './aztec_start_options.js';
 export declare const enum ExitCode {
@@ -24,7 +26,7 @@ export declare const installSignalHandlers: (logFn: LogFn, cb?: Array<() => Prom
 /**
  * Creates logs for the initial accounts
  * @param accounts - The initial accounts
- * @param pxe - A PXE instance to get the registered accounts
+ * @param wallet - A TestWallet instance to get the registered accounts
  * @returns A string array containing the initial accounts details
  */
 export declare function createAccountLogs(accountsWithSecretKeys: {
@@ -36,7 +38,7 @@ export declare function createAccountLogs(accountsWithSecretKeys: {
      * The secret key of the account
      */
     secretKey: Fr;
-}[], pxe: PXEService): Promise<string[]>;
+}[], wallet: TestWallet): Promise<string[]>;
 export declare function getMaxLengths(sections: {
     [key: string]: AztecStartOption[];
 }): [number, number];

package/dest/cli/util.d.ts.map

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

package/dest/cli/util.js

@@ -64,16 +64,16 @@ export const installSignalHandlers = (logFn, cb)=>{
 /**
  * Creates logs for the initial accounts
  * @param accounts - The initial accounts
- * @param pxe - A PXE instance to get the registered accounts
+ * @param wallet - A TestWallet instance to get the registered accounts
  * @returns A string array containing the initial accounts details
- */ export async function createAccountLogs(accountsWithSecretKeys, pxe) {
-    const registeredAccounts = await pxe.getRegisteredAccounts();
+ */ export async function createAccountLogs(accountsWithSecretKeys, wallet) {
+    const registeredAccounts = await wallet.getAccounts();
     const accountLogStrings = [
         `Initial Accounts:\n\n`
     ];
     for (const accountWithSecretKey of accountsWithSecretKeys){
         const completeAddress = await accountWithSecretKey.account.getCompleteAddress();
-        if (registeredAccounts.find((a)=>a.equals(completeAddress))) {
+        if (registeredAccounts.find((a)=>a.item.equals(completeAddress.address))) {
             accountLogStrings.push(` Address: ${completeAddress.address.toString()}\n`);
             accountLogStrings.push(` Partial Address: ${completeAddress.partialAddress.toString()}\n`);
             accountLogStrings.push(` Secret Key: ${accountWithSecretKey.secretKey.toString()}\n`);
@@ -112,8 +112,8 @@ export function formatHelpLine(option, defaultValue, envVar, maxOptionLength, ma
 const getDefaultOrEnvValue = (opt)=>{
     let val;
     // if the option is set in the environment, use that
-    if (opt.envVar) {
-        val = process.env[opt.envVar];
+    if (opt.env) {
+        val = process.env[opt.env];
     }
     // if we have fallback env vars, check those
     if (!val && opt.fallback && opt.fallback.length > 0) {
@@ -130,7 +130,7 @@ const getDefaultOrEnvValue = (opt)=>{
             return opt.parseVal(val);
         }
         return val;
-    } else if (opt.defaultValue) {
+    } else if (opt.defaultValue !== undefined) {
         return opt.defaultValue;
     }
     return undefined;
@@ -138,7 +138,7 @@ const getDefaultOrEnvValue = (opt)=>{
 // Function to add options dynamically
 export const addOptions = (cmd, options)=>{
     options.forEach((opt)=>{
-        cmd.option(opt.flag, `${opt.description} (default: ${opt.defaultValue}) ($${opt.envVar})`, opt.parseVal ? opt.parseVal : (val)=>val, getDefaultOrEnvValue(opt));
+        cmd.option(opt.flag, `${opt.description} (default: ${opt.defaultValue}) ($${opt.env})`, opt.parseVal ? opt.parseVal : (val)=>val, getDefaultOrEnvValue(opt));
     });
 };
 export const printAztecStartHelpText = ()=>{
@@ -150,8 +150,8 @@ export const printAztecStartHelpText = ()=>{
         helpTextLines.push(chalk.bold.blue(`  ${category}`));
         helpTextLines.push('');
         aztecStartOptions[category].forEach((opt)=>{
-            const defaultValueText = opt.defaultValue ? `(default: ${opt.printDefault ? opt.printDefault(opt.defaultValue) : opt.defaultValue})` : '';
-            const envVarText = opt.envVar ? `($${opt.envVar})` : '';
+            const defaultValueText = opt.defaultValue || Array.isArray(opt.defaultValue) && opt.defaultValue.length > 0 ? `(default: ${opt.printDefault ? opt.printDefault(opt.defaultValue) : opt.defaultValue})` : '';
+            const envVarText = opt.env ? `($${opt.env})` : '';
             const flagText = `${opt.flag}`;
             const paddedText = formatHelpLine(flagText, defaultValueText, envVarText, maxFlagLength, maxDefaultLength);
             helpTextLines.push(`    ${paddedText}`);

package/dest/cli/versioning.js

@@ -1,9 +1,9 @@
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { protocolContractsHash } from '@aztec/protocol-contracts';
 import { getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
 export function getVersions(config) {
-    return config ? getComponentsVersionsFromConfig(config, protocolContractTreeRoot, getVKTreeRoot()) : {
+    return config ? getComponentsVersionsFromConfig(config, protocolContractsHash, getVKTreeRoot()) : {
         l2CircuitsVkTreeRoot: getVKTreeRoot().toString(),
-        l2ProtocolContractsTreeRoot: protocolContractTreeRoot.toString()
+        l2ProtocolContractsHash: protocolContractsHash.toString()
     };
 }

package/dest/examples/token.js

@@ -1,49 +1,51 @@
-import { getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
-import { createPXEClient } from '@aztec/aztec.js';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import { createAztecNodeClient } from '@aztec/aztec.js/node';
 import { createLogger } from '@aztec/foundation/log';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import { TestWallet } from '@aztec/test-wallet/server';
 const logger = createLogger('example:token');
-const url = 'http://localhost:8080';
-const pxe = createPXEClient(url);
+const nodeUrl = 'http://localhost:8080';
+const node = createAztecNodeClient(nodeUrl);
 const ALICE_MINT_BALANCE = 333n;
 const TRANSFER_AMOUNT = 33n;
 /**
  * Main function.
  */ async function main() {
     logger.info('Running token contract test on HTTP interface.');
-    const [aliceWallet, bobWallet] = await getDeployedTestAccountsWallets(pxe);
-    const alice = aliceWallet.getAddress();
-    const bob = bobWallet.getAddress();
+    const wallet = await TestWallet.create(node);
+    // During sandbox setup we deploy a few 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);
+    const alice = aliceInitialAccountData.address;
+    const bob = bobInitialAccountData.address;
     logger.info(`Fetched Alice and Bob accounts: ${alice.toString()}, ${bob.toString()}`);
     logger.info('Deploying Token...');
-    const token = await TokenContract.deploy(aliceWallet, alice, 'TokenName', 'TokenSymbol', 18).send({
+    const token = await TokenContract.deploy(wallet, alice, 'TokenName', 'TokenSymbol', 18).send({
         from: alice
     }).deployed();
     logger.info('Token deployed');
-    // Create the contract abstraction and link it to Alice's and Bob's wallet for future signing
-    const tokenAlice = await TokenContract.at(token.address, aliceWallet);
-    const tokenBob = await TokenContract.at(token.address, bobWallet);
     // Mint tokens to Alice
     logger.info(`Minting ${ALICE_MINT_BALANCE} more coins to Alice...`);
-    await tokenAlice.methods.mint_to_private(alice, ALICE_MINT_BALANCE).send({
+    await token.methods.mint_to_private(alice, ALICE_MINT_BALANCE).send({
         from: alice
     }).wait();
     logger.info(`${ALICE_MINT_BALANCE} tokens were successfully minted by Alice and transferred to private`);
-    const balanceAfterMint = await tokenAlice.methods.balance_of_private(alice).simulate({
+    const balanceAfterMint = await token.methods.balance_of_private(alice).simulate({
         from: alice
     });
     logger.info(`Tokens successfully minted. New Alice's balance: ${balanceAfterMint}`);
     // We will now transfer tokens from Alice to Bob
     logger.info(`Transferring ${TRANSFER_AMOUNT} tokens from Alice to Bob...`);
-    await tokenAlice.methods.transfer(bob, TRANSFER_AMOUNT).send({
+    await token.methods.transfer(bob, TRANSFER_AMOUNT).send({
         from: alice
     }).wait();
     // Check the new balances
-    const aliceBalance = await tokenAlice.methods.balance_of_private(alice).simulate({
+    const aliceBalance = await token.methods.balance_of_private(alice).simulate({
         from: alice
     });
     logger.info(`Alice's balance ${aliceBalance}`);
-    const bobBalance = await tokenBob.methods.balance_of_private(bob).simulate({
+    const bobBalance = await token.methods.balance_of_private(bob).simulate({
         from: bob
     });
     logger.info(`Bob's balance ${bobBalance}`);

package/dest/examples/util.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress } from '@aztec/aztec.js';
+import { EthAddress } from '@aztec/aztec.js/addresses';
 import type { ExtendedViemWalletClient } from '@aztec/ethereum';
 import type { Abi, Narrow } from 'abitype';
 import type { Hex } from 'viem';

package/dest/examples/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/examples/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAGhE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,wBAAwB,EAClC,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,SAAS,OAAO,EAAE,CAAC,EACrC,QAAQ,EAAE,GAAG,EACb,IAAI,GAAE,SAAS,OAAO,EAAO,GAC5B,OAAO,CAAC,UAAU,CAAC,CAcrB;AAED;;;GAGG;AACH,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/examples/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAGhE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,wBAAwB,EAClC,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,SAAS,OAAO,EAAE,CAAC,EACrC,QAAQ,EAAE,GAAG,EACb,IAAI,GAAE,SAAS,OAAO,EAAO,GAC5B,OAAO,CAAC,UAAU,CAAC,CAcrB;AAED;;;GAGG;AACH,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C"}

package/dest/examples/util.js

@@ -1,4 +1,4 @@
-import { EthAddress } from '@aztec/aztec.js';
+import { EthAddress } from '@aztec/aztec.js/addresses';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 /**
  * Helper function to deploy ETH contracts.

package/dest/index.d.ts

@@ -1,2 +1,2 @@
-export { createSandbox, getDeployedBananaCoinAddress, getDeployedBananaFPCAddress, getDeployedSponsoredFPCAddress, } from './sandbox/index.js';
+export { createSandbox, registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress, registerDeployedSponsoredFPCInWalletAndGetAddress, } from './sandbox/index.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,4BAA4B,EAC5B,2BAA2B,EAC3B,8BAA8B,GAC/B,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,+CAA+C,EAC/C,8CAA8C,EAC9C,iDAAiD,GAClD,MAAM,oBAAoB,CAAC"}

package/dest/index.js

@@ -1 +1 @@
-export { createSandbox, getDeployedBananaCoinAddress, getDeployedBananaFPCAddress, getDeployedSponsoredFPCAddress } from './sandbox/index.js';
+export { createSandbox, registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress, registerDeployedSponsoredFPCInWalletAndGetAddress } from './sandbox/index.js';

package/dest/sandbox/banana_fpc.d.ts

@@ -1,11 +1,10 @@
 import { type InitialAccountData } from '@aztec/accounts/testing';
-import type { Wallet } from '@aztec/aztec.js';
+import type { Wallet } from '@aztec/aztec.js/wallet';
 import type { LogFn } from '@aztec/foundation/log';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
 export declare function getBananaCoinAddress(initialAccounts: InitialAccountData[]): Promise<AztecAddress>;
 export declare function getBananaFPCAddress(initialAccounts: InitialAccountData[]): Promise<AztecAddress>;
-export declare function setupBananaFPC(initialAccounts: InitialAccountData[], deployer: Wallet, log: LogFn): Promise<void>;
-export declare function getDeployedBananaCoinAddress(pxe: PXE): Promise<AztecAddress>;
-export declare function getDeployedBananaFPCAddress(pxe: PXE): Promise<AztecAddress>;
+export declare function setupBananaFPC(initialAccounts: InitialAccountData[], wallet: Wallet, log: LogFn): Promise<void>;
+export declare function registerDeployedBananaCoinInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress>;
+export declare function registerDeployedBananaFPCInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress>;
 //# sourceMappingURL=banana_fpc.d.ts.map

package/dest/sandbox/banana_fpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"banana_fpc.d.ts","sourceRoot":"","sources":["../../src/sandbox/banana_fpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA0B,MAAM,yBAAyB,CAAC;AAC1F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAuB3D,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,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAcvG;AAED,wBAAsB,4BAA4B,CAAC,GAAG,EAAE,GAAG,yBAQ1D;AAED,wBAAsB,2BAA2B,CAAC,GAAG,EAAE,GAAG,yBAQzD"}
+{"version":3,"file":"banana_fpc.d.ts","sourceRoot":"","sources":["../../src/sandbox/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,iBAcrG;AAED,wBAAsB,+CAA+C,CAAC,MAAM,EAAE,MAAM,yBAMnF;AAED,wBAAsB,8CAA8C,CAAC,MAAM,EAAE,MAAM,yBAMlF"}

package/dest/sandbox/banana_fpc.js

@@ -1,4 +1,4 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { Fr } from '@aztec/foundation/fields';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
@@ -43,16 +43,16 @@ async function getBananaFPCInstance(initialAccounts) {
 export async function getBananaFPCAddress(initialAccounts) {
     return (await getBananaFPCInstance(initialAccounts)).address;
 }
-export async function setupBananaFPC(initialAccounts, deployer, log) {
+export async function setupBananaFPC(initialAccounts, wallet, log) {
     const bananaCoinAddress = await getBananaCoinAddress(initialAccounts);
     const admin = getBananaAdmin(initialAccounts);
     const [bananaCoin, fpc] = await Promise.all([
-        TokenContract.deploy(deployer, admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal).send({
+        TokenContract.deploy(wallet, admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal).send({
             from: admin,
             contractAddressSalt: BANANA_COIN_SALT,
             universalDeploy: true
         }).deployed(),
-        FPCContract.deploy(deployer, bananaCoinAddress, admin).send({
+        FPCContract.deploy(wallet, bananaCoinAddress, admin).send({
             from: admin,
             contractAddressSalt: BANANA_FPC_SALT,
             universalDeploy: true
@@ -61,21 +61,17 @@ export async function setupBananaFPC(initialAccounts, deployer, log) {
     log(`BananaCoin: ${bananaCoin.address}`);
     log(`FPC: ${fpc.address}`);
 }
-export async function getDeployedBananaCoinAddress(pxe) {
-    const initialAccounts = await getInitialTestAccounts();
-    const bananaCoin = await getBananaCoinAddress(initialAccounts);
-    const contracts = await pxe.getContracts();
-    if (!contracts.find((c)=>c.equals(bananaCoin))) {
-        throw new Error('BananaCoin not deployed.');
-    }
-    return bananaCoin;
+export async function registerDeployedBananaCoinInWalletAndGetAddress(wallet) {
+    const initialAccounts = await getInitialTestAccountsData();
+    const bananaCoin = await getBananaCoinInstance(initialAccounts);
+    // The following is no-op if the contract is already registered
+    await wallet.registerContract(bananaCoin, TokenContract.artifact);
+    return bananaCoin.address;
 }
-export async function getDeployedBananaFPCAddress(pxe) {
-    const initialAccounts = await getInitialTestAccounts();
+export async function registerDeployedBananaFPCInWalletAndGetAddress(wallet) {
+    const initialAccounts = await getInitialTestAccountsData();
     const fpc = await getBananaFPCInstance(initialAccounts);
-    const contracts = await pxe.getContracts();
-    if (!contracts.find((c)=>c.equals(fpc.address))) {
-        throw new Error('BananaFPC not deployed.');
-    }
+    // The following is no-op if the contract is already registered
+    await wallet.registerContract(fpc, FPCContract.artifact);
     return fpc.address;
 }

package/dest/sandbox/index.d.ts

@@ -1,4 +1,4 @@
 export * from './sandbox.js';
-export { getDeployedBananaCoinAddress, getDeployedBananaFPCAddress } from './banana_fpc.js';
-export { getDeployedSponsoredFPCAddress } from './sponsored_fpc.js';
+export { registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress, } from './banana_fpc.js';
+export { registerDeployedSponsoredFPCInWalletAndGetAddress } from './sponsored_fpc.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/sandbox/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sandbox/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAE7B,OAAO,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,8BAA8B,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sandbox/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAE7B,OAAO,EACL,+CAA+C,EAC/C,8CAA8C,GAC/C,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iDAAiD,EAAE,MAAM,oBAAoB,CAAC"}

package/dest/sandbox/index.js

@@ -1,3 +1,3 @@
 export * from './sandbox.js';
-export { getDeployedBananaCoinAddress, getDeployedBananaFPCAddress } from './banana_fpc.js';
-export { getDeployedSponsoredFPCAddress } from './sponsored_fpc.js';
+export { registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress } from './banana_fpc.js';
+export { registerDeployedSponsoredFPCInWalletAndGetAddress } from './sponsored_fpc.js';