@aztec/archiver 0.67.1 → 0.68.0

package/src/archiver/instrumentation.ts

@@ -8,11 +8,14 @@ import {
   type LmdbStatsCallback,
   Metrics,
   type TelemetryClient,
+  type Tracer,
   type UpDownCounter,
   ValueType,
 } from '@aztec/telemetry-client';
 
 export class ArchiverInstrumentation {
+  public readonly tracer: Tracer;
+
   private blockHeight: Gauge;
   private blockSize: Gauge;
   private syncDuration: Histogram;
@@ -20,10 +23,12 @@ export class ArchiverInstrumentation {
   private proofsSubmittedDelay: Histogram;
   private proofsSubmittedCount: UpDownCounter;
   private dbMetrics: LmdbMetrics;
+  private pruneCount: UpDownCounter;
 
   private log = createLogger('archiver:instrumentation');
 
   private constructor(private telemetry: TelemetryClient, lmdbStats?: LmdbStatsCallback) {
+    this.tracer = telemetry.getTracer('Archiver');
     const meter = telemetry.getMeter('Archiver');
     this.blockHeight = meter.createGauge(Metrics.ARCHIVER_BLOCK_HEIGHT, {
       description: 'The height of the latest block processed by the archiver',
@@ -64,6 +69,11 @@ export class ArchiverInstrumentation {
       },
       lmdbStats,
     );
+
+    this.pruneCount = meter.createUpDownCounter(Metrics.ARCHIVER_PRUNE_COUNT, {
+      description: 'Number of prunes detected',
+      valueType: ValueType.INT,
+    });
   }
 
   public static async new(telemetry: TelemetryClient, lmdbStats?: LmdbStatsCallback) {
@@ -89,6 +99,10 @@ export class ArchiverInstrumentation {
     }
   }
 
+  public processPrune() {
+    this.pruneCount.add(1);
+  }
+
   public updateLastProvenBlock(blockNumber: number) {
     this.blockHeight.record(blockNumber, { [Attributes.STATUS]: 'proven' });
   }

package/src/archiver/kv_archiver_store/kv_archiver_store.ts

@@ -17,7 +17,7 @@ import {
   type PrivateLog,
   type UnconstrainedFunctionWithMembershipProof,
 } from '@aztec/circuits.js';
-import { type ContractArtifact, FunctionSelector } from '@aztec/foundation/abi';
+import { type FunctionSelector } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { createLogger } from '@aztec/foundation/log';
 import { type AztecKVStore } from '@aztec/kv-store';
@@ -26,7 +26,6 @@ import { type ArchiverDataStore, type ArchiverL1SynchPoint } from '../archiver_s
 import { type DataRetrieval } from '../structs/data_retrieval.js';
 import { type L1Published } from '../structs/published.js';
 import { BlockStore } from './block_store.js';
-import { ContractArtifactsStore } from './contract_artifacts_store.js';
 import { ContractClassStore } from './contract_class_store.js';
 import { ContractInstanceStore } from './contract_instance_store.js';
 import { LogStore } from './log_store.js';
@@ -43,7 +42,6 @@ export class KVArchiverDataStore implements ArchiverDataStore {
   #messageStore: MessageStore;
   #contractClassStore: ContractClassStore;
   #contractInstanceStore: ContractInstanceStore;
-  #contractArtifactStore: ContractArtifactsStore;
   private functionNames = new Map<string, string>();
 
   #log = createLogger('archiver:data-store');
@@ -54,27 +52,22 @@ export class KVArchiverDataStore implements ArchiverDataStore {
     this.#messageStore = new MessageStore(db);
     this.#contractClassStore = new ContractClassStore(db);
     this.#contractInstanceStore = new ContractInstanceStore(db);
-    this.#contractArtifactStore = new ContractArtifactsStore(db);
     this.#nullifierStore = new NullifierStore(db);
   }
 
-  getContractArtifact(address: AztecAddress): Promise<ContractArtifact | undefined> {
-    return Promise.resolve(this.#contractArtifactStore.getContractArtifact(address));
-  }
-
   // TODO:  These function names are in memory only as they are for development/debugging. They require the full contract
   //        artifact supplied to the node out of band. This should be reviewed and potentially removed as part of
   //        the node api cleanup process.
-  getContractFunctionName(address: AztecAddress, selector: FunctionSelector): Promise<string | undefined> {
+  getContractFunctionName(_address: AztecAddress, selector: FunctionSelector): Promise<string | undefined> {
     return Promise.resolve(this.functionNames.get(selector.toString()));
   }
 
-  async addContractArtifact(address: AztecAddress, contract: ContractArtifact): Promise<void> {
-    await this.#contractArtifactStore.addContractArtifact(address, contract);
-    // Building tup this map of selectors to function names save expensive re-hydration of contract artifacts later
-    contract.functions.forEach(f => {
-      this.functionNames.set(FunctionSelector.fromNameAndParameters(f.name, f.parameters).toString(), f.name);
-    });
+  registerContractFunctionName(_address: AztecAddress, names: Record<string, string>): Promise<void> {
+    for (const [selector, name] of Object.entries(names)) {
+      this.functionNames.set(selector, name);
+    }
+
+    return Promise.resolve();
   }
 
   getContractClass(id: Fr): Promise<ContractClassPublic | undefined> {

package/src/archiver/memory_archiver_store/memory_archiver_store.ts

@@ -28,7 +28,7 @@ import {
   type PrivateLog,
   type UnconstrainedFunctionWithMembershipProof,
 } from '@aztec/circuits.js';
-import { type ContractArtifact, FunctionSelector } from '@aztec/foundation/abi';
+import { type FunctionSelector } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { createLogger } from '@aztec/foundation/log';
 
@@ -68,8 +68,6 @@ export class MemoryArchiverStore implements ArchiverDataStore {
    */
   private l1ToL2Messages = new L1ToL2MessageStore();
 
-  private contractArtifacts: Map<string, ContractArtifact> = new Map();
-
   private contractClasses: Map<string, ContractClassPublicWithBlockNumber> = new Map();
 
   private bytecodeCommitments: Map<string, Fr> = new Map();
@@ -86,6 +84,8 @@ export class MemoryArchiverStore implements ArchiverDataStore {
   private lastProvenL2BlockNumber: number = 0;
   private lastProvenL2EpochNumber: number = 0;
 
+  private functionNames = new Map<string, string>();
+
   #log = createLogger('archiver:data-store');
 
   constructor(
@@ -730,26 +730,16 @@ export class MemoryArchiverStore implements ArchiverDataStore {
     });
   }
 
-  public addContractArtifact(address: AztecAddress, contract: ContractArtifact): Promise<void> {
-    this.contractArtifacts.set(address.toString(), contract);
-    return Promise.resolve();
-  }
-
-  public getContractArtifact(address: AztecAddress): Promise<ContractArtifact | undefined> {
-    return Promise.resolve(this.contractArtifacts.get(address.toString()));
+  public getContractFunctionName(_address: AztecAddress, selector: FunctionSelector): Promise<string | undefined> {
+    return Promise.resolve(this.functionNames.get(selector.toString()));
   }
 
-  async getContractFunctionName(address: AztecAddress, selector: FunctionSelector): Promise<string | undefined> {
-    const artifact = await this.getContractArtifact(address);
-
-    if (!artifact) {
-      return undefined;
+  public registerContractFunctionName(_address: AztecAddress, names: Record<string, string>): Promise<void> {
+    for (const [selector, name] of Object.entries(names)) {
+      this.functionNames.set(selector, name);
     }
 
-    const func = artifact.functions.find(f =>
-      FunctionSelector.fromNameAndParameters({ name: f.name, parameters: f.parameters }).equals(selector),
-    );
-    return Promise.resolve(func?.name);
+    return Promise.resolve();
   }
 
   public estimateSize(): { mappingSize: number; actualSize: number; numItems: number } {

package/src/factory.ts

@@ -4,12 +4,15 @@ import {
   computePublicBytecodeCommitment,
   getContractClassFromArtifact,
 } from '@aztec/circuits.js';
+import { FunctionSelector, FunctionType } from '@aztec/foundation/abi';
 import { createLogger } from '@aztec/foundation/log';
 import { type Maybe } from '@aztec/foundation/types';
 import { type DataStoreConfig } from '@aztec/kv-store/config';
 import { createStore } from '@aztec/kv-store/lmdb';
-import { TokenBridgeContractArtifact, TokenContractArtifact } from '@aztec/noir-contracts.js';
-import { getCanonicalProtocolContract, protocolContractNames } from '@aztec/protocol-contracts';
+import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
+import { TokenBridgeContractArtifact } from '@aztec/noir-contracts.js/TokenBridge';
+import { protocolContractNames } from '@aztec/protocol-contracts';
+import { getCanonicalProtocolContract } from '@aztec/protocol-contracts/bundle';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 
@@ -43,7 +46,15 @@ async function registerProtocolContracts(store: KVArchiverDataStore) {
       privateFunctions: [],
       unconstrainedFunctions: [],
     };
-    await store.addContractArtifact(contract.address, contract.artifact);
+
+    const functionNames: Record<string, string> = {};
+    for (const fn of contract.artifact.functions) {
+      if (fn.functionType === FunctionType.PUBLIC) {
+        functionNames[FunctionSelector.fromNameAndParameters(fn.name, fn.parameters).toString()] = fn.name;
+      }
+    }
+
+    await store.registerContractFunctionName(contract.address, functionNames);
     const bytecodeCommitment = computePublicBytecodeCommitment(contractClassPublic.packedBytecode);
     await store.addContractClasses([contractClassPublic], [bytecodeCommitment], blockNumber);
     await store.addContractInstances([contract.instance], blockNumber);

package/dest/archiver/kv_archiver_store/contract_artifacts_store.d.ts

@@ -1,10 +0,0 @@
-import { type AztecAddress } from '@aztec/circuits.js';
-import { type ContractArtifact } from '@aztec/foundation/abi';
-import { type AztecKVStore } from '@aztec/kv-store';
-export declare class ContractArtifactsStore {
-    #private;
-    constructor(db: AztecKVStore);
-    addContractArtifact(address: AztecAddress, contractArtifact: ContractArtifact): Promise<void>;
-    getContractArtifact(address: AztecAddress): ContractArtifact | undefined;
-}
-//# sourceMappingURL=contract_artifacts_store.d.ts.map

package/dest/archiver/kv_archiver_store/contract_artifacts_store.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"contract_artifacts_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/contract_artifacts_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,iBAAiB,CAAC;AAGnE,qBAAa,sBAAsB;;gBAGrB,EAAE,EAAE,YAAY;IAI5B,mBAAmB,CAAC,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7F,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,gBAAgB,GAAG,SAAS;CAKzE"}

package/dest/archiver/kv_archiver_store/contract_artifacts_store.js

@@ -1,19 +0,0 @@
-var _ContractArtifactsStore_contractArtifacts;
-import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
-import { contractArtifactFromBuffer, contractArtifactToBuffer } from '@aztec/types/abi';
-export class ContractArtifactsStore {
-    constructor(db) {
-        _ContractArtifactsStore_contractArtifacts.set(this, void 0);
-        __classPrivateFieldSet(this, _ContractArtifactsStore_contractArtifacts, db.openMap('archiver_contract_artifacts'), "f");
-    }
-    addContractArtifact(address, contractArtifact) {
-        return __classPrivateFieldGet(this, _ContractArtifactsStore_contractArtifacts, "f").set(address.toString(), contractArtifactToBuffer(contractArtifact));
-    }
-    getContractArtifact(address) {
-        const contractArtifact = __classPrivateFieldGet(this, _ContractArtifactsStore_contractArtifacts, "f").get(address.toString());
-        // TODO(@spalladino): AztecMap lies and returns Uint8Arrays instead of Buffers, hence the extra Buffer.from.
-        return contractArtifact && contractArtifactFromBuffer(Buffer.from(contractArtifact));
-    }
-}
-_ContractArtifactsStore_contractArtifacts = new WeakMap();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfYXJ0aWZhY3RzX3N0b3JlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2FyY2hpdmVyL2t2X2FyY2hpdmVyX3N0b3JlL2NvbnRyYWN0X2FydGlmYWN0c19zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUdBLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXhGLE1BQU0sT0FBTyxzQkFBc0I7SUFHakMsWUFBWSxFQUFnQjtRQUY1Qiw0REFBNkM7UUFHM0MsdUJBQUEsSUFBSSw2Q0FBc0IsRUFBRSxDQUFDLE9BQU8sQ0FBQyw2QkFBNkIsQ0FBQyxNQUFBLENBQUM7SUFDdEUsQ0FBQztJQUVELG1CQUFtQixDQUFDLE9BQXFCLEVBQUUsZ0JBQWtDO1FBQzNFLE9BQU8sdUJBQUEsSUFBSSxpREFBbUIsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxFQUFFLHdCQUF3QixDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQztJQUNyRyxDQUFDO0lBRUQsbUJBQW1CLENBQUMsT0FBcUI7UUFDdkMsTUFBTSxnQkFBZ0IsR0FBRyx1QkFBQSxJQUFJLGlEQUFtQixDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztRQUN6RSw0R0FBNEc7UUFDNUcsT0FBTyxnQkFBZ0IsSUFBSSwwQkFBMEIsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQztJQUN2RixDQUFDO0NBQ0YifQ==

package/src/archiver/kv_archiver_store/contract_artifacts_store.ts

@@ -1,22 +0,0 @@
-import { type AztecAddress } from '@aztec/circuits.js';
-import { type ContractArtifact } from '@aztec/foundation/abi';
-import { type AztecKVStore, type AztecMap } from '@aztec/kv-store';
-import { contractArtifactFromBuffer, contractArtifactToBuffer } from '@aztec/types/abi';
-
-export class ContractArtifactsStore {
-  #contractArtifacts: AztecMap<string, Buffer>;
-
-  constructor(db: AztecKVStore) {
-    this.#contractArtifacts = db.openMap('archiver_contract_artifacts');
-  }
-
-  addContractArtifact(address: AztecAddress, contractArtifact: ContractArtifact): Promise<void> {
-    return this.#contractArtifacts.set(address.toString(), contractArtifactToBuffer(contractArtifact));
-  }
-
-  getContractArtifact(address: AztecAddress): ContractArtifact | undefined {
-    const contractArtifact = this.#contractArtifacts.get(address.toString());
-    // TODO(@spalladino): AztecMap lies and returns Uint8Arrays instead of Buffers, hence the extra Buffer.from.
-    return contractArtifact && contractArtifactFromBuffer(Buffer.from(contractArtifact));
-  }
-}