@aztec/archiver 0.26.5 → 0.27.0

package/README.md

@@ -4,8 +4,7 @@ Archiver is a service which is used to fetch data on-chain data and present them
 The on-chain data specifically are the following events:
 
 1. `L2BlockProcessed` event emitted on Rollup contract,
-2. `ContractDeployment` event emitted on ContractDeploymentEmitter contract,
-3. `MessageAdded` event emitted on Inbox contract,
+2. `MessageAdded` event emitted on Inbox contract,
 
 The interfaces defining how the data can be consumed from the archiver are `L2BlockSource`, `L2LogsSource` and `ContractDataSource`.
 
@@ -14,4 +13,4 @@ The interfaces defining how the data can be consumed from the archiver are `L2Bl
 To install dependencies and build the package run `yarn install` followed by `yarn build`.
 To run test execute `yarn test`.
 
-To start the service export `ETHEREUM_HOST` (defaults to `http://127.0.0.1:8545/`), `ARCHIVER_POLLING_INTERVAL` (defaults to `1000 ms`), `ROLLUP_CONTRACT_ADDRESS`, `INBOX_CONTRACT_ADDRESS`, `CONTRACT_DEPLOYMENT_EMITTER_ADDRESS` environmental variables and start the service with `yarn start`.
+To start the service export `ETHEREUM_HOST` (defaults to `http://127.0.0.1:8545/`), `ARCHIVER_POLLING_INTERVAL` (defaults to `1000 ms`), `ROLLUP_CONTRACT_ADDRESS`, `INBOX_CONTRACT_ADDRESS` environmental variables and start the service with `yarn start`.

package/dest/archiver/archiver.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" resolution-mode="require"/>
 import { ContractData, ContractDataSource, EncodedContractFunction, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2Message, L1ToL2MessageSource, L2Block, L2BlockL2Logs, L2BlockSource, L2LogsSource, LogFilter, LogType, TxEffect, TxHash, TxReceipt } from '@aztec/circuit-types';
 import { FunctionSelector } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
@@ -22,8 +23,8 @@ export declare class Archiver implements ArchiveSource {
     private readonly rollupAddress;
     private readonly availabilityOracleAddress;
     private readonly inboxAddress;
+    private readonly newInboxAddress;
     private readonly registryAddress;
-    private readonly contractDeploymentEmitterAddress;
     private readonly store;
     private readonly pollingIntervalMs;
     private readonly log;
@@ -40,13 +41,13 @@ export declare class Archiver implements ArchiveSource {
      * @param publicClient - A client for interacting with the Ethereum node.
      * @param rollupAddress - Ethereum address of the rollup contract.
      * @param inboxAddress - Ethereum address of the inbox contract.
+     * @param newInboxAddress - Ethereum address of the new inbox contract.
      * @param registryAddress - Ethereum address of the registry contract.
-     * @param contractDeploymentEmitterAddress - Ethereum address of the contractDeploymentEmitter contract.
      * @param pollingIntervalMs - The interval for polling for L1 logs (in milliseconds).
      * @param store - An archiver data store for storage & retrieval of blocks, encrypted logs & contract data.
      * @param log - A logger.
      */
-    constructor(publicClient: PublicClient<HttpTransport, Chain>, rollupAddress: EthAddress, availabilityOracleAddress: EthAddress, inboxAddress: EthAddress, registryAddress: EthAddress, contractDeploymentEmitterAddress: EthAddress, store: ArchiverDataStore, pollingIntervalMs?: number, log?: DebugLogger);
+    constructor(publicClient: PublicClient<HttpTransport, Chain>, rollupAddress: EthAddress, availabilityOracleAddress: EthAddress, inboxAddress: EthAddress, newInboxAddress: EthAddress, registryAddress: EthAddress, store: ArchiverDataStore, pollingIntervalMs?: number, log?: DebugLogger);
     /**
      * Creates a new instance of the Archiver and blocks until it syncs from chain.
      * @param config - The archiver's desired configuration.
@@ -80,6 +81,7 @@ export declare class Archiver implements ArchiveSource {
      * Temporary solution until we source this data from the contract class registerer and instance deployer.
      * @param contracts - The extended contract data to be stored.
      * @param l2BlockNum - The L2 block number to which the contract data corresponds.
+     * TODO(palla/purge-old-contract-deploy): Delete this method
      */
     storeContractDataAsClassesAndInstances(contracts: ExtendedContractData[], l2BlockNum: number): Promise<void>;
     /**
@@ -113,14 +115,9 @@ export declare class Archiver implements ArchiveSource {
     /**
      * Temporary method for creating a fake extended contract data out of classes and instances registered in the node.
      * Used as a fallback if the extended contract data is not found.
+     * TODO(palla/purge-old-contract-deploy): Use proper classes
      */
     private makeExtendedContractDataFor;
-    /**
-     * Lookup all contract data in an L2 block.
-     * @param blockNum - The block number to get all contract data from.
-     * @returns All new contract data in the block (if found).
-     */
-    getExtendedContractDataInBlock(blockNum: number): Promise<ExtendedContractData[]>;
     /**
      * Lookup the contract data for this contract.
      * Contains contract address & the ethereum portal address.
@@ -133,13 +130,6 @@ export declare class Archiver implements ArchiveSource {
      * Used as a fallback if the extended contract data is not found.
      */
     private makeContractDataFor;
-    /**
-     * Lookup the L2 contract data inside a block.
-     * Contains contract address & the ethereum portal address.
-     * @param l2BlockNum - The L2 block number to get the contract data from.
-     * @returns ContractData with the portal address (if we didn't throw an error).
-     */
-    getContractDataInBlock(l2BlockNum: number): Promise<ContractData[] | undefined>;
     /**
      * Gets the public function data for a contract.
      * @param contractAddress - The contract address containing the function to fetch.
@@ -180,6 +170,12 @@ export declare class Archiver implements ArchiveSource {
      * @returns The L1 to L2 message (throws if not found).
      */
     getConfirmedL1ToL2Message(entryKey: Fr): Promise<L1ToL2Message>;
+    /**
+     * Gets new L1 to L2 message (to be) included in a given block.
+     * @param blockNumber - L2 block number to get messages for.
+     * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
+     */
+    getNewL1ToL2Messages(blockNumber: bigint): Promise<Buffer[]>;
     getContractClassIds(): Promise<Fr[]>;
 }
 //# sourceMappingURL=archiver.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}

package/dest/archiver/archiver.js

@@ -2,13 +2,15 @@ import { ContractData, ExtendedContractData, L2Block, UnencryptedL2Log, } from '
 import { ContractClassRegisteredEvent } from '@aztec/circuits.js';
 import { ContractInstanceDeployedEvent } from '@aztec/circuits.js/contract';
 import { createEthereumChain } from '@aztec/ethereum';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
+import { RollupAbi } from '@aztec/l1-artifacts';
 import { ClassRegistererAddress } from '@aztec/protocol-contracts/class-registerer';
 import { InstanceDeployerAddress } from '@aztec/protocol-contracts/instance-deployer';
-import { createPublicClient, http } from 'viem';
-import { retrieveBlockBodiesFromAvailabilityOracle, retrieveBlockMetadataFromRollup, retrieveNewCancelledL1ToL2Messages, retrieveNewContractData, retrieveNewPendingL1ToL2Messages, } from './data_retrieval.js';
+import { createPublicClient, getAddress, getContract, http } from 'viem';
+import { retrieveBlockBodiesFromAvailabilityOracle, retrieveBlockMetadataFromRollup, retrieveNewCancelledL1ToL2Messages, retrieveNewL1ToL2Messages, retrieveNewPendingL1ToL2Messages, } from './data_retrieval.js';
 /**
  * Pulls L2 blocks in a non-blocking manner and provides interface for their retrieval.
  * Responsible for handling robust L1 polling so that other components do not need to
@@ -20,19 +22,19 @@ export class Archiver {
      * @param publicClient - A client for interacting with the Ethereum node.
      * @param rollupAddress - Ethereum address of the rollup contract.
      * @param inboxAddress - Ethereum address of the inbox contract.
+     * @param newInboxAddress - Ethereum address of the new inbox contract.
      * @param registryAddress - Ethereum address of the registry contract.
-     * @param contractDeploymentEmitterAddress - Ethereum address of the contractDeploymentEmitter contract.
      * @param pollingIntervalMs - The interval for polling for L1 logs (in milliseconds).
      * @param store - An archiver data store for storage & retrieval of blocks, encrypted logs & contract data.
      * @param log - A logger.
      */
-    constructor(publicClient, rollupAddress, availabilityOracleAddress, inboxAddress, registryAddress, contractDeploymentEmitterAddress, store, pollingIntervalMs = 10000, log = createDebugLogger('aztec:archiver')) {
+    constructor(publicClient, rollupAddress, availabilityOracleAddress, inboxAddress, newInboxAddress, registryAddress, store, pollingIntervalMs = 10000, log = createDebugLogger('aztec:archiver')) {
         this.publicClient = publicClient;
         this.rollupAddress = rollupAddress;
         this.availabilityOracleAddress = availabilityOracleAddress;
         this.inboxAddress = inboxAddress;
+        this.newInboxAddress = newInboxAddress;
         this.registryAddress = registryAddress;
-        this.contractDeploymentEmitterAddress = contractDeploymentEmitterAddress;
         this.store = store;
         this.pollingIntervalMs = pollingIntervalMs;
         this.log = log;
@@ -55,7 +57,17 @@ export class Archiver {
             transport: http(chain.rpcUrl),
             pollingInterval: config.viemPollingIntervalMS,
         });
-        const archiver = new Archiver(publicClient, config.l1Contracts.rollupAddress, config.l1Contracts.availabilityOracleAddress, config.l1Contracts.inboxAddress, config.l1Contracts.registryAddress, config.l1Contracts.contractDeploymentEmitterAddress, archiverStore, config.archiverPollingIntervalMS);
+        // TODO(#4492): Nuke this once the old inbox is purged
+        let newInboxAddress;
+        {
+            const rollup = getContract({
+                address: getAddress(config.l1Contracts.rollupAddress.toString()),
+                abi: RollupAbi,
+                client: publicClient,
+            });
+            newInboxAddress = EthAddress.fromString(await rollup.read.NEW_INBOX());
+        }
+        const archiver = new Archiver(publicClient, config.l1Contracts.rollupAddress, config.l1Contracts.availabilityOracleAddress, config.l1Contracts.inboxAddress, newInboxAddress, config.l1Contracts.registryAddress, archiverStore, config.archiverPollingIntervalMS);
         await archiver.start(blockUntilSynced);
         return archiver;
     }
@@ -94,6 +106,7 @@ export class Archiver {
         const lastL1Blocks = await this.store.getL1BlockNumber();
         const currentL1BlockNumber = await this.publicClient.getBlockNumber();
         if (currentL1BlockNumber <= lastL1Blocks.addedBlock &&
+            currentL1BlockNumber <= lastL1Blocks.newMessages &&
             currentL1BlockNumber <= lastL1Blocks.addedMessages &&
             currentL1BlockNumber <= lastL1Blocks.cancelledMessages) {
             // chain hasn't moved forward
@@ -118,6 +131,7 @@ export class Archiver {
          * in future but for the time being it should give us the guarantees that we need
          */
         // ********** Events that are processed per L1 block **********
+        // TODO(#4492): Nuke the following when purging the old inbox
         // Process l1ToL2Messages, these are consumed as time passes, not each block
         const retrievedPendingL1ToL2Messages = await retrieveNewPendingL1ToL2Messages(this.publicClient, this.inboxAddress, blockUntilSynced, lastL1Blocks.addedMessages + 1n, currentL1BlockNumber);
         const retrievedCancelledL1ToL2Messages = await retrieveNewCancelledL1ToL2Messages(this.publicClient, this.inboxAddress, blockUntilSynced, lastL1Blocks.cancelledMessages + 1n, currentL1BlockNumber);
@@ -142,6 +156,11 @@ export class Archiver {
             await this.store.cancelPendingL1ToL2EntryKeys(cancelledMessages, l1Block);
         }
         // ********** Events that are processed per L2 block **********
+        const retrievedNewL1ToL2Messages = await retrieveNewL1ToL2Messages(this.publicClient, this.newInboxAddress, blockUntilSynced, lastL1Blocks.newMessages + 1n, currentL1BlockNumber);
+        await this.store.addNewL1ToL2Messages(retrievedNewL1ToL2Messages.retrievedData, 
+        // -1n because the function expects the last block in which the message was emitted and not the one after next
+        // TODO(#4492): Check whether this could be cleaned up - `nextEthBlockNumber` value doesn't seem to be used much
+        retrievedNewL1ToL2Messages.nextEthBlockNumber - 1n);
         // Read all data from chain and then write to our stores at the end
         const nextExpectedL2BlockNum = BigInt((await this.store.getBlockNumber()) + 1);
         const retrievedBlockBodies = await retrieveBlockBodiesFromAvailabilityOracle(this.publicClient, this.availabilityOracleAddress, blockUntilSynced, lastL1Blocks.addedBlock + 1n, currentL1BlockNumber);
@@ -167,7 +186,6 @@ export class Archiver {
         retrievedBlocks.retrievedData.forEach((block) => {
             blockNumberToBodyHash[block.number] = block.header.contentCommitment.txsEffectsHash;
         });
-        const retrievedContracts = await retrieveNewContractData(this.publicClient, this.contractDeploymentEmitterAddress, blockUntilSynced, lastL1Blocks.addedBlock + 1n, currentL1BlockNumber, blockNumberToBodyHash);
         this.log(`Retrieved ${retrievedBlocks.retrievedData.length} block(s) from chain`);
         await Promise.all(retrievedBlocks.retrievedData.map(block => {
             const encryptedLogs = block.body.encryptedLogs;
@@ -183,15 +201,6 @@ export class Archiver {
             await this.storeRegisteredContractClasses(blockLogs, block.number);
             await this.storeDeployedContractInstances(blockLogs, block.number);
         }));
-        // store contracts for which we have retrieved L2 blocks
-        const lastKnownL2BlockNum = retrievedBlocks.retrievedData[retrievedBlocks.retrievedData.length - 1].number;
-        await Promise.all(retrievedContracts.retrievedData.map(async ([contracts, l2BlockNum]) => {
-            this.log(`Retrieved extended contract data for l2 block number: ${l2BlockNum}`);
-            if (l2BlockNum <= lastKnownL2BlockNum) {
-                await this.store.addExtendedContractData(contracts, l2BlockNum);
-                await this.storeContractDataAsClassesAndInstances(contracts, l2BlockNum);
-            }
-        }));
         // from retrieved L2Blocks, confirm L1 to L2 messages that have been published
         // from each l2block fetch all entryKeys in a flattened array:
         this.log(`Confirming l1 to l2 messages in store`);
@@ -227,6 +236,7 @@ export class Archiver {
      * Temporary solution until we source this data from the contract class registerer and instance deployer.
      * @param contracts - The extended contract data to be stored.
      * @param l2BlockNum - The L2 block number to which the contract data corresponds.
+     * TODO(palla/purge-old-contract-deploy): Delete this method
      */
     async storeContractDataAsClassesAndInstances(contracts, l2BlockNum) {
         const classesAndInstances = contracts.map(extendedContractDataToContractClassAndInstance);
@@ -288,6 +298,7 @@ export class Archiver {
     /**
      * Temporary method for creating a fake extended contract data out of classes and instances registered in the node.
      * Used as a fallback if the extended contract data is not found.
+     * TODO(palla/purge-old-contract-deploy): Use proper classes
      */
     async makeExtendedContractDataFor(address) {
         const instance = await this.store.getContractInstance(address);
@@ -301,22 +312,14 @@ export class Archiver {
         }
         return ExtendedContractData.fromClassAndInstance(contractClass, instance);
     }
-    /**
-     * Lookup all contract data in an L2 block.
-     * @param blockNum - The block number to get all contract data from.
-     * @returns All new contract data in the block (if found).
-     */
-    getExtendedContractDataInBlock(blockNum) {
-        return this.store.getExtendedContractDataInBlock(blockNum);
-    }
     /**
      * Lookup the contract data for this contract.
      * Contains contract address & the ethereum portal address.
      * @param contractAddress - The contract data address.
      * @returns ContractData with the portal address (if we didn't throw an error).
      */
-    async getContractData(contractAddress) {
-        return (await this.store.getContractData(contractAddress)) ?? this.makeContractDataFor(contractAddress);
+    getContractData(contractAddress) {
+        return this.makeContractDataFor(contractAddress);
     }
     /**
      * Temporary method for creating a fake contract data out of classes and instances registered in the node.
@@ -329,15 +332,6 @@ export class Archiver {
         }
         return new ContractData(address, instance.portalContractAddress);
     }
-    /**
-     * Lookup the L2 contract data inside a block.
-     * Contains contract address & the ethereum portal address.
-     * @param l2BlockNum - The L2 block number to get the contract data from.
-     * @returns ContractData with the portal address (if we didn't throw an error).
-     */
-    getContractDataInBlock(l2BlockNum) {
-        return this.store.getContractDataInBlock(l2BlockNum);
-    }
     /**
      * Gets the public function data for a contract.
      * @param contractAddress - The contract address containing the function to fetch.
@@ -395,6 +389,14 @@ export class Archiver {
     getConfirmedL1ToL2Message(entryKey) {
         return this.store.getConfirmedL1ToL2Message(entryKey);
     }
+    /**
+     * Gets new L1 to L2 message (to be) included in a given block.
+     * @param blockNumber - L2 block number to get messages for.
+     * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
+     */
+    getNewL1ToL2Messages(blockNumber) {
+        return this.store.getNewL1ToL2Messages(blockNumber);
+    }
     getContractClassIds() {
         return this.store.getContractClassIds();
     }
@@ -432,4 +434,4 @@ function extendedContractDataToContractClassAndInstance(data) {
         { ...contractInstance, address },
     ];
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver.js","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver.js","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}

package/dest/archiver/archiver_store.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
-import { Body, ContractData, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2Message, L2Block, L2BlockL2Logs, LogFilter, LogType, TxEffect, TxHash, TxReceipt } from '@aztec/circuit-types';
+import { Body, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2Message, L2Block, L2BlockL2Logs, LogFilter, LogType, NewInboxLeaf, TxEffect, TxHash, TxReceipt } from '@aztec/circuit-types';
 import { Fr } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts';
@@ -9,6 +9,8 @@ import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/c
 export type ArchiverL1SynchPoint = {
     /** The last L1 block that added a new L2 block.  */
     addedBlock: bigint;
+    /** The last L1 block that added messages from the new inbox. */
+    newMessages: bigint;
     /** The last L1 block that added pending messages */
     addedMessages: bigint;
     /** The last L1 block that cancelled messages */
@@ -65,11 +67,19 @@ export interface ArchiverDataStore {
      * @returns True if the operation is successful.
      */
     addLogs(encryptedLogs: L2BlockL2Logs | undefined, unencryptedLogs: L2BlockL2Logs | undefined, blockNumber: number): Promise<boolean>;
+    /**
+     * Append new L1 to L2 messages to the store.
+     * @param messages - The L1 to L2 messages to be added to the store.
+     * @param lastMessageL1BlockNumber - The L1 block number in which the last message was emitted.
+     * @returns True if the operation is successful.
+     */
+    addNewL1ToL2Messages(messages: NewInboxLeaf[], lastMessageL1BlockNumber: bigint): Promise<boolean>;
     /**
      * Append new pending L1 to L2 messages to the store.
      * @param messages - The L1 to L2 messages to be added to the store.
      * @param l1BlockNumber - The block number of the L1 block that added the messages.
      * @returns True if the operation is successful.
+     * TODO(#4492): Nuke the following when purging the old inbox
      */
     addPendingL1ToL2Messages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean>;
     /**
@@ -77,6 +87,7 @@ export interface ArchiverDataStore {
      * @param entryKeys - The entry keys to be removed from the store.
      * @param l1BlockNumber - The block number of the L1 block that cancelled the messages.
      * @returns True if the operation is successful.
+     * TODO(#4492): Nuke the following when purging the old inbox
      */
     cancelPendingL1ToL2EntryKeys(entryKeys: Fr[], l1BlockNumber: bigint): Promise<boolean>;
     /**
@@ -98,6 +109,12 @@ export interface ArchiverDataStore {
      * @returns The requested L1 to L2 message or throws if not found.
      */
     getConfirmedL1ToL2Message(entryKey: Fr): Promise<L1ToL2Message>;
+    /**
+     * Gets new L1 to L2 message (to be) included in a given block.
+     * @param blockNumber - L2 block number to get messages for.
+     * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
+     */
+    getNewL1ToL2Messages(blockNumber: bigint): Promise<Buffer[]>;
     /**
      * Gets up to `limit` amount of logs starting from `from`.
      * @param from - Number of the L2 block to which corresponds the first logs to be returned.
@@ -125,26 +142,6 @@ export interface ArchiverDataStore {
      * @returns The extended contract data or undefined if not found.
      */
     getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined>;
-    /**
-     * Lookup all extended contract data in an L2 block.
-     * @param blockNum - The block number to get all contract data from.
-     * @returns All extended contract data in the block (if found).
-     */
-    getExtendedContractDataInBlock(blockNum: number): Promise<ExtendedContractData[]>;
-    /**
-     * Get basic info for an L2 contract.
-     * Contains contract address & the ethereum portal address.
-     * @param contractAddress - The contract data address.
-     * @returns ContractData with the portal address (if we didn't throw an error).
-     */
-    getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined>;
-    /**
-     * Get basic info for an all L2 contracts deployed in a block.
-     * Contains contract address & the ethereum portal address.
-     * @param l2BlockNum - Number of the L2 block where contracts were deployed.
-     * @returns ContractData with the portal address (if we didn't throw an error).
-     */
-    getContractDataInBlock(l2BlockNum: number): Promise<ContractData[] | undefined>;
     /**
      * Gets the number of the latest L2 block processed.
      * @returns The number of the latest L2 block processed.

package/dest/archiver/archiver_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store.ts"],"names":[],"mappings":"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"}

package/dest/archiver/archiver_store_test_suite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archiver_store_test_suite.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store_test_suite.ts"],"names":[],"mappings":"AAUA,OAAO,2BAA2B,CAAC;AAMnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,QA6oB5F"}
+{"version":3,"file":"archiver_store_test_suite.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store_test_suite.ts"],"names":[],"mappings":"AAUA,OAAO,2BAA2B,CAAC;AAMnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,QAglB5F"}