@aztec/archiver 0.56.0 → 0.57.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/README.md +1 -1
- package/dest/archiver/archiver.d.ts +23 -20
- package/dest/archiver/archiver.d.ts.map +1 -1
- package/dest/archiver/archiver.js +353 -103
- package/dest/archiver/archiver_store.d.ts +39 -9
- 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 +75 -18
- package/dest/archiver/config.js +6 -6
- package/dest/archiver/data_retrieval.d.ts +2 -3
- package/dest/archiver/data_retrieval.d.ts.map +1 -1
- package/dest/archiver/data_retrieval.js +21 -20
- package/dest/archiver/epoch_helpers.d.ts +15 -0
- package/dest/archiver/epoch_helpers.d.ts.map +1 -0
- package/dest/archiver/epoch_helpers.js +23 -0
- package/dest/archiver/kv_archiver_store/block_store.d.ts +20 -1
- package/dest/archiver/kv_archiver_store/block_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/block_store.js +62 -5
- package/dest/archiver/kv_archiver_store/contract_class_store.d.ts +2 -1
- package/dest/archiver/kv_archiver_store/contract_class_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/contract_class_store.js +11 -4
- package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts +1 -0
- package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/contract_instance_store.js +4 -1
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +29 -9
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/kv_archiver_store.js +57 -17
- package/dest/archiver/kv_archiver_store/log_store.d.ts +4 -5
- package/dest/archiver/kv_archiver_store/log_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/log_store.js +18 -14
- package/dest/archiver/kv_archiver_store/message_store.d.ts +1 -0
- package/dest/archiver/kv_archiver_store/message_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/message_store.js +10 -3
- package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts +1 -0
- 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 +4 -1
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts +23 -22
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts.map +1 -1
- package/dest/archiver/memory_archiver_store/memory_archiver_store.js +129 -69
- package/dest/index.js +2 -1
- package/dest/test/index.d.ts +2 -0
- package/dest/test/index.d.ts.map +1 -0
- package/dest/test/index.js +2 -0
- package/dest/test/mock_l2_block_source.d.ts +73 -0
- package/dest/test/mock_l2_block_source.d.ts.map +1 -0
- package/dest/test/mock_l2_block_source.js +134 -0
- package/package.json +15 -11
- package/src/archiver/archiver.ts +457 -149
- package/src/archiver/archiver_store.ts +44 -16
- package/src/archiver/archiver_store_test_suite.ts +91 -52
- package/src/archiver/config.ts +5 -5
- package/src/archiver/data_retrieval.ts +23 -24
- package/src/archiver/epoch_helpers.ts +26 -0
- package/src/archiver/kv_archiver_store/block_store.ts +70 -2
- package/src/archiver/kv_archiver_store/contract_class_store.ts +18 -5
- package/src/archiver/kv_archiver_store/contract_instance_store.ts +4 -0
- package/src/archiver/kv_archiver_store/kv_archiver_store.ts +65 -24
- package/src/archiver/kv_archiver_store/log_store.ts +18 -18
- package/src/archiver/kv_archiver_store/message_store.ts +9 -0
- package/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts +4 -0
- package/src/archiver/memory_archiver_store/memory_archiver_store.ts +149 -80
- package/src/index.ts +1 -0
- package/src/test/index.ts +1 -0
- package/src/test/mock_l2_block_source.ts +165 -0
- package/dest/archiver/kv_archiver_store/proven_store.d.ts +0 -14
- package/dest/archiver/kv_archiver_store/proven_store.d.ts.map +0 -1
- package/dest/archiver/kv_archiver_store/proven_store.js +0 -30
- package/src/archiver/kv_archiver_store/proven_store.ts +0 -34
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
1
|
+
var _ArchiverStoreHelper_instances, _ArchiverStoreHelper_log, _ArchiverStoreHelper_updateRegisteredContractClasses, _ArchiverStoreHelper_updateDeployedContractInstances, _ArchiverStoreHelper_storeBroadcastedIndividualFunctions;
|
|
2
|
+
import { __classPrivateFieldGet } from "tslib";
|
|
3
|
+
import { ContractClassRegisteredEvent, ContractInstanceDeployedEvent, PrivateFunctionBroadcastedEvent, UnconstrainedFunctionBroadcastedEvent, isValidPrivateFunctionMembershipProof, isValidUnconstrainedFunctionMembershipProof, } from '@aztec/circuits.js';
|
|
3
4
|
import { createEthereumChain } from '@aztec/ethereum';
|
|
4
5
|
import { Fr } from '@aztec/foundation/fields';
|
|
5
6
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
@@ -10,6 +11,7 @@ import { ClassRegistererAddress } from '@aztec/protocol-contracts/class-register
|
|
|
10
11
|
import groupBy from 'lodash.groupby';
|
|
11
12
|
import { createPublicClient, getContract, http, } from 'viem';
|
|
12
13
|
import { retrieveBlockFromRollup, retrieveL1ToL2Messages } from './data_retrieval.js';
|
|
14
|
+
import { getEpochNumberAtTimestamp, getSlotAtTimestamp, getSlotRangeForEpoch, getTimestampRangeForEpoch, } from './epoch_helpers.js';
|
|
13
15
|
import { ArchiverInstrumentation } from './instrumentation.js';
|
|
14
16
|
/**
|
|
15
17
|
* Pulls L2 blocks in a non-blocking manner and provides interface for their retrieval.
|
|
@@ -27,16 +29,17 @@ export class Archiver {
|
|
|
27
29
|
* @param store - An archiver data store for storage & retrieval of blocks, encrypted logs & contract data.
|
|
28
30
|
* @param log - A logger.
|
|
29
31
|
*/
|
|
30
|
-
constructor(publicClient, rollupAddress, inboxAddress, registryAddress,
|
|
32
|
+
constructor(publicClient, rollupAddress, inboxAddress, registryAddress, dataStore, pollingIntervalMs, instrumentation, l1constants = EmptyL1RollupConstants, log = createDebugLogger('aztec:archiver')) {
|
|
31
33
|
this.publicClient = publicClient;
|
|
32
34
|
this.rollupAddress = rollupAddress;
|
|
33
35
|
this.inboxAddress = inboxAddress;
|
|
34
36
|
this.registryAddress = registryAddress;
|
|
35
|
-
this.
|
|
37
|
+
this.dataStore = dataStore;
|
|
36
38
|
this.pollingIntervalMs = pollingIntervalMs;
|
|
37
39
|
this.instrumentation = instrumentation;
|
|
38
|
-
this.
|
|
40
|
+
this.l1constants = l1constants;
|
|
39
41
|
this.log = log;
|
|
42
|
+
this.store = new ArchiverStoreHelper(dataStore);
|
|
40
43
|
this.rollup = getContract({
|
|
41
44
|
address: rollupAddress.toString(),
|
|
42
45
|
abi: RollupAbi,
|
|
@@ -67,8 +70,11 @@ export class Archiver {
|
|
|
67
70
|
abi: RollupAbi,
|
|
68
71
|
client: publicClient,
|
|
69
72
|
});
|
|
70
|
-
const l1StartBlock = await
|
|
71
|
-
|
|
73
|
+
const [l1StartBlock, l1GenesisTime] = await Promise.all([
|
|
74
|
+
rollup.read.L1_BLOCK_AT_GENESIS(),
|
|
75
|
+
rollup.read.GENESIS_TIME(),
|
|
76
|
+
]);
|
|
77
|
+
const archiver = new Archiver(publicClient, config.l1Contracts.rollupAddress, config.l1Contracts.inboxAddress, config.l1Contracts.registryAddress, archiverStore, config.archiverPollingIntervalMS ?? 10000, new ArchiverInstrumentation(telemetry), { l1StartBlock, l1GenesisTime });
|
|
72
78
|
await archiver.start(blockUntilSynced);
|
|
73
79
|
return archiver;
|
|
74
80
|
}
|
|
@@ -115,7 +121,8 @@ export class Archiver {
|
|
|
115
121
|
*
|
|
116
122
|
* This code does not handle reorgs.
|
|
117
123
|
*/
|
|
118
|
-
const {
|
|
124
|
+
const { l1StartBlock } = this.l1constants;
|
|
125
|
+
const { blocksSynchedTo = l1StartBlock, messagesSynchedTo = l1StartBlock } = await this.store.getSynchPoint();
|
|
119
126
|
const currentL1BlockNumber = await this.publicClient.getBlockNumber();
|
|
120
127
|
// ********** Ensuring Consistency of data pulled from L1 **********
|
|
121
128
|
/**
|
|
@@ -134,62 +141,98 @@ export class Archiver {
|
|
|
134
141
|
* data up to the currentBlockNumber captured at the top of this function. We might want to improve on this
|
|
135
142
|
* in future but for the time being it should give us the guarantees that we need
|
|
136
143
|
*/
|
|
137
|
-
await this.updateLastProvenL2Block(provenLogsSynchedTo, currentL1BlockNumber);
|
|
138
144
|
// ********** Events that are processed per L1 block **********
|
|
139
145
|
await this.handleL1ToL2Messages(blockUntilSynced, messagesSynchedTo, currentL1BlockNumber);
|
|
140
146
|
// ********** Events that are processed per L2 block **********
|
|
141
147
|
await this.handleL2blocks(blockUntilSynced, blocksSynchedTo, currentL1BlockNumber);
|
|
148
|
+
// Store latest l1 block number and timestamp seen. Used for epoch and slots calculations.
|
|
149
|
+
if (!this.l1BlockNumber || this.l1BlockNumber < currentL1BlockNumber) {
|
|
150
|
+
this.l1Timestamp = await this.publicClient.getBlock({ blockNumber: currentL1BlockNumber }).then(b => b.timestamp);
|
|
151
|
+
this.l1BlockNumber = currentL1BlockNumber;
|
|
152
|
+
}
|
|
142
153
|
}
|
|
143
154
|
async handleL1ToL2Messages(blockUntilSynced, messagesSynchedTo, currentL1BlockNumber) {
|
|
144
155
|
if (currentL1BlockNumber <= messagesSynchedTo) {
|
|
145
156
|
return;
|
|
146
157
|
}
|
|
147
|
-
const
|
|
148
|
-
|
|
158
|
+
const localTotalMessageCount = await this.store.getTotalL1ToL2MessageCount();
|
|
159
|
+
const destinationTotalMessageCount = await this.inbox.read.totalMessagesInserted();
|
|
160
|
+
if (localTotalMessageCount === destinationTotalMessageCount) {
|
|
149
161
|
await this.store.setMessageSynchedL1BlockNumber(currentL1BlockNumber);
|
|
150
162
|
this.log.verbose(`Retrieved no new L1 -> L2 messages between L1 blocks ${messagesSynchedTo + 1n} and ${currentL1BlockNumber}.`);
|
|
151
163
|
return;
|
|
152
164
|
}
|
|
165
|
+
const retrievedL1ToL2Messages = await retrieveL1ToL2Messages(this.inbox, blockUntilSynced, messagesSynchedTo + 1n, currentL1BlockNumber);
|
|
153
166
|
await this.store.addL1ToL2Messages(retrievedL1ToL2Messages);
|
|
154
167
|
this.log.verbose(`Retrieved ${retrievedL1ToL2Messages.retrievedData.length} new L1 -> L2 messages between L1 blocks ${messagesSynchedTo + 1n} and ${currentL1BlockNumber}.`);
|
|
155
168
|
}
|
|
156
|
-
async updateLastProvenL2Block(provenSynchedTo, currentL1BlockNumber) {
|
|
157
|
-
if (currentL1BlockNumber <= provenSynchedTo) {
|
|
158
|
-
return;
|
|
159
|
-
}
|
|
160
|
-
const provenBlockNumber = await this.rollup.read.getProvenBlockNumber();
|
|
161
|
-
if (provenBlockNumber) {
|
|
162
|
-
await this.store.setProvenL2BlockNumber({
|
|
163
|
-
retrievedData: Number(provenBlockNumber),
|
|
164
|
-
lastProcessedL1BlockNumber: currentL1BlockNumber,
|
|
165
|
-
});
|
|
166
|
-
}
|
|
167
|
-
}
|
|
168
169
|
async handleL2blocks(blockUntilSynced, blocksSynchedTo, currentL1BlockNumber) {
|
|
169
170
|
if (currentL1BlockNumber <= blocksSynchedTo) {
|
|
170
171
|
return;
|
|
171
172
|
}
|
|
172
|
-
const
|
|
173
|
-
const [, , pendingBlockNumber, pendingArchive,
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
173
|
+
const localPendingBlockNumber = BigInt(await this.getBlockNumber());
|
|
174
|
+
const [provenBlockNumber, provenArchive, pendingBlockNumber, pendingArchive, archiveForLocalPendingBlockNumber, provenEpochNumber,] = await this.rollup.read.status([localPendingBlockNumber]);
|
|
175
|
+
const updateProvenBlock = async () => {
|
|
176
|
+
const localBlockForDestinationProvenBlockNumber = await this.getBlock(Number(provenBlockNumber));
|
|
177
|
+
if (localBlockForDestinationProvenBlockNumber &&
|
|
178
|
+
provenArchive === localBlockForDestinationProvenBlockNumber.archive.root.toString()) {
|
|
179
|
+
this.log.info(`Updating the proven block number to ${provenBlockNumber} and epoch to ${provenEpochNumber}`);
|
|
180
|
+
await this.store.setProvenL2BlockNumber(Number(provenBlockNumber));
|
|
181
|
+
// if we are here then we must have a valid proven epoch number
|
|
182
|
+
await this.store.setProvenL2EpochNumber(Number(provenEpochNumber));
|
|
183
|
+
}
|
|
184
|
+
};
|
|
185
|
+
// This is an edge case that we only hit if there are no proposed blocks.
|
|
186
|
+
// If we have 0 blocks locally and there are no blocks onchain there is nothing to do.
|
|
187
|
+
const noBlocks = localPendingBlockNumber === 0n && pendingBlockNumber === 0n;
|
|
188
|
+
if (noBlocks) {
|
|
181
189
|
await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
|
|
182
190
|
this.log.verbose(`No blocks to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
|
|
183
191
|
return;
|
|
184
192
|
}
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
193
|
+
await updateProvenBlock();
|
|
194
|
+
// Related to the L2 reorgs of the pending chain. We are only interested in actually addressing a reorg if there
|
|
195
|
+
// are any state that could be impacted by it. If we have no blocks, there is no impact.
|
|
196
|
+
if (localPendingBlockNumber > 0) {
|
|
197
|
+
const localPendingBlock = await this.getBlock(Number(localPendingBlockNumber));
|
|
198
|
+
if (localPendingBlock === undefined) {
|
|
199
|
+
throw new Error(`Missing block ${localPendingBlockNumber}`);
|
|
200
|
+
}
|
|
201
|
+
const noBlockSinceLast = localPendingBlock && pendingArchive === localPendingBlock.archive.root.toString();
|
|
202
|
+
if (noBlockSinceLast) {
|
|
203
|
+
await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
|
|
204
|
+
this.log.verbose(`No blocks to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
|
|
205
|
+
return;
|
|
206
|
+
}
|
|
207
|
+
const localPendingBlockInChain = archiveForLocalPendingBlockNumber === localPendingBlock.archive.root.toString();
|
|
208
|
+
if (!localPendingBlockInChain) {
|
|
209
|
+
// If our local pending block tip is not in the chain on L1 a "prune" must have happened
|
|
210
|
+
// or the L1 have reorged.
|
|
211
|
+
// In any case, we have to figure out how far into the past the action will take us.
|
|
212
|
+
// For simplicity here, we will simply rewind until we end in a block that is also on the chain on L1.
|
|
213
|
+
this.log.verbose(`L2 prune have occurred, unwind state`);
|
|
214
|
+
let tipAfterUnwind = localPendingBlockNumber;
|
|
215
|
+
while (true) {
|
|
216
|
+
const candidateBlock = await this.getBlock(Number(tipAfterUnwind));
|
|
217
|
+
if (candidateBlock === undefined) {
|
|
218
|
+
break;
|
|
219
|
+
}
|
|
220
|
+
const archiveAtContract = await this.rollup.read.archiveAt([BigInt(candidateBlock.number)]);
|
|
221
|
+
if (archiveAtContract === candidateBlock.archive.root.toString()) {
|
|
222
|
+
break;
|
|
223
|
+
}
|
|
224
|
+
tipAfterUnwind--;
|
|
225
|
+
}
|
|
226
|
+
const blocksToUnwind = localPendingBlockNumber - tipAfterUnwind;
|
|
227
|
+
this.log.verbose(`Unwinding ${blocksToUnwind} block${blocksToUnwind > 1n ? 's' : ''} from block ${localPendingBlockNumber}`);
|
|
228
|
+
await this.store.unwindBlocks(Number(localPendingBlockNumber), Number(blocksToUnwind));
|
|
229
|
+
}
|
|
188
230
|
}
|
|
189
231
|
this.log.debug(`Retrieving blocks from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
|
|
190
232
|
const retrievedBlocks = await retrieveBlockFromRollup(this.rollup, this.publicClient, blockUntilSynced, blocksSynchedTo + 1n, currentL1BlockNumber, this.log);
|
|
191
233
|
if (retrievedBlocks.length === 0) {
|
|
192
|
-
|
|
234
|
+
// We are not calling `setBlockSynchedL1BlockNumber` because it may cause sync issues if based off infura.
|
|
235
|
+
// See further details in earlier comments.
|
|
193
236
|
this.log.verbose(`Retrieved no new blocks from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
|
|
194
237
|
return;
|
|
195
238
|
}
|
|
@@ -198,75 +241,14 @@ export class Archiver {
|
|
|
198
241
|
this.log.debug(`Processing retrieved blocks ${retrievedBlocks
|
|
199
242
|
.map(b => b.data.number)
|
|
200
243
|
.join(',')} with last processed L1 block ${lastProcessedL1BlockNumber}`);
|
|
201
|
-
await Promise.all(retrievedBlocks.map(block => {
|
|
202
|
-
return this.store.addLogs(block.data.body.noteEncryptedLogs, block.data.body.encryptedLogs, block.data.body.unencryptedLogs, block.data.number);
|
|
203
|
-
}));
|
|
204
|
-
// Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
|
|
205
|
-
await Promise.all(retrievedBlocks.map(async (block) => {
|
|
206
|
-
const blockLogs = block.data.body.txEffects
|
|
207
|
-
.flatMap(txEffect => (txEffect ? [txEffect.unencryptedLogs] : []))
|
|
208
|
-
.flatMap(txLog => txLog.unrollLogs());
|
|
209
|
-
await this.storeRegisteredContractClasses(blockLogs, block.data.number);
|
|
210
|
-
await this.storeDeployedContractInstances(blockLogs, block.data.number);
|
|
211
|
-
await this.storeBroadcastedIndividualFunctions(blockLogs, block.data.number);
|
|
212
|
-
}));
|
|
213
244
|
const timer = new Timer();
|
|
214
245
|
await this.store.addBlocks(retrievedBlocks);
|
|
246
|
+
// Important that we update AFTER inserting the blocks.
|
|
247
|
+
await updateProvenBlock();
|
|
215
248
|
this.instrumentation.processNewBlocks(timer.ms() / retrievedBlocks.length, retrievedBlocks.map(b => b.data));
|
|
216
249
|
const lastL2BlockNumber = retrievedBlocks[retrievedBlocks.length - 1].data.number;
|
|
217
250
|
this.log.verbose(`Processed ${retrievedBlocks.length} new L2 blocks up to ${lastL2BlockNumber}`);
|
|
218
251
|
}
|
|
219
|
-
/**
|
|
220
|
-
* Extracts and stores contract classes out of ContractClassRegistered events emitted by the class registerer contract.
|
|
221
|
-
* @param allLogs - All logs emitted in a bunch of blocks.
|
|
222
|
-
*/
|
|
223
|
-
async storeRegisteredContractClasses(allLogs, blockNum) {
|
|
224
|
-
const contractClasses = ContractClassRegisteredEvent.fromLogs(allLogs, ClassRegistererAddress).map(e => e.toContractClassPublic());
|
|
225
|
-
if (contractClasses.length > 0) {
|
|
226
|
-
contractClasses.forEach(c => this.log.verbose(`Registering contract class ${c.id.toString()}`));
|
|
227
|
-
await this.store.addContractClasses(contractClasses, blockNum);
|
|
228
|
-
}
|
|
229
|
-
}
|
|
230
|
-
/**
|
|
231
|
-
* Extracts and stores contract instances out of ContractInstanceDeployed events emitted by the canonical deployer contract.
|
|
232
|
-
* @param allLogs - All logs emitted in a bunch of blocks.
|
|
233
|
-
*/
|
|
234
|
-
async storeDeployedContractInstances(allLogs, blockNum) {
|
|
235
|
-
const contractInstances = ContractInstanceDeployedEvent.fromLogs(allLogs).map(e => e.toContractInstance());
|
|
236
|
-
if (contractInstances.length > 0) {
|
|
237
|
-
contractInstances.forEach(c => this.log.verbose(`Storing contract instance at ${c.address.toString()}`));
|
|
238
|
-
await this.store.addContractInstances(contractInstances, blockNum);
|
|
239
|
-
}
|
|
240
|
-
}
|
|
241
|
-
async storeBroadcastedIndividualFunctions(allLogs, _blockNum) {
|
|
242
|
-
// Filter out private and unconstrained function broadcast events
|
|
243
|
-
const privateFnEvents = PrivateFunctionBroadcastedEvent.fromLogs(allLogs, ClassRegistererAddress);
|
|
244
|
-
const unconstrainedFnEvents = UnconstrainedFunctionBroadcastedEvent.fromLogs(allLogs, ClassRegistererAddress);
|
|
245
|
-
// Group all events by contract class id
|
|
246
|
-
for (const [classIdString, classEvents] of Object.entries(groupBy([...privateFnEvents, ...unconstrainedFnEvents], e => e.contractClassId.toString()))) {
|
|
247
|
-
const contractClassId = Fr.fromString(classIdString);
|
|
248
|
-
const contractClass = await this.store.getContractClass(contractClassId);
|
|
249
|
-
if (!contractClass) {
|
|
250
|
-
this.log.warn(`Skipping broadcasted functions as contract class ${contractClassId.toString()} was not found`);
|
|
251
|
-
continue;
|
|
252
|
-
}
|
|
253
|
-
// Split private and unconstrained functions, and filter out invalid ones
|
|
254
|
-
const allFns = classEvents.map(e => e.toFunctionWithMembershipProof());
|
|
255
|
-
const privateFns = allFns.filter((fn) => 'unconstrainedFunctionsArtifactTreeRoot' in fn);
|
|
256
|
-
const unconstrainedFns = allFns.filter((fn) => 'privateFunctionsArtifactTreeRoot' in fn);
|
|
257
|
-
const validPrivateFns = privateFns.filter(fn => isValidPrivateFunctionMembershipProof(fn, contractClass));
|
|
258
|
-
const validUnconstrainedFns = unconstrainedFns.filter(fn => isValidUnconstrainedFunctionMembershipProof(fn, contractClass));
|
|
259
|
-
const validFnCount = validPrivateFns.length + validUnconstrainedFns.length;
|
|
260
|
-
if (validFnCount !== allFns.length) {
|
|
261
|
-
this.log.warn(`Skipping ${allFns.length - validFnCount} invalid functions`);
|
|
262
|
-
}
|
|
263
|
-
// Store the functions in the contract class in a single operation
|
|
264
|
-
if (validFnCount > 0) {
|
|
265
|
-
this.log.verbose(`Storing ${validFnCount} functions for contract class ${contractClassId.toString()}`);
|
|
266
|
-
}
|
|
267
|
-
await this.store.addFunctions(contractClassId, validPrivateFns, validUnconstrainedFns);
|
|
268
|
-
}
|
|
269
|
-
}
|
|
270
252
|
/**
|
|
271
253
|
* Stops the archiver.
|
|
272
254
|
* @returns A promise signalling completion of the stop process.
|
|
@@ -283,6 +265,58 @@ export class Archiver {
|
|
|
283
265
|
getRegistryAddress() {
|
|
284
266
|
return Promise.resolve(this.registryAddress);
|
|
285
267
|
}
|
|
268
|
+
getL1BlockNumber() {
|
|
269
|
+
const l1BlockNumber = this.l1BlockNumber;
|
|
270
|
+
if (!l1BlockNumber) {
|
|
271
|
+
throw new Error('L1 block number not yet available. Complete an initial sync first.');
|
|
272
|
+
}
|
|
273
|
+
return l1BlockNumber;
|
|
274
|
+
}
|
|
275
|
+
getL1Timestamp() {
|
|
276
|
+
const l1Timestamp = this.l1Timestamp;
|
|
277
|
+
if (!l1Timestamp) {
|
|
278
|
+
throw new Error('L1 timestamp not yet available. Complete an initial sync first.');
|
|
279
|
+
}
|
|
280
|
+
return l1Timestamp;
|
|
281
|
+
}
|
|
282
|
+
getL2SlotNumber() {
|
|
283
|
+
return Promise.resolve(getSlotAtTimestamp(this.getL1Timestamp(), this.l1constants));
|
|
284
|
+
}
|
|
285
|
+
getL2EpochNumber() {
|
|
286
|
+
return Promise.resolve(getEpochNumberAtTimestamp(this.getL1Timestamp(), this.l1constants));
|
|
287
|
+
}
|
|
288
|
+
async getBlocksForEpoch(epochNumber) {
|
|
289
|
+
const [start, end] = getSlotRangeForEpoch(epochNumber);
|
|
290
|
+
const blocks = [];
|
|
291
|
+
// Walk the list of blocks backwards and filter by slots matching the requested epoch.
|
|
292
|
+
// We'll typically ask for blocks for a very recent epoch, so we shouldn't need an index here.
|
|
293
|
+
let block = await this.getBlock(await this.store.getSynchedL2BlockNumber());
|
|
294
|
+
const slot = (b) => b.header.globalVariables.slotNumber.toBigInt();
|
|
295
|
+
while (block && slot(block) >= start) {
|
|
296
|
+
if (slot(block) <= end) {
|
|
297
|
+
blocks.push(block);
|
|
298
|
+
}
|
|
299
|
+
block = await this.getBlock(block.number - 1);
|
|
300
|
+
}
|
|
301
|
+
return blocks.reverse();
|
|
302
|
+
}
|
|
303
|
+
async isEpochComplete(epochNumber) {
|
|
304
|
+
// The epoch is complete if the current L2 block is the last one in the epoch (or later)
|
|
305
|
+
const header = await this.getBlockHeader('latest');
|
|
306
|
+
const slot = header?.globalVariables.slotNumber.toBigInt();
|
|
307
|
+
const [_startSlot, endSlot] = getSlotRangeForEpoch(epochNumber);
|
|
308
|
+
if (slot && slot >= endSlot) {
|
|
309
|
+
return true;
|
|
310
|
+
}
|
|
311
|
+
// If not, the epoch may also be complete if the L2 slot has passed without a block
|
|
312
|
+
// We compute this based on the timestamp for the given epoch and the timestamp of the last L1 block
|
|
313
|
+
const l1Timestamp = this.getL1Timestamp();
|
|
314
|
+
const [_startTimestamp, endTimestamp] = getTimestampRangeForEpoch(epochNumber, this.l1constants);
|
|
315
|
+
// 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
|
|
317
|
+
const leeway = 3n;
|
|
318
|
+
return l1Timestamp + leeway >= endTimestamp;
|
|
319
|
+
}
|
|
286
320
|
/**
|
|
287
321
|
* Gets up to `limit` amount of L2 blocks starting from `from`.
|
|
288
322
|
* @param from - Number of the first block to return (inclusive).
|
|
@@ -298,7 +332,7 @@ export class Archiver {
|
|
|
298
332
|
}
|
|
299
333
|
/**
|
|
300
334
|
* Gets an l2 block.
|
|
301
|
-
* @param number - The block number to return
|
|
335
|
+
* @param number - The block number to return.
|
|
302
336
|
* @returns The requested L2 block.
|
|
303
337
|
*/
|
|
304
338
|
async getBlock(number) {
|
|
@@ -306,9 +340,19 @@ export class Archiver {
|
|
|
306
340
|
if (number < 0) {
|
|
307
341
|
number = await this.store.getSynchedL2BlockNumber();
|
|
308
342
|
}
|
|
343
|
+
if (number == 0) {
|
|
344
|
+
return undefined;
|
|
345
|
+
}
|
|
309
346
|
const blocks = await this.store.getBlocks(number, 1);
|
|
310
347
|
return blocks.length === 0 ? undefined : blocks[0].data;
|
|
311
348
|
}
|
|
349
|
+
async getBlockHeader(number) {
|
|
350
|
+
if (number === 'latest') {
|
|
351
|
+
number = await this.store.getSynchedL2BlockNumber();
|
|
352
|
+
}
|
|
353
|
+
const headers = await this.store.getBlockHeaders(number, 1);
|
|
354
|
+
return headers.length === 0 ? undefined : headers[0];
|
|
355
|
+
}
|
|
312
356
|
getTxEffect(txHash) {
|
|
313
357
|
return this.store.getTxEffect(txHash);
|
|
314
358
|
}
|
|
@@ -360,9 +404,12 @@ export class Archiver {
|
|
|
360
404
|
getProvenBlockNumber() {
|
|
361
405
|
return this.store.getProvenL2BlockNumber();
|
|
362
406
|
}
|
|
407
|
+
getProvenL2EpochNumber() {
|
|
408
|
+
return this.store.getProvenL2EpochNumber();
|
|
409
|
+
}
|
|
363
410
|
/** Forcefully updates the last proven block number. Use for testing. */
|
|
364
|
-
setProvenBlockNumber(
|
|
365
|
-
return this.store.setProvenL2BlockNumber(
|
|
411
|
+
setProvenBlockNumber(blockNumber) {
|
|
412
|
+
return this.store.setProvenL2BlockNumber(blockNumber);
|
|
366
413
|
}
|
|
367
414
|
getContractClass(id) {
|
|
368
415
|
return this.store.getContractClass(id);
|
|
@@ -397,4 +444,207 @@ export class Archiver {
|
|
|
397
444
|
return this.store.getContractArtifact(address);
|
|
398
445
|
}
|
|
399
446
|
}
|
|
400
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver.js","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}
|
|
447
|
+
var Operation;
|
|
448
|
+
(function (Operation) {
|
|
449
|
+
Operation[Operation["Store"] = 0] = "Store";
|
|
450
|
+
Operation[Operation["Delete"] = 1] = "Delete";
|
|
451
|
+
})(Operation || (Operation = {}));
|
|
452
|
+
/**
|
|
453
|
+
* A helper class that we use to deal with some of the logic needed when adding blocks.
|
|
454
|
+
*
|
|
455
|
+
* I would have preferred to not have this type. But it is useful for handling the logic that any
|
|
456
|
+
* store would need to include otherwise while exposing fewer functions and logic directly to the archiver.
|
|
457
|
+
*/
|
|
458
|
+
class ArchiverStoreHelper {
|
|
459
|
+
constructor(store) {
|
|
460
|
+
_ArchiverStoreHelper_instances.add(this);
|
|
461
|
+
this.store = store;
|
|
462
|
+
_ArchiverStoreHelper_log.set(this, createDebugLogger('aztec:archiver:block-helper'));
|
|
463
|
+
}
|
|
464
|
+
async addBlocks(blocks) {
|
|
465
|
+
return [
|
|
466
|
+
this.store.addLogs(blocks.map(block => block.data)),
|
|
467
|
+
// Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
|
|
468
|
+
...(await Promise.all(blocks.map(async (block) => {
|
|
469
|
+
const blockLogs = block.data.body.txEffects
|
|
470
|
+
.flatMap(txEffect => (txEffect ? [txEffect.unencryptedLogs] : []))
|
|
471
|
+
.flatMap(txLog => txLog.unrollLogs());
|
|
472
|
+
return (await Promise.all([
|
|
473
|
+
__classPrivateFieldGet(this, _ArchiverStoreHelper_instances, "m", _ArchiverStoreHelper_updateRegisteredContractClasses).call(this, blockLogs, block.data.number, Operation.Store),
|
|
474
|
+
__classPrivateFieldGet(this, _ArchiverStoreHelper_instances, "m", _ArchiverStoreHelper_updateDeployedContractInstances).call(this, blockLogs, block.data.number, Operation.Store),
|
|
475
|
+
__classPrivateFieldGet(this, _ArchiverStoreHelper_instances, "m", _ArchiverStoreHelper_storeBroadcastedIndividualFunctions).call(this, blockLogs, block.data.number),
|
|
476
|
+
])).every(Boolean);
|
|
477
|
+
}))),
|
|
478
|
+
this.store.addBlocks(blocks),
|
|
479
|
+
].every(Boolean);
|
|
480
|
+
}
|
|
481
|
+
async unwindBlocks(from, blocksToUnwind) {
|
|
482
|
+
const last = await this.getSynchedL2BlockNumber();
|
|
483
|
+
if (from != last) {
|
|
484
|
+
throw new Error(`Can only remove from the tip`);
|
|
485
|
+
}
|
|
486
|
+
// from - blocksToUnwind = the new head, so + 1 for what we need to remove
|
|
487
|
+
const blocks = await this.getBlocks(from - blocksToUnwind + 1, blocksToUnwind);
|
|
488
|
+
return [
|
|
489
|
+
// Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
|
|
490
|
+
...(await Promise.all(blocks.map(async (block) => {
|
|
491
|
+
const blockLogs = block.data.body.txEffects
|
|
492
|
+
.flatMap(txEffect => (txEffect ? [txEffect.unencryptedLogs] : []))
|
|
493
|
+
.flatMap(txLog => txLog.unrollLogs());
|
|
494
|
+
await __classPrivateFieldGet(this, _ArchiverStoreHelper_instances, "m", _ArchiverStoreHelper_updateRegisteredContractClasses).call(this, blockLogs, block.data.number, Operation.Delete);
|
|
495
|
+
await __classPrivateFieldGet(this, _ArchiverStoreHelper_instances, "m", _ArchiverStoreHelper_updateDeployedContractInstances).call(this, blockLogs, block.data.number, Operation.Delete);
|
|
496
|
+
}))),
|
|
497
|
+
this.store.deleteLogs(blocks.map(b => b.data)),
|
|
498
|
+
this.store.unwindBlocks(from, blocksToUnwind),
|
|
499
|
+
].every(Boolean);
|
|
500
|
+
}
|
|
501
|
+
getBlocks(from, limit) {
|
|
502
|
+
return this.store.getBlocks(from, limit);
|
|
503
|
+
}
|
|
504
|
+
getBlockHeaders(from, limit) {
|
|
505
|
+
return this.store.getBlockHeaders(from, limit);
|
|
506
|
+
}
|
|
507
|
+
getTxEffect(txHash) {
|
|
508
|
+
return this.store.getTxEffect(txHash);
|
|
509
|
+
}
|
|
510
|
+
getSettledTxReceipt(txHash) {
|
|
511
|
+
return this.store.getSettledTxReceipt(txHash);
|
|
512
|
+
}
|
|
513
|
+
addL1ToL2Messages(messages) {
|
|
514
|
+
return this.store.addL1ToL2Messages(messages);
|
|
515
|
+
}
|
|
516
|
+
getL1ToL2Messages(blockNumber) {
|
|
517
|
+
return this.store.getL1ToL2Messages(blockNumber);
|
|
518
|
+
}
|
|
519
|
+
getL1ToL2MessageIndex(l1ToL2Message, startIndex) {
|
|
520
|
+
return this.store.getL1ToL2MessageIndex(l1ToL2Message, startIndex);
|
|
521
|
+
}
|
|
522
|
+
getLogs(from, limit, logType) {
|
|
523
|
+
return this.store.getLogs(from, limit, logType);
|
|
524
|
+
}
|
|
525
|
+
getUnencryptedLogs(filter) {
|
|
526
|
+
return this.store.getUnencryptedLogs(filter);
|
|
527
|
+
}
|
|
528
|
+
getSynchedL2BlockNumber() {
|
|
529
|
+
return this.store.getSynchedL2BlockNumber();
|
|
530
|
+
}
|
|
531
|
+
getProvenL2BlockNumber() {
|
|
532
|
+
return this.store.getProvenL2BlockNumber();
|
|
533
|
+
}
|
|
534
|
+
getProvenL2EpochNumber() {
|
|
535
|
+
return this.store.getProvenL2EpochNumber();
|
|
536
|
+
}
|
|
537
|
+
setProvenL2BlockNumber(l2BlockNumber) {
|
|
538
|
+
return this.store.setProvenL2BlockNumber(l2BlockNumber);
|
|
539
|
+
}
|
|
540
|
+
setProvenL2EpochNumber(l2EpochNumber) {
|
|
541
|
+
return this.store.setProvenL2EpochNumber(l2EpochNumber);
|
|
542
|
+
}
|
|
543
|
+
setBlockSynchedL1BlockNumber(l1BlockNumber) {
|
|
544
|
+
return this.store.setBlockSynchedL1BlockNumber(l1BlockNumber);
|
|
545
|
+
}
|
|
546
|
+
setMessageSynchedL1BlockNumber(l1BlockNumber) {
|
|
547
|
+
return this.store.setMessageSynchedL1BlockNumber(l1BlockNumber);
|
|
548
|
+
}
|
|
549
|
+
getSynchPoint() {
|
|
550
|
+
return this.store.getSynchPoint();
|
|
551
|
+
}
|
|
552
|
+
getContractClass(id) {
|
|
553
|
+
return this.store.getContractClass(id);
|
|
554
|
+
}
|
|
555
|
+
getContractInstance(address) {
|
|
556
|
+
return this.store.getContractInstance(address);
|
|
557
|
+
}
|
|
558
|
+
getContractClassIds() {
|
|
559
|
+
return this.store.getContractClassIds();
|
|
560
|
+
}
|
|
561
|
+
addContractArtifact(address, contract) {
|
|
562
|
+
return this.store.addContractArtifact(address, contract);
|
|
563
|
+
}
|
|
564
|
+
getContractArtifact(address) {
|
|
565
|
+
return this.store.getContractArtifact(address);
|
|
566
|
+
}
|
|
567
|
+
getTotalL1ToL2MessageCount() {
|
|
568
|
+
return this.store.getTotalL1ToL2MessageCount();
|
|
569
|
+
}
|
|
570
|
+
}
|
|
571
|
+
_ArchiverStoreHelper_log = new WeakMap(), _ArchiverStoreHelper_instances = new WeakSet(), _ArchiverStoreHelper_updateRegisteredContractClasses =
|
|
572
|
+
/**
|
|
573
|
+
* Extracts and stores contract classes out of ContractClassRegistered events emitted by the class registerer contract.
|
|
574
|
+
* @param allLogs - All logs emitted in a bunch of blocks.
|
|
575
|
+
*/
|
|
576
|
+
async function _ArchiverStoreHelper_updateRegisteredContractClasses(allLogs, blockNum, operation) {
|
|
577
|
+
const contractClasses = ContractClassRegisteredEvent.fromLogs(allLogs, ClassRegistererAddress).map(e => e.toContractClassPublic());
|
|
578
|
+
if (contractClasses.length > 0) {
|
|
579
|
+
contractClasses.forEach(c => __classPrivateFieldGet(this, _ArchiverStoreHelper_log, "f").verbose(`Registering contract class ${c.id.toString()}`));
|
|
580
|
+
if (operation == Operation.Store) {
|
|
581
|
+
return await this.store.addContractClasses(contractClasses, blockNum);
|
|
582
|
+
}
|
|
583
|
+
else if (operation == Operation.Delete) {
|
|
584
|
+
return await this.store.deleteContractClasses(contractClasses, blockNum);
|
|
585
|
+
}
|
|
586
|
+
}
|
|
587
|
+
return true;
|
|
588
|
+
}, _ArchiverStoreHelper_updateDeployedContractInstances =
|
|
589
|
+
/**
|
|
590
|
+
* Extracts and stores contract instances out of ContractInstanceDeployed events emitted by the canonical deployer contract.
|
|
591
|
+
* @param allLogs - All logs emitted in a bunch of blocks.
|
|
592
|
+
*/
|
|
593
|
+
async function _ArchiverStoreHelper_updateDeployedContractInstances(allLogs, blockNum, operation) {
|
|
594
|
+
const contractInstances = ContractInstanceDeployedEvent.fromLogs(allLogs).map(e => e.toContractInstance());
|
|
595
|
+
if (contractInstances.length > 0) {
|
|
596
|
+
contractInstances.forEach(c => __classPrivateFieldGet(this, _ArchiverStoreHelper_log, "f").verbose(`${Operation[operation]} contract instance at ${c.address.toString()}`));
|
|
597
|
+
if (operation == Operation.Store) {
|
|
598
|
+
return await this.store.addContractInstances(contractInstances, blockNum);
|
|
599
|
+
}
|
|
600
|
+
else if (operation == Operation.Delete) {
|
|
601
|
+
return await this.store.deleteContractInstances(contractInstances, blockNum);
|
|
602
|
+
}
|
|
603
|
+
}
|
|
604
|
+
return true;
|
|
605
|
+
}, _ArchiverStoreHelper_storeBroadcastedIndividualFunctions =
|
|
606
|
+
/**
|
|
607
|
+
* Stores the functions that was broadcasted individually
|
|
608
|
+
*
|
|
609
|
+
* @dev Beware that there is not a delete variant of this, since they are added to contract classes
|
|
610
|
+
* and will be deleted as part of the class if needed.
|
|
611
|
+
*
|
|
612
|
+
* @param allLogs - The logs from the block
|
|
613
|
+
* @param _blockNum - The block number
|
|
614
|
+
* @returns
|
|
615
|
+
*/
|
|
616
|
+
async function _ArchiverStoreHelper_storeBroadcastedIndividualFunctions(allLogs, _blockNum) {
|
|
617
|
+
// Filter out private and unconstrained function broadcast events
|
|
618
|
+
const privateFnEvents = PrivateFunctionBroadcastedEvent.fromLogs(allLogs, ClassRegistererAddress);
|
|
619
|
+
const unconstrainedFnEvents = UnconstrainedFunctionBroadcastedEvent.fromLogs(allLogs, ClassRegistererAddress);
|
|
620
|
+
// Group all events by contract class id
|
|
621
|
+
for (const [classIdString, classEvents] of Object.entries(groupBy([...privateFnEvents, ...unconstrainedFnEvents], e => e.contractClassId.toString()))) {
|
|
622
|
+
const contractClassId = Fr.fromString(classIdString);
|
|
623
|
+
const contractClass = await this.getContractClass(contractClassId);
|
|
624
|
+
if (!contractClass) {
|
|
625
|
+
__classPrivateFieldGet(this, _ArchiverStoreHelper_log, "f").warn(`Skipping broadcasted functions as contract class ${contractClassId.toString()} was not found`);
|
|
626
|
+
continue;
|
|
627
|
+
}
|
|
628
|
+
// Split private and unconstrained functions, and filter out invalid ones
|
|
629
|
+
const allFns = classEvents.map(e => e.toFunctionWithMembershipProof());
|
|
630
|
+
const privateFns = allFns.filter((fn) => 'unconstrainedFunctionsArtifactTreeRoot' in fn);
|
|
631
|
+
const unconstrainedFns = allFns.filter((fn) => 'privateFunctionsArtifactTreeRoot' in fn);
|
|
632
|
+
const validPrivateFns = privateFns.filter(fn => isValidPrivateFunctionMembershipProof(fn, contractClass));
|
|
633
|
+
const validUnconstrainedFns = unconstrainedFns.filter(fn => isValidUnconstrainedFunctionMembershipProof(fn, contractClass));
|
|
634
|
+
const validFnCount = validPrivateFns.length + validUnconstrainedFns.length;
|
|
635
|
+
if (validFnCount !== allFns.length) {
|
|
636
|
+
__classPrivateFieldGet(this, _ArchiverStoreHelper_log, "f").warn(`Skipping ${allFns.length - validFnCount} invalid functions`);
|
|
637
|
+
}
|
|
638
|
+
// Store the functions in the contract class in a single operation
|
|
639
|
+
if (validFnCount > 0) {
|
|
640
|
+
__classPrivateFieldGet(this, _ArchiverStoreHelper_log, "f").verbose(`Storing ${validFnCount} functions for contract class ${contractClassId.toString()}`);
|
|
641
|
+
}
|
|
642
|
+
return await this.store.addFunctions(contractClassId, validPrivateFns, validUnconstrainedFns);
|
|
643
|
+
}
|
|
644
|
+
return true;
|
|
645
|
+
};
|
|
646
|
+
const EmptyL1RollupConstants = {
|
|
647
|
+
l1StartBlock: 0n,
|
|
648
|
+
l1GenesisTime: 0n,
|
|
649
|
+
};
|
|
650
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver.js","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}
|