@aztec/pxe 0.65.2 → 0.67.0

package/dest/utils/create_pxe_service.js

@@ -0,0 +1,49 @@
+import { BBNativePrivateKernelProver } from '@aztec/bb-prover';
+import { randomBytes } from '@aztec/foundation/crypto';
+import { createLogger } from '@aztec/foundation/log';
+import { KeyStore } from '@aztec/key-store';
+import { createStore } from '@aztec/kv-store/lmdb';
+import { L2TipsStore } from '@aztec/kv-store/stores';
+import { KVPxeDatabase } from '../database/kv_pxe_database.js';
+import { TestPrivateKernelProver } from '../kernel_prover/test/test_circuit_prover.js';
+import { PXEService } from '../pxe_service/pxe_service.js';
+/**
+ * Create and start an PXEService instance with the given AztecNode.
+ * If no keyStore or database is provided, it will use KeyStore and MemoryDB as default values.
+ * Returns a Promise that resolves to the started PXEService instance.
+ *
+ * @param aztecNode - The AztecNode instance to be used by the server.
+ * @param config - The PXE Service Config to use
+ * @param options - (Optional) Optional information for creating an PXEService.
+ * @param proofCreator - An optional proof creator to use in place of any other configuration
+ * @returns A Promise that resolves to the started PXEService instance.
+ */
+export async function createPXEService(aztecNode, config, useLogSuffix = undefined, proofCreator) {
+    const logSuffix = typeof useLogSuffix === 'boolean' ? (useLogSuffix ? randomBytes(3).toString('hex') : undefined) : useLogSuffix;
+    const l1Contracts = await aztecNode.getL1ContractAddresses();
+    const configWithContracts = {
+        ...config,
+        l1Contracts,
+    };
+    const keyStore = new KeyStore(await createStore('pxe_key_store', configWithContracts, createLogger('pxe:keystore:lmdb')));
+    const store = await createStore('pxe_data', configWithContracts, createLogger('pxe:data:lmdb'));
+    const db = await KVPxeDatabase.create(store);
+    const tips = new L2TipsStore(store, 'pxe');
+    const prover = proofCreator ?? (await createProver(config, logSuffix));
+    const pxe = new PXEService(keyStore, aztecNode, db, tips, prover, config, logSuffix);
+    await pxe.init();
+    return pxe;
+}
+function createProver(config, logSuffix) {
+    if (!config.proverEnabled) {
+        return new TestPrivateKernelProver();
+    }
+    // (@PhilWindle) Temporary validation until WASM is implemented
+    if (!config.bbBinaryPath || !config.bbWorkingDirectory) {
+        throw new Error(`Prover must be configured with binary path and working directory`);
+    }
+    const bbConfig = config;
+    const log = createLogger('pxe:bb-native-prover' + (logSuffix ? `:${logSuffix}` : ''));
+    return BBNativePrivateKernelProver.new({ bbSkipCleanup: false, ...bbConfig }, log);
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlX3B4ZV9zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2NyZWF0ZV9weGVfc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUvRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDdkQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBR3JELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUMvRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQUN2RixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFM0Q7Ozs7Ozs7Ozs7R0FVRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsZ0JBQWdCLENBQ3BDLFNBQW9CLEVBQ3BCLE1BQXdCLEVBQ3hCLGVBQTZDLFNBQVMsRUFDdEQsWUFBa0M7SUFFbEMsTUFBTSxTQUFTLEdBQ2IsT0FBTyxZQUFZLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQztJQUVqSCxNQUFNLFdBQVcsR0FBRyxNQUFNLFNBQVMsQ0FBQyxzQkFBc0IsRUFBRSxDQUFDO0lBQzdELE1BQU0sbUJBQW1CLEdBQUc7UUFDMUIsR0FBRyxNQUFNO1FBQ1QsV0FBVztLQUNRLENBQUM7SUFFdEIsTUFBTSxRQUFRLEdBQUcsSUFBSSxRQUFRLENBQzNCLE1BQU0sV0FBVyxDQUFDLGVBQWUsRUFBRSxtQkFBbUIsRUFBRSxZQUFZLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUMzRixDQUFDO0lBRUYsTUFBTSxLQUFLLEdBQUcsTUFBTSxXQUFXLENBQUMsVUFBVSxFQUFFLG1CQUFtQixFQUFFLFlBQVksQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDO0lBRWhHLE1BQU0sRUFBRSxHQUFHLE1BQU0sYUFBYSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUM3QyxNQUFNLElBQUksR0FBRyxJQUFJLFdBQVcsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFFM0MsTUFBTSxNQUFNLEdBQUcsWUFBWSxJQUFJLENBQUMsTUFBTSxZQUFZLENBQUMsTUFBTSxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDdkUsTUFBTSxHQUFHLEdBQUcsSUFBSSxVQUFVLENBQUMsUUFBUSxFQUFFLFNBQVMsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDckYsTUFBTSxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDakIsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDO0FBRUQsU0FBUyxZQUFZLENBQUMsTUFBd0IsRUFBRSxTQUFrQjtJQUNoRSxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsRUFBRSxDQUFDO1FBQzFCLE9BQU8sSUFBSSx1QkFBdUIsRUFBRSxDQUFDO0lBQ3ZDLENBQUM7SUFFRCwrREFBK0Q7SUFDL0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxZQUFZLElBQUksQ0FBQyxNQUFNLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztRQUN2RCxNQUFNLElBQUksS0FBSyxDQUFDLGtFQUFrRSxDQUFDLENBQUM7SUFDdEYsQ0FBQztJQUNELE1BQU0sUUFBUSxHQUFHLE1BQW9HLENBQUM7SUFDdEgsTUFBTSxHQUFHLEdBQUcsWUFBWSxDQUFDLHNCQUFzQixHQUFHLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxJQUFJLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ3RGLE9BQU8sMkJBQTJCLENBQUMsR0FBRyxDQUFDLEVBQUUsYUFBYSxFQUFFLEtBQUssRUFBRSxHQUFHLFFBQVEsRUFBRSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0FBQ3JGLENBQUMifQ==

package/package.json

@@ -1,8 +1,14 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.65.2",
+  "version": "0.67.0",
   "type": "module",
-  "exports": "./dest/index.js",
+  "exports": {
+    ".": "./dest/index.js",
+    "./service": "./dest/pxe_service/index.js",
+    "./config": "./dest/config/index.js",
+    "./database": "./dest/database/index.js",
+    "./kernel_prover": "./dest/kernel_prover/index.js"
+  },
   "bin": "./dest/bin/index.js",
   "typedocOptions": {
     "entryPoints": [
@@ -12,16 +18,18 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && tsc -b",
+    "build": "yarn clean && yarn generate && tsc -b",
     "build:dev": "tsc -b --watch",
-    "clean": "rm -rf ./dest .tsbuildinfo",
+    "clean": "rm -rf ./dest .tsbuildinfo ./src/config/package_info.ts",
     "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",
-    "start": "DEBUG='aztec:*' && node ./dest/bin/index.js"
+    "start": "LOG_LEVEL=${LOG_LEVEL:-debug} && node ./dest/bin/index.js",
+    "generate": "node ./scripts/generate_package_info.js"
   },
   "inherits": [
-    "../package.common.json"
+    "../package.common.json",
+    "./package.local.json"
   ],
   "jest": {
     "moduleNameMapper": {
@@ -56,22 +64,26 @@
           "summaryThreshold": 9999
         }
       ]
+    ],
+    "testTimeout": 30000,
+    "setupFiles": [
+      "../../foundation/src/jest/setup.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.65.2",
-    "@aztec/bb.js": "0.65.2",
-    "@aztec/builder": "0.65.2",
-    "@aztec/circuit-types": "0.65.2",
-    "@aztec/circuits.js": "0.65.2",
-    "@aztec/ethereum": "0.65.2",
-    "@aztec/foundation": "0.65.2",
-    "@aztec/key-store": "0.65.2",
-    "@aztec/kv-store": "0.65.2",
-    "@aztec/noir-protocol-circuits-types": "0.65.2",
-    "@aztec/protocol-contracts": "0.65.2",
-    "@aztec/simulator": "0.65.2",
-    "@aztec/types": "0.65.2",
+    "@aztec/bb-prover": "0.67.0",
+    "@aztec/bb.js": "0.67.0",
+    "@aztec/builder": "0.67.0",
+    "@aztec/circuit-types": "0.67.0",
+    "@aztec/circuits.js": "0.67.0",
+    "@aztec/ethereum": "0.67.0",
+    "@aztec/foundation": "0.67.0",
+    "@aztec/key-store": "0.67.0",
+    "@aztec/kv-store": "0.67.0",
+    "@aztec/noir-protocol-circuits-types": "0.67.0",
+    "@aztec/protocol-contracts": "0.67.0",
+    "@aztec/simulator": "0.67.0",
+    "@aztec/types": "0.67.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
     "@noir-lang/types": "workspace:*",

package/src/bin/index.ts

@@ -1,15 +1,15 @@
 #!/usr/bin/env -S node --no-warnings
 import { createAztecNodeClient } from '@aztec/circuit-types';
 import { init } from '@aztec/foundation/crypto';
-import { createDebugLogger } from '@aztec/foundation/log';
+import { createLogger } from '@aztec/foundation/log';
 
 import { getPXEServiceConfig } from '../config/index.js';
 import { startPXEHttpServer } from '../pxe_http/index.js';
-import { createPXEService } from '../pxe_service/index.js';
+import { createPXEService } from '../utils/create_pxe_service.js';
 
 const { PXE_PORT = 8080, AZTEC_NODE_URL = 'http://localhost:8079' } = process.env;
 
-const logger = createDebugLogger('aztec:pxe_service');
+const logger = createLogger('pxe:service');
 
 /**
  * Create and start a new PXE HTTP Server
@@ -23,9 +23,8 @@ async function main() {
   const nodeRpcClient = createAztecNodeClient(AZTEC_NODE_URL);
   const pxeService = await createPXEService(nodeRpcClient, pxeConfig);
 
-  const shutdown = async () => {
+  const shutdown = () => {
     logger.info('Shutting down...');
-    await pxeService.stop();
     process.exit(0);
   };
 

package/src/config/index.ts

@@ -8,10 +8,6 @@ import {
 import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
 import { type Network } from '@aztec/types/network';
 
-import { readFileSync } from 'fs';
-import { dirname, resolve } from 'path';
-import { fileURLToPath } from 'url';
-
 /**
  * Temporary configuration until WASM can be used instead of native
  */
@@ -32,8 +28,6 @@ export interface KernelProverConfig {
  * Configuration settings for the PXE.
  */
 export interface PXEConfig {
-  /** The interval to wait between polling for new blocks. */
-  l2BlockPollingIntervalMS: number;
   /** L2 block to start scanning from for new accounts */
   l2StartingBlock: number;
 }
@@ -51,11 +45,6 @@ export type CliPXEOptions = {
 
 export const pxeConfigMappings: ConfigMappingsType<PXEServiceConfig> = {
   ...dataConfigMappings,
-  l2BlockPollingIntervalMS: {
-    env: 'PXE_BLOCK_POLLING_INTERVAL_MS',
-    description: 'The interval to wait between polling for new blocks.',
-    ...numberConfigHelper(1_000),
-  },
   l2StartingBlock: {
     env: 'PXE_L2_STARTING_BLOCK',
     ...numberConfigHelper(INITIAL_L2_BLOCK_NUM),
@@ -128,13 +117,3 @@ export function getCliPXEOptions(): CliPXEOptions & PXEServiceConfig {
     proverEnabled: pxeConfig.proverEnabled || !!cliOptions.network,
   };
 }
-
-/**
- * Returns package name and version.
- */
-export function getPackageInfo() {
-  const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
-  const { version, name } = JSON.parse(readFileSync(packageJsonPath).toString());
-
-  return { version, name };
-}

package/src/config/package_info.ts

@@ -0,0 +1,3 @@
+export function getPackageInfo() {
+  return { version: '0.1.0', name: '@aztec/pxe' };
+}

package/src/contract_data_oracle/index.ts

@@ -7,7 +7,7 @@ import {
   getFunctionDebugMetadata,
 } from '@aztec/foundation/abi';
 import { type Fr } from '@aztec/foundation/fields';
-import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator';
+import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator/client';
 
 import { type ContractArtifactDatabase } from '../database/contracts/contract_artifact_db.js';
 import { type ContractInstanceDatabase } from '../database/contracts/contract_instance_db.js';

package/src/database/incoming_note_dao.ts

@@ -3,7 +3,7 @@ import { AztecAddress, Fr, Point, type PublicKey } from '@aztec/circuits.js';
 import { NoteSelector } from '@aztec/foundation/abi';
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { type NoteData } from '@aztec/simulator';
+import { type NoteData } from '@aztec/simulator/acvm';
 
 import { type NoteInfo } from '../note_decryption_utils/index.js';
 
@@ -78,7 +78,7 @@ export class IncomingNoteDao implements NoteData {
       this.noteTypeId,
       this.txHash.buffer,
       this.l2BlockNumber,
-      Fr.fromString(this.l2BlockHash),
+      Fr.fromHexString(this.l2BlockHash),
       this.nonce,
       this.noteHash,
       this.siloedNullifier,