@aztec/pxe 0.66.0 → 0.67.1

package/package.json

@@ -1,8 +1,14 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.66.0",
+  "version": "0.67.1",
   "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.66.0",
-    "@aztec/bb.js": "0.66.0",
-    "@aztec/builder": "0.66.0",
-    "@aztec/circuit-types": "0.66.0",
-    "@aztec/circuits.js": "0.66.0",
-    "@aztec/ethereum": "0.66.0",
-    "@aztec/foundation": "0.66.0",
-    "@aztec/key-store": "0.66.0",
-    "@aztec/kv-store": "0.66.0",
-    "@aztec/noir-protocol-circuits-types": "0.66.0",
-    "@aztec/protocol-contracts": "0.66.0",
-    "@aztec/simulator": "0.66.0",
-    "@aztec/types": "0.66.0",
+    "@aztec/bb-prover": "0.67.1",
+    "@aztec/bb.js": "0.67.1",
+    "@aztec/builder": "0.67.1",
+    "@aztec/circuit-types": "0.67.1",
+    "@aztec/circuits.js": "0.67.1",
+    "@aztec/ethereum": "0.67.1",
+    "@aztec/foundation": "0.67.1",
+    "@aztec/key-store": "0.67.1",
+    "@aztec/kv-store": "0.67.1",
+    "@aztec/noir-protocol-circuits-types": "0.67.1",
+    "@aztec/protocol-contracts": "0.67.1",
+    "@aztec/simulator": "0.67.1",
+    "@aztec/types": "0.67.1",
     "@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,