@aztec/aztec 0.0.0-test.1 → 0.0.1-commit.017a351

package/dest/cli/util.js

@@ -1,40 +1,91 @@
+import { getNetworkConfig } from '@aztec/cli/config';
+import { RegistryContract } from '@aztec/ethereum/contracts';
+import { jsonStringify } from '@aztec/foundation/json-rpc';
+import { createLogger } from '@aztec/foundation/log';
+import { getPackageVersion } from '@aztec/stdlib/update-checker';
 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.map((fn)=>fn())).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 EmbeddedWallet 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(accountManagers, 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))) {
+    for (const accountManager of accountManagers){
+        const account = await accountManager.getAccount();
+        const completeAddress = account.getCompleteAddress();
+        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`);
-            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(` Secret Key: ${account.getSecretKey().toString()}\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;
@@ -65,22 +116,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 +155,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 +215,76 @@ 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, 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, undefined, log),
+            GrumpkinCrs.new(2 ** 18, undefined, log)
+        ]);
+    }
+}
+export async function setupVersionChecker(network, followsCanonicalRollup, publicClient, signalHandlers, cacheDir) {
+    const networkConfig = await getNetworkConfig(network, cacheDir);
+    if (!networkConfig) {
+        return;
+    }
+    const { VersionChecker } = await import('@aztec/stdlib/update-checker');
+    const logger = createLogger('version_check');
+    const registry = new RegistryContract(publicClient, networkConfig.registryAddress);
+    const checks = [];
+    checks.push({
+        name: 'node',
+        currentVersion: getPackageVersion(),
+        getLatestVersion: async ()=>{
+            const cfg = await getNetworkConfig(network, cacheDir);
+            return cfg?.nodeVersion;
+        }
+    });
+    if (followsCanonicalRollup) {
+        const getLatestVersion = async ()=>{
+            const version = (await registry.getRollupVersions()).at(-1);
+            return version !== undefined ? String(version) : undefined;
+        };
+        const currentVersion = await getLatestVersion();
+        if (currentVersion !== undefined) {
+            checks.push({
+                name: 'rollup',
+                currentVersion,
+                getLatestVersion
+            });
+        }
+    }
+    const checker = new VersionChecker(checks, 600_000, logger);
+    checker.on('newVersion', ({ name, latestVersion, currentVersion })=>{
+        if (isShuttingDown()) {
+            return;
+        }
+        logger.warn(`New ${name} version available`, {
+            latestVersion,
+            currentVersion
+        });
+    });
+    checker.start();
+    signalHandlers.push(()=>checker.stop());
+}
+export function stringifyConfig(config) {
+    return Object.entries(config).map(([key, value])=>`${key}=${jsonStringify(value)}`).join(' ');
+}

package/dest/cli/versioning.d.ts

@@ -1,4 +1,4 @@
 import type { ChainConfig } from '@aztec/stdlib/config';
 import { type ComponentsVersions } from '@aztec/stdlib/versioning';
 export declare function getVersions(config?: ChainConfig): Partial<ComponentsVersions>;
-//# sourceMappingURL=versioning.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbmluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS92ZXJzaW9uaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3hELE9BQU8sRUFBRSxLQUFLLGtCQUFrQixFQUFtQyxNQUFNLDBCQUEwQixDQUFDO0FBRXBHLHdCQUFnQixXQUFXLENBQUMsTUFBTSxDQUFDLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQU83RSJ9

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.d.ts

@@ -1,2 +1,2 @@
 export {};
-//# sourceMappingURL=token.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW4uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9leGFtcGxlcy90b2tlbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=

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 { EmbeddedWallet } from '@aztec/wallets/embedded';
 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 EmbeddedWallet.create(node);
+    // During local network 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 { contract: token } = await TokenContract.deploy(wallet, alice, 'TokenName', 'TokenSymbol', 18).send({
+        from: alice
+    });
     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
+    });
     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 { result: 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
+    });
     // Check the new balances
-    const aliceBalance = await tokenAlice.methods.balance_of_private(alice).simulate();
+    const { result: 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 { result: 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,20 +1,19 @@
-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/types';
 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
  */
 export declare function delay(ms: number): Promise<void>;
-//# sourceMappingURL=util.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2V4YW1wbGVzL3V0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHdEUsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUMzQyxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFaEM7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixnQkFBZ0IsQ0FDcEMsUUFBUSxFQUFFLHdCQUF3QixFQUNsQyxHQUFHLEVBQUUsTUFBTSxDQUFDLEdBQUcsR0FBRyxTQUFTLE9BQU8sRUFBRSxDQUFDLEVBQ3JDLFFBQVEsRUFBRSxHQUFHLEVBQ2IsSUFBSSxHQUFFLFNBQVMsT0FBTyxFQUFPLEdBQzVCLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FjckI7QUFFRDs7O0dBR0c7QUFDSCx3QkFBZ0IsS0FBSyxDQUFDLEVBQUUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUUvQyJ9

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,uBAAuB,CAAC;AAGtE,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';
-//# sourceMappingURL=index.d.ts.map
+export { createLocalNetwork, registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress, registerDeployedSponsoredFPCInWalletAndGetAddress, } from './local-network/index.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsa0JBQWtCLEVBQ2xCLCtDQUErQyxFQUMvQyw4Q0FBOEMsRUFDOUMsaURBQWlELEdBQ2xELE1BQU0sMEJBQTBCLENBQUMifQ==

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,kBAAkB,EAClB,+CAA+C,EAC/C,8CAA8C,EAC9C,iDAAiD,GAClD,MAAM,0BAA0B,CAAC"}

package/dest/index.js

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

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

@@ -0,0 +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, 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFuYW5hX2ZwYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvYmFuYW5hX2ZwYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxrQkFBa0IsRUFBOEIsTUFBTSx5QkFBeUIsQ0FBQztBQUM5RixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVyRCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUduRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUF3QjNELHdCQUFzQixvQkFBb0IsQ0FBQyxlQUFlLEVBQUUsa0JBQWtCLEVBQUUseUJBRS9FO0FBV0Qsd0JBQXNCLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxrQkFBa0IsRUFBRSx5QkFFOUU7QUFFRCx3QkFBc0IsY0FBYyxDQUNsQyxlQUFlLEVBQUUsa0JBQWtCLEVBQUUsRUFDckMsTUFBTSxFQUFFLE1BQU0sRUFDZCxHQUFHLEVBQUUsS0FBSyxFQUNWLFFBQVEsQ0FBQyxFQUFFLFFBQVEsaUJBaUJwQjtBQUVELHdCQUFzQiwrQ0FBK0MsQ0FBQyxNQUFNLEVBQUUsTUFBTSx5QkFNbkY7QUFFRCx3QkFBc0IsOENBQThDLENBQUMsTUFBTSxFQUFFLE1BQU0seUJBTWxGIn0=

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

@@ -0,0 +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,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/{sandbox → local-network}/banana_fpc.js

@@ -1,9 +1,9 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
-import { Fr } from '@aztec/foundation/fields';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import { Fr } from '@aztec/foundation/curves/bn254';
 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,37 +43,39 @@ 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, waitOpts) {
     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({
-            contractAddressSalt: BANANA_COIN_SALT,
+    const [{ contract: bananaCoin }, { contract: fpc }] = await Promise.all([
+        TokenContract.deploy(wallet, admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal, {
+            salt: BANANA_COIN_SALT,
             universalDeploy: true
-        }).deployed(),
-        FPCContract.deploy(deployer, bananaCoinAddress, admin).send({
-            contractAddressSalt: BANANA_FPC_SALT,
+        }).send({
+            from: admin,
+            wait: waitOpts
+        }),
+        FPCContract.deploy(wallet, bananaCoinAddress, admin, {
+            salt: BANANA_FPC_SALT,
             universalDeploy: true
-        }).deployed()
+        }).send({
+            from: admin,
+            wait: waitOpts
+        })
     ]);
     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/local-network/index.d.ts

@@ -0,0 +1,4 @@
+export * from './local-network.js';
+export { registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress, } from './banana_fpc.js';
+export { registerDeployedSponsoredFPCInWalletAndGetAddress } from './sponsored_fpc.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2NhbC1uZXR3b3JrL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFFbkMsT0FBTyxFQUNMLCtDQUErQyxFQUMvQyw4Q0FBOEMsR0FDL0MsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QixPQUFPLEVBQUUsaURBQWlELEVBQUUsTUFBTSxvQkFBb0IsQ0FBQyJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/local-network/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EACL,+CAA+C,EAC/C,8CAA8C,GAC/C,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iDAAiD,EAAE,MAAM,oBAAoB,CAAC"}

package/dest/local-network/index.js

@@ -0,0 +1,3 @@
+export * from './local-network.js';
+export { registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress } from './banana_fpc.js';
+export { registerDeployedSponsoredFPCInWalletAndGetAddress } from './sponsored_fpc.js';