@aztec/archiver 0.28.1 → 0.30.0

package/src/index.ts

@@ -1,9 +1,7 @@
-import { EthAddress } from '@aztec/foundation/eth-address';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { fileURLToPath } from '@aztec/foundation/url';
-import { RollupAbi } from '@aztec/l1-artifacts';
 
-import { createPublicClient, getAddress, getContract, http } from 'viem';
+import { createPublicClient, http } from 'viem';
 import { localhost } from 'viem/chains';
 
 import { Archiver, getConfigEnvVars } from './archiver/index.js';
@@ -29,23 +27,11 @@ async function main() {
 
   const archiverStore = new MemoryArchiverStore(1000);
 
-  // TODO(#4492): Nuke this once the old inbox is purged
-  let newInboxAddress!: EthAddress;
-  {
-    const rollup = getContract({
-      address: getAddress(l1Contracts.rollupAddress.toString()),
-      abi: RollupAbi,
-      client: publicClient,
-    });
-    newInboxAddress = EthAddress.fromString(await rollup.read.NEW_INBOX());
-  }
-
   const archiver = new Archiver(
     publicClient,
     l1Contracts.rollupAddress,
     l1Contracts.availabilityOracleAddress,
     l1Contracts.inboxAddress,
-    newInboxAddress,
     l1Contracts.registryAddress,
     archiverStore,
   );

package/src/rpc/archiver_client.ts

@@ -1,9 +1,5 @@
 import {
-  ContractData,
-  EncodedContractFunction,
-  ExtendedContractData,
   ExtendedUnencryptedL2Log,
-  L1ToL2Message,
   L2Block,
   L2BlockL2Logs,
   NullifierMembershipWitness,
@@ -18,13 +14,9 @@ export const createArchiverClient = (url: string, fetch = makeFetch([1, 2, 3], t
   createJsonRpcClient<ArchiveSource>(
     url,
     {
-      ContractData,
-      EncodedContractFunction,
       EthAddress,
-      ExtendedContractData,
       ExtendedUnencryptedL2Log,
       Fr,
-      L1ToL2Message,
       L2Block,
       L2BlockL2Logs,
     },

package/src/rpc/archiver_server.ts

@@ -1,9 +1,5 @@
 import {
-  ContractData,
-  EncodedContractFunction,
-  ExtendedContractData,
   ExtendedUnencryptedL2Log,
-  L1ToL2Message,
   L2Block,
   L2BlockL2Logs,
   NullifierMembershipWitness,
@@ -24,13 +20,9 @@ export function createArchiverRpcServer(archiverService: Archiver): JsonRpcServe
   return new JsonRpcServer(
     archiverService,
     {
-      ContractData,
-      EncodedContractFunction,
       EthAddress,
-      ExtendedContractData,
       ExtendedUnencryptedL2Log,
       Fr,
-      L1ToL2Message,
       L2Block,
       L2BlockL2Logs,
       TxEffect,

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

@@ -1,26 +0,0 @@
-import { ExtendedContractData } from '@aztec/circuit-types';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { AztecKVStore } from '@aztec/kv-store';
-import { BlockStore } from './block_store.js';
-/**
- * LMDB implementation of the ArchiverDataStore interface.
- */
-export declare class ContractStore {
-    #private;
-    private db;
-    constructor(db: AztecKVStore, blockStore: BlockStore);
-    /**
-     * Add new extended contract data from an L2 block to the store's list.
-     * @param data - List of contracts' data to be added.
-     * @param blockNum - Number of the L2 block the contract data was deployed in.
-     * @returns True if the operation is successful.
-     */
-    addExtendedContractData(data: ExtendedContractData[], blockNum: number): Promise<boolean>;
-    /**
-     * Get the extended contract data for this contract.
-     * @param contractAddress - The contract data address.
-     * @returns The extended contract data or undefined if not found.
-     */
-    getExtendedContractData(contractAddress: AztecAddress): ExtendedContractData | undefined;
-}
-//# sourceMappingURL=contract_store.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"contract_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/contract_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;GAEG;AACH,qBAAa,aAAa;;IAKZ,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU;IAK5D;;;;;OAKG;IACH,uBAAuB,CAAC,IAAI,EAAE,oBAAoB,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOzF;;;;OAIG;IACH,uBAAuB,CAAC,eAAe,EAAE,YAAY,GAAG,oBAAoB,GAAG,SAAS;CAgBzF"}

package/dest/archiver/kv_archiver_store/contract_store.js

@@ -1,49 +0,0 @@
-var _ContractStore_blockStore, _ContractStore_extendedContractData, _ContractStore_log;
-import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
-import { ExtendedContractData } from '@aztec/circuit-types';
-import { createDebugLogger } from '@aztec/foundation/log';
-/**
- * LMDB implementation of the ArchiverDataStore interface.
- */
-export class ContractStore {
-    constructor(db, blockStore) {
-        this.db = db;
-        _ContractStore_blockStore.set(this, void 0);
-        _ContractStore_extendedContractData.set(this, void 0);
-        _ContractStore_log.set(this, createDebugLogger('aztec:archiver:contract_store'));
-        __classPrivateFieldSet(this, _ContractStore_extendedContractData, db.openMap('archiver_extended_contract_data'), "f");
-        __classPrivateFieldSet(this, _ContractStore_blockStore, blockStore, "f");
-    }
-    /**
-     * Add new extended contract data from an L2 block to the store's list.
-     * @param data - List of contracts' data to be added.
-     * @param blockNum - Number of the L2 block the contract data was deployed in.
-     * @returns True if the operation is successful.
-     */
-    addExtendedContractData(data, blockNum) {
-        return __classPrivateFieldGet(this, _ContractStore_extendedContractData, "f").swap(blockNum, (existingData = []) => {
-            existingData.push(...data.map(d => d.toBuffer()));
-            return existingData;
-        });
-    }
-    /**
-     * Get the extended contract data for this contract.
-     * @param contractAddress - The contract data address.
-     * @returns The extended contract data or undefined if not found.
-     */
-    getExtendedContractData(contractAddress) {
-        const [blockNumber, _] = __classPrivateFieldGet(this, _ContractStore_blockStore, "f").getContractLocation(contractAddress) ?? [];
-        if (typeof blockNumber !== 'number') {
-            return undefined;
-        }
-        for (const contract of __classPrivateFieldGet(this, _ContractStore_extendedContractData, "f").get(blockNumber) ?? []) {
-            const extendedContractData = ExtendedContractData.fromBuffer(contract);
-            if (extendedContractData.contractData.contractAddress.equals(contractAddress)) {
-                return extendedContractData;
-            }
-        }
-        return undefined;
-    }
-}
-_ContractStore_blockStore = new WeakMap(), _ContractStore_extendedContractData = new WeakMap(), _ContractStore_log = new WeakMap();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3Rfc3RvcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXJjaGl2ZXIva3ZfYXJjaGl2ZXJfc3RvcmUvY29udHJhY3Rfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUU1RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUsxRDs7R0FFRztBQUNILE1BQU0sT0FBTyxhQUFhO0lBS3hCLFlBQW9CLEVBQWdCLEVBQUUsVUFBc0I7UUFBeEMsT0FBRSxHQUFGLEVBQUUsQ0FBYztRQUpwQyw0Q0FBd0I7UUFDeEIsc0RBQWtEO1FBQ2xELDZCQUFPLGlCQUFpQixDQUFDLCtCQUErQixDQUFDLEVBQUM7UUFHeEQsdUJBQUEsSUFBSSx1Q0FBeUIsRUFBRSxDQUFDLE9BQU8sQ0FBQyxpQ0FBaUMsQ0FBQyxNQUFBLENBQUM7UUFDM0UsdUJBQUEsSUFBSSw2QkFBZSxVQUFVLE1BQUEsQ0FBQztJQUNoQyxDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSCx1QkFBdUIsQ0FBQyxJQUE0QixFQUFFLFFBQWdCO1FBQ3BFLE9BQU8sdUJBQUEsSUFBSSwyQ0FBc0IsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsWUFBWSxHQUFHLEVBQUUsRUFBRSxFQUFFO1lBQ3JFLFlBQVksQ0FBQyxJQUFJLENBQUMsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUMsQ0FBQztZQUNsRCxPQUFPLFlBQVksQ0FBQztRQUN0QixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsdUJBQXVCLENBQUMsZUFBNkI7UUFDbkQsTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUMsR0FBRyx1QkFBQSxJQUFJLGlDQUFZLENBQUMsbUJBQW1CLENBQUMsZUFBZSxDQUFDLElBQUksRUFBRSxDQUFDO1FBRXJGLElBQUksT0FBTyxXQUFXLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDcEMsT0FBTyxTQUFTLENBQUM7UUFDbkIsQ0FBQztRQUVELEtBQUssTUFBTSxRQUFRLElBQUksdUJBQUEsSUFBSSwyQ0FBc0IsQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUM7WUFDekUsTUFBTSxvQkFBb0IsR0FBRyxvQkFBb0IsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDdkUsSUFBSSxvQkFBb0IsQ0FBQyxZQUFZLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDO2dCQUM5RSxPQUFPLG9CQUFvQixDQUFDO1lBQzlCLENBQUM7UUFDSCxDQUFDO1FBRUQsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztDQUNGIn0=

package/src/archiver/kv_archiver_store/contract_store.ts

@@ -1,55 +0,0 @@
-import { ExtendedContractData } from '@aztec/circuit-types';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { createDebugLogger } from '@aztec/foundation/log';
-import { AztecKVStore, AztecMap } from '@aztec/kv-store';
-
-import { BlockStore } from './block_store.js';
-
-/**
- * LMDB implementation of the ArchiverDataStore interface.
- */
-export class ContractStore {
-  #blockStore: BlockStore;
-  #extendedContractData: AztecMap<number, Buffer[]>;
-  #log = createDebugLogger('aztec:archiver:contract_store');
-
-  constructor(private db: AztecKVStore, blockStore: BlockStore) {
-    this.#extendedContractData = db.openMap('archiver_extended_contract_data');
-    this.#blockStore = blockStore;
-  }
-
-  /**
-   * Add new extended contract data from an L2 block to the store's list.
-   * @param data - List of contracts' data to be added.
-   * @param blockNum - Number of the L2 block the contract data was deployed in.
-   * @returns True if the operation is successful.
-   */
-  addExtendedContractData(data: ExtendedContractData[], blockNum: number): Promise<boolean> {
-    return this.#extendedContractData.swap(blockNum, (existingData = []) => {
-      existingData.push(...data.map(d => d.toBuffer()));
-      return existingData;
-    });
-  }
-
-  /**
-   * Get the extended contract data for this contract.
-   * @param contractAddress - The contract data address.
-   * @returns The extended contract data or undefined if not found.
-   */
-  getExtendedContractData(contractAddress: AztecAddress): ExtendedContractData | undefined {
-    const [blockNumber, _] = this.#blockStore.getContractLocation(contractAddress) ?? [];
-
-    if (typeof blockNumber !== 'number') {
-      return undefined;
-    }
-
-    for (const contract of this.#extendedContractData.get(blockNumber) ?? []) {
-      const extendedContractData = ExtendedContractData.fromBuffer(contract);
-      if (extendedContractData.contractData.contractAddress.equals(contractAddress)) {
-        return extendedContractData;
-      }
-    }
-
-    return undefined;
-  }
-}