@aztec/archiver 0.76.4 → 0.77.0-testnet-ignition.21
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 +22 -10
- package/dest/archiver/archiver.d.ts.map +1 -1
- package/dest/archiver/archiver.js +762 -713
- package/dest/archiver/archiver_store.d.ts +20 -7
- package/dest/archiver/archiver_store.d.ts.map +1 -1
- package/dest/archiver/archiver_store.js +4 -2
- package/dest/archiver/archiver_store_test_suite.d.ts +2 -2
- package/dest/archiver/archiver_store_test_suite.d.ts.map +1 -1
- package/dest/archiver/archiver_store_test_suite.js +398 -227
- package/dest/archiver/config.d.ts +1 -1
- package/dest/archiver/config.d.ts.map +1 -1
- package/dest/archiver/config.js +10 -12
- package/dest/archiver/data_retrieval.d.ts +17 -14
- package/dest/archiver/data_retrieval.d.ts.map +1 -1
- package/dest/archiver/data_retrieval.js +90 -88
- package/dest/archiver/errors.js +1 -2
- package/dest/archiver/index.d.ts +1 -1
- package/dest/archiver/index.d.ts.map +1 -1
- package/dest/archiver/index.js +0 -1
- package/dest/archiver/instrumentation.d.ts +3 -1
- package/dest/archiver/instrumentation.d.ts.map +1 -1
- package/dest/archiver/instrumentation.js +37 -17
- package/dest/archiver/kv_archiver_store/block_store.d.ts +5 -3
- package/dest/archiver/kv_archiver_store/block_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/block_store.js +125 -130
- 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 +45 -37
- package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts +10 -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 +54 -15
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +16 -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 +143 -160
- package/dest/archiver/kv_archiver_store/log_store.d.ts +5 -3
- package/dest/archiver/kv_archiver_store/log_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/log_store.js +296 -255
- package/dest/archiver/kv_archiver_store/message_store.d.ts +3 -3
- package/dest/archiver/kv_archiver_store/message_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/message_store.js +45 -50
- package/dest/archiver/kv_archiver_store/nullifier_store.d.ts +2 -2
- package/dest/archiver/kv_archiver_store/nullifier_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/nullifier_store.js +36 -43
- 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 +17 -26
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts +16 -7
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts.map +1 -1
- package/dest/archiver/memory_archiver_store/memory_archiver_store.js +287 -247
- package/dest/archiver/structs/data_retrieval.js +5 -2
- package/dest/archiver/structs/published.js +1 -2
- package/dest/factory.d.ts +20 -6
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +54 -30
- package/dest/index.js +0 -1
- package/dest/rpc/index.d.ts +2 -1
- package/dest/rpc/index.d.ts.map +1 -1
- package/dest/rpc/index.js +8 -4
- package/dest/test/index.js +0 -1
- package/dest/test/mock_archiver.d.ts +3 -2
- package/dest/test/mock_archiver.d.ts.map +1 -1
- package/dest/test/mock_archiver.js +8 -13
- package/dest/test/mock_l1_to_l2_message_source.d.ts +2 -2
- package/dest/test/mock_l1_to_l2_message_source.d.ts.map +1 -1
- package/dest/test/mock_l1_to_l2_message_source.js +4 -4
- package/dest/test/mock_l2_block_source.d.ts +5 -3
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +71 -68
- package/package.json +15 -16
- package/src/archiver/archiver.ts +149 -89
- package/src/archiver/archiver_store.ts +27 -27
- package/src/archiver/archiver_store_test_suite.ts +22 -15
- package/src/archiver/config.ts +1 -1
- package/src/archiver/data_retrieval.ts +32 -44
- package/src/archiver/index.ts +1 -1
- package/src/archiver/instrumentation.ts +11 -1
- package/src/archiver/kv_archiver_store/block_store.ts +10 -4
- package/src/archiver/kv_archiver_store/contract_class_store.ts +9 -9
- package/src/archiver/kv_archiver_store/contract_instance_store.ts +81 -3
- package/src/archiver/kv_archiver_store/kv_archiver_store.ts +44 -29
- package/src/archiver/kv_archiver_store/log_store.ts +56 -32
- package/src/archiver/kv_archiver_store/message_store.ts +4 -3
- package/src/archiver/kv_archiver_store/nullifier_store.ts +3 -2
- package/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts +3 -3
- package/src/archiver/memory_archiver_store/memory_archiver_store.ts +110 -57
- package/src/factory.ts +44 -25
- package/src/rpc/index.ts +2 -6
- package/src/test/mock_archiver.ts +3 -2
- package/src/test/mock_l1_to_l2_message_source.ts +2 -2
- package/src/test/mock_l2_block_source.ts +16 -15
|
@@ -1,19 +1,25 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
}
|
|
5
7
|
import { createEthereumChain } from '@aztec/ethereum';
|
|
6
8
|
import { Fr } from '@aztec/foundation/fields';
|
|
7
9
|
import { createLogger } from '@aztec/foundation/log';
|
|
8
|
-
import { RunningPromise } from '@aztec/foundation/running-promise';
|
|
10
|
+
import { RunningPromise, makeLoggingErrorHandler } from '@aztec/foundation/running-promise';
|
|
9
11
|
import { count } from '@aztec/foundation/string';
|
|
10
12
|
import { elapsed } from '@aztec/foundation/timer';
|
|
11
13
|
import { InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
|
|
12
|
-
import { ContractClassRegisteredEvent, PrivateFunctionBroadcastedEvent, UnconstrainedFunctionBroadcastedEvent
|
|
13
|
-
import { ContractInstanceDeployedEvent } from '@aztec/protocol-contracts/instance-deployer';
|
|
14
|
+
import { ContractClassRegisteredEvent, PrivateFunctionBroadcastedEvent, UnconstrainedFunctionBroadcastedEvent } from '@aztec/protocol-contracts/class-registerer';
|
|
15
|
+
import { ContractInstanceDeployedEvent, ContractInstanceUpdatedEvent } from '@aztec/protocol-contracts/instance-deployer';
|
|
16
|
+
import { L2BlockSourceEvents } from '@aztec/stdlib/block';
|
|
17
|
+
import { computePublicBytecodeCommitment, isValidPrivateFunctionMembershipProof, isValidUnconstrainedFunctionMembershipProof } from '@aztec/stdlib/contract';
|
|
18
|
+
import { getEpochAtSlot, getEpochNumberAtTimestamp, getSlotAtTimestamp, getSlotRangeForEpoch, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
|
|
14
19
|
import { Attributes, trackSpan } from '@aztec/telemetry-client';
|
|
20
|
+
import { EventEmitter } from 'events';
|
|
15
21
|
import groupBy from 'lodash.groupby';
|
|
16
|
-
import { createPublicClient, getContract, http
|
|
22
|
+
import { createPublicClient, fallback, getContract, http } from 'viem';
|
|
17
23
|
import { retrieveBlocksFromRollup, retrieveL1ToL2Messages } from './data_retrieval.js';
|
|
18
24
|
import { NoBlobBodiesFoundError } from './errors.js';
|
|
19
25
|
import { ArchiverInstrumentation } from './instrumentation.js';
|
|
@@ -21,642 +27,778 @@ import { ArchiverInstrumentation } from './instrumentation.js';
|
|
|
21
27
|
* Pulls L2 blocks in a non-blocking manner and provides interface for their retrieval.
|
|
22
28
|
* Responsible for handling robust L1 polling so that other components do not need to
|
|
23
29
|
* concern themselves with it.
|
|
24
|
-
*/
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
30
|
+
*/ export class Archiver extends EventEmitter {
|
|
31
|
+
publicClient;
|
|
32
|
+
l1Addresses;
|
|
33
|
+
dataStore;
|
|
34
|
+
config;
|
|
35
|
+
blobSinkClient;
|
|
36
|
+
instrumentation;
|
|
37
|
+
l1constants;
|
|
38
|
+
log;
|
|
39
|
+
/**
|
|
40
|
+
* A promise in which we will be continually fetching new L2 blocks.
|
|
41
|
+
*/ runningPromise;
|
|
42
|
+
rollup;
|
|
43
|
+
inbox;
|
|
44
|
+
store;
|
|
45
|
+
l1BlockNumber;
|
|
46
|
+
l1Timestamp;
|
|
47
|
+
tracer;
|
|
48
|
+
/**
|
|
49
|
+
* Creates a new instance of the Archiver.
|
|
50
|
+
* @param publicClient - A client for interacting with the Ethereum node.
|
|
51
|
+
* @param rollupAddress - Ethereum address of the rollup contract.
|
|
52
|
+
* @param inboxAddress - Ethereum address of the inbox contract.
|
|
53
|
+
* @param registryAddress - Ethereum address of the registry contract.
|
|
54
|
+
* @param pollingIntervalMs - The interval for polling for L1 logs (in milliseconds).
|
|
55
|
+
* @param store - An archiver data store for storage & retrieval of blocks, encrypted logs & contract data.
|
|
56
|
+
* @param log - A logger.
|
|
57
|
+
*/ constructor(publicClient, l1Addresses, dataStore, config, blobSinkClient, instrumentation, l1constants, log = createLogger('archiver')){
|
|
58
|
+
super(), this.publicClient = publicClient, this.l1Addresses = l1Addresses, this.dataStore = dataStore, this.config = config, this.blobSinkClient = blobSinkClient, this.instrumentation = instrumentation, this.l1constants = l1constants, this.log = log;
|
|
59
|
+
this.tracer = instrumentation.tracer;
|
|
60
|
+
this.store = new ArchiverStoreHelper(dataStore);
|
|
61
|
+
this.rollup = getContract({
|
|
62
|
+
address: l1Addresses.rollupAddress.toString(),
|
|
63
|
+
abi: RollupAbi,
|
|
64
|
+
client: publicClient
|
|
65
|
+
});
|
|
66
|
+
this.inbox = getContract({
|
|
67
|
+
address: l1Addresses.inboxAddress.toString(),
|
|
68
|
+
abi: InboxAbi,
|
|
69
|
+
client: publicClient
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* Creates a new instance of the Archiver and blocks until it syncs from chain.
|
|
74
|
+
* @param config - The archiver's desired configuration.
|
|
75
|
+
* @param archiverStore - The backing store for the archiver.
|
|
76
|
+
* @param blockUntilSynced - If true, blocks until the archiver has fully synced.
|
|
77
|
+
* @returns - An instance of the archiver.
|
|
78
|
+
*/ static async createAndSync(config, archiverStore, deps, blockUntilSynced = true) {
|
|
79
|
+
const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
|
|
80
|
+
const publicClient = createPublicClient({
|
|
81
|
+
chain: chain.chainInfo,
|
|
82
|
+
transport: fallback(config.l1RpcUrls.map((url)=>http(url))),
|
|
83
|
+
pollingInterval: config.viemPollingIntervalMS
|
|
84
|
+
});
|
|
85
|
+
const rollup = getContract({
|
|
86
|
+
address: config.l1Contracts.rollupAddress.toString(),
|
|
87
|
+
abi: RollupAbi,
|
|
88
|
+
client: publicClient
|
|
89
|
+
});
|
|
90
|
+
const [l1StartBlock, l1GenesisTime] = await Promise.all([
|
|
91
|
+
rollup.read.L1_BLOCK_AT_GENESIS(),
|
|
92
|
+
rollup.read.getGenesisTime()
|
|
93
|
+
]);
|
|
94
|
+
const { aztecEpochDuration: epochDuration, aztecSlotDuration: slotDuration, ethereumSlotDuration } = config;
|
|
95
|
+
const archiver = new Archiver(publicClient, config.l1Contracts, archiverStore, {
|
|
96
|
+
pollingIntervalMs: config.archiverPollingIntervalMS ?? 10_000,
|
|
97
|
+
batchSize: config.archiverBatchSize ?? 100
|
|
98
|
+
}, deps.blobSinkClient, await ArchiverInstrumentation.new(deps.telemetry, ()=>archiverStore.estimateSize()), {
|
|
99
|
+
l1StartBlock,
|
|
100
|
+
l1GenesisTime,
|
|
101
|
+
epochDuration,
|
|
102
|
+
slotDuration,
|
|
103
|
+
ethereumSlotDuration
|
|
104
|
+
});
|
|
105
|
+
await archiver.start(blockUntilSynced);
|
|
106
|
+
return archiver;
|
|
107
|
+
}
|
|
108
|
+
/**
|
|
109
|
+
* Starts sync process.
|
|
110
|
+
* @param blockUntilSynced - If true, blocks until the archiver has fully synced.
|
|
111
|
+
*/ async start(blockUntilSynced) {
|
|
112
|
+
if (this.runningPromise) {
|
|
113
|
+
throw new Error('Archiver is already running');
|
|
114
|
+
}
|
|
115
|
+
if (blockUntilSynced) {
|
|
116
|
+
await this.syncSafe(blockUntilSynced);
|
|
117
|
+
}
|
|
118
|
+
this.runningPromise = new RunningPromise(()=>this.sync(false), this.log, this.config.pollingIntervalMs, makeLoggingErrorHandler(this.log, // Ignored errors will not log to the console
|
|
119
|
+
// We ignore NoBlobBodiesFound as the message may not have been passed to the blob sink yet
|
|
120
|
+
NoBlobBodiesFoundError));
|
|
121
|
+
this.runningPromise.start();
|
|
122
|
+
}
|
|
123
|
+
async syncSafe(initialRun) {
|
|
124
|
+
try {
|
|
125
|
+
await this.sync(initialRun);
|
|
126
|
+
} catch (error) {
|
|
127
|
+
this.log.error('Error during sync', {
|
|
128
|
+
error
|
|
129
|
+
});
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
/**
|
|
133
|
+
* Fetches logs from L1 contracts and processes them.
|
|
134
|
+
*/ async sync(initialRun) {
|
|
135
|
+
/**
|
|
136
|
+
* We keep track of three "pointers" to L1 blocks:
|
|
137
|
+
* 1. the last L1 block that published an L2 block
|
|
138
|
+
* 2. the last L1 block that added L1 to L2 messages
|
|
139
|
+
* 3. the last L1 block that cancelled L1 to L2 messages
|
|
140
|
+
*
|
|
141
|
+
* We do this to deal with L1 data providers that are eventually consistent (e.g. Infura).
|
|
142
|
+
* We guard against seeing block X with no data at one point, and later, the provider processes the block and it has data.
|
|
143
|
+
* The archiver will stay back, until there's data on L1 that will move the pointers forward.
|
|
144
|
+
*
|
|
145
|
+
* This code does not handle reorgs.
|
|
146
|
+
*/ const { l1StartBlock } = this.l1constants;
|
|
147
|
+
const { blocksSynchedTo = l1StartBlock, messagesSynchedTo = l1StartBlock } = await this.store.getSynchPoint();
|
|
148
|
+
const currentL1BlockNumber = await this.publicClient.getBlockNumber();
|
|
149
|
+
if (initialRun) {
|
|
150
|
+
this.log.info(`Starting archiver sync to rollup contract ${this.l1Addresses.rollupAddress.toString()} from L1 block ${Math.min(Number(blocksSynchedTo), Number(messagesSynchedTo))} to current L1 block ${currentL1BlockNumber}`);
|
|
151
|
+
}
|
|
152
|
+
// ********** Ensuring Consistency of data pulled from L1 **********
|
|
153
|
+
/**
|
|
154
|
+
* There are a number of calls in this sync operation to L1 for retrieving
|
|
155
|
+
* events and transaction data. There are a couple of things we need to bear in mind
|
|
156
|
+
* to ensure that data is read exactly once.
|
|
157
|
+
*
|
|
158
|
+
* The first is the problem of eventually consistent ETH service providers like Infura.
|
|
159
|
+
* Each L1 read operation will query data from the last L1 block that it saw emit its kind of data.
|
|
160
|
+
* (so pending L1 to L2 messages will read from the last L1 block that emitted a message and so on)
|
|
161
|
+
* This will mean the archiver will lag behind L1 and will only advance when there's L2-relevant activity on the chain.
|
|
162
|
+
*
|
|
163
|
+
* The second is that in between the various calls to L1, the block number can move meaning some
|
|
164
|
+
* of the following calls will return data for blocks that were not present during earlier calls.
|
|
165
|
+
* To combat this for the time being we simply ensure that all data retrieval methods only retrieve
|
|
166
|
+
* data up to the currentBlockNumber captured at the top of this function. We might want to improve on this
|
|
167
|
+
* in future but for the time being it should give us the guarantees that we need
|
|
168
|
+
*/ // ********** Events that are processed per L1 block **********
|
|
169
|
+
await this.handleL1ToL2Messages(messagesSynchedTo, currentL1BlockNumber);
|
|
170
|
+
// Store latest l1 block number and timestamp seen. Used for epoch and slots calculations.
|
|
171
|
+
if (!this.l1BlockNumber || this.l1BlockNumber < currentL1BlockNumber) {
|
|
172
|
+
this.l1Timestamp = (await this.publicClient.getBlock({
|
|
173
|
+
blockNumber: currentL1BlockNumber
|
|
174
|
+
})).timestamp;
|
|
175
|
+
this.l1BlockNumber = currentL1BlockNumber;
|
|
176
|
+
}
|
|
177
|
+
// ********** Events that are processed per L2 block **********
|
|
178
|
+
if (currentL1BlockNumber > blocksSynchedTo) {
|
|
179
|
+
// First we retrieve new L2 blocks
|
|
180
|
+
const { provenBlockNumber } = await this.handleL2blocks(blocksSynchedTo, currentL1BlockNumber);
|
|
181
|
+
// And then we prune the current epoch if it'd reorg on next submission.
|
|
182
|
+
// Note that we don't do this before retrieving L2 blocks because we may need to retrieve
|
|
183
|
+
// blocks from more than 2 epochs ago, so we want to make sure we have the latest view of
|
|
184
|
+
// the chain locally before we start unwinding stuff. This can be optimized by figuring out
|
|
185
|
+
// up to which point we're pruning, and then requesting L2 blocks up to that point only.
|
|
186
|
+
await this.handleEpochPrune(provenBlockNumber, currentL1BlockNumber);
|
|
187
|
+
this.instrumentation.updateL1BlockHeight(currentL1BlockNumber);
|
|
188
|
+
}
|
|
189
|
+
if (initialRun) {
|
|
190
|
+
this.log.info(`Initial archiver sync to L1 block ${currentL1BlockNumber} complete.`, {
|
|
191
|
+
l1BlockNumber: currentL1BlockNumber,
|
|
192
|
+
syncPoint: await this.store.getSynchPoint(),
|
|
193
|
+
...await this.getL2Tips()
|
|
194
|
+
});
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
/** Queries the rollup contract on whether a prune can be executed on the immediatenext L1 block. */ async canPrune(currentL1BlockNumber) {
|
|
198
|
+
const time = (this.l1Timestamp ?? 0n) + BigInt(this.l1constants.ethereumSlotDuration);
|
|
199
|
+
return await this.rollup.read.canPruneAtTime([
|
|
200
|
+
time
|
|
201
|
+
], {
|
|
202
|
+
blockNumber: currentL1BlockNumber
|
|
203
|
+
});
|
|
204
|
+
}
|
|
205
|
+
/** Checks if there'd be a reorg for the next block submission and start pruning now. */ async handleEpochPrune(provenBlockNumber, currentL1BlockNumber) {
|
|
206
|
+
const localPendingBlockNumber = BigInt(await this.getBlockNumber());
|
|
207
|
+
const canPrune = localPendingBlockNumber > provenBlockNumber && await this.canPrune(currentL1BlockNumber);
|
|
208
|
+
if (canPrune) {
|
|
209
|
+
const localPendingSlotNumber = await this.getL2SlotNumber();
|
|
210
|
+
const localPendingEpochNumber = getEpochAtSlot(localPendingSlotNumber, this.l1constants);
|
|
211
|
+
// Emit an event for listening services to react to the chain prune
|
|
212
|
+
this.emit(L2BlockSourceEvents.L2PruneDetected, {
|
|
213
|
+
type: L2BlockSourceEvents.L2PruneDetected,
|
|
214
|
+
blockNumber: localPendingBlockNumber,
|
|
215
|
+
slotNumber: localPendingSlotNumber,
|
|
216
|
+
epochNumber: localPendingEpochNumber
|
|
217
|
+
});
|
|
218
|
+
const blocksToUnwind = localPendingBlockNumber - provenBlockNumber;
|
|
219
|
+
this.log.debug(`L2 prune from ${provenBlockNumber + 1n} to ${localPendingBlockNumber} will occur on next block submission.`);
|
|
220
|
+
await this.store.unwindBlocks(Number(localPendingBlockNumber), Number(blocksToUnwind));
|
|
221
|
+
this.log.warn(`Unwound ${count(blocksToUnwind, 'block')} from L2 block ${localPendingBlockNumber} ` + `to ${provenBlockNumber} due to predicted reorg at L1 block ${currentL1BlockNumber}. ` + `Updated L2 latest block is ${await this.getBlockNumber()}.`);
|
|
222
|
+
this.instrumentation.processPrune();
|
|
223
|
+
// TODO(palla/reorg): Do we need to set the block synched L1 block number here?
|
|
224
|
+
// Seems like the next iteration should handle this.
|
|
225
|
+
// await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
nextRange(end, limit) {
|
|
229
|
+
const batchSize = this.config.batchSize * this.l1constants.slotDuration / this.l1constants.ethereumSlotDuration;
|
|
230
|
+
const nextStart = end + 1n;
|
|
231
|
+
const nextEnd = nextStart + BigInt(batchSize);
|
|
232
|
+
if (nextEnd > limit) {
|
|
233
|
+
return [
|
|
234
|
+
nextStart,
|
|
235
|
+
limit
|
|
236
|
+
];
|
|
237
|
+
}
|
|
238
|
+
return [
|
|
239
|
+
nextStart,
|
|
240
|
+
nextEnd
|
|
241
|
+
];
|
|
242
|
+
}
|
|
243
|
+
async handleL1ToL2Messages(messagesSynchedTo, currentL1BlockNumber) {
|
|
244
|
+
this.log.trace(`Handling L1 to L2 messages from ${messagesSynchedTo} to ${currentL1BlockNumber}.`);
|
|
245
|
+
if (currentL1BlockNumber <= messagesSynchedTo) {
|
|
246
|
+
return;
|
|
247
|
+
}
|
|
248
|
+
const localTotalMessageCount = await this.store.getTotalL1ToL2MessageCount();
|
|
249
|
+
const destinationTotalMessageCount = await this.inbox.read.totalMessagesInserted();
|
|
250
|
+
if (localTotalMessageCount === destinationTotalMessageCount) {
|
|
251
|
+
await this.store.setMessageSynchedL1BlockNumber(currentL1BlockNumber);
|
|
252
|
+
this.log.trace(`Retrieved no new L1 to L2 messages between L1 blocks ${messagesSynchedTo + 1n} and ${currentL1BlockNumber}.`);
|
|
253
|
+
return;
|
|
254
|
+
}
|
|
255
|
+
// Retrieve messages in batches. Each batch is estimated to acommodate up to L2 'blockBatchSize' blocks,
|
|
256
|
+
let searchStartBlock = messagesSynchedTo;
|
|
257
|
+
let searchEndBlock = messagesSynchedTo;
|
|
258
|
+
do {
|
|
259
|
+
[searchStartBlock, searchEndBlock] = this.nextRange(searchEndBlock, currentL1BlockNumber);
|
|
260
|
+
this.log.trace(`Retrieving L1 to L2 messages between L1 blocks ${searchStartBlock} and ${searchEndBlock}.`);
|
|
261
|
+
const retrievedL1ToL2Messages = await retrieveL1ToL2Messages(this.inbox, searchStartBlock, searchEndBlock);
|
|
262
|
+
this.log.verbose(`Retrieved ${retrievedL1ToL2Messages.retrievedData.length} new L1 to L2 messages between L1 blocks ${searchStartBlock} and ${searchEndBlock}.`);
|
|
263
|
+
await this.store.addL1ToL2Messages(retrievedL1ToL2Messages);
|
|
264
|
+
for (const msg of retrievedL1ToL2Messages.retrievedData){
|
|
265
|
+
this.log.debug(`Downloaded L1 to L2 message`, {
|
|
266
|
+
leaf: msg.leaf.toString(),
|
|
267
|
+
index: msg.index
|
|
80
268
|
});
|
|
81
|
-
const [l1StartBlock, l1GenesisTime] = await Promise.all([
|
|
82
|
-
rollup.read.L1_BLOCK_AT_GENESIS(),
|
|
83
|
-
rollup.read.getGenesisTime(),
|
|
84
|
-
]);
|
|
85
|
-
const { aztecEpochDuration: epochDuration, aztecSlotDuration: slotDuration, ethereumSlotDuration } = config;
|
|
86
|
-
const archiver = new _a(publicClient, config.l1Contracts, archiverStore, {
|
|
87
|
-
pollingIntervalMs: config.archiverPollingIntervalMS ?? 10000,
|
|
88
|
-
batchSize: config.archiverBatchSize ?? 100,
|
|
89
|
-
}, deps.blobSinkClient, await ArchiverInstrumentation.new(deps.telemetry, () => archiverStore.estimateSize()), { l1StartBlock, l1GenesisTime, epochDuration, slotDuration, ethereumSlotDuration });
|
|
90
|
-
await archiver.start(blockUntilSynced);
|
|
91
|
-
return archiver;
|
|
92
269
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
270
|
+
}while (searchEndBlock < currentL1BlockNumber)
|
|
271
|
+
}
|
|
272
|
+
async handleL2blocks(blocksSynchedTo, currentL1BlockNumber) {
|
|
273
|
+
const localPendingBlockNumber = BigInt(await this.getBlockNumber());
|
|
274
|
+
const [provenBlockNumber, provenArchive, pendingBlockNumber, pendingArchive, archiveForLocalPendingBlockNumber, provenEpochNumber] = await this.rollup.read.status([
|
|
275
|
+
localPendingBlockNumber
|
|
276
|
+
], {
|
|
277
|
+
blockNumber: currentL1BlockNumber
|
|
278
|
+
});
|
|
279
|
+
const updateProvenBlock = async ()=>{
|
|
280
|
+
const localBlockForDestinationProvenBlockNumber = await this.getBlock(Number(provenBlockNumber));
|
|
281
|
+
// Sanity check. I've hit what seems to be a state where the proven block is set to a value greater than the latest
|
|
282
|
+
// synched block when requesting L2Tips from the archiver. This is the only place where the proven block is set.
|
|
283
|
+
const synched = await this.store.getSynchedL2BlockNumber();
|
|
284
|
+
if (localBlockForDestinationProvenBlockNumber && synched < localBlockForDestinationProvenBlockNumber?.number) {
|
|
285
|
+
this.log.error(`Hit local block greater than last synched block: ${localBlockForDestinationProvenBlockNumber.number} > ${synched}`);
|
|
286
|
+
}
|
|
287
|
+
if (localBlockForDestinationProvenBlockNumber && provenArchive === localBlockForDestinationProvenBlockNumber.archive.root.toString()) {
|
|
288
|
+
const [localProvenEpochNumber, localProvenBlockNumber] = await Promise.all([
|
|
289
|
+
this.store.getProvenL2EpochNumber(),
|
|
290
|
+
this.store.getProvenL2BlockNumber()
|
|
108
291
|
]);
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
/**
|
|
116
|
-
* We keep track of three "pointers" to L1 blocks:
|
|
117
|
-
* 1. the last L1 block that published an L2 block
|
|
118
|
-
* 2. the last L1 block that added L1 to L2 messages
|
|
119
|
-
* 3. the last L1 block that cancelled L1 to L2 messages
|
|
120
|
-
*
|
|
121
|
-
* We do this to deal with L1 data providers that are eventually consistent (e.g. Infura).
|
|
122
|
-
* We guard against seeing block X with no data at one point, and later, the provider processes the block and it has data.
|
|
123
|
-
* The archiver will stay back, until there's data on L1 that will move the pointers forward.
|
|
124
|
-
*
|
|
125
|
-
* This code does not handle reorgs.
|
|
126
|
-
*/
|
|
127
|
-
const { l1StartBlock } = this.l1constants;
|
|
128
|
-
const { blocksSynchedTo = l1StartBlock, messagesSynchedTo = l1StartBlock } = await this.store.getSynchPoint();
|
|
129
|
-
const currentL1BlockNumber = await this.publicClient.getBlockNumber();
|
|
130
|
-
if (initialRun) {
|
|
131
|
-
this.log.info(`Starting archiver sync to rollup contract ${this.l1Addresses.rollupAddress.toString()} from L1 block ${Math.min(Number(blocksSynchedTo), Number(messagesSynchedTo))} to current L1 block ${currentL1BlockNumber}`);
|
|
132
|
-
}
|
|
133
|
-
// ********** Ensuring Consistency of data pulled from L1 **********
|
|
134
|
-
/**
|
|
135
|
-
* There are a number of calls in this sync operation to L1 for retrieving
|
|
136
|
-
* events and transaction data. There are a couple of things we need to bear in mind
|
|
137
|
-
* to ensure that data is read exactly once.
|
|
138
|
-
*
|
|
139
|
-
* The first is the problem of eventually consistent ETH service providers like Infura.
|
|
140
|
-
* Each L1 read operation will query data from the last L1 block that it saw emit its kind of data.
|
|
141
|
-
* (so pending L1 to L2 messages will read from the last L1 block that emitted a message and so on)
|
|
142
|
-
* This will mean the archiver will lag behind L1 and will only advance when there's L2-relevant activity on the chain.
|
|
143
|
-
*
|
|
144
|
-
* The second is that in between the various calls to L1, the block number can move meaning some
|
|
145
|
-
* of the following calls will return data for blocks that were not present during earlier calls.
|
|
146
|
-
* To combat this for the time being we simply ensure that all data retrieval methods only retrieve
|
|
147
|
-
* data up to the currentBlockNumber captured at the top of this function. We might want to improve on this
|
|
148
|
-
* in future but for the time being it should give us the guarantees that we need
|
|
149
|
-
*/
|
|
150
|
-
// ********** Events that are processed per L1 block **********
|
|
151
|
-
await this.handleL1ToL2Messages(messagesSynchedTo, currentL1BlockNumber);
|
|
152
|
-
// Store latest l1 block number and timestamp seen. Used for epoch and slots calculations.
|
|
153
|
-
if (!this.l1BlockNumber || this.l1BlockNumber < currentL1BlockNumber) {
|
|
154
|
-
this.l1Timestamp = (await this.publicClient.getBlock({ blockNumber: currentL1BlockNumber })).timestamp;
|
|
155
|
-
this.l1BlockNumber = currentL1BlockNumber;
|
|
156
|
-
}
|
|
157
|
-
// ********** Events that are processed per L2 block **********
|
|
158
|
-
if (currentL1BlockNumber > blocksSynchedTo) {
|
|
159
|
-
// First we retrieve new L2 blocks
|
|
160
|
-
const { provenBlockNumber } = await this.handleL2blocks(blocksSynchedTo, currentL1BlockNumber);
|
|
161
|
-
// And then we prune the current epoch if it'd reorg on next submission.
|
|
162
|
-
// Note that we don't do this before retrieving L2 blocks because we may need to retrieve
|
|
163
|
-
// blocks from more than 2 epochs ago, so we want to make sure we have the latest view of
|
|
164
|
-
// the chain locally before we start unwinding stuff. This can be optimized by figuring out
|
|
165
|
-
// up to which point we're pruning, and then requesting L2 blocks up to that point only.
|
|
166
|
-
await this.handleEpochPrune(provenBlockNumber, currentL1BlockNumber);
|
|
167
|
-
}
|
|
168
|
-
if (initialRun) {
|
|
169
|
-
this.log.info(`Initial archiver sync to L1 block ${currentL1BlockNumber} complete.`, {
|
|
170
|
-
l1BlockNumber: currentL1BlockNumber,
|
|
171
|
-
...(await this.getL2Tips()),
|
|
292
|
+
if (localProvenEpochNumber !== Number(provenEpochNumber) || localProvenBlockNumber !== Number(provenBlockNumber)) {
|
|
293
|
+
await this.store.setProvenL2BlockNumber(Number(provenBlockNumber));
|
|
294
|
+
await this.store.setProvenL2EpochNumber(Number(provenEpochNumber));
|
|
295
|
+
this.log.info(`Updated proven chain to block ${provenBlockNumber} (epoch ${provenEpochNumber})`, {
|
|
296
|
+
provenBlockNumber,
|
|
297
|
+
provenEpochNumber
|
|
172
298
|
});
|
|
173
299
|
}
|
|
174
300
|
}
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
return [nextStart, nextEnd];
|
|
202
|
-
}
|
|
203
|
-
async handleL1ToL2Messages(messagesSynchedTo, currentL1BlockNumber) {
|
|
204
|
-
this.log.trace(`Handling L1 to L2 messages from ${messagesSynchedTo} to ${currentL1BlockNumber}.`);
|
|
205
|
-
if (currentL1BlockNumber <= messagesSynchedTo) {
|
|
206
|
-
return;
|
|
207
|
-
}
|
|
208
|
-
const localTotalMessageCount = await this.store.getTotalL1ToL2MessageCount();
|
|
209
|
-
const destinationTotalMessageCount = await this.inbox.read.totalMessagesInserted();
|
|
210
|
-
if (localTotalMessageCount === destinationTotalMessageCount) {
|
|
211
|
-
await this.store.setMessageSynchedL1BlockNumber(currentL1BlockNumber);
|
|
212
|
-
this.log.trace(`Retrieved no new L1 to L2 messages between L1 blocks ${messagesSynchedTo + 1n} and ${currentL1BlockNumber}.`);
|
|
213
|
-
return;
|
|
214
|
-
}
|
|
215
|
-
// Retrieve messages in batches. Each batch is estimated to acommodate up to L2 'blockBatchSize' blocks,
|
|
216
|
-
let searchStartBlock = messagesSynchedTo;
|
|
217
|
-
let searchEndBlock = messagesSynchedTo;
|
|
218
|
-
do {
|
|
219
|
-
[searchStartBlock, searchEndBlock] = this.nextRange(searchEndBlock, currentL1BlockNumber);
|
|
220
|
-
this.log.trace(`Retrieving L1 to L2 messages between L1 blocks ${searchStartBlock} and ${searchEndBlock}.`);
|
|
221
|
-
const retrievedL1ToL2Messages = await retrieveL1ToL2Messages(this.inbox, searchStartBlock, searchEndBlock);
|
|
222
|
-
this.log.verbose(`Retrieved ${retrievedL1ToL2Messages.retrievedData.length} new L1 to L2 messages between L1 blocks ${searchStartBlock} and ${searchEndBlock}.`);
|
|
223
|
-
await this.store.addL1ToL2Messages(retrievedL1ToL2Messages);
|
|
224
|
-
for (const msg of retrievedL1ToL2Messages.retrievedData) {
|
|
225
|
-
this.log.debug(`Downloaded L1 to L2 message`, { leaf: msg.leaf.toString(), index: msg.index });
|
|
226
|
-
}
|
|
227
|
-
} while (searchEndBlock < currentL1BlockNumber);
|
|
228
|
-
}
|
|
229
|
-
async handleL2blocks(blocksSynchedTo, currentL1BlockNumber) {
|
|
230
|
-
const localPendingBlockNumber = BigInt(await this.getBlockNumber());
|
|
231
|
-
const [provenBlockNumber, provenArchive, pendingBlockNumber, pendingArchive, archiveForLocalPendingBlockNumber, provenEpochNumber,] = await this.rollup.read.status([localPendingBlockNumber], { blockNumber: currentL1BlockNumber });
|
|
232
|
-
const updateProvenBlock = async () => {
|
|
233
|
-
const localBlockForDestinationProvenBlockNumber = await this.getBlock(Number(provenBlockNumber));
|
|
234
|
-
// Sanity check. I've hit what seems to be a state where the proven block is set to a value greater than the latest
|
|
235
|
-
// synched block when requesting L2Tips from the archiver. This is the only place where the proven block is set.
|
|
236
|
-
const synched = await this.store.getSynchedL2BlockNumber();
|
|
237
|
-
if (localBlockForDestinationProvenBlockNumber && synched < localBlockForDestinationProvenBlockNumber?.number) {
|
|
238
|
-
this.log.error(`Hit local block greater than last synched block: ${localBlockForDestinationProvenBlockNumber.number} > ${synched}`);
|
|
239
|
-
}
|
|
240
|
-
if (localBlockForDestinationProvenBlockNumber &&
|
|
241
|
-
provenArchive === localBlockForDestinationProvenBlockNumber.archive.root.toString()) {
|
|
242
|
-
const [localProvenEpochNumber, localProvenBlockNumber] = await Promise.all([
|
|
243
|
-
this.store.getProvenL2EpochNumber(),
|
|
244
|
-
this.store.getProvenL2BlockNumber(),
|
|
245
|
-
]);
|
|
246
|
-
if (localProvenEpochNumber !== Number(provenEpochNumber) ||
|
|
247
|
-
localProvenBlockNumber !== Number(provenBlockNumber)) {
|
|
248
|
-
await this.store.setProvenL2BlockNumber(Number(provenBlockNumber));
|
|
249
|
-
await this.store.setProvenL2EpochNumber(Number(provenEpochNumber));
|
|
250
|
-
this.log.info(`Updated proven chain to block ${provenBlockNumber} (epoch ${provenEpochNumber})`, {
|
|
251
|
-
provenBlockNumber,
|
|
252
|
-
provenEpochNumber,
|
|
253
|
-
});
|
|
254
|
-
}
|
|
255
|
-
}
|
|
256
|
-
this.instrumentation.updateLastProvenBlock(Number(provenBlockNumber));
|
|
301
|
+
this.instrumentation.updateLastProvenBlock(Number(provenBlockNumber));
|
|
302
|
+
};
|
|
303
|
+
// This is an edge case that we only hit if there are no proposed blocks.
|
|
304
|
+
// If we have 0 blocks locally and there are no blocks onchain there is nothing to do.
|
|
305
|
+
const noBlocks = localPendingBlockNumber === 0n && pendingBlockNumber === 0n;
|
|
306
|
+
if (noBlocks) {
|
|
307
|
+
await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
|
|
308
|
+
this.log.debug(`No blocks to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
|
|
309
|
+
return {
|
|
310
|
+
provenBlockNumber
|
|
311
|
+
};
|
|
312
|
+
}
|
|
313
|
+
await updateProvenBlock();
|
|
314
|
+
// Related to the L2 reorgs of the pending chain. We are only interested in actually addressing a reorg if there
|
|
315
|
+
// are any state that could be impacted by it. If we have no blocks, there is no impact.
|
|
316
|
+
if (localPendingBlockNumber > 0) {
|
|
317
|
+
const localPendingBlock = await this.getBlock(Number(localPendingBlockNumber));
|
|
318
|
+
if (localPendingBlock === undefined) {
|
|
319
|
+
throw new Error(`Missing block ${localPendingBlockNumber}`);
|
|
320
|
+
}
|
|
321
|
+
const noBlockSinceLast = localPendingBlock && pendingArchive === localPendingBlock.archive.root.toString();
|
|
322
|
+
if (noBlockSinceLast) {
|
|
323
|
+
await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
|
|
324
|
+
this.log.debug(`No blocks to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
|
|
325
|
+
return {
|
|
326
|
+
provenBlockNumber
|
|
257
327
|
};
|
|
258
|
-
// This is an edge case that we only hit if there are no proposed blocks.
|
|
259
|
-
// If we have 0 blocks locally and there are no blocks onchain there is nothing to do.
|
|
260
|
-
const noBlocks = localPendingBlockNumber === 0n && pendingBlockNumber === 0n;
|
|
261
|
-
if (noBlocks) {
|
|
262
|
-
await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
|
|
263
|
-
this.log.debug(`No blocks to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
|
|
264
|
-
return { provenBlockNumber };
|
|
265
|
-
}
|
|
266
|
-
await updateProvenBlock();
|
|
267
|
-
// Related to the L2 reorgs of the pending chain. We are only interested in actually addressing a reorg if there
|
|
268
|
-
// are any state that could be impacted by it. If we have no blocks, there is no impact.
|
|
269
|
-
if (localPendingBlockNumber > 0) {
|
|
270
|
-
const localPendingBlock = await this.getBlock(Number(localPendingBlockNumber));
|
|
271
|
-
if (localPendingBlock === undefined) {
|
|
272
|
-
throw new Error(`Missing block ${localPendingBlockNumber}`);
|
|
273
|
-
}
|
|
274
|
-
const noBlockSinceLast = localPendingBlock && pendingArchive === localPendingBlock.archive.root.toString();
|
|
275
|
-
if (noBlockSinceLast) {
|
|
276
|
-
await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
|
|
277
|
-
this.log.debug(`No blocks to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
|
|
278
|
-
return { provenBlockNumber };
|
|
279
|
-
}
|
|
280
|
-
const localPendingBlockInChain = archiveForLocalPendingBlockNumber === localPendingBlock.archive.root.toString();
|
|
281
|
-
if (!localPendingBlockInChain) {
|
|
282
|
-
// If our local pending block tip is not in the chain on L1 a "prune" must have happened
|
|
283
|
-
// or the L1 have reorged.
|
|
284
|
-
// In any case, we have to figure out how far into the past the action will take us.
|
|
285
|
-
// For simplicity here, we will simply rewind until we end in a block that is also on the chain on L1.
|
|
286
|
-
this.log.debug(`L2 prune has been detected.`);
|
|
287
|
-
let tipAfterUnwind = localPendingBlockNumber;
|
|
288
|
-
while (true) {
|
|
289
|
-
const candidateBlock = await this.getBlock(Number(tipAfterUnwind));
|
|
290
|
-
if (candidateBlock === undefined) {
|
|
291
|
-
break;
|
|
292
|
-
}
|
|
293
|
-
const archiveAtContract = await this.rollup.read.archiveAt([BigInt(candidateBlock.number)]);
|
|
294
|
-
if (archiveAtContract === candidateBlock.archive.root.toString()) {
|
|
295
|
-
break;
|
|
296
|
-
}
|
|
297
|
-
tipAfterUnwind--;
|
|
298
|
-
}
|
|
299
|
-
const blocksToUnwind = localPendingBlockNumber - tipAfterUnwind;
|
|
300
|
-
await this.store.unwindBlocks(Number(localPendingBlockNumber), Number(blocksToUnwind));
|
|
301
|
-
this.log.warn(`Unwound ${count(blocksToUnwind, 'block')} from L2 block ${localPendingBlockNumber} ` +
|
|
302
|
-
`due to mismatched block hashes at L1 block ${currentL1BlockNumber}. ` +
|
|
303
|
-
`Updated L2 latest block is ${await this.getBlockNumber()}.`);
|
|
304
|
-
}
|
|
305
|
-
}
|
|
306
|
-
// Retrieve L2 blocks in batches. Each batch is estimated to acommodate up to L2 'blockBatchSize' blocks,
|
|
307
|
-
// computed using the L2 block time vs the L1 block time.
|
|
308
|
-
let searchStartBlock = blocksSynchedTo;
|
|
309
|
-
let searchEndBlock = blocksSynchedTo;
|
|
310
|
-
do {
|
|
311
|
-
[searchStartBlock, searchEndBlock] = this.nextRange(searchEndBlock, currentL1BlockNumber);
|
|
312
|
-
this.log.trace(`Retrieving L2 blocks from L1 block ${searchStartBlock} to ${searchEndBlock}`);
|
|
313
|
-
// TODO(md): Retreive from blob sink then from consensus client, then from peers
|
|
314
|
-
const retrievedBlocks = await retrieveBlocksFromRollup(this.rollup, this.publicClient, this.blobSinkClient, searchStartBlock, // TODO(palla/reorg): If the L2 reorg was due to an L1 reorg, we need to start search earlier
|
|
315
|
-
searchEndBlock, this.log);
|
|
316
|
-
if (retrievedBlocks.length === 0) {
|
|
317
|
-
// We are not calling `setBlockSynchedL1BlockNumber` because it may cause sync issues if based off infura.
|
|
318
|
-
// See further details in earlier comments.
|
|
319
|
-
this.log.trace(`Retrieved no new L2 blocks from L1 block ${searchStartBlock} to ${searchEndBlock}`);
|
|
320
|
-
continue;
|
|
321
|
-
}
|
|
322
|
-
const lastProcessedL1BlockNumber = retrievedBlocks[retrievedBlocks.length - 1].l1.blockNumber;
|
|
323
|
-
this.log.debug(`Retrieved ${retrievedBlocks.length} new L2 blocks between L1 blocks ${searchStartBlock} and ${searchEndBlock} with last processed L1 block ${lastProcessedL1BlockNumber}.`);
|
|
324
|
-
for (const block of retrievedBlocks) {
|
|
325
|
-
this.log.debug(`Ingesting new L2 block ${block.data.number} with ${block.data.body.txEffects.length} txs`, {
|
|
326
|
-
blockHash: block.data.hash(),
|
|
327
|
-
l1BlockNumber: block.l1.blockNumber,
|
|
328
|
-
...block.data.header.globalVariables.toInspect(),
|
|
329
|
-
...block.data.getStats(),
|
|
330
|
-
});
|
|
331
|
-
}
|
|
332
|
-
const [processDuration] = await elapsed(() => this.store.addBlocks(retrievedBlocks));
|
|
333
|
-
this.instrumentation.processNewBlocks(processDuration / retrievedBlocks.length, retrievedBlocks.map(b => b.data));
|
|
334
|
-
for (const block of retrievedBlocks) {
|
|
335
|
-
this.log.info(`Downloaded L2 block ${block.data.number}`, {
|
|
336
|
-
blockHash: block.data.hash(),
|
|
337
|
-
blockNumber: block.data.number,
|
|
338
|
-
txCount: block.data.body.txEffects.length,
|
|
339
|
-
globalVariables: block.data.header.globalVariables.toInspect(),
|
|
340
|
-
});
|
|
341
|
-
}
|
|
342
|
-
} while (searchEndBlock < currentL1BlockNumber);
|
|
343
|
-
// Important that we update AFTER inserting the blocks.
|
|
344
|
-
await updateProvenBlock();
|
|
345
|
-
return { provenBlockNumber };
|
|
346
|
-
}
|
|
347
|
-
/**
|
|
348
|
-
* Stops the archiver.
|
|
349
|
-
* @returns A promise signalling completion of the stop process.
|
|
350
|
-
*/
|
|
351
|
-
async stop() {
|
|
352
|
-
this.log.debug('Stopping...');
|
|
353
|
-
await this.runningPromise?.stop();
|
|
354
|
-
this.log.info('Stopped.');
|
|
355
|
-
return Promise.resolve();
|
|
356
328
|
}
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
throw new Error('L1 block number not yet available. Complete an initial sync first.');
|
|
370
|
-
}
|
|
371
|
-
return l1BlockNumber;
|
|
372
|
-
}
|
|
373
|
-
getL1Timestamp() {
|
|
374
|
-
const l1Timestamp = this.l1Timestamp;
|
|
375
|
-
if (!l1Timestamp) {
|
|
376
|
-
throw new Error('L1 timestamp not yet available. Complete an initial sync first.');
|
|
377
|
-
}
|
|
378
|
-
return l1Timestamp;
|
|
379
|
-
}
|
|
380
|
-
getL2SlotNumber() {
|
|
381
|
-
return Promise.resolve(getSlotAtTimestamp(this.getL1Timestamp(), this.l1constants));
|
|
382
|
-
}
|
|
383
|
-
getL2EpochNumber() {
|
|
384
|
-
return Promise.resolve(getEpochNumberAtTimestamp(this.getL1Timestamp(), this.l1constants));
|
|
385
|
-
}
|
|
386
|
-
async getBlocksForEpoch(epochNumber) {
|
|
387
|
-
const [start, end] = getSlotRangeForEpoch(epochNumber, this.l1constants);
|
|
388
|
-
const blocks = [];
|
|
389
|
-
// Walk the list of blocks backwards and filter by slots matching the requested epoch.
|
|
390
|
-
// We'll typically ask for blocks for a very recent epoch, so we shouldn't need an index here.
|
|
391
|
-
let block = await this.getBlock(await this.store.getSynchedL2BlockNumber());
|
|
392
|
-
const slot = (b) => b.header.globalVariables.slotNumber.toBigInt();
|
|
393
|
-
while (block && slot(block) >= start) {
|
|
394
|
-
if (slot(block) <= end) {
|
|
395
|
-
blocks.push(block);
|
|
329
|
+
const localPendingBlockInChain = archiveForLocalPendingBlockNumber === localPendingBlock.archive.root.toString();
|
|
330
|
+
if (!localPendingBlockInChain) {
|
|
331
|
+
// If our local pending block tip is not in the chain on L1 a "prune" must have happened
|
|
332
|
+
// or the L1 have reorged.
|
|
333
|
+
// In any case, we have to figure out how far into the past the action will take us.
|
|
334
|
+
// For simplicity here, we will simply rewind until we end in a block that is also on the chain on L1.
|
|
335
|
+
this.log.debug(`L2 prune has been detected.`);
|
|
336
|
+
let tipAfterUnwind = localPendingBlockNumber;
|
|
337
|
+
while(true){
|
|
338
|
+
const candidateBlock = await this.getBlock(Number(tipAfterUnwind));
|
|
339
|
+
if (candidateBlock === undefined) {
|
|
340
|
+
break;
|
|
396
341
|
}
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
const slot = header?.globalVariables.slotNumber.toBigInt();
|
|
405
|
-
const [_startSlot, endSlot] = getSlotRangeForEpoch(epochNumber, this.l1constants);
|
|
406
|
-
if (slot && slot >= endSlot) {
|
|
407
|
-
return true;
|
|
408
|
-
}
|
|
409
|
-
// If we haven't run an initial sync, just return false.
|
|
410
|
-
const l1Timestamp = this.l1Timestamp;
|
|
411
|
-
if (l1Timestamp === undefined) {
|
|
412
|
-
return false;
|
|
413
|
-
}
|
|
414
|
-
// If not, the epoch may also be complete if the L2 slot has passed without a block
|
|
415
|
-
// We compute this based on the end timestamp for the given epoch and the timestamp of the last L1 block
|
|
416
|
-
const [_startTimestamp, endTimestamp] = getTimestampRangeForEpoch(epochNumber, this.l1constants);
|
|
417
|
-
// For this computation, we throw in a few extra seconds just for good measure,
|
|
418
|
-
// since we know the next L1 block won't be mined within this range. Remember that
|
|
419
|
-
// l1timestamp is the timestamp of the last l1 block we've seen, so this relies on
|
|
420
|
-
// the fact that L1 won't mine two blocks within this time of each other.
|
|
421
|
-
// TODO(palla/reorg): Is the above a safe assumption?
|
|
422
|
-
const leeway = 1n;
|
|
423
|
-
return l1Timestamp + leeway >= endTimestamp;
|
|
424
|
-
}
|
|
425
|
-
/**
|
|
426
|
-
* Gets up to `limit` amount of L2 blocks starting from `from`.
|
|
427
|
-
* @param from - Number of the first block to return (inclusive).
|
|
428
|
-
* @param limit - The number of blocks to return.
|
|
429
|
-
* @param proven - If true, only return blocks that have been proven.
|
|
430
|
-
* @returns The requested L2 blocks.
|
|
431
|
-
*/
|
|
432
|
-
async getBlocks(from, limit, proven) {
|
|
433
|
-
const limitWithProven = proven
|
|
434
|
-
? Math.min(limit, Math.max((await this.store.getProvenL2BlockNumber()) - from + 1, 0))
|
|
435
|
-
: limit;
|
|
436
|
-
return limitWithProven === 0 ? [] : (await this.store.getBlocks(from, limitWithProven)).map(b => b.data);
|
|
437
|
-
}
|
|
438
|
-
/**
|
|
439
|
-
* Gets an l2 block.
|
|
440
|
-
* @param number - The block number to return.
|
|
441
|
-
* @returns The requested L2 block.
|
|
442
|
-
*/
|
|
443
|
-
async getBlock(number) {
|
|
444
|
-
// If the number provided is -ve, then return the latest block.
|
|
445
|
-
if (number < 0) {
|
|
446
|
-
number = await this.store.getSynchedL2BlockNumber();
|
|
447
|
-
}
|
|
448
|
-
if (number == 0) {
|
|
449
|
-
return undefined;
|
|
450
|
-
}
|
|
451
|
-
const blocks = await this.store.getBlocks(number, 1);
|
|
452
|
-
return blocks.length === 0 ? undefined : blocks[0].data;
|
|
453
|
-
}
|
|
454
|
-
async getBlockHeader(number) {
|
|
455
|
-
if (number === 'latest') {
|
|
456
|
-
number = await this.store.getSynchedL2BlockNumber();
|
|
457
|
-
}
|
|
458
|
-
if (number === 0) {
|
|
459
|
-
return undefined;
|
|
460
|
-
}
|
|
461
|
-
const headers = await this.store.getBlockHeaders(number, 1);
|
|
462
|
-
return headers.length === 0 ? undefined : headers[0];
|
|
463
|
-
}
|
|
464
|
-
getTxEffect(txHash) {
|
|
465
|
-
return this.store.getTxEffect(txHash);
|
|
466
|
-
}
|
|
467
|
-
getSettledTxReceipt(txHash) {
|
|
468
|
-
return this.store.getSettledTxReceipt(txHash);
|
|
469
|
-
}
|
|
470
|
-
/**
|
|
471
|
-
* Gets the public function data for a contract.
|
|
472
|
-
* @param address - The contract address containing the function to fetch.
|
|
473
|
-
* @param selector - The function selector of the function to fetch.
|
|
474
|
-
* @returns The public function data (if found).
|
|
475
|
-
*/
|
|
476
|
-
async getPublicFunction(address, selector) {
|
|
477
|
-
const instance = await this.getContract(address);
|
|
478
|
-
if (!instance) {
|
|
479
|
-
throw new Error(`Contract ${address.toString()} not found`);
|
|
480
|
-
}
|
|
481
|
-
const contractClass = await this.getContractClass(instance.contractClassId);
|
|
482
|
-
if (!contractClass) {
|
|
483
|
-
throw new Error(`Contract class ${instance.contractClassId.toString()} for ${address.toString()} not found`);
|
|
342
|
+
const archiveAtContract = await this.rollup.read.archiveAt([
|
|
343
|
+
BigInt(candidateBlock.number)
|
|
344
|
+
]);
|
|
345
|
+
if (archiveAtContract === candidateBlock.archive.root.toString()) {
|
|
346
|
+
break;
|
|
347
|
+
}
|
|
348
|
+
tipAfterUnwind--;
|
|
484
349
|
}
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
* Retrieves all private logs from up to `limit` blocks, starting from the block number `from`.
|
|
489
|
-
* @param from - The block number from which to begin retrieving logs.
|
|
490
|
-
* @param limit - The maximum number of blocks to retrieve logs from.
|
|
491
|
-
* @returns An array of private logs from the specified range of blocks.
|
|
492
|
-
*/
|
|
493
|
-
getPrivateLogs(from, limit) {
|
|
494
|
-
return this.store.getPrivateLogs(from, limit);
|
|
495
|
-
}
|
|
496
|
-
/**
|
|
497
|
-
* Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
|
|
498
|
-
* @param tags - The tags to filter the logs by.
|
|
499
|
-
* @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
|
|
500
|
-
* that tag.
|
|
501
|
-
*/
|
|
502
|
-
getLogsByTags(tags) {
|
|
503
|
-
return this.store.getLogsByTags(tags);
|
|
504
|
-
}
|
|
505
|
-
/**
|
|
506
|
-
* Returns the provided nullifier indexes scoped to the block
|
|
507
|
-
* they were first included in, or undefined if they're not present in the tree
|
|
508
|
-
* @param blockNumber Max block number to search for the nullifiers
|
|
509
|
-
* @param nullifiers Nullifiers to get
|
|
510
|
-
* @returns The block scoped indexes of the provided nullifiers, or undefined if the nullifier doesn't exist in the tree
|
|
511
|
-
*/
|
|
512
|
-
findNullifiersIndexesWithBlock(blockNumber, nullifiers) {
|
|
513
|
-
return this.store.findNullifiersIndexesWithBlock(blockNumber, nullifiers);
|
|
514
|
-
}
|
|
515
|
-
/**
|
|
516
|
-
* Gets public logs based on the provided filter.
|
|
517
|
-
* @param filter - The filter to apply to the logs.
|
|
518
|
-
* @returns The requested logs.
|
|
519
|
-
*/
|
|
520
|
-
getPublicLogs(filter) {
|
|
521
|
-
return this.store.getPublicLogs(filter);
|
|
522
|
-
}
|
|
523
|
-
/**
|
|
524
|
-
* Gets contract class logs based on the provided filter.
|
|
525
|
-
* @param filter - The filter to apply to the logs.
|
|
526
|
-
* @returns The requested logs.
|
|
527
|
-
*/
|
|
528
|
-
getContractClassLogs(filter) {
|
|
529
|
-
return this.store.getContractClassLogs(filter);
|
|
530
|
-
}
|
|
531
|
-
/**
|
|
532
|
-
* Gets the number of the latest L2 block processed by the block source implementation.
|
|
533
|
-
* @returns The number of the latest L2 block processed by the block source implementation.
|
|
534
|
-
*/
|
|
535
|
-
getBlockNumber() {
|
|
536
|
-
return this.store.getSynchedL2BlockNumber();
|
|
537
|
-
}
|
|
538
|
-
getProvenBlockNumber() {
|
|
539
|
-
return this.store.getProvenL2BlockNumber();
|
|
540
|
-
}
|
|
541
|
-
getProvenL2EpochNumber() {
|
|
542
|
-
return this.store.getProvenL2EpochNumber();
|
|
543
|
-
}
|
|
544
|
-
/** Forcefully updates the last proven block number. Use for testing. */
|
|
545
|
-
setProvenBlockNumber(blockNumber) {
|
|
546
|
-
return this.store.setProvenL2BlockNumber(blockNumber);
|
|
547
|
-
}
|
|
548
|
-
getContractClass(id) {
|
|
549
|
-
return this.store.getContractClass(id);
|
|
550
|
-
}
|
|
551
|
-
getBytecodeCommitment(id) {
|
|
552
|
-
return this.store.getBytecodeCommitment(id);
|
|
350
|
+
const blocksToUnwind = localPendingBlockNumber - tipAfterUnwind;
|
|
351
|
+
await this.store.unwindBlocks(Number(localPendingBlockNumber), Number(blocksToUnwind));
|
|
352
|
+
this.log.warn(`Unwound ${count(blocksToUnwind, 'block')} from L2 block ${localPendingBlockNumber} ` + `due to mismatched block hashes at L1 block ${currentL1BlockNumber}. ` + `Updated L2 latest block is ${await this.getBlockNumber()}.`);
|
|
553
353
|
}
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
return;
|
|
580
|
-
}
|
|
581
|
-
registerContractFunctionSignatures(address, signatures) {
|
|
582
|
-
return this.store.registerContractFunctionSignatures(address, signatures);
|
|
583
|
-
}
|
|
584
|
-
getContractFunctionName(address, selector) {
|
|
585
|
-
return this.store.getContractFunctionName(address, selector);
|
|
354
|
+
}
|
|
355
|
+
// Retrieve L2 blocks in batches. Each batch is estimated to acommodate up to L2 'blockBatchSize' blocks,
|
|
356
|
+
// computed using the L2 block time vs the L1 block time.
|
|
357
|
+
let searchStartBlock = blocksSynchedTo;
|
|
358
|
+
let searchEndBlock = blocksSynchedTo;
|
|
359
|
+
do {
|
|
360
|
+
[searchStartBlock, searchEndBlock] = this.nextRange(searchEndBlock, currentL1BlockNumber);
|
|
361
|
+
this.log.trace(`Retrieving L2 blocks from L1 block ${searchStartBlock} to ${searchEndBlock}`);
|
|
362
|
+
// TODO(md): Retreive from blob sink then from consensus client, then from peers
|
|
363
|
+
const retrievedBlocks = await retrieveBlocksFromRollup(this.rollup, this.publicClient, this.blobSinkClient, searchStartBlock, searchEndBlock, this.log);
|
|
364
|
+
if (retrievedBlocks.length === 0) {
|
|
365
|
+
// We are not calling `setBlockSynchedL1BlockNumber` because it may cause sync issues if based off infura.
|
|
366
|
+
// See further details in earlier comments.
|
|
367
|
+
this.log.trace(`Retrieved no new L2 blocks from L1 block ${searchStartBlock} to ${searchEndBlock}`);
|
|
368
|
+
continue;
|
|
369
|
+
}
|
|
370
|
+
const lastProcessedL1BlockNumber = retrievedBlocks[retrievedBlocks.length - 1].l1.blockNumber;
|
|
371
|
+
this.log.debug(`Retrieved ${retrievedBlocks.length} new L2 blocks between L1 blocks ${searchStartBlock} and ${searchEndBlock} with last processed L1 block ${lastProcessedL1BlockNumber}.`);
|
|
372
|
+
for (const block of retrievedBlocks){
|
|
373
|
+
this.log.debug(`Ingesting new L2 block ${block.data.number} with ${block.data.body.txEffects.length} txs`, {
|
|
374
|
+
blockHash: block.data.hash(),
|
|
375
|
+
l1BlockNumber: block.l1.blockNumber,
|
|
376
|
+
...block.data.header.globalVariables.toInspect(),
|
|
377
|
+
...block.data.getStats()
|
|
378
|
+
});
|
|
586
379
|
}
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
if (latestBlockNumber > 0 && !latestBlockHeader) {
|
|
597
|
-
throw new Error(`Failed to retrieve latest block header for block ${latestBlockNumber}`);
|
|
598
|
-
}
|
|
599
|
-
if (provenBlockNumber > 0 && !provenBlockHeader) {
|
|
600
|
-
throw new Error(`Failed to retrieve proven block header for block ${provenBlockNumber} (latest block is ${latestBlockNumber})`);
|
|
601
|
-
}
|
|
602
|
-
const latestBlockHeaderHash = await latestBlockHeader?.hash();
|
|
603
|
-
const provenBlockHeaderHash = await provenBlockHeader?.hash();
|
|
604
|
-
const finalizedBlockHeaderHash = await provenBlockHeader?.hash();
|
|
605
|
-
return {
|
|
606
|
-
latest: { number: latestBlockNumber, hash: latestBlockHeaderHash?.toString() },
|
|
607
|
-
proven: { number: provenBlockNumber, hash: provenBlockHeaderHash?.toString() },
|
|
608
|
-
finalized: { number: provenBlockNumber, hash: finalizedBlockHeaderHash?.toString() },
|
|
609
|
-
};
|
|
380
|
+
const [processDuration] = await elapsed(()=>this.store.addBlocks(retrievedBlocks));
|
|
381
|
+
this.instrumentation.processNewBlocks(processDuration / retrievedBlocks.length, retrievedBlocks.map((b)=>b.data));
|
|
382
|
+
for (const block of retrievedBlocks){
|
|
383
|
+
this.log.info(`Downloaded L2 block ${block.data.number}`, {
|
|
384
|
+
blockHash: block.data.hash(),
|
|
385
|
+
blockNumber: block.data.number,
|
|
386
|
+
txCount: block.data.body.txEffects.length,
|
|
387
|
+
globalVariables: block.data.header.globalVariables.toInspect()
|
|
388
|
+
});
|
|
610
389
|
}
|
|
611
|
-
}
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
(
|
|
390
|
+
}while (searchEndBlock < currentL1BlockNumber)
|
|
391
|
+
// Important that we update AFTER inserting the blocks.
|
|
392
|
+
await updateProvenBlock();
|
|
393
|
+
return {
|
|
394
|
+
provenBlockNumber
|
|
395
|
+
};
|
|
396
|
+
}
|
|
397
|
+
/**
|
|
398
|
+
* Stops the archiver.
|
|
399
|
+
* @returns A promise signalling completion of the stop process.
|
|
400
|
+
*/ async stop() {
|
|
401
|
+
this.log.debug('Stopping...');
|
|
402
|
+
await this.runningPromise?.stop();
|
|
403
|
+
this.log.info('Stopped.');
|
|
404
|
+
return Promise.resolve();
|
|
405
|
+
}
|
|
406
|
+
getL1Constants() {
|
|
407
|
+
return Promise.resolve(this.l1constants);
|
|
408
|
+
}
|
|
409
|
+
getRollupAddress() {
|
|
410
|
+
return Promise.resolve(this.l1Addresses.rollupAddress);
|
|
411
|
+
}
|
|
412
|
+
getRegistryAddress() {
|
|
413
|
+
return Promise.resolve(this.l1Addresses.registryAddress);
|
|
414
|
+
}
|
|
415
|
+
getL1BlockNumber() {
|
|
416
|
+
const l1BlockNumber = this.l1BlockNumber;
|
|
417
|
+
if (!l1BlockNumber) {
|
|
418
|
+
throw new Error('L1 block number not yet available. Complete an initial sync first.');
|
|
419
|
+
}
|
|
420
|
+
return l1BlockNumber;
|
|
421
|
+
}
|
|
422
|
+
getL1Timestamp() {
|
|
423
|
+
const l1Timestamp = this.l1Timestamp;
|
|
424
|
+
if (!l1Timestamp) {
|
|
425
|
+
throw new Error('L1 timestamp not yet available. Complete an initial sync first.');
|
|
426
|
+
}
|
|
427
|
+
return l1Timestamp;
|
|
428
|
+
}
|
|
429
|
+
getL2SlotNumber() {
|
|
430
|
+
return Promise.resolve(getSlotAtTimestamp(this.getL1Timestamp(), this.l1constants));
|
|
431
|
+
}
|
|
432
|
+
getL2EpochNumber() {
|
|
433
|
+
return Promise.resolve(getEpochNumberAtTimestamp(this.getL1Timestamp(), this.l1constants));
|
|
434
|
+
}
|
|
435
|
+
async getBlocksForEpoch(epochNumber) {
|
|
436
|
+
const [start, end] = getSlotRangeForEpoch(epochNumber, this.l1constants);
|
|
437
|
+
const blocks = [];
|
|
438
|
+
// Walk the list of blocks backwards and filter by slots matching the requested epoch.
|
|
439
|
+
// We'll typically ask for blocks for a very recent epoch, so we shouldn't need an index here.
|
|
440
|
+
let block = await this.getBlock(await this.store.getSynchedL2BlockNumber());
|
|
441
|
+
const slot = (b)=>b.header.globalVariables.slotNumber.toBigInt();
|
|
442
|
+
while(block && slot(block) >= start){
|
|
443
|
+
if (slot(block) <= end) {
|
|
444
|
+
blocks.push(block);
|
|
445
|
+
}
|
|
446
|
+
block = await this.getBlock(block.number - 1);
|
|
447
|
+
}
|
|
448
|
+
return blocks.reverse();
|
|
449
|
+
}
|
|
450
|
+
async isEpochComplete(epochNumber) {
|
|
451
|
+
// The epoch is complete if the current L2 block is the last one in the epoch (or later)
|
|
452
|
+
const header = await this.getBlockHeader('latest');
|
|
453
|
+
const slot = header?.globalVariables.slotNumber.toBigInt();
|
|
454
|
+
const [_startSlot, endSlot] = getSlotRangeForEpoch(epochNumber, this.l1constants);
|
|
455
|
+
if (slot && slot >= endSlot) {
|
|
456
|
+
return true;
|
|
457
|
+
}
|
|
458
|
+
// If we haven't run an initial sync, just return false.
|
|
459
|
+
const l1Timestamp = this.l1Timestamp;
|
|
460
|
+
if (l1Timestamp === undefined) {
|
|
461
|
+
return false;
|
|
462
|
+
}
|
|
463
|
+
// If not, the epoch may also be complete if the L2 slot has passed without a block
|
|
464
|
+
// We compute this based on the end timestamp for the given epoch and the timestamp of the last L1 block
|
|
465
|
+
const [_startTimestamp, endTimestamp] = getTimestampRangeForEpoch(epochNumber, this.l1constants);
|
|
466
|
+
// For this computation, we throw in a few extra seconds just for good measure,
|
|
467
|
+
// since we know the next L1 block won't be mined within this range. Remember that
|
|
468
|
+
// l1timestamp is the timestamp of the last l1 block we've seen, so this relies on
|
|
469
|
+
// the fact that L1 won't mine two blocks within this time of each other.
|
|
470
|
+
// TODO(palla/reorg): Is the above a safe assumption?
|
|
471
|
+
const leeway = 1n;
|
|
472
|
+
return l1Timestamp + leeway >= endTimestamp;
|
|
473
|
+
}
|
|
474
|
+
/**
|
|
475
|
+
* Gets up to `limit` amount of L2 blocks starting from `from`.
|
|
476
|
+
* @param from - Number of the first block to return (inclusive).
|
|
477
|
+
* @param limit - The number of blocks to return.
|
|
478
|
+
* @param proven - If true, only return blocks that have been proven.
|
|
479
|
+
* @returns The requested L2 blocks.
|
|
480
|
+
*/ async getBlocks(from, limit, proven) {
|
|
481
|
+
const limitWithProven = proven ? Math.min(limit, Math.max(await this.store.getProvenL2BlockNumber() - from + 1, 0)) : limit;
|
|
482
|
+
return limitWithProven === 0 ? [] : (await this.store.getBlocks(from, limitWithProven)).map((b)=>b.data);
|
|
483
|
+
}
|
|
484
|
+
/**
|
|
485
|
+
* Gets an l2 block.
|
|
486
|
+
* @param number - The block number to return.
|
|
487
|
+
* @returns The requested L2 block.
|
|
488
|
+
*/ async getBlock(number) {
|
|
489
|
+
// If the number provided is -ve, then return the latest block.
|
|
490
|
+
if (number < 0) {
|
|
491
|
+
number = await this.store.getSynchedL2BlockNumber();
|
|
492
|
+
}
|
|
493
|
+
if (number == 0) {
|
|
494
|
+
return undefined;
|
|
495
|
+
}
|
|
496
|
+
const blocks = await this.store.getBlocks(number, 1);
|
|
497
|
+
return blocks.length === 0 ? undefined : blocks[0].data;
|
|
498
|
+
}
|
|
499
|
+
async getBlockHeader(number) {
|
|
500
|
+
if (number === 'latest') {
|
|
501
|
+
number = await this.store.getSynchedL2BlockNumber();
|
|
502
|
+
}
|
|
503
|
+
if (number === 0) {
|
|
504
|
+
return undefined;
|
|
505
|
+
}
|
|
506
|
+
const headers = await this.store.getBlockHeaders(number, 1);
|
|
507
|
+
return headers.length === 0 ? undefined : headers[0];
|
|
508
|
+
}
|
|
509
|
+
getTxEffect(txHash) {
|
|
510
|
+
return this.store.getTxEffect(txHash);
|
|
511
|
+
}
|
|
512
|
+
getSettledTxReceipt(txHash) {
|
|
513
|
+
return this.store.getSettledTxReceipt(txHash);
|
|
514
|
+
}
|
|
515
|
+
/**
|
|
516
|
+
* Gets the public function data for a contract.
|
|
517
|
+
* @param address - The contract address containing the function to fetch.
|
|
518
|
+
* @param selector - The function selector of the function to fetch.
|
|
519
|
+
* @returns The public function data (if found).
|
|
520
|
+
*/ async getPublicFunction(address, selector) {
|
|
521
|
+
const instance = await this.getContract(address);
|
|
522
|
+
if (!instance) {
|
|
523
|
+
throw new Error(`Contract ${address.toString()} not found`);
|
|
524
|
+
}
|
|
525
|
+
const contractClass = await this.getContractClass(instance.currentContractClassId);
|
|
526
|
+
if (!contractClass) {
|
|
527
|
+
throw new Error(`Contract class ${instance.currentContractClassId.toString()} for ${address.toString()} not found`);
|
|
528
|
+
}
|
|
529
|
+
return contractClass.publicFunctions.find((f)=>f.selector.equals(selector));
|
|
530
|
+
}
|
|
531
|
+
/**
|
|
532
|
+
* Retrieves all private logs from up to `limit` blocks, starting from the block number `from`.
|
|
533
|
+
* @param from - The block number from which to begin retrieving logs.
|
|
534
|
+
* @param limit - The maximum number of blocks to retrieve logs from.
|
|
535
|
+
* @returns An array of private logs from the specified range of blocks.
|
|
536
|
+
*/ getPrivateLogs(from, limit) {
|
|
537
|
+
return this.store.getPrivateLogs(from, limit);
|
|
538
|
+
}
|
|
539
|
+
/**
|
|
540
|
+
* Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
|
|
541
|
+
* @param tags - The tags to filter the logs by.
|
|
542
|
+
* @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
|
|
543
|
+
* that tag.
|
|
544
|
+
*/ getLogsByTags(tags) {
|
|
545
|
+
return this.store.getLogsByTags(tags);
|
|
546
|
+
}
|
|
547
|
+
/**
|
|
548
|
+
* Returns the provided nullifier indexes scoped to the block
|
|
549
|
+
* they were first included in, or undefined if they're not present in the tree
|
|
550
|
+
* @param blockNumber Max block number to search for the nullifiers
|
|
551
|
+
* @param nullifiers Nullifiers to get
|
|
552
|
+
* @returns The block scoped indexes of the provided nullifiers, or undefined if the nullifier doesn't exist in the tree
|
|
553
|
+
*/ findNullifiersIndexesWithBlock(blockNumber, nullifiers) {
|
|
554
|
+
return this.store.findNullifiersIndexesWithBlock(blockNumber, nullifiers);
|
|
555
|
+
}
|
|
556
|
+
/**
|
|
557
|
+
* Gets public logs based on the provided filter.
|
|
558
|
+
* @param filter - The filter to apply to the logs.
|
|
559
|
+
* @returns The requested logs.
|
|
560
|
+
*/ getPublicLogs(filter) {
|
|
561
|
+
return this.store.getPublicLogs(filter);
|
|
562
|
+
}
|
|
563
|
+
/**
|
|
564
|
+
* Gets contract class logs based on the provided filter.
|
|
565
|
+
* @param filter - The filter to apply to the logs.
|
|
566
|
+
* @returns The requested logs.
|
|
567
|
+
*/ getContractClassLogs(filter) {
|
|
568
|
+
return this.store.getContractClassLogs(filter);
|
|
569
|
+
}
|
|
570
|
+
/**
|
|
571
|
+
* Gets the number of the latest L2 block processed by the block source implementation.
|
|
572
|
+
* @returns The number of the latest L2 block processed by the block source implementation.
|
|
573
|
+
*/ getBlockNumber() {
|
|
574
|
+
return this.store.getSynchedL2BlockNumber();
|
|
575
|
+
}
|
|
576
|
+
getProvenBlockNumber() {
|
|
577
|
+
return this.store.getProvenL2BlockNumber();
|
|
578
|
+
}
|
|
579
|
+
getProvenL2EpochNumber() {
|
|
580
|
+
return this.store.getProvenL2EpochNumber();
|
|
581
|
+
}
|
|
582
|
+
/** Forcefully updates the last proven block number. Use for testing. */ setProvenBlockNumber(blockNumber) {
|
|
583
|
+
return this.store.setProvenL2BlockNumber(blockNumber);
|
|
584
|
+
}
|
|
585
|
+
getContractClass(id) {
|
|
586
|
+
return this.store.getContractClass(id);
|
|
587
|
+
}
|
|
588
|
+
getBytecodeCommitment(id) {
|
|
589
|
+
return this.store.getBytecodeCommitment(id);
|
|
590
|
+
}
|
|
591
|
+
getContract(address) {
|
|
592
|
+
return this.store.getContractInstance(address);
|
|
593
|
+
}
|
|
594
|
+
/**
|
|
595
|
+
* Gets L1 to L2 message (to be) included in a given block.
|
|
596
|
+
* @param blockNumber - L2 block number to get messages for.
|
|
597
|
+
* @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
|
|
598
|
+
*/ getL1ToL2Messages(blockNumber) {
|
|
599
|
+
return this.store.getL1ToL2Messages(blockNumber);
|
|
600
|
+
}
|
|
601
|
+
/**
|
|
602
|
+
* Gets the L1 to L2 message index in the L1 to L2 message tree.
|
|
603
|
+
* @param l1ToL2Message - The L1 to L2 message.
|
|
604
|
+
* @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
|
|
605
|
+
*/ getL1ToL2MessageIndex(l1ToL2Message) {
|
|
606
|
+
return this.store.getL1ToL2MessageIndex(l1ToL2Message);
|
|
607
|
+
}
|
|
608
|
+
getContractClassIds() {
|
|
609
|
+
return this.store.getContractClassIds();
|
|
610
|
+
}
|
|
611
|
+
// TODO(#10007): Remove this method
|
|
612
|
+
async addContractClass(contractClass) {
|
|
613
|
+
await this.store.addContractClasses([
|
|
614
|
+
contractClass
|
|
615
|
+
], [
|
|
616
|
+
await computePublicBytecodeCommitment(contractClass.packedBytecode)
|
|
617
|
+
], 0);
|
|
618
|
+
return;
|
|
619
|
+
}
|
|
620
|
+
registerContractFunctionSignatures(address, signatures) {
|
|
621
|
+
return this.store.registerContractFunctionSignatures(address, signatures);
|
|
622
|
+
}
|
|
623
|
+
getContractFunctionName(address, selector) {
|
|
624
|
+
return this.store.getContractFunctionName(address, selector);
|
|
625
|
+
}
|
|
626
|
+
async getL2Tips() {
|
|
627
|
+
const [latestBlockNumber, provenBlockNumber] = await Promise.all([
|
|
628
|
+
this.getBlockNumber(),
|
|
629
|
+
this.getProvenBlockNumber()
|
|
630
|
+
]);
|
|
631
|
+
const [latestBlockHeader, provenBlockHeader] = await Promise.all([
|
|
632
|
+
latestBlockNumber > 0 ? this.getBlockHeader(latestBlockNumber) : undefined,
|
|
633
|
+
provenBlockNumber > 0 ? this.getBlockHeader(provenBlockNumber) : undefined
|
|
634
|
+
]);
|
|
635
|
+
if (latestBlockNumber > 0 && !latestBlockHeader) {
|
|
636
|
+
throw new Error(`Failed to retrieve latest block header for block ${latestBlockNumber}`);
|
|
637
|
+
}
|
|
638
|
+
if (provenBlockNumber > 0 && !provenBlockHeader) {
|
|
639
|
+
throw new Error(`Failed to retrieve proven block header for block ${provenBlockNumber} (latest block is ${latestBlockNumber})`);
|
|
640
|
+
}
|
|
641
|
+
const latestBlockHeaderHash = await latestBlockHeader?.hash();
|
|
642
|
+
const provenBlockHeaderHash = await provenBlockHeader?.hash();
|
|
643
|
+
const finalizedBlockHeaderHash = await provenBlockHeader?.hash();
|
|
644
|
+
return {
|
|
645
|
+
latest: {
|
|
646
|
+
number: latestBlockNumber,
|
|
647
|
+
hash: latestBlockHeaderHash?.toString()
|
|
648
|
+
},
|
|
649
|
+
proven: {
|
|
650
|
+
number: provenBlockNumber,
|
|
651
|
+
hash: provenBlockHeaderHash?.toString()
|
|
652
|
+
},
|
|
653
|
+
finalized: {
|
|
654
|
+
number: provenBlockNumber,
|
|
655
|
+
hash: finalizedBlockHeaderHash?.toString()
|
|
656
|
+
}
|
|
657
|
+
};
|
|
658
|
+
}
|
|
659
|
+
}
|
|
660
|
+
_ts_decorate([
|
|
661
|
+
trackSpan('Archiver.sync', (initialRun)=>({
|
|
662
|
+
[Attributes.INITIAL_SYNC]: initialRun
|
|
663
|
+
}))
|
|
664
|
+
], Archiver.prototype, "sync", null);
|
|
665
|
+
var Operation = /*#__PURE__*/ function(Operation) {
|
|
623
666
|
Operation[Operation["Store"] = 0] = "Store";
|
|
624
667
|
Operation[Operation["Delete"] = 1] = "Delete";
|
|
625
|
-
|
|
668
|
+
return Operation;
|
|
669
|
+
}(Operation || {});
|
|
626
670
|
/**
|
|
627
671
|
* A helper class that we use to deal with some of the logic needed when adding blocks.
|
|
628
672
|
*
|
|
629
673
|
* I would have preferred to not have this type. But it is useful for handling the logic that any
|
|
630
674
|
* store would need to include otherwise while exposing fewer functions and logic directly to the archiver.
|
|
631
|
-
*/
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
|
|
675
|
+
*/ class ArchiverStoreHelper {
|
|
676
|
+
store;
|
|
677
|
+
#log;
|
|
678
|
+
constructor(store){
|
|
635
679
|
this.store = store;
|
|
636
|
-
|
|
680
|
+
this.#log = createLogger('archiver:block-helper');
|
|
637
681
|
}
|
|
638
682
|
// TODO(#10007): Remove this method
|
|
639
683
|
addContractClasses(contractClasses, bytecodeCommitments, blockNum) {
|
|
640
684
|
return this.store.addContractClasses(contractClasses, bytecodeCommitments, blockNum);
|
|
641
685
|
}
|
|
686
|
+
/**
|
|
687
|
+
* Extracts and stores contract classes out of ContractClassRegistered events emitted by the class registerer contract.
|
|
688
|
+
* @param allLogs - All logs emitted in a bunch of blocks.
|
|
689
|
+
*/ async #updateRegisteredContractClasses(allLogs, blockNum, operation) {
|
|
690
|
+
const contractClassRegisteredEvents = allLogs.filter((log)=>ContractClassRegisteredEvent.isContractClassRegisteredEvent(log)).map((log)=>ContractClassRegisteredEvent.fromLog(log));
|
|
691
|
+
const contractClasses = await Promise.all(contractClassRegisteredEvents.map((e)=>e.toContractClassPublic()));
|
|
692
|
+
if (contractClasses.length > 0) {
|
|
693
|
+
contractClasses.forEach((c)=>this.#log.verbose(`${Operation[operation]} contract class ${c.id.toString()}`));
|
|
694
|
+
if (operation == 0) {
|
|
695
|
+
// TODO: Will probably want to create some worker threads to compute these bytecode commitments as they are expensive
|
|
696
|
+
const commitments = await Promise.all(contractClasses.map((c)=>computePublicBytecodeCommitment(c.packedBytecode)));
|
|
697
|
+
return await this.store.addContractClasses(contractClasses, commitments, blockNum);
|
|
698
|
+
} else if (operation == 1) {
|
|
699
|
+
return await this.store.deleteContractClasses(contractClasses, blockNum);
|
|
700
|
+
}
|
|
701
|
+
}
|
|
702
|
+
return true;
|
|
703
|
+
}
|
|
704
|
+
/**
|
|
705
|
+
* Extracts and stores contract instances out of ContractInstanceDeployed events emitted by the canonical deployer contract.
|
|
706
|
+
* @param allLogs - All logs emitted in a bunch of blocks.
|
|
707
|
+
*/ async #updateDeployedContractInstances(allLogs, blockNum, operation) {
|
|
708
|
+
const contractInstances = allLogs.filter((log)=>ContractInstanceDeployedEvent.isContractInstanceDeployedEvent(log)).map((log)=>ContractInstanceDeployedEvent.fromLog(log)).map((e)=>e.toContractInstance());
|
|
709
|
+
if (contractInstances.length > 0) {
|
|
710
|
+
contractInstances.forEach((c)=>this.#log.verbose(`${Operation[operation]} contract instance at ${c.address.toString()}`));
|
|
711
|
+
if (operation == 0) {
|
|
712
|
+
return await this.store.addContractInstances(contractInstances, blockNum);
|
|
713
|
+
} else if (operation == 1) {
|
|
714
|
+
return await this.store.deleteContractInstances(contractInstances, blockNum);
|
|
715
|
+
}
|
|
716
|
+
}
|
|
717
|
+
return true;
|
|
718
|
+
}
|
|
719
|
+
/**
|
|
720
|
+
* Extracts and stores contract instances out of ContractInstanceDeployed events emitted by the canonical deployer contract.
|
|
721
|
+
* @param allLogs - All logs emitted in a bunch of blocks.
|
|
722
|
+
*/ async #updateUpdatedContractInstances(allLogs, blockNum, operation) {
|
|
723
|
+
const contractUpdates = allLogs.filter((log)=>ContractInstanceUpdatedEvent.isContractInstanceUpdatedEvent(log)).map((log)=>ContractInstanceUpdatedEvent.fromLog(log)).map((e)=>e.toContractInstanceUpdate());
|
|
724
|
+
if (contractUpdates.length > 0) {
|
|
725
|
+
contractUpdates.forEach((c)=>this.#log.verbose(`${Operation[operation]} contract instance update at ${c.address.toString()}`));
|
|
726
|
+
if (operation == 0) {
|
|
727
|
+
return await this.store.addContractInstanceUpdates(contractUpdates, blockNum);
|
|
728
|
+
} else if (operation == 1) {
|
|
729
|
+
return await this.store.deleteContractInstanceUpdates(contractUpdates, blockNum);
|
|
730
|
+
}
|
|
731
|
+
}
|
|
732
|
+
return true;
|
|
733
|
+
}
|
|
734
|
+
/**
|
|
735
|
+
* Stores the functions that was broadcasted individually
|
|
736
|
+
*
|
|
737
|
+
* @dev Beware that there is not a delete variant of this, since they are added to contract classes
|
|
738
|
+
* and will be deleted as part of the class if needed.
|
|
739
|
+
*
|
|
740
|
+
* @param allLogs - The logs from the block
|
|
741
|
+
* @param _blockNum - The block number
|
|
742
|
+
* @returns
|
|
743
|
+
*/ async #storeBroadcastedIndividualFunctions(allLogs, _blockNum) {
|
|
744
|
+
// Filter out private and unconstrained function broadcast events
|
|
745
|
+
const privateFnEvents = allLogs.filter((log)=>PrivateFunctionBroadcastedEvent.isPrivateFunctionBroadcastedEvent(log)).map((log)=>PrivateFunctionBroadcastedEvent.fromLog(log));
|
|
746
|
+
const unconstrainedFnEvents = allLogs.filter((log)=>UnconstrainedFunctionBroadcastedEvent.isUnconstrainedFunctionBroadcastedEvent(log)).map((log)=>UnconstrainedFunctionBroadcastedEvent.fromLog(log));
|
|
747
|
+
// Group all events by contract class id
|
|
748
|
+
for (const [classIdString, classEvents] of Object.entries(groupBy([
|
|
749
|
+
...privateFnEvents,
|
|
750
|
+
...unconstrainedFnEvents
|
|
751
|
+
], (e)=>e.contractClassId.toString()))){
|
|
752
|
+
const contractClassId = Fr.fromHexString(classIdString);
|
|
753
|
+
const contractClass = await this.getContractClass(contractClassId);
|
|
754
|
+
if (!contractClass) {
|
|
755
|
+
this.#log.warn(`Skipping broadcasted functions as contract class ${contractClassId.toString()} was not found`);
|
|
756
|
+
continue;
|
|
757
|
+
}
|
|
758
|
+
// Split private and unconstrained functions, and filter out invalid ones
|
|
759
|
+
const allFns = classEvents.map((e)=>e.toFunctionWithMembershipProof());
|
|
760
|
+
const privateFns = allFns.filter((fn)=>'unconstrainedFunctionsArtifactTreeRoot' in fn);
|
|
761
|
+
const unconstrainedFns = allFns.filter((fn)=>'privateFunctionsArtifactTreeRoot' in fn);
|
|
762
|
+
const privateFunctionsWithValidity = await Promise.all(privateFns.map(async (fn)=>({
|
|
763
|
+
fn,
|
|
764
|
+
valid: await isValidPrivateFunctionMembershipProof(fn, contractClass)
|
|
765
|
+
})));
|
|
766
|
+
const validPrivateFns = privateFunctionsWithValidity.filter(({ valid })=>valid).map(({ fn })=>fn);
|
|
767
|
+
const unconstrainedFunctionsWithValidity = await Promise.all(unconstrainedFns.map(async (fn)=>({
|
|
768
|
+
fn,
|
|
769
|
+
valid: await isValidUnconstrainedFunctionMembershipProof(fn, contractClass)
|
|
770
|
+
})));
|
|
771
|
+
const validUnconstrainedFns = unconstrainedFunctionsWithValidity.filter(({ valid })=>valid).map(({ fn })=>fn);
|
|
772
|
+
const validFnCount = validPrivateFns.length + validUnconstrainedFns.length;
|
|
773
|
+
if (validFnCount !== allFns.length) {
|
|
774
|
+
this.#log.warn(`Skipping ${allFns.length - validFnCount} invalid functions`);
|
|
775
|
+
}
|
|
776
|
+
// Store the functions in the contract class in a single operation
|
|
777
|
+
if (validFnCount > 0) {
|
|
778
|
+
this.#log.verbose(`Storing ${validFnCount} functions for contract class ${contractClassId.toString()}`);
|
|
779
|
+
}
|
|
780
|
+
return await this.store.addFunctions(contractClassId, validPrivateFns, validUnconstrainedFns);
|
|
781
|
+
}
|
|
782
|
+
return true;
|
|
783
|
+
}
|
|
642
784
|
async addBlocks(blocks) {
|
|
643
785
|
const opResults = await Promise.all([
|
|
644
|
-
this.store.addLogs(blocks.map(block
|
|
786
|
+
this.store.addLogs(blocks.map((block)=>block.data)),
|
|
645
787
|
// Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
|
|
646
|
-
...blocks.map(async (block)
|
|
647
|
-
const contractClassLogs = block.data.body.txEffects
|
|
648
|
-
.flatMap(txEffect => (txEffect ? [txEffect.contractClassLogs] : []))
|
|
649
|
-
.flatMap(txLog => txLog.unrollLogs());
|
|
788
|
+
...blocks.map(async (block)=>{
|
|
789
|
+
const contractClassLogs = block.data.body.txEffects.flatMap((txEffect)=>txEffect.contractClassLogs);
|
|
650
790
|
// ContractInstanceDeployed event logs are broadcast in privateLogs.
|
|
651
|
-
const privateLogs = block.data.body.txEffects.flatMap(txEffect
|
|
791
|
+
const privateLogs = block.data.body.txEffects.flatMap((txEffect)=>txEffect.privateLogs);
|
|
792
|
+
const publicLogs = block.data.body.txEffects.flatMap((txEffect)=>txEffect.publicLogs);
|
|
652
793
|
return (await Promise.all([
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
|
|
794
|
+
this.#updateRegisteredContractClasses(contractClassLogs, block.data.number, 0),
|
|
795
|
+
this.#updateDeployedContractInstances(privateLogs, block.data.number, 0),
|
|
796
|
+
this.#updateUpdatedContractInstances(publicLogs, block.data.number, 0),
|
|
797
|
+
this.#storeBroadcastedIndividualFunctions(contractClassLogs, block.data.number)
|
|
656
798
|
])).every(Boolean);
|
|
657
799
|
}),
|
|
658
|
-
this.store.addNullifiers(blocks.map(block
|
|
659
|
-
this.store.addBlocks(blocks)
|
|
800
|
+
this.store.addNullifiers(blocks.map((block)=>block.data)),
|
|
801
|
+
this.store.addBlocks(blocks)
|
|
660
802
|
]);
|
|
661
803
|
return opResults.every(Boolean);
|
|
662
804
|
}
|
|
@@ -669,19 +811,19 @@ class ArchiverStoreHelper {
|
|
|
669
811
|
const blocks = await this.getBlocks(from - blocksToUnwind + 1, blocksToUnwind);
|
|
670
812
|
const opResults = await Promise.all([
|
|
671
813
|
// Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
|
|
672
|
-
...blocks.map(async (block)
|
|
673
|
-
const contractClassLogs = block.data.body.txEffects
|
|
674
|
-
.flatMap(txEffect => (txEffect ? [txEffect.contractClassLogs] : []))
|
|
675
|
-
.flatMap(txLog => txLog.unrollLogs());
|
|
814
|
+
...blocks.map(async (block)=>{
|
|
815
|
+
const contractClassLogs = block.data.body.txEffects.flatMap((txEffect)=>txEffect.contractClassLogs);
|
|
676
816
|
// ContractInstanceDeployed event logs are broadcast in privateLogs.
|
|
677
|
-
const privateLogs = block.data.body.txEffects.flatMap(txEffect
|
|
817
|
+
const privateLogs = block.data.body.txEffects.flatMap((txEffect)=>txEffect.privateLogs);
|
|
818
|
+
const publicLogs = block.data.body.txEffects.flatMap((txEffect)=>txEffect.publicLogs);
|
|
678
819
|
return (await Promise.all([
|
|
679
|
-
|
|
680
|
-
|
|
820
|
+
this.#updateRegisteredContractClasses(contractClassLogs, block.data.number, 1),
|
|
821
|
+
this.#updateDeployedContractInstances(privateLogs, block.data.number, 1),
|
|
822
|
+
this.#updateUpdatedContractInstances(publicLogs, block.data.number, 1)
|
|
681
823
|
])).every(Boolean);
|
|
682
824
|
}),
|
|
683
|
-
this.store.deleteLogs(blocks.map(b
|
|
684
|
-
this.store.unwindBlocks(from, blocksToUnwind)
|
|
825
|
+
this.store.deleteLogs(blocks.map((b)=>b.data)),
|
|
826
|
+
this.store.unwindBlocks(from, blocksToUnwind)
|
|
685
827
|
]);
|
|
686
828
|
return opResults.every(Boolean);
|
|
687
829
|
}
|
|
@@ -770,96 +912,3 @@ class ArchiverStoreHelper {
|
|
|
770
912
|
return this.store.estimateSize();
|
|
771
913
|
}
|
|
772
914
|
}
|
|
773
|
-
_ArchiverStoreHelper_log = new WeakMap(), _ArchiverStoreHelper_instances = new WeakSet(), _ArchiverStoreHelper_updateRegisteredContractClasses =
|
|
774
|
-
/**
|
|
775
|
-
* Extracts and stores contract classes out of ContractClassRegistered events emitted by the class registerer contract.
|
|
776
|
-
* @param allLogs - All logs emitted in a bunch of blocks.
|
|
777
|
-
*/
|
|
778
|
-
async function _ArchiverStoreHelper_updateRegisteredContractClasses(allLogs, blockNum, operation) {
|
|
779
|
-
const contractClassRegisteredEvents = allLogs
|
|
780
|
-
.filter(log => ContractClassRegisteredEvent.isContractClassRegisteredEvent(log.data))
|
|
781
|
-
.map(log => ContractClassRegisteredEvent.fromLog(log.data));
|
|
782
|
-
const contractClasses = await Promise.all(contractClassRegisteredEvents.map(e => e.toContractClassPublic()));
|
|
783
|
-
if (contractClasses.length > 0) {
|
|
784
|
-
contractClasses.forEach(c => __classPrivateFieldGet(this, _ArchiverStoreHelper_log, "f").verbose(`${Operation[operation]} contract class ${c.id.toString()}`));
|
|
785
|
-
if (operation == Operation.Store) {
|
|
786
|
-
// TODO: Will probably want to create some worker threads to compute these bytecode commitments as they are expensive
|
|
787
|
-
const commitments = await Promise.all(contractClasses.map(c => computePublicBytecodeCommitment(c.packedBytecode)));
|
|
788
|
-
return await this.store.addContractClasses(contractClasses, commitments, blockNum);
|
|
789
|
-
}
|
|
790
|
-
else if (operation == Operation.Delete) {
|
|
791
|
-
return await this.store.deleteContractClasses(contractClasses, blockNum);
|
|
792
|
-
}
|
|
793
|
-
}
|
|
794
|
-
return true;
|
|
795
|
-
}, _ArchiverStoreHelper_updateDeployedContractInstances =
|
|
796
|
-
/**
|
|
797
|
-
* Extracts and stores contract instances out of ContractInstanceDeployed events emitted by the canonical deployer contract.
|
|
798
|
-
* @param allLogs - All logs emitted in a bunch of blocks.
|
|
799
|
-
*/
|
|
800
|
-
async function _ArchiverStoreHelper_updateDeployedContractInstances(allLogs, blockNum, operation) {
|
|
801
|
-
const contractInstances = allLogs
|
|
802
|
-
.filter(log => ContractInstanceDeployedEvent.isContractInstanceDeployedEvent(log))
|
|
803
|
-
.map(log => ContractInstanceDeployedEvent.fromLog(log))
|
|
804
|
-
.map(e => e.toContractInstance());
|
|
805
|
-
if (contractInstances.length > 0) {
|
|
806
|
-
contractInstances.forEach(c => __classPrivateFieldGet(this, _ArchiverStoreHelper_log, "f").verbose(`${Operation[operation]} contract instance at ${c.address.toString()}`));
|
|
807
|
-
if (operation == Operation.Store) {
|
|
808
|
-
return await this.store.addContractInstances(contractInstances, blockNum);
|
|
809
|
-
}
|
|
810
|
-
else if (operation == Operation.Delete) {
|
|
811
|
-
return await this.store.deleteContractInstances(contractInstances, blockNum);
|
|
812
|
-
}
|
|
813
|
-
}
|
|
814
|
-
return true;
|
|
815
|
-
}, _ArchiverStoreHelper_storeBroadcastedIndividualFunctions =
|
|
816
|
-
/**
|
|
817
|
-
* Stores the functions that was broadcasted individually
|
|
818
|
-
*
|
|
819
|
-
* @dev Beware that there is not a delete variant of this, since they are added to contract classes
|
|
820
|
-
* and will be deleted as part of the class if needed.
|
|
821
|
-
*
|
|
822
|
-
* @param allLogs - The logs from the block
|
|
823
|
-
* @param _blockNum - The block number
|
|
824
|
-
* @returns
|
|
825
|
-
*/
|
|
826
|
-
async function _ArchiverStoreHelper_storeBroadcastedIndividualFunctions(allLogs, _blockNum) {
|
|
827
|
-
// Filter out private and unconstrained function broadcast events
|
|
828
|
-
const privateFnEvents = allLogs
|
|
829
|
-
.filter(log => PrivateFunctionBroadcastedEvent.isPrivateFunctionBroadcastedEvent(log.data))
|
|
830
|
-
.map(log => PrivateFunctionBroadcastedEvent.fromLog(log.data));
|
|
831
|
-
const unconstrainedFnEvents = allLogs
|
|
832
|
-
.filter(log => UnconstrainedFunctionBroadcastedEvent.isUnconstrainedFunctionBroadcastedEvent(log.data))
|
|
833
|
-
.map(log => UnconstrainedFunctionBroadcastedEvent.fromLog(log.data));
|
|
834
|
-
// Group all events by contract class id
|
|
835
|
-
for (const [classIdString, classEvents] of Object.entries(groupBy([...privateFnEvents, ...unconstrainedFnEvents], e => e.contractClassId.toString()))) {
|
|
836
|
-
const contractClassId = Fr.fromHexString(classIdString);
|
|
837
|
-
const contractClass = await this.getContractClass(contractClassId);
|
|
838
|
-
if (!contractClass) {
|
|
839
|
-
__classPrivateFieldGet(this, _ArchiverStoreHelper_log, "f").warn(`Skipping broadcasted functions as contract class ${contractClassId.toString()} was not found`);
|
|
840
|
-
continue;
|
|
841
|
-
}
|
|
842
|
-
// Split private and unconstrained functions, and filter out invalid ones
|
|
843
|
-
const allFns = classEvents.map(e => e.toFunctionWithMembershipProof());
|
|
844
|
-
const privateFns = allFns.filter((fn) => 'unconstrainedFunctionsArtifactTreeRoot' in fn);
|
|
845
|
-
const unconstrainedFns = allFns.filter((fn) => 'privateFunctionsArtifactTreeRoot' in fn);
|
|
846
|
-
const privateFunctionsWithValidity = await Promise.all(privateFns.map(async (fn) => ({ fn, valid: await isValidPrivateFunctionMembershipProof(fn, contractClass) })));
|
|
847
|
-
const validPrivateFns = privateFunctionsWithValidity.filter(({ valid }) => valid).map(({ fn }) => fn);
|
|
848
|
-
const unconstrainedFunctionsWithValidity = await Promise.all(unconstrainedFns.map(async (fn) => ({
|
|
849
|
-
fn,
|
|
850
|
-
valid: await isValidUnconstrainedFunctionMembershipProof(fn, contractClass),
|
|
851
|
-
})));
|
|
852
|
-
const validUnconstrainedFns = unconstrainedFunctionsWithValidity.filter(({ valid }) => valid).map(({ fn }) => fn);
|
|
853
|
-
const validFnCount = validPrivateFns.length + validUnconstrainedFns.length;
|
|
854
|
-
if (validFnCount !== allFns.length) {
|
|
855
|
-
__classPrivateFieldGet(this, _ArchiverStoreHelper_log, "f").warn(`Skipping ${allFns.length - validFnCount} invalid functions`);
|
|
856
|
-
}
|
|
857
|
-
// Store the functions in the contract class in a single operation
|
|
858
|
-
if (validFnCount > 0) {
|
|
859
|
-
__classPrivateFieldGet(this, _ArchiverStoreHelper_log, "f").verbose(`Storing ${validFnCount} functions for contract class ${contractClassId.toString()}`);
|
|
860
|
-
}
|
|
861
|
-
return await this.store.addFunctions(contractClassId, validPrivateFns, validUnconstrainedFns);
|
|
862
|
-
}
|
|
863
|
-
return true;
|
|
864
|
-
};
|
|
865
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver.js","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}
|