@aztec/aztec 0.0.0-test.1 → 0.0.1-commit.b655e406

package/dest/cli/util.d.ts

@@ -1,14 +1,32 @@
-import type { AccountManager, Fr } from '@aztec/aztec.js';
+import type { AztecNodeConfig } from '@aztec/aztec-node';
+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 { PXEService } from '@aztec/pxe/server';
+import { type LogFn } from '@aztec/foundation/log';
+import type { SharedNodeConfig } from '@aztec/node-lib/config';
+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 {
+    SUCCESS = 0,
+    ERROR = 1,
+    ROLLUP_UPGRADE = 78,// EX_CONFIG from FreeBSD (https://man.freebsd.org/cgi/man.cgi?query=sysexits)
+    VERSION_UPGRADE = 79,// prev + 1 because there's nothing better
+    SIGHUP = 129,
+    SIGINT = 130,
+    SIGQUIT = 131,
+    SIGTERM = 143
+}
+export declare function shutdown(logFn: LogFn, exitCode: ExitCode, cb?: Array<() => Promise<void>>): Promise<never>;
+export declare function isShuttingDown(): boolean;
 export declare const installSignalHandlers: (logFn: LogFn, cb?: Array<() => Promise<void>>) => void;
 /**
  * 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: {
@@ -20,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];
@@ -43,4 +61,17 @@ export declare const extractNamespacedOptions: (options: Record<string, any>, na
  * @returns Key-value map of relevant options.
  */
 export declare const extractRelevantOptions: <T>(options: Record<string, any>, mappings: ConfigMappingsType<T>, namespace: string) => T;
+/**
+ * Downloads just enough points to be able to verify Chonk proofs.
+ * @param opts - Whether proof are to be verifier
+ * @param log - Logging function
+ */
+export declare function preloadCrsDataForVerifying({ realProofs }: Pick<AztecNodeConfig, 'realProofs'>, log: LogFn): Promise<void>;
+/**
+ * Downloads enough points to be able to prove every server-side circuit
+ * @param opts - Whether real proof are to be generated
+ * @param log - Logging function
+ */
+export declare function preloadCrsDataForServerSideProving({ realProofs }: Pick<ProverConfig, 'realProofs'>, log: LogFn): Promise<void>;
+export declare function setupUpdateMonitor(autoUpdateMode: SharedNodeConfig['autoUpdate'], updatesLocation: URL, followsCanonicalRollup: boolean, publicClient: ViemClient, registryContractAddress: EthAddress, signalHandlers: Array<() => Promise<void>>, updateNodeConfig?: (config: object) => Promise<void>): Promise<void>;
 //# sourceMappingURL=util.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/cli/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAE,KAAK,gBAAgB,EAAqB,MAAM,0BAA0B,CAAC;AAEpF,eAAO,MAAM,qBAAqB,UAAW,KAAK,OAAO,MAAM,MAAM,QAAQ,IAAI,CAAC,CAAC,SAclF,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,sBAAsB,EAAE;IACtB;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;IACxB;;OAEG;IACH,SAAS,EAAE,EAAE,CAAC;CACf,EAAE,EACH,GAAG,EAAE,UAAU,qBAyBhB;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAiB/F;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAKR;AAmBD,eAAO,MAAM,UAAU,QAAS,OAAO,WAAW,gBAAgB,EAAE,SASnE,CAAC;AAEF,eAAO,MAAM,uBAAuB,cAwBnC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,YAAa,OAAO,MAAM,EAAE,GAAG,CAAC,aAAa,MAAM,wBASvF,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,eACxB,OAAO,MAAM,EAAE,GAAG,CAAC,YAClB,mBAAmB,CAAC,CAAC,aACpB,MAAM,KAChB,CA8BF,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/cli/util.ts"],"names":[],"mappings":"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"}

package/dest/cli/util.js

@@ -1,33 +1,79 @@
+import { createLogger } from '@aztec/foundation/log';
+import { UpdateChecker } from '@aztec/stdlib/update-checker';
+import { getTelemetryClient } from '@aztec/telemetry-client';
 import chalk from 'chalk';
 import { aztecStartOptions } from './aztec_start_options.js';
+export var ExitCode = /*#__PURE__*/ function(ExitCode) {
+    ExitCode[ExitCode["SUCCESS"] = 0] = "SUCCESS";
+    ExitCode[ExitCode["ERROR"] = 1] = "ERROR";
+    ExitCode[ExitCode["ROLLUP_UPGRADE"] = 78] = "ROLLUP_UPGRADE";
+    ExitCode[ExitCode["VERSION_UPGRADE"] = 79] = "VERSION_UPGRADE";
+    // 128 + int(SIGNAL)
+    ExitCode[ExitCode["SIGHUP"] = 129] = "SIGHUP";
+    ExitCode[ExitCode["SIGINT"] = 130] = "SIGINT";
+    ExitCode[ExitCode["SIGQUIT"] = 131] = "SIGQUIT";
+    ExitCode[ExitCode["SIGTERM"] = 143] = "SIGTERM";
+    return ExitCode;
+}({});
+let shutdownPromise;
+export function shutdown(logFn, exitCode, cb) {
+    if (shutdownPromise) {
+        logFn('Already shutting down.');
+        return shutdownPromise;
+    }
+    logFn('Shutting down...', {
+        exitCode
+    });
+    if (cb) {
+        shutdownPromise = Promise.allSettled(cb).then(()=>process.exit(exitCode));
+    } else {
+        // synchronously shuts down the process
+        // no need to set shutdownPromise on this branch of the if statement because no more code will be executed
+        process.exit(exitCode);
+    }
+    return shutdownPromise;
+}
+export function isShuttingDown() {
+    return shutdownPromise !== undefined;
+}
 export const installSignalHandlers = (logFn, cb)=>{
-    const shutdown = async ()=>{
-        logFn('Shutting down...');
-        if (cb) {
-            await Promise.all(cb);
-        }
-        process.exit(0);
-    };
-    process.removeAllListeners('SIGINT');
-    process.removeAllListeners('SIGTERM');
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    process.once('SIGINT', shutdown);
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    process.once('SIGTERM', shutdown);
+    const signals = [
+        [
+            'SIGINT',
+            130
+        ],
+        [
+            'SIGTERM',
+            143
+        ],
+        [
+            'SIGHUP',
+            129
+        ],
+        [
+            'SIQUIT',
+            131
+        ]
+    ];
+    for (const [signal, exitCode] of signals){
+        process.removeAllListeners(signal);
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        process.once(signal, ()=>shutdown(logFn, exitCode, 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`);
@@ -65,22 +111,34 @@ export function formatHelpLine(option, defaultValue, envVar, maxOptionLength, ma
 }
 const getDefaultOrEnvValue = (opt)=>{
     let val;
-    // if the option is set in the environment, use that & parse it
-    if (opt.envVar && process.env[opt.envVar]) {
-        val = process.env[opt.envVar];
-        if (val && opt.parseVal) {
+    // if the option is set in the environment, use that
+    if (opt.env) {
+        val = process.env[opt.env];
+    }
+    // if we have fallback env vars, check those
+    if (!val && opt.fallback && opt.fallback.length > 0) {
+        for (const fallback of opt.fallback){
+            val = process.env[fallback];
+            if (val) {
+                break;
+            }
+        }
+    }
+    // if we have a value, optionally parse it and return
+    if (val) {
+        if (opt.parseVal) {
             return opt.parseVal(val);
         }
-    // if no env variable, use the default value
-    } else if (opt.defaultValue) {
-        val = opt.defaultValue;
+        return val;
+    } else if (opt.defaultValue !== undefined) {
+        return opt.defaultValue;
     }
-    return val;
+    return undefined;
 };
 // 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 = ()=>{
@@ -92,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}`);
@@ -152,3 +210,115 @@ export const printAztecStartHelpText = ()=>{
     });
     return relevantOptions;
 };
+/**
+ * Downloads just enough points to be able to verify Chonk proofs.
+ * @param opts - Whether proof are to be verifier
+ * @param log - Logging function
+ */ export async function preloadCrsDataForVerifying({ realProofs }, log) {
+    if (realProofs) {
+        const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
+        await Promise.all([
+            Crs.new(2 ** 1, undefined, log),
+            GrumpkinCrs.new(2 ** 16 + 1, undefined, log)
+        ]);
+    }
+}
+/**
+ * Downloads enough points to be able to prove every server-side circuit
+ * @param opts - Whether real proof are to be generated
+ * @param log - Logging function
+ */ export async function preloadCrsDataForServerSideProving({ realProofs }, log) {
+    if (realProofs) {
+        const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
+        await Promise.all([
+            Crs.new(2 ** 25 + 1, undefined, log),
+            GrumpkinCrs.new(2 ** 18 + 1, undefined, log)
+        ]);
+    }
+}
+export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, followsCanonicalRollup, publicClient, registryContractAddress, signalHandlers, updateNodeConfig) {
+    const logger = createLogger('update-check');
+    const checker = await UpdateChecker.new({
+        baseURL: updatesLocation,
+        publicClient,
+        registryContractAddress
+    });
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    checker.on('newRollupVersion', async ({ latestVersion, currentVersion })=>{
+        if (isShuttingDown()) {
+            return;
+        }
+        // if node follows canonical rollup then this is equivalent to a config update
+        if (!followsCanonicalRollup) {
+            return;
+        }
+        if (autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') {
+            logger.info(`New rollup version detected. Please restart the node`, {
+                latestVersion,
+                currentVersion
+            });
+            await shutdown(logger.info, 78, signalHandlers);
+        } else if (autoUpdateMode === 'notify') {
+            logger.warn(`New rollup detected. Please restart the node`, {
+                latestVersion,
+                currentVersion
+            });
+        }
+    });
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    checker.on('newNodeVersion', async ({ latestVersion, currentVersion })=>{
+        if (isShuttingDown()) {
+            return;
+        }
+        if (autoUpdateMode === 'config-and-version') {
+            logger.info(`New node version detected. Please update and restart the node`, {
+                latestVersion,
+                currentVersion
+            });
+            await shutdown(logger.info, 79, signalHandlers);
+        } else if (autoUpdateMode === 'notify') {
+            logger.info(`New node version detected. Please update and restart the node`, {
+                latestVersion,
+                currentVersion
+            });
+        }
+    });
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    checker.on('updateNodeConfig', async (config)=>{
+        if (isShuttingDown()) {
+            return;
+        }
+        if ((autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') && updateNodeConfig) {
+            logger.warn(`Config change detected. Updating node`, config);
+            try {
+                await updateNodeConfig(config);
+            } catch (err) {
+                logger.warn('Failed to update config', {
+                    err
+                });
+            }
+        }
+    // don't notify on these config changes
+    });
+    checker.on('updatePublicTelemetryConfig', (config)=>{
+        if (autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') {
+            logger.warn(`Public telemetry config change detected. Updating telemetry client`, config);
+            try {
+                const publicIncludeMetrics = config.publicIncludeMetrics;
+                if (Array.isArray(publicIncludeMetrics) && publicIncludeMetrics.every((m)=>typeof m === 'string')) {
+                    getTelemetryClient().setExportedPublicTelemetry(publicIncludeMetrics);
+                }
+                const publicMetricsCollectFrom = config.publicMetricsCollectFrom;
+                if (Array.isArray(publicMetricsCollectFrom) && publicMetricsCollectFrom.every((m)=>typeof m === 'string')) {
+                    getTelemetryClient().setPublicTelemetryCollectFrom(publicMetricsCollectFrom);
+                }
+            } catch (err) {
+                logger.warn('Failed to update config', {
+                    err
+                });
+            }
+        }
+    // don't notify on these config changes
+    });
+    checker.start();
+}

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,40 +1,53 @@
-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.getCompleteAddress();
-    const bob = bobWallet.getCompleteAddress();
-    logger.info(`Fetched Alice and Bob accounts: ${alice.address.toString()}, ${bob.address.toString()}`);
+    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().deployed();
+    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...`);
-    const from = aliceWallet.getAddress(); // we are setting from to Alice here because we need a sender to calculate the tag
-    await tokenAlice.methods.mint_to_private(from, aliceWallet.getAddress(), ALICE_MINT_BALANCE).send().wait();
+    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().wait();
+    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}`);
 }
 main().then(()=>{

package/dest/examples/util.d.ts

@@ -1,17 +1,16 @@
-import { EthAddress } from '@aztec/aztec.js';
-import type { ViemPublicClient, ViemWalletClient } from '@aztec/ethereum';
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import type { ExtendedViemWalletClient } from '@aztec/ethereum';
 import type { Abi, Narrow } from 'abitype';
 import type { Hex } from 'viem';
 /**
  * Helper function to deploy ETH contracts.
- * @param walletClient - A viem WalletClient.
- * @param publicClient - A viem PublicClient.
+ * @param l1Client - A viem WalletClient extended with public actions.
  * @param abi - The ETH contract's ABI (as abitype's Abi).
  * @param bytecode  - The ETH contract's bytecode.
  * @param args - Constructor arguments for the contract.
  * @returns The ETH address the contract was deployed to.
  */
-export declare function deployL1Contract(walletClient: ViemWalletClient, publicClient: ViemPublicClient, abi: Narrow<Abi | readonly unknown[]>, bytecode: Hex, args?: readonly unknown[]): Promise<EthAddress>;
+export declare function deployL1Contract(l1Client: ExtendedViemWalletClient, abi: Narrow<Abi | readonly unknown[]>, bytecode: Hex, args?: readonly unknown[]): Promise<EthAddress>;
 /**
  * Sleep for a given number of milliseconds.
  * @param ms - the number of milliseconds to sleep for

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,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAG1E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,gBAAgB,EAC9B,YAAY,EAAE,gBAAgB,EAC9B,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,20 +1,19 @@
-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.
- * @param walletClient - A viem WalletClient.
- * @param publicClient - A viem PublicClient.
+ * @param l1Client - A viem WalletClient extended with public actions.
  * @param abi - The ETH contract's ABI (as abitype's Abi).
  * @param bytecode  - The ETH contract's bytecode.
  * @param args - Constructor arguments for the contract.
  * @returns The ETH address the contract was deployed to.
- */ export async function deployL1Contract(walletClient, publicClient, abi, bytecode, args = []) {
-    const hash = await walletClient.deployContract({
+ */ export async function deployL1Contract(l1Client, abi, bytecode, args = []) {
+    const hash = await l1Client.deployContract({
         abi,
         bytecode,
         args
     });
-    const receipt = await publicClient.waitForTransactionReceipt({
+    const receipt = await l1Client.waitForTransactionReceipt({
         hash
     });
     const contractAddress = receipt.contractAddress;

package/dest/index.d.ts

@@ -1,2 +1,2 @@
-export { createSandbox, getDeployedBananaCoinAddress, getDeployedBananaFPCAddress, getDeployedSponsoredFPCAddress, SponsoredFeePaymentMethod, } 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,EAC9B,yBAAyB,GAC1B,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, SponsoredFeePaymentMethod } 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,9 +1,9 @@
-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';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
+import { getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
 const BANANA_COIN_SALT = new Fr(0);
 const bananaCoinArgs = {
     name: 'BC',
@@ -16,7 +16,7 @@ function getBananaAdmin(initialAccounts) {
 }
 async function getBananaCoinInstance(initialAccounts) {
     const admin = getBananaAdmin(initialAccounts);
-    return await getContractInstanceFromDeployParams(TokenContract.artifact, {
+    return await getContractInstanceFromInstantiationParams(TokenContract.artifact, {
         constructorArgs: [
             admin,
             bananaCoinArgs.name,
@@ -32,7 +32,7 @@ export async function getBananaCoinAddress(initialAccounts) {
 async function getBananaFPCInstance(initialAccounts) {
     const bananaCoin = await getBananaCoinAddress(initialAccounts);
     const admin = getBananaAdmin(initialAccounts);
-    return await getContractInstanceFromDeployParams(FPCContract.artifact, {
+    return await getContractInstanceFromInstantiationParams(FPCContract.artifact, {
         constructorArgs: [
             bananaCoin,
             admin
@@ -43,15 +43,17 @@ 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
         }).deployed()
@@ -59,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,5 +1,4 @@
 export * from './sandbox.js';
-export { getDeployedBananaCoinAddress, getDeployedBananaFPCAddress } from './banana_fpc.js';
-export { getDeployedSponsoredFPCAddress } from './sponsored_fpc.js';
-export { SponsoredFeePaymentMethod } from './sponsored_fee_payment_method.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;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,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,4 +1,3 @@
 export * from './sandbox.js';
-export { getDeployedBananaCoinAddress, getDeployedBananaFPCAddress } from './banana_fpc.js';
-export { getDeployedSponsoredFPCAddress } from './sponsored_fpc.js';
-export { SponsoredFeePaymentMethod } from './sponsored_fee_payment_method.js';
+export { registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress } from './banana_fpc.js';
+export { registerDeployedSponsoredFPCInWalletAndGetAddress } from './sponsored_fpc.js';