@aztec/cli-wallet 0.85.0 → 0.86.0

package/dest/cmds/bridge_fee_juice.js

@@ -1,14 +1,14 @@
 import { L1FeeJuicePortalManager } from '@aztec/aztec.js';
 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) {
     // Prepare L1 client
     const chain = createEthereumChain(l1RpcUrls, chainId);
-    const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
+    const client = createExtendedL1Client(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
     const { protocolContractAddresses: { feeJuice: feeJuiceAddress } } = await pxe.getPXEInfo();
     // Setup portal manager
-    const portal = await L1FeeJuicePortalManager.new(pxe, publicClient, walletClient, debugLogger);
+    const portal = await L1FeeJuicePortalManager.new(pxe, client, debugLogger);
     const { claimAmount, claimSecret, messageHash, messageLeafIndex } = await portal.bridgeTokensPublic(recipient, amount, mint);
     if (json) {
         const out = {

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",
+  "version": "0.86.0",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -23,8 +23,6 @@
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
@@ -65,18 +63,17 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.85.0",
-    "@aztec/aztec.js": "0.85.0",
-    "@aztec/cli": "0.85.0",
-    "@aztec/entrypoints": "0.85.0",
-    "@aztec/ethereum": "0.85.0",
-    "@aztec/foundation": "0.85.0",
-    "@aztec/kv-store": "0.85.0",
-    "@aztec/noir-contracts.js": "0.85.0",
-    "@aztec/noir-noirc_abi": "0.85.0",
-    "@aztec/pxe": "0.85.0",
-    "@aztec/stdlib": "0.85.0",
-    "@msgpack/msgpack": "^3.0.0-beta2",
+    "@aztec/accounts": "0.86.0",
+    "@aztec/aztec.js": "0.86.0",
+    "@aztec/cli": "0.86.0",
+    "@aztec/entrypoints": "0.86.0",
+    "@aztec/ethereum": "0.86.0",
+    "@aztec/foundation": "0.86.0",
+    "@aztec/kv-store": "0.86.0",
+    "@aztec/noir-contracts.js": "0.86.0",
+    "@aztec/noir-noirc_abi": "0.86.0",
+    "@aztec/pxe": "0.86.0",
+    "@aztec/stdlib": "0.86.0",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",
     "source-map-support": "^0.5.21",

package/src/cmds/bridge_fee_juice.ts

@@ -1,6 +1,6 @@
 import { L1FeeJuicePortalManager, type PXE } from '@aztec/aztec.js';
 import { prettyPrintJSON } from '@aztec/cli/utils';
-import { createEthereumChain, createL1Clients } from '@aztec/ethereum';
+import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -22,14 +22,14 @@ export async function bridgeL1FeeJuice(
 ) {
   // Prepare L1 client
   const chain = createEthereumChain(l1RpcUrls, chainId);
-  const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
+  const client = createExtendedL1Client(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
 
   const {
     protocolContractAddresses: { feeJuice: feeJuiceAddress },
   } = await pxe.getPXEInfo();
 
   // Setup portal manager
-  const portal = await L1FeeJuicePortalManager.new(pxe, publicClient, walletClient, debugLogger);
+  const portal = await L1FeeJuicePortalManager.new(pxe, client, debugLogger);
   const { claimAmount, claimSecret, messageHash, messageLeafIndex } = await portal.bridgeTokensPublic(
     recipient,
     amount,

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));
   }
 }