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

package/README.md

@@ -1,2 +1,32 @@
 # Aztec wallet Documentation
 
+### Run tests locally
+
+1) Start a local Ethereum node (Anvil) in one terminal:
+
+```bash
+anvil --host 127.0.0.1 --port 8545
+```
+
+2) In another terminal, start the Aztec sandbox from `yarn-project/aztec`:
+
+```bash
+cd yarn-project/aztec
+NODE_NO_WARNINGS=1 ETHEREUM_HOSTS=http://127.0.0.1:8545 node ./dest/bin/index.js start --sandbox
+```
+
+3) Run the wallet tests from `yarn-project/cli-wallet/test`:
+
+```bash
+cd yarn-project/cli-wallet/test
+./test.sh --filter <partialnameoftest>
+```
+
+Notes:
+- **Filter tests**: Omit `--filter` to run all tests, or pass part of a test filename to run a subset.
+- **Docker mode**: You can run tests using Docker by adding `--docker`:
+
+```bash
+./test.sh --docker --filter <partialnameoftest>
+```
+

package/dest/bin/index.js

@@ -1,18 +1,25 @@
-import { Fr, computeSecretHash, fileURLToPath } from '@aztec/aztec.js';
+import { computeSecretHash } from '@aztec/aztec.js/crypto';
+import { Fr } from '@aztec/aztec.js/fields';
+import { createAztecNodeClient } from '@aztec/aztec.js/node';
+import { ProtocolContractAddress } from '@aztec/aztec.js/protocol';
 import { LOCALHOST } from '@aztec/cli/cli-utils';
 import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
 import { openStoreAt } from '@aztec/kv-store/lmdb-v2';
+import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import { Argument, Command, Option } from 'commander';
-import { mkdirSync, readFileSync } from 'fs';
+import { mkdirSync } from 'fs';
 import { homedir } from 'os';
 import { dirname, join, resolve } from 'path';
+import { fileURLToPath } from 'url';
 import { injectCommands } from '../cmds/index.js';
 import { Aliases, WalletDB } from '../storage/wallet_db.js';
+import { CliWalletAndNodeWrapper } from '../utils/cli_wallet_and_node_wrapper.js';
 import { createAliasOption } from '../utils/options/index.js';
-import { PXEWrapper } from '../utils/pxe_wrapper.js';
+import { CLIWallet } from '../utils/wallet.js';
 const userLog = createConsoleLogger();
 const debugLogger = createLogger('wallet');
-const { WALLET_DATA_DIRECTORY = join(homedir(), '.aztec/wallet'), PXE_PROVER = 'none' } = process.env;
+const { WALLET_DATA_DIRECTORY = join(homedir(), '.aztec/wallet') } = process.env;
+// TODO: This function is only used in 1 place so we could just inline this
 function injectInternalCommands(program, log, db) {
     program.command('alias').description('Aliases information for easy reference.').addArgument(new Argument('<type>', 'Type of alias to create').choices(Aliases)).argument('<key>', 'Key to alias.').argument('<value>', 'Value to assign to the alias.').action(async (type, key, value)=>{
         value = db.tryRetrieveAlias(value) || value;
@@ -33,38 +40,53 @@ function injectInternalCommands(program, log, db) {
         const options = command.optsWithGlobals();
         const { alias } = options;
         const value = Fr.random();
-        const hash = computeSecretHash(value);
+        const hash = await computeSecretHash(value);
         await db.storeAlias('secrets', alias, Buffer.from(value.toString()), log);
         await db.storeAlias('secrets', `${alias}:hash`, Buffer.from(hash.toString()), log);
     });
     return program;
 }
 /** CLI wallet main entrypoint */ async function main() {
-    const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
-    const walletVersion = JSON.parse(readFileSync(packageJsonPath).toString()).version;
+    const walletVersion = getPackageVersion() ?? '0.0.0';
     const db = WalletDB.getInstance();
-    const pxeWrapper = new PXEWrapper();
+    const walletAndNodeWrapper = new CliWalletAndNodeWrapper();
     const program = new Command('wallet');
-    program.description('Aztec wallet').version(walletVersion).option('-d, --data-dir <string>', 'Storage directory for wallet data', WALLET_DATA_DIRECTORY).option('-p, --prover <string>', 'wasm|native|none', PXE_PROVER).addOption(new Option('--remote-pxe', 'Connect to an external PXE RPC server, instead of the local one').env('REMOTE_PXE').default(false).conflicts('rpc-url')).addOption(new Option('-n, --node-url <string>', 'URL of the Aztec node to connect to').env('AZTEC_NODE_URL').default(`http://${LOCALHOST}:8080`)).hook('preSubcommand', async (command)=>{
-        const { dataDir, remotePxe, nodeUrl, prover } = command.optsWithGlobals();
-        if (!remotePxe) {
-            debugLogger.info('Using local PXE service');
-            const proverEnabled = prover !== 'none';
-            const bbBinaryPath = prover === 'native' ? resolve(dirname(fileURLToPath(import.meta.url)), '../../../../barretenberg/cpp/build/bin/bb') : undefined;
-            const bbWorkingDirectory = dataDir + '/bb';
-            mkdirSync(bbWorkingDirectory, {
-                recursive: true
-            });
-            const overridePXEConfig = {
-                proverEnabled,
-                bbBinaryPath: prover === 'native' ? bbBinaryPath : undefined,
-                bbWorkingDirectory: prover === 'native' ? bbWorkingDirectory : undefined
-            };
-            await pxeWrapper.init(nodeUrl, join(dataDir, 'pxe'), overridePXEConfig);
-        }
+    program.description('Aztec wallet').version(walletVersion).option('-d, --data-dir <string>', 'Storage directory for wallet data', WALLET_DATA_DIRECTORY).addOption(new Option('-p, --prover <string>', 'The type of prover the wallet uses').choices([
+        'wasm',
+        'native',
+        'none'
+    ]).env('PXE_PROVER').default('native')).addOption(new Option('-n, --node-url <string>', 'URL of the Aztec node to connect to').env('AZTEC_NODE_URL').default(`http://${LOCALHOST}:8080`)).hook('preSubcommand', async (command)=>{
+        const { dataDir, nodeUrl, prover } = command.optsWithGlobals();
+        const proverEnabled = prover !== 'none';
+        const bbBinaryPath = prover === 'native' ? process.env.BB_BINARY_PATH ?? resolve(dirname(fileURLToPath(import.meta.url)), '../../../../barretenberg/cpp/build/bin/bb') : undefined;
+        const bbWorkingDirectory = dataDir + '/bb';
+        mkdirSync(bbWorkingDirectory, {
+            recursive: true
+        });
+        const overridePXEConfig = {
+            proverEnabled,
+            bbBinaryPath: prover === 'native' ? bbBinaryPath : undefined,
+            bbWorkingDirectory: prover === 'native' ? bbWorkingDirectory : undefined,
+            dataDirectory: join(dataDir, 'pxe')
+        };
+        const node = createAztecNodeClient(nodeUrl);
+        const wallet = await CLIWallet.create(node, userLog, db, overridePXEConfig);
+        walletAndNodeWrapper.setNodeAndWallet(node, wallet);
         await db.init(await openStoreAt(dataDir));
+        let protocolContractsRegistered;
+        try {
+            protocolContractsRegistered = !!await db.retrieveAlias('contracts:ContractClassRegistry');
+        // eslint-disable-next-line no-empty
+        } catch  {}
+        if (!protocolContractsRegistered) {
+            userLog('Registering protocol contract aliases...');
+            for (const [name, address] of Object.entries(ProtocolContractAddress)){
+                await db.storeAlias('contracts', name, Buffer.from(address.toString()), userLog);
+                await db.storeAlias('artifacts', address.toString(), Buffer.from(`${name.slice(0, 1).toUpperCase()}${name.slice(1)}`), userLog);
+            }
+        }
     });
-    injectCommands(program, userLog, debugLogger, db, pxeWrapper);
+    injectCommands(program, userLog, debugLogger, walletAndNodeWrapper, db);
     injectInternalCommands(program, userLog, db);
     await program.parseAsync(process.argv);
 }

package/dest/cmds/authorize_action.d.ts

@@ -1,4 +1,5 @@
-import { type AccountWalletWithSecretKey, type AztecAddress } from '@aztec/aztec.js';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { Wallet } from '@aztec/aztec.js/wallet';
 import type { LogFn } from '@aztec/foundation/log';
-export declare function authorizeAction(wallet: AccountWalletWithSecretKey, functionName: string, caller: AztecAddress, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, log: LogFn): Promise<import("@aztec/aztec.js").FieldsOf<import("@aztec/aztec.js").TxReceipt>>;
+export declare function authorizeAction(wallet: Wallet, from: AztecAddress, functionName: string, caller: AztecAddress, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, log: LogFn): Promise<import("@aztec/foundation/types").FieldsOf<import("@aztec/aztec.js/tx").TxReceipt>>;
 //# sourceMappingURL=authorize_action.d.ts.map

package/dest/cmds/authorize_action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authorize_action.d.ts","sourceRoot":"","sources":["../../src/cmds/authorize_action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,KAAK,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAE/F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,eAAe,CACnC,MAAM,EAAE,0BAA0B,EAClC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,YAAY,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,GAAG,EAAE,KAAK,oFAwBX"}
+{"version":3,"file":"authorize_action.d.ts","sourceRoot":"","sources":["../../src/cmds/authorize_action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAG9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,YAAY,EAClB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,YAAY,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,GAAG,EAAE,KAAK,+FA6BX"}

package/dest/cmds/authorize_action.js

@@ -1,17 +1,21 @@
-import { Contract } from '@aztec/aztec.js';
+import { SetPublicAuthwitContractInteraction } from '@aztec/aztec.js/authorization';
+import { Contract } from '@aztec/aztec.js/contracts';
 import { prepTx } from '@aztec/cli/utils';
-export async function authorizeAction(wallet, functionName, caller, functionArgsIn, contractArtifactPath, contractAddress, log) {
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
+export async function authorizeAction(wallet, from, functionName, caller, functionArgsIn, contractArtifactPath, contractAddress, log) {
     const { functionArgs, contractArtifact, isPrivate } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
     if (isPrivate) {
         throw new Error('Cannot authorize private function. To allow a third party to call a private function, please create an authorization witness via the create-authwit command');
     }
     const contract = await Contract.at(contractAddress, contractArtifact, wallet);
     const action = contract.methods[functionName](...functionArgs);
-    const setAuthwitnessInteraction = await wallet.setPublicAuthWit({
+    const setAuthwitnessInteraction = await SetPublicAuthwitContractInteraction.create(wallet, from, {
         caller,
         action
     }, true);
-    const witness = await setAuthwitnessInteraction.send().wait();
+    const witness = await setAuthwitnessInteraction.send().wait({
+        timeout: DEFAULT_TX_TIMEOUT_S
+    });
     log(`Authorized action ${functionName} on contract ${contractAddress} for caller ${caller}`);
     return witness;
 }

package/dest/cmds/bridge_fee_juice.d.ts

@@ -1,6 +1,6 @@
-import { type PXE } from '@aztec/aztec.js';
+import type { AztecNode } from '@aztec/aztec.js/node';
 import { Fr } from '@aztec/foundation/fields';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-export declare function bridgeL1FeeJuice(amount: bigint, recipient: AztecAddress, pxe: PXE, l1RpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mint: boolean, json: boolean, wait: boolean, interval: number | undefined, log: LogFn, debugLogger: Logger): Promise<readonly [Fr, bigint]>;
+export declare function bridgeL1FeeJuice(amount: bigint, recipient: AztecAddress, node: AztecNode, l1RpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mint: boolean, json: boolean, wait: boolean, interval: number | undefined, log: LogFn, debugLogger: Logger): Promise<readonly [Fr, bigint]>;
 //# sourceMappingURL=bridge_fee_juice.d.ts.map

package/dest/cmds/bridge_fee_juice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bridge_fee_juice.d.ts","sourceRoot":"","sources":["../../src/cmds/bridge_fee_juice.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY,EACvB,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,EACb,QAAQ,oBAAS,EACjB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,kCAmEpB"}
+{"version":3,"file":"bridge_fee_juice.d.ts","sourceRoot":"","sources":["../../src/cmds/bridge_fee_juice.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAItD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY,EACvB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,EACb,QAAQ,oBAAS,EACjB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,kCAmEpB"}

package/dest/cmds/bridge_fee_juice.js

@@ -1,14 +1,15 @@
-import { L1FeeJuicePortalManager } from '@aztec/aztec.js';
+import { L1FeeJuicePortalManager } from '@aztec/aztec.js/ethereum';
+import { ProtocolContractAddress } from '@aztec/aztec.js/protocol';
 import { prettyPrintJSON } from '@aztec/cli/utils';
-import { createEthereumChain, createL1Clients } from '@aztec/ethereum';
+import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
-export async function bridgeL1FeeJuice(amount, recipient, pxe, l1RpcUrls, chainId, privateKey, mnemonic, mint, json, wait, interval = 60_000, log, debugLogger) {
+import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
+export async function bridgeL1FeeJuice(amount, recipient, node, l1RpcUrls, chainId, privateKey, mnemonic, mint, json, wait, interval = 60_000, log, debugLogger) {
     // Prepare L1 client
     const chain = createEthereumChain(l1RpcUrls, chainId);
-    const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
-    const { protocolContractAddresses: { feeJuice: feeJuiceAddress } } = await pxe.getPXEInfo();
+    const client = createExtendedL1Client(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
     // Setup portal manager
-    const portal = await L1FeeJuicePortalManager.new(pxe, publicClient, walletClient, debugLogger);
+    const portal = await L1FeeJuicePortalManager.new(node, client, debugLogger);
     const { claimAmount, claimSecret, messageHash, messageLeafIndex } = await portal.bridgeTokensPublic(recipient, amount, mint);
     if (json) {
         const out = {
@@ -33,7 +34,7 @@ export async function bridgeL1FeeJuice(amount, recipient, pxe, l1RpcUrls, chainI
         const delayedCheck = (delay)=>{
             return new Promise((resolve, reject)=>{
                 setTimeout(()=>{
-                    void pxe.getL1ToL2MembershipWitness(feeJuiceAddress, Fr.fromHexString(messageHash), claimSecret).then((witness)=>resolve(witness)).catch((err)=>reject(err));
+                    void getNonNullifiedL1ToL2MessageWitness(node, ProtocolContractAddress.FeeJuice, Fr.fromHexString(messageHash), claimSecret).then((witness)=>resolve(witness)).catch((err)=>reject(err));
                 }, delay);
             });
         };

package/dest/cmds/check_tx.d.ts

@@ -1,4 +1,6 @@
-import type { PXE, TxHash } from '@aztec/aztec.js';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import type { TxHash } from '@aztec/aztec.js/tx';
 import type { LogFn } from '@aztec/foundation/log';
-export declare function checkTx(client: PXE, txHash: TxHash, statusOnly: boolean, log: LogFn): Promise<import("@aztec/aztec.js").TxStatus | undefined>;
+import type { CLIWallet } from '../utils/wallet.js';
+export declare function checkTx(wallet: CLIWallet, aztecNode: AztecNode, txHash: TxHash, statusOnly: boolean, log: LogFn): Promise<import("@aztec/aztec.js/tx").TxStatus | undefined>;
 //# sourceMappingURL=check_tx.d.ts.map

package/dest/cmds/check_tx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"check_tx.d.ts","sourceRoot":"","sources":["../../src/cmds/check_tx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,2DAOzF"}
+{"version":3,"file":"check_tx.d.ts","sourceRoot":"","sources":["../../src/cmds/check_tx.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,OAAO,EACnB,GAAG,EAAE,KAAK,8DAQX"}

package/dest/cmds/check_tx.js

@@ -1,11 +1,150 @@
-import { inspectTx } from '@aztec/cli/inspect';
-export async function checkTx(client, txHash, statusOnly, log) {
+import { ProtocolContractAddress } from '@aztec/aztec.js/protocol';
+import { siloNullifier } from '@aztec/stdlib/hash';
+export async function checkTx(wallet, aztecNode, txHash, statusOnly, log) {
     if (statusOnly) {
-        const receipt = await client.getTxReceipt(txHash);
+        const receipt = await aztecNode.getTxReceipt(txHash);
         return receipt.status;
     } else {
-        await inspectTx(client, txHash, log, {
-            includeBlockInfo: true
-        });
+        await inspectTx(wallet, aztecNode, txHash, log);
     }
 }
+// The rest of the code here was copied over here from CLI because in CLI I needed to prune the inspect function of the PXE
+// dependency when dropping PXE JSON RPC Server.
+async function inspectTx(wallet, aztecNode, txHash, log) {
+    const [receipt, effectsInBlock] = await Promise.all([
+        aztecNode.getTxReceipt(txHash),
+        aztecNode.getTxEffect(txHash)
+    ]);
+    // Base tx data
+    log(`Tx ${txHash.toString()}`);
+    log(` Status: ${receipt.status} ${effectsInBlock ? `(${effectsInBlock.data.revertCode.getDescription()})` : ''}`);
+    if (receipt.error) {
+        log(` Error: ${receipt.error}`);
+    }
+    if (!effectsInBlock) {
+        return;
+    }
+    const effects = effectsInBlock.data;
+    const artifactMap = await getKnownArtifacts(wallet);
+    log(` Block: ${receipt.blockNumber} (${receipt.blockHash?.toString()})`);
+    if (receipt.transactionFee) {
+        log(` Fee: ${receipt.transactionFee.toString()}`);
+    }
+    // Public logs
+    const publicLogs = effects.publicLogs;
+    if (publicLogs.length > 0) {
+        log(' Logs:');
+        for (const publicLog of publicLogs){
+            log(`  ${publicLog.toHumanReadable()}`);
+        }
+    }
+    // Public data writes
+    const writes = effects.publicDataWrites;
+    if (writes.length > 0) {
+        log(' Public data writes:');
+        for (const write of writes){
+            log(`  Leaf ${write.leafSlot.toString()} = ${write.value.toString()}`);
+        }
+    }
+    // Created notes
+    const notes = effects.noteHashes;
+    if (notes.length > 0) {
+        log(' Created notes:');
+        log(`  Total: ${notes.length}`);
+        for (const note of notes){
+            log(`  Note hash: ${note.toShortString()}`);
+        }
+    }
+    // Nullifiers
+    const nullifierCount = effects.nullifiers.length;
+    const { deployNullifiers, initNullifiers, classNullifiers } = await getKnownNullifiers(wallet, artifactMap);
+    if (nullifierCount > 0) {
+        log(' Nullifiers:');
+        for (const nullifier of effects.nullifiers){
+            const deployed = deployNullifiers[nullifier.toString()];
+            const note = deployed ? (await wallet.getNotes({
+                siloedNullifier: nullifier,
+                contractAddress: deployed
+            }))[0] : undefined;
+            const initialized = initNullifiers[nullifier.toString()];
+            const registered = classNullifiers[nullifier.toString()];
+            if (nullifier.toBuffer().equals(txHash.toBuffer())) {
+                log(`  Transaction hash nullifier ${nullifier.toShortString()}`);
+            } else if (note) {
+                inspectNote(note, artifactMap, log, `Nullifier ${nullifier.toShortString()} for note`);
+            } else if (deployed) {
+                log(`  Contract ${toFriendlyAddress(deployed, artifactMap)} deployed via nullifier ${nullifier.toShortString()}`);
+            } else if (initialized) {
+                log(`  Contract ${toFriendlyAddress(initialized, artifactMap)} initialized via nullifier ${nullifier.toShortString()}`);
+            } else if (registered) {
+                log(`  Class ${registered} registered via nullifier ${nullifier.toShortString()}`);
+            } else {
+                log(`  Unknown nullifier ${nullifier.toString()}`);
+            }
+        }
+    }
+    // L2 to L1 messages
+    if (effects.l2ToL1Msgs.length > 0) {
+        log(` L2 to L1 messages:`);
+        for (const msg of effects.l2ToL1Msgs){
+            log(`  ${msg.toString()}`);
+        }
+    }
+}
+function inspectNote(note, artifactMap, log, text = 'Note') {
+    const artifact = artifactMap[note.contractAddress.toString()];
+    const contract = artifact?.name ?? note.contractAddress.toString();
+    log(`  ${text} at ${contract}`);
+    log(`    Recipient: ${toFriendlyAddress(note.recipient, artifactMap)}`);
+    for (const field of note.note.items){
+        log(`    ${field.toString()}`);
+    }
+}
+function toFriendlyAddress(address, artifactMap) {
+    const artifact = artifactMap[address.toString()];
+    if (!artifact) {
+        return address.toString();
+    }
+    return `${artifact.name}<${address.toString()}>`;
+}
+async function getKnownNullifiers(wallet, artifactMap) {
+    const knownContracts = await wallet.getContracts();
+    const deployerAddress = ProtocolContractAddress.ContractInstanceRegistry;
+    const classRegistryAddress = ProtocolContractAddress.ContractClassRegistry;
+    const initNullifiers = {};
+    const deployNullifiers = {};
+    const classNullifiers = {};
+    for (const contract of knownContracts){
+        initNullifiers[(await siloNullifier(contract, contract.toField())).toString()] = contract;
+        deployNullifiers[(await siloNullifier(deployerAddress, contract.toField())).toString()] = contract;
+    }
+    for (const artifact of Object.values(artifactMap)){
+        classNullifiers[(await siloNullifier(classRegistryAddress, artifact.classId)).toString()] = `${artifact.name}Class<${artifact.classId}>`;
+    }
+    return {
+        initNullifiers,
+        deployNullifiers,
+        classNullifiers
+    };
+}
+async function getKnownArtifacts(wallet) {
+    const knownContractAddresses = await wallet.getContracts();
+    const knownContracts = (await Promise.all(knownContractAddresses.map((contractAddress)=>wallet.getContractMetadata(contractAddress)))).map((contractMetadata)=>contractMetadata.contractInstance);
+    const classIds = [
+        ...new Set(knownContracts.map((contract)=>contract?.currentContractClassId))
+    ];
+    const knownArtifacts = (await Promise.all(classIds.map((classId)=>classId ? wallet.getContractClassMetadata(classId) : undefined))).map((contractClassMetadata)=>contractClassMetadata ? {
+            ...contractClassMetadata.artifact,
+            classId: contractClassMetadata.contractClass?.id
+        } : undefined);
+    const map = {};
+    for (const instance of knownContracts){
+        if (instance) {
+            const artifact = knownArtifacts.find((a)=>a?.classId?.equals(instance.currentContractClassId));
+            if (artifact) {
+                map[instance.address.toString()] = artifact;
+            }
+        }
+    }
+    return map;
+}

package/dest/cmds/create_account.d.ts

@@ -1,11 +1,12 @@
-import type { PXE } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { AztecNode } from '@aztec/aztec.js/node';
 import { Fr } from '@aztec/foundation/fields';
 import type { LogFn, Logger } from '@aztec/foundation/log';
-import { type AccountType } from '../utils/accounts.js';
-import { type IFeeOpts } from '../utils/options/fees.js';
-export declare function createAccount(client: PXE, accountType: AccountType, secretKey: Fr | undefined, publicKey: string | undefined, alias: string | undefined, registerOnly: boolean, publicDeploy: boolean, skipInitialization: boolean, wait: boolean, feeOpts: IFeeOpts, json: boolean, debugLogger: Logger, log: LogFn): Promise<{
+import { CLIFeeArgs } from '../utils/options/fees.js';
+import { type AccountType, CLIWallet } from '../utils/wallet.js';
+export declare function createAccount(wallet: CLIWallet, aztecNode: AztecNode, accountType: AccountType, secretKey: Fr | undefined, publicKey: string | undefined, alias: string | undefined, deployer: AztecAddress | undefined, registerOnly: boolean, skipInitialization: boolean, publicDeploy: boolean, registerClass: boolean, wait: boolean, feeOpts: CLIFeeArgs, json: boolean, verbose: boolean, debugLogger: Logger, log: LogFn): Promise<{
     alias: string | undefined;
-    address: import("@aztec/aztec.js").AztecAddress;
+    address: AztecAddress;
     secretKey: Fr;
     salt: Fr;
 }>;

package/dest/cmds/create_account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create_account.d.ts","sourceRoot":"","sources":["../../src/cmds/create_account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAwB,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,WAAW,EAA2B,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAE5E,wBAAsB,aAAa,CACjC,MAAM,EAAE,GAAG,EACX,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,EAAE,GAAG,SAAS,EACzB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,kBAAkB,EAAE,OAAO,EAC3B,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;;GAkGX"}
+{"version":3,"file":"create_account.d.ts","sourceRoot":"","sources":["../../src/cmds/create_account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,EAAE,KAAK,WAAW,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEjE,wBAAsB,aAAa,CACjC,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,EAAE,GAAG,SAAS,EACzB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,EAAE,YAAY,GAAG,SAAS,EAClC,YAAY,EAAE,OAAO,EACrB,kBAAkB,EAAE,OAAO,EAC3B,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,OAAO,EACtB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;;GAiHX"}

package/dest/cmds/create_account.js

@@ -1,11 +1,12 @@
+import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import { Fr } from '@aztec/foundation/fields';
-import { createOrRetrieveAccount } from '../utils/accounts.js';
-import { printGasEstimates } from '../utils/options/fees.js';
-export async function createAccount(client, accountType, secretKey, publicKey, alias, registerOnly, publicDeploy, skipInitialization, wait, feeOpts, json, debugLogger, log) {
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
+import { printProfileResult } from '../utils/profiling.js';
+export async function createAccount(wallet, aztecNode, accountType, secretKey, publicKey, alias, deployer, registerOnly, skipInitialization, publicDeploy, registerClass, wait, feeOpts, json, verbose, debugLogger, log) {
     secretKey ??= Fr.random();
-    const account = await createOrRetrieveAccount(client, undefined /* address, we don't have it yet */ , undefined /* db, as we want to create from scratch */ , secretKey, accountType, Fr.ZERO, publicKey);
-    const salt = account.getInstance().salt;
+    const account = await wallet.createOrRetrieveAccount(undefined /* address, we don't have it yet */ , secretKey, accountType, Fr.ZERO, publicKey);
+    const { salt } = account.getInstance();
     const { address, publicKeys, partialAddress } = await account.getCompleteAddress();
     const out = {};
     if (json) {
@@ -17,7 +18,6 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
         out.partialAddress = partialAddress;
         out.salt = salt;
         out.initHash = account.getInstance().initializationHash;
-        out.deployer = account.getInstance().deployer;
     } else {
         log(`\nNew account:\n`);
         log(`Address:         ${address.toString()}`);
@@ -28,46 +28,65 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
         log(`Partial address: ${partialAddress.toString()}`);
         log(`Salt:            ${salt.toString()}`);
         log(`Init hash:       ${account.getInstance().initializationHash.toString()}`);
-        log(`Deployer:        ${account.getInstance().deployer.toString()}`);
     }
     let tx;
     let txReceipt;
-    if (registerOnly) {
-        await account.register();
-    } else {
-        const wallet = await account.getWallet();
-        const deployOpts = {
-            skipClassRegistration: !publicDeploy,
-            skipPublicDeployment: !publicDeploy,
-            skipInitialization: skipInitialization,
-            ...await feeOpts.toDeployAccountOpts(wallet)
+    if (!registerOnly) {
+        const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
+        const delegatedDeployment = deployer && !account.address.equals(deployer);
+        const from = delegatedDeployment ? deployer : AztecAddress.ZERO;
+        const deployAccountOpts = {
+            skipClassPublication: !registerClass,
+            skipInstancePublication: !publicDeploy,
+            skipInitialization,
+            from,
+            fee: {
+                paymentMethod,
+                gasSettings
+            }
         };
+        const deployMethod = await account.getDeployMethod();
+        const { estimatedGas, stats } = await deployMethod.simulate({
+            ...deployAccountOpts,
+            fee: {
+                ...deployAccountOpts.fee,
+                estimateGas: true
+            }
+        });
         if (feeOpts.estimateOnly) {
-            const gas = await (await account.getDeployMethod(deployOpts.deployWallet)).estimateGas(deployOpts);
             if (json) {
                 out.fee = {
                     gasLimits: {
-                        da: gas.gasLimits.daGas,
-                        l2: gas.gasLimits.l2Gas
+                        da: estimatedGas.gasLimits.daGas,
+                        l2: estimatedGas.gasLimits.l2Gas
                     },
                     teardownGasLimits: {
-                        da: gas.teardownGasLimits.daGas,
-                        l2: gas.teardownGasLimits
+                        da: estimatedGas.teardownGasLimits.daGas,
+                        l2: estimatedGas.teardownGasLimits
                     }
                 };
-            } else {
-                printGasEstimates(feeOpts, gas, log);
             }
         } else {
-            tx = account.deploy(deployOpts);
+            tx = deployMethod.send({
+                ...deployAccountOpts,
+                fee: deployAccountOpts.fee ? {
+                    ...deployAccountOpts.fee,
+                    gasSettings: estimatedGas
+                } : undefined
+            });
+            if (verbose) {
+                printProfileResult(stats, log);
+            }
             const txHash = await tx.getTxHash();
-            debugLogger.debug(`Account contract tx sent with hash ${txHash}`);
+            debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
             out.txHash = txHash;
             if (wait) {
                 if (!json) {
                     log(`\nWaiting for account contract deployment...`);
                 }
-                txReceipt = await tx.wait();
+                txReceipt = await tx.wait({
+                    timeout: DEFAULT_TX_TIMEOUT_S
+                });
                 out.txReceipt = {
                     status: txReceipt.status,
                     transactionFee: txReceipt.transactionFee
@@ -79,7 +98,7 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
         log(prettyPrintJSON(out));
     } else {
         if (tx) {
-            log(`Deploy tx hash:  ${await tx.getTxHash()}`);
+            log(`Deploy tx hash:  ${(await tx.getTxHash()).toString()}`);
         }
         if (txReceipt) {
             log(`Deploy tx fee:   ${txReceipt.transactionFee}`);

package/dest/cmds/create_authwit.d.ts

@@ -1,4 +1,5 @@
-import { type AccountWalletWithSecretKey, type AztecAddress } from '@aztec/aztec.js';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
 import type { LogFn } from '@aztec/foundation/log';
-export declare function createAuthwit(wallet: AccountWalletWithSecretKey, functionName: string, caller: AztecAddress, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, log: LogFn): Promise<import("@aztec/aztec.js").AuthWitness>;
+import type { CLIWallet } from '../utils/wallet.js';
+export declare function createAuthwit(wallet: CLIWallet, from: AztecAddress, functionName: string, caller: AztecAddress, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, log: LogFn): Promise<import("@aztec/stdlib/auth-witness").AuthWitness>;
 //# sourceMappingURL=create_authwit.d.ts.map

package/dest/cmds/create_authwit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create_authwit.d.ts","sourceRoot":"","sources":["../../src/cmds/create_authwit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,KAAK,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAE/F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,aAAa,CACjC,MAAM,EAAE,0BAA0B,EAClC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,YAAY,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,GAAG,EAAE,KAAK,kDAuBX"}
+{"version":3,"file":"create_authwit.d.ts","sourceRoot":"","sources":["../../src/cmds/create_authwit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAG9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,wBAAsB,aAAa,CACjC,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,YAAY,EAClB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,YAAY,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,GAAG,EAAE,KAAK,6DAuBX"}

package/dest/cmds/create_authwit.js

@@ -1,15 +1,15 @@
-import { Contract } from '@aztec/aztec.js';
+import { Contract } from '@aztec/aztec.js/contracts';
 import { prepTx } from '@aztec/cli/utils';
-export async function createAuthwit(wallet, functionName, caller, functionArgsIn, contractArtifactPath, contractAddress, log) {
+export async function createAuthwit(wallet, from, functionName, caller, functionArgsIn, contractArtifactPath, contractAddress, log) {
     const { functionArgs, contractArtifact, isPrivate } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
     if (!isPrivate) {
         throw new Error('Cannot create an authwit for a public function. To allow a third party to call a public function, please authorize the action via the authorize-action command');
     }
     const contract = await Contract.at(contractAddress, contractArtifact, wallet);
-    const action = contract.methods[functionName](...functionArgs);
-    const witness = await wallet.createAuthWit({
+    const call = await contract.methods[functionName](...functionArgs).getFunctionCall();
+    const witness = await wallet.createAuthWit(from, {
         caller,
-        action
+        call
     });
     log(`Created authorization witness for action ${functionName} on contract ${contractAddress} for caller ${caller}`);
     return witness;

package/dest/cmds/deploy.d.ts

@@ -1,6 +1,9 @@
-import { type AccountWalletWithSecretKey, Fr, type PXE } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { Fr } from '@aztec/aztec.js/fields';
+import type { AztecNode } from '@aztec/aztec.js/node';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { PublicKeys } from '@aztec/stdlib/keys';
-import { type IFeeOpts } from '../utils/options/fees.js';
-export declare function deploy(client: PXE, wallet: AccountWalletWithSecretKey, artifactPath: string, json: boolean, publicKeys: PublicKeys | undefined, rawArgs: any[], salt: Fr | undefined, initializer: string | undefined, skipPublicDeployment: boolean, skipClassRegistration: boolean, skipInitialization: boolean | undefined, universalDeploy: boolean | undefined, wait: boolean, feeOpts: IFeeOpts, debugLogger: Logger, log: LogFn, logJson: (output: any) => void): Promise<import("@aztec/aztec.js").AztecAddress | undefined>;
+import { CLIFeeArgs } from '../utils/options/fees.js';
+import type { CLIWallet } from '../utils/wallet.js';
+export declare function deploy(wallet: CLIWallet, node: AztecNode, deployer: AztecAddress, artifactPath: string, json: boolean, publicKeys: PublicKeys | undefined, rawArgs: any[], salt: Fr | undefined, initializer: string | undefined, skipInstancePublication: boolean, skipClassPublication: boolean, skipInitialization: boolean | undefined, wait: boolean, feeOpts: CLIFeeArgs, verbose: boolean, timeout: number | undefined, debugLogger: Logger, log: LogFn): Promise<AztecAddress | undefined>;
 //# sourceMappingURL=deploy.d.ts.map

package/dest/cmds/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAuC,EAAE,EAAE,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAErH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAE5E,wBAAsB,MAAM,CAC1B,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,0BAA0B,EAClC,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,OAAO,EAAE,GAAG,EAAE,EACd,IAAI,EAAE,EAAE,GAAG,SAAS,EACpB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,oBAAoB,EAAE,OAAO,EAC7B,qBAAqB,EAAE,OAAO,EAC9B,kBAAkB,EAAE,OAAO,GAAG,SAAS,EACvC,eAAe,EAAE,OAAO,GAAG,SAAS,EACpC,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,QAAQ,EACjB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,EACV,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,+DAuF/B"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,wBAAsB,MAAM,CAC1B,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,YAAY,EACtB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,OAAO,EAAE,GAAG,EAAE,EACd,IAAI,EAAE,EAAE,GAAG,SAAS,EACpB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,uBAAuB,EAAE,OAAO,EAChC,oBAAoB,EAAE,OAAO,EAC7B,kBAAkB,EAAE,OAAO,GAAG,SAAS,EACvC,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,YAAuB,EACtC,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,qCAgGX"}