@aztec/archiver 0.57.0 → 0.58.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/archiver/archiver.d.ts +5 -3
- package/dest/archiver/archiver.d.ts.map +1 -1
- package/dest/archiver/archiver.js +77 -21
- package/dest/archiver/archiver_store.d.ts +1 -2
- package/dest/archiver/archiver_store.d.ts.map +1 -1
- package/dest/archiver/archiver_store_test_suite.d.ts.map +1 -1
- package/dest/archiver/archiver_store_test_suite.js +10 -14
- package/dest/archiver/data_retrieval.js +3 -3
- package/dest/archiver/kv_archiver_store/contract_class_store.d.ts +1 -2
- package/dest/archiver/kv_archiver_store/contract_class_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/contract_class_store.js +2 -2
- package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts +1 -2
- package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/contract_instance_store.js +2 -2
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +1 -2
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/kv_archiver_store.js +1 -1
- package/dest/archiver/kv_archiver_store/message_store.d.ts +1 -1
- package/dest/archiver/kv_archiver_store/message_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/message_store.js +8 -11
- package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts +2 -2
- package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts.map +1 -1
- package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.js +9 -14
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts +1 -2
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts.map +1 -1
- package/dest/archiver/memory_archiver_store/memory_archiver_store.js +2 -2
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +17 -1
- package/dest/test/index.d.ts +2 -0
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/index.js +3 -1
- package/dest/test/mock_archiver.d.ts +22 -0
- package/dest/test/mock_archiver.d.ts.map +1 -0
- package/dest/test/mock_archiver.js +44 -0
- package/dest/test/mock_l1_to_l2_message_source.d.ts +16 -0
- package/dest/test/mock_l1_to_l2_message_source.d.ts.map +1 -0
- package/dest/test/mock_l1_to_l2_message_source.js +25 -0
- package/dest/test/mock_l2_block_source.d.ts +11 -9
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +36 -16
- package/package.json +10 -10
- package/src/archiver/archiver.ts +109 -34
- package/src/archiver/archiver_store.ts +5 -4
- package/src/archiver/archiver_store_test_suite.ts +20 -21
- package/src/archiver/data_retrieval.ts +2 -2
- package/src/archiver/kv_archiver_store/contract_class_store.ts +6 -4
- package/src/archiver/kv_archiver_store/contract_instance_store.ts +1 -2
- package/src/archiver/kv_archiver_store/kv_archiver_store.ts +7 -6
- package/src/archiver/kv_archiver_store/message_store.ts +7 -18
- package/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts +9 -19
- package/src/archiver/memory_archiver_store/memory_archiver_store.ts +6 -4
- package/src/factory.ts +18 -0
- package/src/test/index.ts +2 -0
- package/src/test/mock_archiver.ts +55 -0
- package/src/test/mock_l1_to_l2_message_source.ts +31 -0
- package/src/test/mock_l2_block_source.ts +42 -17
|
@@ -1,12 +1,11 @@
|
|
|
1
|
-
import { type FromLogType, type GetUnencryptedLogsResponse, type L1ToL2MessageSource, type L2Block, type L2BlockL2Logs, type L2BlockSource, type L2LogsSource, type LogFilter, type LogType, type TxEffect, type TxHash, type TxReceipt } from '@aztec/circuit-types';
|
|
2
|
-
import { type FunctionSelector, type Header } from '@aztec/circuits.js';
|
|
1
|
+
import { type FromLogType, type GetUnencryptedLogsResponse, type L1ToL2MessageSource, type L2Block, type L2BlockL2Logs, type L2BlockSource, type L2LogsSource, type L2Tips, type LogFilter, type LogType, type TxEffect, type TxHash, type TxReceipt } from '@aztec/circuit-types';
|
|
2
|
+
import { type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress, type FunctionSelector, type Header, type PublicFunction } from '@aztec/circuits.js';
|
|
3
3
|
import { type ContractArtifact } from '@aztec/foundation/abi';
|
|
4
4
|
import { type AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
5
|
import { type EthAddress } from '@aztec/foundation/eth-address';
|
|
6
6
|
import { Fr } from '@aztec/foundation/fields';
|
|
7
7
|
import { type DebugLogger } from '@aztec/foundation/log';
|
|
8
8
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
9
|
-
import { type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress, type PublicFunction } from '@aztec/types/contracts';
|
|
10
9
|
import { type Chain, type HttpTransport, type PublicClient } from 'viem';
|
|
11
10
|
import { type ArchiverDataStore } from './archiver_store.js';
|
|
12
11
|
import { type ArchiverConfig } from './config.js';
|
|
@@ -72,6 +71,8 @@ export declare class Archiver implements ArchiveSource {
|
|
|
72
71
|
* @param blockUntilSynced - If true, blocks until the archiver has fully synced.
|
|
73
72
|
*/
|
|
74
73
|
private sync;
|
|
74
|
+
/** Checks if there'd be a reorg for the next block submission and start pruning now. */
|
|
75
|
+
private handleEpochPrune;
|
|
75
76
|
private handleL1ToL2Messages;
|
|
76
77
|
private handleL2blocks;
|
|
77
78
|
/**
|
|
@@ -152,6 +153,7 @@ export declare class Archiver implements ArchiveSource {
|
|
|
152
153
|
getContractClassIds(): Promise<Fr[]>;
|
|
153
154
|
addContractArtifact(address: AztecAddress, artifact: ContractArtifact): Promise<void>;
|
|
154
155
|
getContractArtifact(address: AztecAddress): Promise<ContractArtifact | undefined>;
|
|
156
|
+
getL2Tips(): Promise<L2Tips>;
|
|
155
157
|
}
|
|
156
158
|
type L1RollupConstants = {
|
|
157
159
|
l1StartBlock: bigint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,0BAA0B,EAE/B,KAAK,mBAAmB,EACxB,KAAK,OAAO,
|
|
1
|
+
{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import { createDebugLogger } from '@aztec/foundation/log';
|
|
|
7
7
|
import { RunningPromise } from '@aztec/foundation/running-promise';
|
|
8
8
|
import { Timer } from '@aztec/foundation/timer';
|
|
9
9
|
import { InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
|
|
10
|
-
import {
|
|
10
|
+
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
11
11
|
import groupBy from 'lodash.groupby';
|
|
12
12
|
import { createPublicClient, getContract, http, } from 'viem';
|
|
13
13
|
import { retrieveBlockFromRollup, retrieveL1ToL2Messages } from './data_retrieval.js';
|
|
@@ -144,13 +144,37 @@ export class Archiver {
|
|
|
144
144
|
// ********** Events that are processed per L1 block **********
|
|
145
145
|
await this.handleL1ToL2Messages(blockUntilSynced, messagesSynchedTo, currentL1BlockNumber);
|
|
146
146
|
// ********** Events that are processed per L2 block **********
|
|
147
|
-
|
|
147
|
+
if (currentL1BlockNumber > blocksSynchedTo) {
|
|
148
|
+
// First we retrieve new L2 blocks
|
|
149
|
+
const { provenBlockNumber } = await this.handleL2blocks(blockUntilSynced, blocksSynchedTo, currentL1BlockNumber);
|
|
150
|
+
// And then we prune the current epoch if it'd reorg on next submission.
|
|
151
|
+
// Note that we don't do this before retrieving L2 blocks because we may need to retrieve
|
|
152
|
+
// blocks from more than 2 epochs ago, so we want to make sure we have the latest view of
|
|
153
|
+
// the chain locally before we start unwinding stuff. This can be optimized by figuring out
|
|
154
|
+
// up to which point we're pruning, and then requesting L2 blocks up to that point only.
|
|
155
|
+
await this.handleEpochPrune(provenBlockNumber, currentL1BlockNumber);
|
|
156
|
+
}
|
|
148
157
|
// Store latest l1 block number and timestamp seen. Used for epoch and slots calculations.
|
|
149
158
|
if (!this.l1BlockNumber || this.l1BlockNumber < currentL1BlockNumber) {
|
|
150
159
|
this.l1Timestamp = await this.publicClient.getBlock({ blockNumber: currentL1BlockNumber }).then(b => b.timestamp);
|
|
151
160
|
this.l1BlockNumber = currentL1BlockNumber;
|
|
152
161
|
}
|
|
153
162
|
}
|
|
163
|
+
/** Checks if there'd be a reorg for the next block submission and start pruning now. */
|
|
164
|
+
async handleEpochPrune(provenBlockNumber, currentL1BlockNumber) {
|
|
165
|
+
const localPendingBlockNumber = BigInt(await this.getBlockNumber());
|
|
166
|
+
const canPrune = localPendingBlockNumber > provenBlockNumber &&
|
|
167
|
+
(await this.rollup.read.canPrune({ blockNumber: currentL1BlockNumber }));
|
|
168
|
+
if (canPrune) {
|
|
169
|
+
this.log.verbose(`L2 prune will occur on next submission. Rolling back to last proven block.`);
|
|
170
|
+
const blocksToUnwind = localPendingBlockNumber - provenBlockNumber;
|
|
171
|
+
this.log.verbose(`Unwinding ${blocksToUnwind} block${blocksToUnwind > 1n ? 's' : ''} from block ${localPendingBlockNumber}`);
|
|
172
|
+
await this.store.unwindBlocks(Number(localPendingBlockNumber), Number(blocksToUnwind));
|
|
173
|
+
// TODO(palla/reorg): Do we need to set the block synched L1 block number here?
|
|
174
|
+
// Seems like the next iteration should handle this.
|
|
175
|
+
// await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
|
|
176
|
+
}
|
|
177
|
+
}
|
|
154
178
|
async handleL1ToL2Messages(blockUntilSynced, messagesSynchedTo, currentL1BlockNumber) {
|
|
155
179
|
if (currentL1BlockNumber <= messagesSynchedTo) {
|
|
156
180
|
return;
|
|
@@ -167,11 +191,8 @@ export class Archiver {
|
|
|
167
191
|
this.log.verbose(`Retrieved ${retrievedL1ToL2Messages.retrievedData.length} new L1 -> L2 messages between L1 blocks ${messagesSynchedTo + 1n} and ${currentL1BlockNumber}.`);
|
|
168
192
|
}
|
|
169
193
|
async handleL2blocks(blockUntilSynced, blocksSynchedTo, currentL1BlockNumber) {
|
|
170
|
-
if (currentL1BlockNumber <= blocksSynchedTo) {
|
|
171
|
-
return;
|
|
172
|
-
}
|
|
173
194
|
const localPendingBlockNumber = BigInt(await this.getBlockNumber());
|
|
174
|
-
const [provenBlockNumber, provenArchive, pendingBlockNumber, pendingArchive, archiveForLocalPendingBlockNumber, provenEpochNumber,] = await this.rollup.read.status([localPendingBlockNumber]);
|
|
195
|
+
const [provenBlockNumber, provenArchive, pendingBlockNumber, pendingArchive, archiveForLocalPendingBlockNumber, provenEpochNumber,] = await this.rollup.read.status([localPendingBlockNumber], { blockNumber: currentL1BlockNumber });
|
|
175
196
|
const updateProvenBlock = async () => {
|
|
176
197
|
const localBlockForDestinationProvenBlockNumber = await this.getBlock(Number(provenBlockNumber));
|
|
177
198
|
if (localBlockForDestinationProvenBlockNumber &&
|
|
@@ -181,6 +202,7 @@ export class Archiver {
|
|
|
181
202
|
// if we are here then we must have a valid proven epoch number
|
|
182
203
|
await this.store.setProvenL2EpochNumber(Number(provenEpochNumber));
|
|
183
204
|
}
|
|
205
|
+
this.instrumentation.updateLastProvenBlock(Number(provenBlockNumber));
|
|
184
206
|
};
|
|
185
207
|
// This is an edge case that we only hit if there are no proposed blocks.
|
|
186
208
|
// If we have 0 blocks locally and there are no blocks onchain there is nothing to do.
|
|
@@ -188,7 +210,7 @@ export class Archiver {
|
|
|
188
210
|
if (noBlocks) {
|
|
189
211
|
await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
|
|
190
212
|
this.log.verbose(`No blocks to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
|
|
191
|
-
return;
|
|
213
|
+
return { provenBlockNumber };
|
|
192
214
|
}
|
|
193
215
|
await updateProvenBlock();
|
|
194
216
|
// Related to the L2 reorgs of the pending chain. We are only interested in actually addressing a reorg if there
|
|
@@ -202,7 +224,7 @@ export class Archiver {
|
|
|
202
224
|
if (noBlockSinceLast) {
|
|
203
225
|
await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
|
|
204
226
|
this.log.verbose(`No blocks to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
|
|
205
|
-
return;
|
|
227
|
+
return { provenBlockNumber };
|
|
206
228
|
}
|
|
207
229
|
const localPendingBlockInChain = archiveForLocalPendingBlockNumber === localPendingBlock.archive.root.toString();
|
|
208
230
|
if (!localPendingBlockInChain) {
|
|
@@ -229,18 +251,20 @@ export class Archiver {
|
|
|
229
251
|
}
|
|
230
252
|
}
|
|
231
253
|
this.log.debug(`Retrieving blocks from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
|
|
232
|
-
const retrievedBlocks = await retrieveBlockFromRollup(this.rollup, this.publicClient, blockUntilSynced, blocksSynchedTo + 1n,
|
|
254
|
+
const retrievedBlocks = await retrieveBlockFromRollup(this.rollup, this.publicClient, blockUntilSynced, blocksSynchedTo + 1n, // TODO(palla/reorg): If the L2 reorg was due to an L1 reorg, we need to start search earlier
|
|
255
|
+
currentL1BlockNumber, this.log);
|
|
233
256
|
if (retrievedBlocks.length === 0) {
|
|
234
257
|
// We are not calling `setBlockSynchedL1BlockNumber` because it may cause sync issues if based off infura.
|
|
235
258
|
// See further details in earlier comments.
|
|
236
|
-
this.log.verbose(`Retrieved no new blocks from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
|
|
237
|
-
return;
|
|
259
|
+
this.log.verbose(`Retrieved no new L2 blocks from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
|
|
260
|
+
return { provenBlockNumber };
|
|
238
261
|
}
|
|
239
262
|
this.log.debug(`Retrieved ${retrievedBlocks.length} new L2 blocks between L1 blocks ${blocksSynchedTo + 1n} and ${currentL1BlockNumber}.`);
|
|
240
263
|
const lastProcessedL1BlockNumber = retrievedBlocks[retrievedBlocks.length - 1].l1.blockNumber;
|
|
241
|
-
this.log.debug(`
|
|
242
|
-
|
|
243
|
-
.
|
|
264
|
+
this.log.debug(`last processed L1 block: [${lastProcessedL1BlockNumber}]`);
|
|
265
|
+
for (const block of retrievedBlocks) {
|
|
266
|
+
this.log.debug(`ingesting new L2 block`, block.data.header.globalVariables.toFriendlyJSON());
|
|
267
|
+
}
|
|
244
268
|
const timer = new Timer();
|
|
245
269
|
await this.store.addBlocks(retrievedBlocks);
|
|
246
270
|
// Important that we update AFTER inserting the blocks.
|
|
@@ -248,6 +272,7 @@ export class Archiver {
|
|
|
248
272
|
this.instrumentation.processNewBlocks(timer.ms() / retrievedBlocks.length, retrievedBlocks.map(b => b.data));
|
|
249
273
|
const lastL2BlockNumber = retrievedBlocks[retrievedBlocks.length - 1].data.number;
|
|
250
274
|
this.log.verbose(`Processed ${retrievedBlocks.length} new L2 blocks up to ${lastL2BlockNumber}`);
|
|
275
|
+
return { provenBlockNumber };
|
|
251
276
|
}
|
|
252
277
|
/**
|
|
253
278
|
* Stops the archiver.
|
|
@@ -313,7 +338,10 @@ export class Archiver {
|
|
|
313
338
|
const l1Timestamp = this.getL1Timestamp();
|
|
314
339
|
const [_startTimestamp, endTimestamp] = getTimestampRangeForEpoch(epochNumber, this.l1constants);
|
|
315
340
|
// For this computation, we throw in a few extra seconds just for good measure,
|
|
316
|
-
// since we know the next L1 block won't be mined within this range
|
|
341
|
+
// since we know the next L1 block won't be mined within this range. Remember that
|
|
342
|
+
// l1timestamp is the timestamp of the last l1 block we've seen, so this 3s rely on
|
|
343
|
+
// the fact that L1 won't mine two blocks within 3s of each other.
|
|
344
|
+
// TODO(palla/reorg): Is the above a safe assumption?
|
|
317
345
|
const leeway = 3n;
|
|
318
346
|
return l1Timestamp + leeway >= endTimestamp;
|
|
319
347
|
}
|
|
@@ -350,8 +378,15 @@ export class Archiver {
|
|
|
350
378
|
if (number === 'latest') {
|
|
351
379
|
number = await this.store.getSynchedL2BlockNumber();
|
|
352
380
|
}
|
|
353
|
-
|
|
354
|
-
|
|
381
|
+
try {
|
|
382
|
+
const headers = await this.store.getBlockHeaders(number, 1);
|
|
383
|
+
return headers.length === 0 ? undefined : headers[0];
|
|
384
|
+
}
|
|
385
|
+
catch (e) {
|
|
386
|
+
// If the latest is 0, then getBlockHeaders will throw an error
|
|
387
|
+
this.log.error(`getBlockHeader: error fetching block number: ${number}`);
|
|
388
|
+
return undefined;
|
|
389
|
+
}
|
|
355
390
|
}
|
|
356
391
|
getTxEffect(txHash) {
|
|
357
392
|
return this.store.getTxEffect(txHash);
|
|
@@ -443,6 +478,27 @@ export class Archiver {
|
|
|
443
478
|
getContractArtifact(address) {
|
|
444
479
|
return this.store.getContractArtifact(address);
|
|
445
480
|
}
|
|
481
|
+
async getL2Tips() {
|
|
482
|
+
const [latestBlockNumber, provenBlockNumber] = await Promise.all([
|
|
483
|
+
this.getBlockNumber(),
|
|
484
|
+
this.getProvenBlockNumber(),
|
|
485
|
+
]);
|
|
486
|
+
const [latestBlockHeader, provenBlockHeader] = await Promise.all([
|
|
487
|
+
latestBlockNumber > 0 ? this.getBlockHeader(latestBlockNumber) : undefined,
|
|
488
|
+
provenBlockNumber > 0 ? this.getBlockHeader(provenBlockNumber) : undefined,
|
|
489
|
+
]);
|
|
490
|
+
if (latestBlockNumber > 0 && !latestBlockHeader) {
|
|
491
|
+
throw new Error('Failed to retrieve latest block header');
|
|
492
|
+
}
|
|
493
|
+
if (provenBlockNumber > 0 && !provenBlockHeader) {
|
|
494
|
+
throw new Error('Failed to retrieve proven block header');
|
|
495
|
+
}
|
|
496
|
+
return {
|
|
497
|
+
latest: { number: latestBlockNumber, hash: latestBlockHeader?.hash().toString() },
|
|
498
|
+
proven: { number: provenBlockNumber, hash: provenBlockHeader?.hash().toString() },
|
|
499
|
+
finalized: { number: provenBlockNumber, hash: provenBlockHeader?.hash().toString() },
|
|
500
|
+
};
|
|
501
|
+
}
|
|
446
502
|
}
|
|
447
503
|
var Operation;
|
|
448
504
|
(function (Operation) {
|
|
@@ -574,7 +630,7 @@ _ArchiverStoreHelper_log = new WeakMap(), _ArchiverStoreHelper_instances = new W
|
|
|
574
630
|
* @param allLogs - All logs emitted in a bunch of blocks.
|
|
575
631
|
*/
|
|
576
632
|
async function _ArchiverStoreHelper_updateRegisteredContractClasses(allLogs, blockNum, operation) {
|
|
577
|
-
const contractClasses = ContractClassRegisteredEvent.fromLogs(allLogs,
|
|
633
|
+
const contractClasses = ContractClassRegisteredEvent.fromLogs(allLogs, ProtocolContractAddress.ContractClassRegisterer).map(e => e.toContractClassPublic());
|
|
578
634
|
if (contractClasses.length > 0) {
|
|
579
635
|
contractClasses.forEach(c => __classPrivateFieldGet(this, _ArchiverStoreHelper_log, "f").verbose(`Registering contract class ${c.id.toString()}`));
|
|
580
636
|
if (operation == Operation.Store) {
|
|
@@ -615,8 +671,8 @@ async function _ArchiverStoreHelper_updateDeployedContractInstances(allLogs, blo
|
|
|
615
671
|
*/
|
|
616
672
|
async function _ArchiverStoreHelper_storeBroadcastedIndividualFunctions(allLogs, _blockNum) {
|
|
617
673
|
// Filter out private and unconstrained function broadcast events
|
|
618
|
-
const privateFnEvents = PrivateFunctionBroadcastedEvent.fromLogs(allLogs,
|
|
619
|
-
const unconstrainedFnEvents = UnconstrainedFunctionBroadcastedEvent.fromLogs(allLogs,
|
|
674
|
+
const privateFnEvents = PrivateFunctionBroadcastedEvent.fromLogs(allLogs, ProtocolContractAddress.ContractClassRegisterer);
|
|
675
|
+
const unconstrainedFnEvents = UnconstrainedFunctionBroadcastedEvent.fromLogs(allLogs, ProtocolContractAddress.ContractClassRegisterer);
|
|
620
676
|
// Group all events by contract class id
|
|
621
677
|
for (const [classIdString, classEvents] of Object.entries(groupBy([...privateFnEvents, ...unconstrainedFnEvents], e => e.contractClassId.toString()))) {
|
|
622
678
|
const contractClassId = Fr.fromString(classIdString);
|
|
@@ -647,4 +703,4 @@ const EmptyL1RollupConstants = {
|
|
|
647
703
|
l1StartBlock: 0n,
|
|
648
704
|
l1GenesisTime: 0n,
|
|
649
705
|
};
|
|
650
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver.js","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}
|
|
706
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver.js","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { type FromLogType, type GetUnencryptedLogsResponse, type InboxLeaf, type L2Block, type L2BlockL2Logs, type LogFilter, type LogType, type TxEffect, type TxHash, type TxReceipt } from '@aztec/circuit-types';
|
|
2
|
-
import { type Fr, type Header } from '@aztec/circuits.js';
|
|
2
|
+
import { type ContractClassPublic, type ContractInstanceWithAddress, type ExecutablePrivateFunctionWithMembershipProof, type Fr, type Header, type UnconstrainedFunctionWithMembershipProof } from '@aztec/circuits.js';
|
|
3
3
|
import { type ContractArtifact } from '@aztec/foundation/abi';
|
|
4
4
|
import { type AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
|
-
import { type ContractClassPublic, type ContractInstanceWithAddress, type ExecutablePrivateFunctionWithMembershipProof, type UnconstrainedFunctionWithMembershipProof } from '@aztec/types/contracts';
|
|
6
5
|
import { type DataRetrieval } from './structs/data_retrieval.js';
|
|
7
6
|
import { type L1Published } from './structs/published.js';
|
|
8
7
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EACd,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,OAAO,EACZ,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,SAAS,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,
|
|
1
|
+
{"version":3,"file":"archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver_store_test_suite.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store_test_suite.ts"],"names":[],"mappings":"AACA,OAAO,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"archiver_store_test_suite.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store_test_suite.ts"],"names":[],"mappings":"AACA,OAAO,2BAA2B,CAAC;AAkBnC,OAAO,EAAE,KAAK,iBAAiB,EAA6B,MAAM,qBAAqB,CAAC;AAGxF;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,QAugB5F"}
|