@aztec/cli-wallet 0.85.0-alpha-testnet.2 → 0.85.0-alpha-testnet.4

package/dest/cmds/deploy_account.d.ts

@@ -1,7 +1,7 @@
 import type { AccountManager } from '@aztec/aztec.js';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { type IFeeOpts } from '../utils/options/fees.js';
-export declare function deployAccount(account: AccountManager, wait: boolean, registerClass: boolean, feeOpts: IFeeOpts, json: boolean, debugLogger: Logger, log: LogFn): Promise<{
+export declare function deployAccount(account: AccountManager, wait: boolean, registerClass: boolean, publicDeploy: boolean, feeOpts: IFeeOpts, json: boolean, debugLogger: Logger, log: LogFn): Promise<{
     address: import("@aztec/aztec.js").AztecAddress;
     secretKey: import("@aztec/aztec.js").Fr;
     salt: import("@aztec/aztec.js").Fr;

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

@@ -1 +1 @@
-{"version":3,"file":"deploy_account.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy_account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAwB,MAAM,iBAAiB,CAAC;AAE5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAE5E,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,OAAO,EACb,aAAa,EAAE,OAAO,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;GA8FX"}
+{"version":3,"file":"deploy_account.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy_account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAwB,MAAM,iBAAiB,CAAC;AAE5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAE5E,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,OAAO,EACb,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,OAAO,EACrB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;GA8FX"}

package/dest/cmds/deploy_account.js

@@ -1,6 +1,6 @@
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import { printGasEstimates } from '../utils/options/fees.js';
-export async function deployAccount(account, wait, registerClass, feeOpts, json, debugLogger, log) {
+export async function deployAccount(account, wait, registerClass, publicDeploy, feeOpts, json, debugLogger, log) {
     const out = {};
     const { address, partialAddress, publicKeys } = await account.getCompleteAddress();
     const { initializationHash, deployer, salt } = account.getInstance();
@@ -28,7 +28,7 @@ export async function deployAccount(account, wait, registerClass, feeOpts, json,
     let txReceipt;
     const deployOpts = {
         skipInitialization: false,
-        skipPublicDeployment: false,
+        skipPublicDeployment: !publicDeploy,
         skipClassRegistration: !registerClass,
         ...await feeOpts.toDeployAccountOpts(wallet)
     };

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cmds/index.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAGjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAuBxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAE1D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,EACnB,EAAE,CAAC,EAAE,QAAQ,EACb,UAAU,CAAC,EAAE,UAAU,WAgpBxB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cmds/index.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAGjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAuBxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAE1D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,EACnB,EAAE,CAAC,EAAE,QAAQ,EACb,UAAU,CAAC,EAAE,UAAU,WAkpBxB"}

package/dest/cmds/index.js

@@ -54,14 +54,14 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
     });
     const deployAccountCommand = program.command('deploy-account').description('Deploys an already registered aztec account that can be used for sending transactions.').addOption(createAccountOption('Alias or address of the account to deploy', !db, db)).addOption(pxeOption).option('--json', 'Emit output as json')// `options.wait` is default true. Passing `--no-wait` will set it to false.
     // https://github.com/tj/commander.js#other-option-types-negatable-boolean-and-booleanvalue
-    .option('--no-wait', 'Skip waiting for the contract to be deployed. Print the hash of deployment transaction').option('--register-class', 'Register the contract class (useful for when the contract class has not been deployed yet).');
+    .option('--no-wait', 'Skip waiting for the contract to be deployed. Print the hash of deployment transaction').option('--register-class', 'Register the contract class (useful for when the contract class has not been deployed yet).').option('--public-deploy', 'Publicly deploy this account contract (only useful if it contains public functions');
     addOptions(deployAccountCommand, FeeOptsWithFeePayer.getOptions()).action(async (_options, command)=>{
         const { deployAccount } = await import('./deploy_account.js');
         const options = command.optsWithGlobals();
-        const { rpcUrl, wait, from: parsedFromAddress, json, registerClass } = options;
+        const { rpcUrl, wait, from: parsedFromAddress, json, registerClass, publicDeploy } = options;
         const client = pxeWrapper?.getPXE() ?? await createCompatibleClient(rpcUrl, debugLogger);
         const account = await createOrRetrieveAccount(client, parsedFromAddress, db);
-        await deployAccount(account, wait, registerClass, await FeeOptsWithFeePayer.fromCli(options, client, log, db), json, debugLogger, log);
+        await deployAccount(account, wait, registerClass, publicDeploy, await FeeOptsWithFeePayer.fromCli(options, client, log, db), json, debugLogger, log);
     });
     const deployCommand = program.command('deploy').description('Deploys a compiled Aztec.nr contract to Aztec.').argument('[artifact]', ARTIFACT_DESCRIPTION, artifactPathParser).option('--init <string>', 'The contract initializer function to call', 'constructor').option('--no-init', 'Leave the contract uninitialized').option('-k, --public-key <string>', 'Optional encryption public key for this address. Set this value only if this contract is expected to receive private notes, which will be encrypted using this public key.', parsePublicKey).option('-s, --salt <hex string>', 'Optional deployment salt as a hex string for generating the deployment address.', parseFieldFromHexString).option('--universal', 'Do not mix the sender address into the deployment.').addOption(pxeOption).addOption(createArgsOption(true, db)).addOption(createSecretKeyOption("The sender's secret key", !db, (sk)=>aliasedSecretKeyParser(sk, db)).conflicts('account')).addOption(createAccountOption('Alias or address of the account to deploy from', !db, db)).addOption(createAliasOption('Alias for the contract. Used for easy reference subsequent commands.', !db)).option('--json', 'Emit output as json')// `options.wait` is default true. Passing `--no-wait` will set it to false.
     // https://github.com/tj/commander.js#other-option-types-negatable-boolean-and-booleanvalue

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

@@ -1 +1 @@
-{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/cmds/profile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,WAAW,EAAE,KAAK,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAE5G,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AA8CnD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,0BAA0B,EAClC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,aAAa,EAAE,WAAW,EAAE,EAC5B,GAAG,EAAE,KAAK,iBAcX"}
+{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/cmds/profile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,WAAW,EAAE,KAAK,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAE5G,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AA6BnD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,0BAA0B,EAClC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,aAAa,EAAE,WAAW,EAAE,EAC5B,GAAG,EAAE,KAAK,iBAeX"}

package/dest/cmds/profile.js

@@ -1,7 +1,6 @@
 import { Contract } from '@aztec/aztec.js';
 import { prepTx } from '@aztec/cli/utils';
-import { serializeWitness } from '@aztec/noir-noirc_abi';
-import { encode } from '@msgpack/msgpack';
+import { serializePrivateExecutionSteps } from '@aztec/stdlib/kernel';
 import { promises as fs } from 'fs';
 import path from 'path';
 import { format } from 'util';
@@ -16,20 +15,6 @@ function printProfileResult(result, log) {
     });
     log(format('\nTotal gates:', acc.toLocaleString()));
 }
-// TODO(#7371): This is duplicated.
-// Longer term we won't use this hacked together msgpack format
-// Leaving duplicated as this eventually bb will provide a serialization
-// helper for passing to a generic msgpack RPC endpoint.
-async function _createClientIvcProofFiles(directory, executionSteps) {
-    const acirPath = path.join(directory, 'acir.msgpack');
-    const witnessPath = path.join(directory, 'witnesses.msgpack');
-    await fs.writeFile(acirPath, encode(executionSteps.map((map)=>map.bytecode)));
-    await fs.writeFile(witnessPath, encode(executionSteps.map((map)=>serializeWitness(map.witness))));
-    return {
-        acirPath,
-        witnessPath
-    };
-}
 export async function profile(wallet, functionName, functionArgsIn, contractArtifactPath, contractAddress, debugOutputPath, authWitnesses, log) {
     const profileMode = debugOutputPath ? 'full' : 'gates';
     const { functionArgs, contractArtifact } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
@@ -41,7 +26,8 @@ export async function profile(wallet, functionName, functionArgsIn, contractArti
     });
     printProfileResult(result, log);
     if (debugOutputPath) {
-        log(`Debug output written to ${debugOutputPath} (witnesses.msgpack and acir.msgpack)`);
-        await _createClientIvcProofFiles(debugOutputPath, result.executionSteps);
+        const ivcInputsPath = path.join(debugOutputPath, 'ivc-inputs.msgpack');
+        log(`Debug output written to ${ivcInputsPath}.`);
+        await fs.writeFile(ivcInputsPath, serializePrivateExecutionSteps(result.executionSteps));
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli-wallet",
-  "version": "0.85.0-alpha-testnet.2",
+  "version": "0.85.0-alpha-testnet.4",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -65,18 +65,17 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.85.0-alpha-testnet.2",
-    "@aztec/aztec.js": "0.85.0-alpha-testnet.2",
-    "@aztec/cli": "0.85.0-alpha-testnet.2",
-    "@aztec/entrypoints": "0.85.0-alpha-testnet.2",
-    "@aztec/ethereum": "0.85.0-alpha-testnet.2",
-    "@aztec/foundation": "0.85.0-alpha-testnet.2",
-    "@aztec/kv-store": "0.85.0-alpha-testnet.2",
-    "@aztec/noir-contracts.js": "0.85.0-alpha-testnet.2",
-    "@aztec/noir-noirc_abi": "0.85.0-alpha-testnet.2",
-    "@aztec/pxe": "0.85.0-alpha-testnet.2",
-    "@aztec/stdlib": "0.85.0-alpha-testnet.2",
-    "@msgpack/msgpack": "^3.0.0-beta2",
+    "@aztec/accounts": "0.85.0-alpha-testnet.4",
+    "@aztec/aztec.js": "0.85.0-alpha-testnet.4",
+    "@aztec/cli": "0.85.0-alpha-testnet.4",
+    "@aztec/entrypoints": "0.85.0-alpha-testnet.4",
+    "@aztec/ethereum": "0.85.0-alpha-testnet.4",
+    "@aztec/foundation": "0.85.0-alpha-testnet.4",
+    "@aztec/kv-store": "0.85.0-alpha-testnet.4",
+    "@aztec/noir-contracts.js": "0.85.0-alpha-testnet.4",
+    "@aztec/noir-noirc_abi": "0.85.0-alpha-testnet.4",
+    "@aztec/pxe": "0.85.0-alpha-testnet.4",
+    "@aztec/stdlib": "0.85.0-alpha-testnet.4",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",
     "source-map-support": "^0.5.21",

package/src/cmds/deploy_account.ts

@@ -8,6 +8,7 @@ export async function deployAccount(
   account: AccountManager,
   wait: boolean,
   registerClass: boolean,
+  publicDeploy: boolean,
   feeOpts: IFeeOpts,
   json: boolean,
   debugLogger: Logger,
@@ -43,7 +44,7 @@ export async function deployAccount(
 
   const deployOpts: DeployAccountOptions = {
     skipInitialization: false,
-    skipPublicDeployment: false,
+    skipPublicDeployment: !publicDeploy,
     skipClassRegistration: !registerClass,
     ...(await feeOpts.toDeployAccountOpts(wallet)),
   };

package/src/cmds/index.ts

@@ -153,12 +153,13 @@ export function injectCommands(
     .option(
       '--register-class',
       'Register the contract class (useful for when the contract class has not been deployed yet).',
-    );
+    )
+    .option('--public-deploy', 'Publicly deploy this account contract (only useful if it contains public functions');
 
   addOptions(deployAccountCommand, FeeOptsWithFeePayer.getOptions()).action(async (_options, command) => {
     const { deployAccount } = await import('./deploy_account.js');
     const options = command.optsWithGlobals();
-    const { rpcUrl, wait, from: parsedFromAddress, json, registerClass } = options;
+    const { rpcUrl, wait, from: parsedFromAddress, json, registerClass, publicDeploy } = options;
 
     const client = pxeWrapper?.getPXE() ?? (await createCompatibleClient(rpcUrl, debugLogger));
     const account = await createOrRetrieveAccount(client, parsedFromAddress, db);
@@ -167,6 +168,7 @@ export function injectCommands(
       account,
       wait,
       registerClass,
+      publicDeploy,
       await FeeOptsWithFeePayer.fromCli(options, client, log, db),
       json,
       debugLogger,

package/src/cmds/profile.ts

@@ -1,11 +1,9 @@
 import { type AccountWalletWithSecretKey, AuthWitness, type AztecAddress, Contract } from '@aztec/aztec.js';
 import { prepTx } from '@aztec/cli/utils';
 import type { LogFn } from '@aztec/foundation/log';
-import { serializeWitness } from '@aztec/noir-noirc_abi';
-import type { PrivateExecutionStep } from '@aztec/stdlib/kernel';
+import { serializePrivateExecutionSteps } from '@aztec/stdlib/kernel';
 import type { TxProfileResult } from '@aztec/stdlib/tx';
 
-import { encode } from '@msgpack/msgpack';
 import { promises as fs } from 'fs';
 import path from 'path';
 import { format } from 'util';
@@ -31,21 +29,6 @@ function printProfileResult(result: TxProfileResult, log: LogFn) {
   log(format('\nTotal gates:', acc.toLocaleString()));
 }
 
-// TODO(#7371): This is duplicated.
-// Longer term we won't use this hacked together msgpack format
-// Leaving duplicated as this eventually bb will provide a serialization
-// helper for passing to a generic msgpack RPC endpoint.
-async function _createClientIvcProofFiles(directory: string, executionSteps: PrivateExecutionStep[]) {
-  const acirPath = path.join(directory, 'acir.msgpack');
-  const witnessPath = path.join(directory, 'witnesses.msgpack');
-  await fs.writeFile(acirPath, encode(executionSteps.map(map => map.bytecode)));
-  await fs.writeFile(witnessPath, encode(executionSteps.map(map => serializeWitness(map.witness))));
-  return {
-    acirPath,
-    witnessPath,
-  };
-}
-
 export async function profile(
   wallet: AccountWalletWithSecretKey,
   functionName: string,
@@ -65,7 +48,8 @@ export async function profile(
   const result = await call.profile({ profileMode, authWitnesses });
   printProfileResult(result, log);
   if (debugOutputPath) {
-    log(`Debug output written to ${debugOutputPath} (witnesses.msgpack and acir.msgpack)`);
-    await _createClientIvcProofFiles(debugOutputPath, result.executionSteps);
+    const ivcInputsPath = path.join(debugOutputPath, 'ivc-inputs.msgpack');
+    log(`Debug output written to ${ivcInputsPath}.`);
+    await fs.writeFile(ivcInputsPath, serializePrivateExecutionSteps(result.executionSteps));
   }
 }