@aztec/cli-wallet 0.77.0 → 0.78.0

package/dest/bin/index.js

@@ -49,19 +49,18 @@ function injectInternalCommands(program, log, db) {
         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';
-            const proverEnabled = prover !== 'none';
             mkdirSync(bbWorkingDirectory, {
                 recursive: true
             });
-            await pxeWrapper.init(nodeUrl, join(dataDir, 'pxe'), {
-                ...proverEnabled && {
-                    proverEnabled,
-                    bbBinaryPath,
-                    bbWorkingDirectory
-                }
-            });
+            const overridePXEConfig = {
+                proverEnabled,
+                bbBinaryPath: prover === 'native' ? bbBinaryPath : undefined,
+                bbWorkingDirectory: prover === 'native' ? bbWorkingDirectory : undefined
+            };
+            await pxeWrapper.init(nodeUrl, join(dataDir, 'pxe'), overridePXEConfig);
         }
         await db.init(await openStoreAt(dataDir));
     });

package/dest/utils/pxe_wrapper.d.ts

@@ -1,4 +1,4 @@
-import { type PXEServiceConfig } from '@aztec/pxe';
+import { type PXEServiceConfig } from '@aztec/pxe/server';
 import { type AztecNode, type PXE } from '@aztec/stdlib/interfaces/client';
 export declare class PXEWrapper {
     private static pxe;

package/dest/utils/pxe_wrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pxe_wrapper.d.ts","sourceRoot":"","sources":["../../src/utils/pxe_wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,YAAY,CAAC;AAC1F,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,GAAG,EAAyB,MAAM,iCAAiC,CAAC;AAMlG,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAkB;IACpC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAwB;IAE3C,MAAM,IAAI,GAAG,GAAG,SAAS;IAIzB,OAAO,IAAI,SAAS,GAAG,SAAS;IAI1B,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,wBAAwB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC;CAMlG"}
+{"version":3,"file":"pxe_wrapper.d.ts","sourceRoot":"","sources":["../../src/utils/pxe_wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,GAAG,EAAyB,MAAM,iCAAiC,CAAC;AAMlG,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAkB;IACpC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAwB;IAE3C,MAAM,IAAI,GAAG,GAAG,SAAS;IAIzB,OAAO,IAAI,SAAS,GAAG,SAAS;IAI1B,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,wBAAwB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC;CAMlG"}

package/dest/utils/pxe_wrapper.js

@@ -1,4 +1,4 @@
-import { createPXEService, getPXEServiceConfig } from '@aztec/pxe';
+import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
 import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 /*
  * Wrapper class for PXE service, avoids initialization issues due to

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli-wallet",
-  "version": "0.77.0",
+  "version": "0.78.0",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -65,15 +65,15 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.77.0",
-    "@aztec/aztec.js": "0.77.0",
-    "@aztec/cli": "0.77.0",
-    "@aztec/ethereum": "0.77.0",
-    "@aztec/foundation": "0.77.0",
-    "@aztec/kv-store": "0.77.0",
-    "@aztec/noir-contracts.js": "0.77.0",
-    "@aztec/pxe": "0.77.0",
-    "@aztec/stdlib": "0.77.0",
+    "@aztec/accounts": "0.78.0",
+    "@aztec/aztec.js": "0.78.0",
+    "@aztec/cli": "0.78.0",
+    "@aztec/ethereum": "0.78.0",
+    "@aztec/foundation": "0.78.0",
+    "@aztec/kv-store": "0.78.0",
+    "@aztec/noir-contracts.js": "0.78.0",
+    "@aztec/pxe": "0.78.0",
+    "@aztec/stdlib": "0.78.0",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",
     "source-map-support": "^0.5.21",

package/src/bin/index.ts

@@ -2,6 +2,7 @@ import { Fr, computeSecretHash, fileURLToPath } from '@aztec/aztec.js';
 import { LOCALHOST } from '@aztec/cli/cli-utils';
 import { type LogFn, createConsoleLogger, createLogger } from '@aztec/foundation/log';
 import { openStoreAt } from '@aztec/kv-store/lmdb-v2';
+import type { PXEServiceConfig } from '@aztec/pxe/config';
 
 import { Argument, Command, Option } from 'commander';
 import { mkdirSync, readFileSync } from 'fs';
@@ -94,18 +95,22 @@ async function main() {
       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';
-        const proverEnabled = prover !== 'none';
-
         mkdirSync(bbWorkingDirectory, { recursive: true });
 
-        await pxeWrapper.init(nodeUrl, join(dataDir, 'pxe'), {
-          ...(proverEnabled && { proverEnabled, bbBinaryPath, bbWorkingDirectory }), // only override if we're profiling
-        });
+        const overridePXEConfig: Partial<PXEServiceConfig> = {
+          proverEnabled,
+          bbBinaryPath: prover === 'native' ? bbBinaryPath : undefined,
+          bbWorkingDirectory: prover === 'native' ? bbWorkingDirectory : undefined,
+        };
+
+        await pxeWrapper.init(nodeUrl, join(dataDir, 'pxe'), overridePXEConfig);
       }
       await db.init(await openStoreAt(dataDir));
     });

package/src/utils/pxe_wrapper.ts

@@ -1,4 +1,4 @@
-import { type PXEServiceConfig, createPXEService, getPXEServiceConfig } from '@aztec/pxe';
+import { type PXEServiceConfig, createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
 import { type AztecNode, type PXE, createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 
 /*