@aztec/epoch-cache 0.0.1-commit.10bd49492 → 0.0.1-commit.11bf3dd6e
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 +211 -0
- package/dest/config.d.ts +3 -2
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +3 -1
- package/dest/epoch_cache.d.ts +77 -17
- package/dest/epoch_cache.d.ts.map +1 -1
- package/dest/epoch_cache.js +227 -68
- package/dest/test/test_epoch_cache.d.ts +19 -3
- package/dest/test/test_epoch_cache.d.ts.map +1 -1
- package/dest/test/test_epoch_cache.js +57 -11
- package/package.json +5 -5
- package/src/config.ts +9 -3
- package/src/epoch_cache.ts +280 -62
- package/src/test/test_epoch_cache.ts +83 -12
package/dest/epoch_cache.js
CHANGED
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
import { createEthereumChain } from '@aztec/ethereum/chain';
|
|
2
|
+
import { makeL1HttpTransport } from '@aztec/ethereum/client';
|
|
2
3
|
import { NoCommitteeError, RollupContract } from '@aztec/ethereum/contracts';
|
|
4
|
+
import { SlotNumber } from '@aztec/foundation/branded-types';
|
|
3
5
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
6
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
7
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
6
|
-
import { getEpochAtSlot, getEpochNumberAtTimestamp, getSlotAtTimestamp, getSlotRangeForEpoch,
|
|
7
|
-
import { createPublicClient, encodeAbiParameters,
|
|
8
|
+
import { getEpochAtSlot, getEpochNumberAtTimestamp, getNextL1SlotTimestamp, getSlotAtNextL1Block, getSlotAtTimestamp, getSlotRangeForEpoch, getStartTimestampForEpoch, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
|
|
9
|
+
import { createPublicClient, encodeAbiParameters, keccak256 } from 'viem';
|
|
8
10
|
import { getEpochCacheConfigEnvVars } from './config.js';
|
|
11
|
+
/** When proposer pipelining is enabled, the proposer builds one slot ahead. */ export const PROPOSER_PIPELINING_SLOT_OFFSET = 1;
|
|
9
12
|
/**
|
|
10
13
|
* Epoch cache
|
|
11
14
|
*
|
|
@@ -19,14 +22,19 @@ import { getEpochCacheConfigEnvVars } from './config.js';
|
|
|
19
22
|
l1constants;
|
|
20
23
|
dateProvider;
|
|
21
24
|
config;
|
|
22
|
-
|
|
25
|
+
/**
|
|
26
|
+
* Single map holding both resolved entries and in-flight promises.
|
|
27
|
+
* A `Promise` value means a fetch is in progress; concurrent callers await it.
|
|
28
|
+
*/ // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
|
|
23
29
|
cache;
|
|
24
30
|
allValidators;
|
|
25
31
|
lastValidatorRefresh;
|
|
26
32
|
log;
|
|
33
|
+
enableProposerPipelining;
|
|
27
34
|
constructor(rollup, l1constants, dateProvider = new DateProvider(), config = {
|
|
28
35
|
cacheSize: 12,
|
|
29
|
-
validatorRefreshIntervalSeconds: 60
|
|
36
|
+
validatorRefreshIntervalSeconds: 60,
|
|
37
|
+
enableProposerPipelining: false
|
|
30
38
|
}){
|
|
31
39
|
this.rollup = rollup;
|
|
32
40
|
this.l1constants = l1constants;
|
|
@@ -36,8 +44,10 @@ import { getEpochCacheConfigEnvVars } from './config.js';
|
|
|
36
44
|
this.allValidators = new Set();
|
|
37
45
|
this.lastValidatorRefresh = 0;
|
|
38
46
|
this.log = createLogger('epoch-cache');
|
|
47
|
+
this.enableProposerPipelining = this.config.enableProposerPipelining;
|
|
39
48
|
this.log.debug(`Initialized EpochCache`, {
|
|
40
|
-
l1constants
|
|
49
|
+
l1constants,
|
|
50
|
+
enableProposerPipelining: this.enableProposerPipelining
|
|
41
51
|
});
|
|
42
52
|
}
|
|
43
53
|
static async create(rollupOrAddress, config, deps = {}) {
|
|
@@ -50,9 +60,9 @@ import { getEpochCacheConfigEnvVars } from './config.js';
|
|
|
50
60
|
const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
|
|
51
61
|
const publicClient = createPublicClient({
|
|
52
62
|
chain: chain.chainInfo,
|
|
53
|
-
transport:
|
|
54
|
-
|
|
55
|
-
|
|
63
|
+
transport: makeL1HttpTransport(config.l1RpcUrls, {
|
|
64
|
+
timeout: config.l1HttpTimeoutMS
|
|
65
|
+
}),
|
|
56
66
|
pollingInterval: config.viemPollingIntervalMS
|
|
57
67
|
});
|
|
58
68
|
rollup = new RollupContract(publicClient, rollupOrAddress.toString());
|
|
@@ -80,11 +90,35 @@ import { getEpochCacheConfigEnvVars } from './config.js';
|
|
|
80
90
|
targetCommitteeSize: Number(targetCommitteeSize),
|
|
81
91
|
rollupManaLimit: Number(rollupManaLimit)
|
|
82
92
|
};
|
|
83
|
-
return new EpochCache(rollup, l1RollupConstants, deps.dateProvider
|
|
93
|
+
return new EpochCache(rollup, l1RollupConstants, deps.dateProvider, {
|
|
94
|
+
cacheSize: 12,
|
|
95
|
+
validatorRefreshIntervalSeconds: 60,
|
|
96
|
+
enableProposerPipelining: config.enableProposerPipelining
|
|
97
|
+
});
|
|
84
98
|
}
|
|
85
99
|
getL1Constants() {
|
|
86
100
|
return this.l1constants;
|
|
87
101
|
}
|
|
102
|
+
isProposerPipeliningEnabled() {
|
|
103
|
+
return this.enableProposerPipelining;
|
|
104
|
+
}
|
|
105
|
+
pipeliningOffset() {
|
|
106
|
+
return this.enableProposerPipelining ? PROPOSER_PIPELINING_SLOT_OFFSET : 0;
|
|
107
|
+
}
|
|
108
|
+
getSlotNow() {
|
|
109
|
+
return this.getEpochAndSlotNow().slot;
|
|
110
|
+
}
|
|
111
|
+
getTargetSlot() {
|
|
112
|
+
const slotNow = this.getSlotNow();
|
|
113
|
+
const offset = this.isProposerPipeliningEnabled() ? PROPOSER_PIPELINING_SLOT_OFFSET : 0;
|
|
114
|
+
return SlotNumber(slotNow + offset);
|
|
115
|
+
}
|
|
116
|
+
getEpochNow() {
|
|
117
|
+
return this.getEpochAndSlotNow().epoch;
|
|
118
|
+
}
|
|
119
|
+
getTargetEpoch() {
|
|
120
|
+
return getEpochAtSlot(this.getTargetSlot(), this.l1constants);
|
|
121
|
+
}
|
|
88
122
|
getEpochAndSlotNow() {
|
|
89
123
|
const nowMs = BigInt(this.dateProvider.now());
|
|
90
124
|
const nowSeconds = nowMs / 1000n;
|
|
@@ -93,48 +127,44 @@ import { getEpochCacheConfigEnvVars } from './config.js';
|
|
|
93
127
|
nowMs
|
|
94
128
|
};
|
|
95
129
|
}
|
|
96
|
-
nowInSeconds() {
|
|
97
|
-
return BigInt(Math.floor(this.dateProvider.now() / 1000));
|
|
98
|
-
}
|
|
99
130
|
getEpochAndSlotAtSlot(slot) {
|
|
100
|
-
|
|
101
|
-
const ts = getTimestampRangeForEpoch(epoch, this.l1constants)[0];
|
|
102
|
-
return {
|
|
103
|
-
epoch,
|
|
104
|
-
ts,
|
|
105
|
-
slot
|
|
106
|
-
};
|
|
131
|
+
return this.getEpochAndSlotAtTimestamp(getTimestampForSlot(slot, this.l1constants));
|
|
107
132
|
}
|
|
108
133
|
getEpochAndSlotInNextL1Slot() {
|
|
109
|
-
const
|
|
110
|
-
const nextSlotTs =
|
|
134
|
+
const nowSeconds = this.dateProvider.nowInSeconds();
|
|
135
|
+
const nextSlotTs = getNextL1SlotTimestamp(nowSeconds, this.l1constants);
|
|
111
136
|
return {
|
|
112
137
|
...this.getEpochAndSlotAtTimestamp(nextSlotTs),
|
|
113
|
-
|
|
138
|
+
nowSeconds: BigInt(nowSeconds)
|
|
139
|
+
};
|
|
140
|
+
}
|
|
141
|
+
getTargetEpochAndSlotInNextL1Slot() {
|
|
142
|
+
if (!this.isProposerPipeliningEnabled()) {
|
|
143
|
+
return this.getEpochAndSlotInNextL1Slot();
|
|
144
|
+
}
|
|
145
|
+
const result = this.getEpochAndSlotInNextL1Slot();
|
|
146
|
+
const offset = PROPOSER_PIPELINING_SLOT_OFFSET;
|
|
147
|
+
const targetSlot = SlotNumber(result.slot + offset);
|
|
148
|
+
return {
|
|
149
|
+
...result,
|
|
150
|
+
slot: targetSlot,
|
|
151
|
+
epoch: getEpochAtSlot(targetSlot, this.l1constants)
|
|
114
152
|
};
|
|
115
153
|
}
|
|
116
154
|
getEpochAndSlotAtTimestamp(ts) {
|
|
117
155
|
const slot = getSlotAtTimestamp(ts, this.l1constants);
|
|
156
|
+
const epoch = getEpochNumberAtTimestamp(ts, this.l1constants);
|
|
118
157
|
return {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
slot
|
|
158
|
+
slot,
|
|
159
|
+
epoch,
|
|
160
|
+
ts: getTimestampForSlot(slot, this.l1constants)
|
|
122
161
|
};
|
|
123
162
|
}
|
|
124
163
|
getCommitteeForEpoch(epoch) {
|
|
125
164
|
const [startSlot] = getSlotRangeForEpoch(epoch, this.l1constants);
|
|
126
165
|
return this.getCommittee(startSlot);
|
|
127
166
|
}
|
|
128
|
-
/**
|
|
129
|
-
* Returns whether the escape hatch is open for the given epoch.
|
|
130
|
-
*
|
|
131
|
-
* Uses the already-cached EpochCommitteeInfo when available. If not cached, it will fetch
|
|
132
|
-
* the epoch committee info (which includes the escape hatch flag) and return it.
|
|
133
|
-
*/ async isEscapeHatchOpen(epoch) {
|
|
134
|
-
const cached = this.cache.get(epoch);
|
|
135
|
-
if (cached) {
|
|
136
|
-
return cached.isEscapeHatchOpen;
|
|
137
|
-
}
|
|
167
|
+
/** Returns whether the escape hatch is open for the given epoch. */ async isEscapeHatchOpen(epoch) {
|
|
138
168
|
const info = await this.getCommitteeForEpoch(epoch);
|
|
139
169
|
return info.isEscapeHatchOpen;
|
|
140
170
|
}
|
|
@@ -144,30 +174,47 @@ import { getEpochCacheConfigEnvVars } from './config.js';
|
|
|
144
174
|
* This is a lightweight helper intended for callers that already have a slot number and only
|
|
145
175
|
* need the escape hatch flag (without pulling full committee info).
|
|
146
176
|
*/ async isEscapeHatchOpenAtSlot(slot = 'now') {
|
|
147
|
-
const epoch = slot === 'now' ? this.
|
|
177
|
+
const epoch = slot === 'now' ? this.getEpochNow() : slot === 'next' ? this.getEpochAndSlotInNextL1Slot().epoch : getEpochAtSlot(slot, this.l1constants);
|
|
148
178
|
return await this.isEscapeHatchOpen(epoch);
|
|
149
179
|
}
|
|
150
180
|
/**
|
|
151
|
-
* Get the current validator set
|
|
152
|
-
*
|
|
153
|
-
*
|
|
181
|
+
* Get the current validator set.
|
|
182
|
+
*
|
|
183
|
+
* Returns cached data if the entry is finalized or still fresh (queried less than one
|
|
184
|
+
* Ethereum slot ago). Stale non-finalized entries are re-queried, and concurrent callers
|
|
185
|
+
* coalesce on the same in-flight promise so the L1 query happens only once.
|
|
154
186
|
*/ async getCommittee(slot = 'now') {
|
|
155
187
|
const { epoch, ts } = this.getEpochAndTimestamp(slot);
|
|
156
|
-
|
|
157
|
-
|
|
188
|
+
const cached = this.cache.get(epoch);
|
|
189
|
+
// In-flight promise: another caller is already fetching this epoch — just await it.
|
|
190
|
+
if (cached instanceof Promise) {
|
|
191
|
+
return (await cached).data;
|
|
158
192
|
}
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
}
|
|
163
|
-
//
|
|
164
|
-
if
|
|
165
|
-
|
|
193
|
+
// Resolved entry: return it if finalized or still fresh.
|
|
194
|
+
if (cached && (cached.finalized || !this.isStale(cached))) {
|
|
195
|
+
return cached.data;
|
|
196
|
+
}
|
|
197
|
+
// Stale non-finalized entry: do a lightweight refresh first (check block hash + finalized ts).
|
|
198
|
+
// Only fall back to a full re-fetch if the L1 block was reorged.
|
|
199
|
+
if (cached) {
|
|
200
|
+
const promise = this.refreshStaleEntry(cached, epoch, ts);
|
|
201
|
+
this.cache.set(epoch, promise);
|
|
202
|
+
try {
|
|
203
|
+
return (await promise).data;
|
|
204
|
+
} catch (err) {
|
|
205
|
+
this.cache.set(epoch, cached);
|
|
206
|
+
throw err;
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
// No entry at all: full fetch.
|
|
210
|
+
const promise = this.fetchAndCache(epoch, ts);
|
|
211
|
+
this.cache.set(epoch, promise);
|
|
212
|
+
try {
|
|
213
|
+
return (await promise).data;
|
|
214
|
+
} catch (err) {
|
|
215
|
+
this.cache.delete(epoch);
|
|
216
|
+
throw err;
|
|
166
217
|
}
|
|
167
|
-
this.cache.set(epoch, epochData);
|
|
168
|
-
const toPurge = Array.from(this.cache.keys()).sort((a, b)=>Number(b - a)).slice(this.config.cacheSize);
|
|
169
|
-
toPurge.forEach((key)=>this.cache.delete(key));
|
|
170
|
-
return epochData;
|
|
171
218
|
}
|
|
172
219
|
getEpochAndTimestamp(slot = 'now') {
|
|
173
220
|
if (slot === 'now') {
|
|
@@ -178,27 +225,126 @@ import { getEpochCacheConfigEnvVars } from './config.js';
|
|
|
178
225
|
return this.getEpochAndSlotAtSlot(slot);
|
|
179
226
|
}
|
|
180
227
|
}
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
228
|
+
/** Evicts oldest cache entries (resolved or in-flight) beyond cacheSize. */ purgeCache() {
|
|
229
|
+
if (this.cache.size <= this.config.cacheSize) {
|
|
230
|
+
return;
|
|
231
|
+
}
|
|
232
|
+
const toPurge = Array.from(this.cache.keys()).sort((a, b)=>Number(b - a)).slice(this.config.cacheSize);
|
|
233
|
+
toPurge.forEach((key)=>this.cache.delete(key));
|
|
234
|
+
}
|
|
235
|
+
/** Returns true if a non-finalized cache entry is older than one Ethereum slot. */ isStale(entry) {
|
|
236
|
+
const nowSeconds = BigInt(this.dateProvider.nowInSeconds());
|
|
237
|
+
return nowSeconds - entry.lastRefreshL1Timestamp >= BigInt(this.l1constants.ethereumSlotDuration);
|
|
238
|
+
}
|
|
239
|
+
/** Whether a cached epoch entry has been marked as finalized. Returns undefined if not cached or still in-flight. */ isFinalized(epoch) {
|
|
240
|
+
const entry = this.cache.get(epoch);
|
|
241
|
+
if (!entry || entry instanceof Promise) {
|
|
242
|
+
return undefined;
|
|
243
|
+
}
|
|
244
|
+
return entry.finalized;
|
|
245
|
+
}
|
|
246
|
+
/** Returns the latest L1 timestamp stored in the cached entry. Undefined if not cached or in-flight. */ getCachedLastRefreshL1Timestamp(epoch) {
|
|
247
|
+
const entry = this.cache.get(epoch);
|
|
248
|
+
if (!entry || entry instanceof Promise) {
|
|
249
|
+
return undefined;
|
|
250
|
+
}
|
|
251
|
+
return entry.lastRefreshL1Timestamp;
|
|
252
|
+
}
|
|
253
|
+
/** Computes the sampling timestamp for an epoch's committee data. */ getSamplingTimestamp(epoch) {
|
|
254
|
+
const { lagInEpochsForRandao, epochDuration, slotDuration } = this.l1constants;
|
|
255
|
+
const epochStartTs = getStartTimestampForEpoch(epoch, this.l1constants);
|
|
256
|
+
return epochStartTs - BigInt(lagInEpochsForRandao) * BigInt(epochDuration) * BigInt(slotDuration);
|
|
257
|
+
}
|
|
258
|
+
/**
|
|
259
|
+
* Lightweight refresh for a stale non-finalized entry. Queries only the block hash at
|
|
260
|
+
* the original block number and the finalized block timestamp — avoids the expensive
|
|
261
|
+
* getCommitteeAt and getSampleSeedAt calls on the rollup contract.
|
|
262
|
+
*
|
|
263
|
+
* If the block hash still matches (no L1 reorg), we keep the existing data and just
|
|
264
|
+
* update the provenance timestamp. If the finalized block has caught up, we promote the
|
|
265
|
+
* entry to finalized. If there was a reorg (hash mismatch), we fall back to a full fetch.
|
|
266
|
+
*/ async refreshStaleEntry(stale, epoch, ts) {
|
|
267
|
+
const [blockAtOriginal, l1FinalizedBlock, latestBlock] = await Promise.all([
|
|
268
|
+
this.rollup.client.getBlock({
|
|
269
|
+
blockNumber: stale.lastQueryL1BlockNumber,
|
|
270
|
+
includeTransactions: false
|
|
271
|
+
}),
|
|
272
|
+
this.rollup.client.getBlock({
|
|
273
|
+
blockTag: 'finalized',
|
|
274
|
+
includeTransactions: false
|
|
275
|
+
}),
|
|
276
|
+
this.rollup.client.getBlock({
|
|
277
|
+
includeTransactions: false
|
|
278
|
+
})
|
|
279
|
+
]);
|
|
280
|
+
if (blockAtOriginal.hash === stale.lastQueryL1BlockHash) {
|
|
281
|
+
// No reorg: the data is still valid. Check if we can now mark it as finalized.
|
|
282
|
+
const samplingTs = this.getSamplingTimestamp(epoch);
|
|
283
|
+
const finalized = !!(stale.data.committee && stale.data.committee.length > 0) && samplingTs <= l1FinalizedBlock.timestamp;
|
|
284
|
+
const refreshed = {
|
|
285
|
+
...stale,
|
|
286
|
+
lastRefreshL1Timestamp: latestBlock.timestamp,
|
|
287
|
+
finalized
|
|
288
|
+
};
|
|
289
|
+
this.cache.set(epoch, refreshed);
|
|
290
|
+
return refreshed;
|
|
291
|
+
}
|
|
292
|
+
// Reorg detected: block hash mismatch. Do a full re-fetch.
|
|
293
|
+
// Pass the already-fetched block timestamps to avoid redundant queries.
|
|
294
|
+
this.log.warn(`L1 reorg detected for epoch ${epoch}: block ${stale.lastQueryL1BlockNumber} hash changed`, {
|
|
295
|
+
epoch,
|
|
296
|
+
expectedHash: stale.lastQueryL1BlockHash,
|
|
297
|
+
actualHash: blockAtOriginal.hash
|
|
298
|
+
});
|
|
299
|
+
return this.fetchAndCache(epoch, ts, {
|
|
300
|
+
latestBlock,
|
|
301
|
+
finalizedBlock: l1FinalizedBlock
|
|
302
|
+
});
|
|
303
|
+
}
|
|
304
|
+
/**
|
|
305
|
+
* Fetches committee data from L1, determines finalization status, and stores in the cache.
|
|
306
|
+
*
|
|
307
|
+
* Uses `lagInEpochsForRandao` (the binding constraint, always <= lagInEpochsForValidatorSet)
|
|
308
|
+
* and computes the sampling timestamp from the epoch start to match the L1 contract's logic.
|
|
309
|
+
*
|
|
310
|
+
* When called from refreshStaleEntry after a reorg, the latest and finalized blocks are
|
|
311
|
+
* passed in to avoid redundant L1 queries.
|
|
312
|
+
*/ async fetchAndCache(epoch, ts, prefetched) {
|
|
313
|
+
const [committee, seedBuffer, latestBlock, finalizedBlock, isEscapeHatchOpen] = await Promise.all([
|
|
184
314
|
this.rollup.getCommitteeAt(ts),
|
|
185
315
|
this.rollup.getSampleSeedAt(ts),
|
|
186
|
-
this.rollup.client.getBlock({
|
|
316
|
+
prefetched?.latestBlock ?? this.rollup.client.getBlock({
|
|
187
317
|
includeTransactions: false
|
|
188
|
-
})
|
|
318
|
+
}),
|
|
319
|
+
prefetched?.finalizedBlock ?? this.rollup.client.getBlock({
|
|
320
|
+
blockTag: 'finalized',
|
|
321
|
+
includeTransactions: false
|
|
322
|
+
}),
|
|
189
323
|
this.rollup.isEscapeHatchOpen(epoch)
|
|
190
324
|
]);
|
|
191
|
-
const
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
throw new Error(`Cannot query committee for future epoch ${epoch} with timestamp ${ts} (current L1 time is ${l1Timestamp}). Check your Ethereum node is synced.`);
|
|
325
|
+
const samplingTs = this.getSamplingTimestamp(epoch);
|
|
326
|
+
if (samplingTs > latestBlock.timestamp) {
|
|
327
|
+
throw new Error(`Cannot query committee for future epoch ${epoch}: ` + `sampling timestamp ${samplingTs} is beyond latest L1 block at ${latestBlock.timestamp}. ` + `Check your Ethereum node is synced.`);
|
|
195
328
|
}
|
|
196
|
-
|
|
329
|
+
// Empty committees are never marked finalized so they always get re-queried after TTL.
|
|
330
|
+
const hasCommittee = !!(committee && committee.length > 0);
|
|
331
|
+
const finalized = hasCommittee && samplingTs <= finalizedBlock.timestamp;
|
|
332
|
+
const data = {
|
|
197
333
|
committee,
|
|
198
334
|
seed: seedBuffer.toBigInt(),
|
|
199
335
|
epoch,
|
|
200
336
|
isEscapeHatchOpen
|
|
201
337
|
};
|
|
338
|
+
const entry = {
|
|
339
|
+
data,
|
|
340
|
+
lastQueryL1BlockNumber: latestBlock.number,
|
|
341
|
+
lastQueryL1BlockHash: latestBlock.hash,
|
|
342
|
+
lastRefreshL1Timestamp: latestBlock.timestamp,
|
|
343
|
+
finalized
|
|
344
|
+
};
|
|
345
|
+
this.cache.set(epoch, entry);
|
|
346
|
+
this.purgeCache();
|
|
347
|
+
return entry;
|
|
202
348
|
}
|
|
203
349
|
/**
|
|
204
350
|
* Get the ABI encoding of the proposer index - see ValidatorSelectionLib.sol computeProposerIndex
|
|
@@ -229,14 +375,26 @@ import { getEpochCacheConfigEnvVars } from './config.js';
|
|
|
229
375
|
}
|
|
230
376
|
return BigInt(keccak256(this.getProposerIndexEncoding(epoch, slot, seed))) % size;
|
|
231
377
|
}
|
|
232
|
-
/** Returns the current and next L2 slot
|
|
233
|
-
const
|
|
378
|
+
/** Returns the current and next L2 slot in next eth L1 Slot. */ getCurrentAndNextSlot() {
|
|
379
|
+
const currentSlot = this.getSlotNow();
|
|
234
380
|
const next = this.getEpochAndSlotInNextL1Slot();
|
|
235
381
|
return {
|
|
236
|
-
currentSlot
|
|
382
|
+
currentSlot,
|
|
237
383
|
nextSlot: next.slot
|
|
238
384
|
};
|
|
239
385
|
}
|
|
386
|
+
/** Returns the target and next L2 slot in the next L1 slot. */ getTargetAndNextSlot() {
|
|
387
|
+
const nowSeconds = BigInt(this.dateProvider.nowInSeconds());
|
|
388
|
+
const offset = this.isProposerPipeliningEnabled() ? PROPOSER_PIPELINING_SLOT_OFFSET : 0;
|
|
389
|
+
const currentSlot = getSlotAtTimestamp(nowSeconds, this.l1constants);
|
|
390
|
+
const targetSlot = SlotNumber(currentSlot + offset);
|
|
391
|
+
const nextL2SlotOnL1 = getSlotAtNextL1Block(nowSeconds, this.l1constants);
|
|
392
|
+
const nextSlot = SlotNumber(nextL2SlotOnL1 + offset);
|
|
393
|
+
return {
|
|
394
|
+
targetSlot,
|
|
395
|
+
nextSlot
|
|
396
|
+
};
|
|
397
|
+
}
|
|
240
398
|
/**
|
|
241
399
|
* Get the proposer attester address in the given L2 slot
|
|
242
400
|
* @returns The proposer attester address. If the committee does not exist, we throw a NoCommitteeError.
|
|
@@ -294,10 +452,11 @@ import { getEpochCacheConfigEnvVars } from './config.js';
|
|
|
294
452
|
async getRegisteredValidators() {
|
|
295
453
|
const validatorRefreshIntervalMs = this.config.validatorRefreshIntervalSeconds * 1000;
|
|
296
454
|
const validatorRefreshTime = this.lastValidatorRefresh + validatorRefreshIntervalMs;
|
|
297
|
-
|
|
298
|
-
|
|
455
|
+
const now = this.dateProvider.now();
|
|
456
|
+
if (validatorRefreshTime < now) {
|
|
457
|
+
const currentSet = await this.rollup.getAttesters(BigInt(Math.floor(now / 1000)));
|
|
299
458
|
this.allValidators = new Set(currentSet.map((v)=>v.toString()));
|
|
300
|
-
this.lastValidatorRefresh =
|
|
459
|
+
this.lastValidatorRefresh = now;
|
|
301
460
|
}
|
|
302
461
|
return Array.from(this.allValidators.keys()).map((v)=>EthAddress.fromString(v));
|
|
303
462
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
2
2
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
3
|
import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
|
|
4
|
-
import type
|
|
4
|
+
import { type EpochAndSlot, type EpochCacheInterface, type EpochCommitteeInfo, type SlotTag } from '../epoch_cache.js';
|
|
5
5
|
/**
|
|
6
6
|
* A test implementation of EpochCacheInterface that allows manual configuration
|
|
7
7
|
* of committee, proposer, slot, and escape hatch state for use in tests.
|
|
@@ -17,6 +17,7 @@ export declare class TestEpochCache implements EpochCacheInterface {
|
|
|
17
17
|
private seed;
|
|
18
18
|
private registeredValidators;
|
|
19
19
|
private l1Constants;
|
|
20
|
+
private proposerPipeliningEnabled;
|
|
20
21
|
constructor(l1Constants?: Partial<L1RollupConstants>);
|
|
21
22
|
/**
|
|
22
23
|
* Sets the committee members. Used in validation and attestation flows.
|
|
@@ -54,12 +55,22 @@ export declare class TestEpochCache implements EpochCacheInterface {
|
|
|
54
55
|
*/
|
|
55
56
|
setL1Constants(constants: Partial<L1RollupConstants>): this;
|
|
56
57
|
getL1Constants(): L1RollupConstants;
|
|
58
|
+
setProposerPipeliningEnabled(enabled: boolean): void;
|
|
57
59
|
getCommittee(_slot?: SlotTag): Promise<EpochCommitteeInfo>;
|
|
60
|
+
getSlotNow(): SlotNumber;
|
|
61
|
+
getTargetSlot(): SlotNumber;
|
|
62
|
+
getEpochNow(): EpochNumber;
|
|
63
|
+
getTargetEpoch(): EpochNumber;
|
|
64
|
+
isProposerPipeliningEnabled(): boolean;
|
|
65
|
+
pipeliningOffset(): number;
|
|
58
66
|
getEpochAndSlotNow(): EpochAndSlot & {
|
|
59
67
|
nowMs: bigint;
|
|
60
68
|
};
|
|
61
69
|
getEpochAndSlotInNextL1Slot(): EpochAndSlot & {
|
|
62
|
-
|
|
70
|
+
nowSeconds: bigint;
|
|
71
|
+
};
|
|
72
|
+
getTargetEpochAndSlotInNextL1Slot(): EpochAndSlot & {
|
|
73
|
+
nowSeconds: bigint;
|
|
63
74
|
};
|
|
64
75
|
getProposerIndexEncoding(epoch: EpochNumber, slot: SlotNumber, seed: bigint): `0x${string}`;
|
|
65
76
|
computeProposerIndex(slot: SlotNumber, _epoch: EpochNumber, _seed: bigint, size: bigint): bigint;
|
|
@@ -67,10 +78,15 @@ export declare class TestEpochCache implements EpochCacheInterface {
|
|
|
67
78
|
currentSlot: SlotNumber;
|
|
68
79
|
nextSlot: SlotNumber;
|
|
69
80
|
};
|
|
81
|
+
getTargetAndNextSlot(): {
|
|
82
|
+
targetSlot: SlotNumber;
|
|
83
|
+
nextSlot: SlotNumber;
|
|
84
|
+
};
|
|
70
85
|
getProposerAttesterAddressInSlot(_slot: SlotNumber): Promise<EthAddress | undefined>;
|
|
71
86
|
getRegisteredValidators(): Promise<EthAddress[]>;
|
|
72
87
|
isInCommittee(_slot: SlotTag, validator: EthAddress): Promise<boolean>;
|
|
73
88
|
filterInCommittee(_slot: SlotTag, validators: EthAddress[]): Promise<EthAddress[]>;
|
|
89
|
+
isEscapeHatchOpen(_epoch: EpochNumber): Promise<boolean>;
|
|
74
90
|
isEscapeHatchOpenAtSlot(_slot?: SlotTag): Promise<boolean>;
|
|
75
91
|
}
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9lcG9jaF9jYWNoZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvdGVzdF9lcG9jaF9jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBR3JFLE9BQU8sRUFDTCxLQUFLLFlBQVksRUFDakIsS0FBSyxtQkFBbUIsRUFDeEIsS0FBSyxrQkFBa0IsRUFFdkIsS0FBSyxPQUFPLEVBQ2IsTUFBTSxtQkFBbUIsQ0FBQztBQWMzQjs7Ozs7O0dBTUc7QUFDSCxxQkFBYSxjQUFlLFlBQVcsbUJBQW1CO0lBQ3hELE9BQU8sQ0FBQyxTQUFTLENBQW9CO0lBQ3JDLE9BQU8sQ0FBQyxlQUFlLENBQXlCO0lBQ2hELE9BQU8sQ0FBQyxXQUFXLENBQTZCO0lBQ2hELE9BQU8sQ0FBQyxlQUFlLENBQWtCO0lBQ3pDLE9BQU8sQ0FBQyxJQUFJLENBQWM7SUFDMUIsT0FBTyxDQUFDLG9CQUFvQixDQUFvQjtJQUNoRCxPQUFPLENBQUMsV0FBVyxDQUFvQjtJQUN2QyxPQUFPLENBQUMseUJBQXlCLENBQVM7SUFFMUMsWUFBWSxXQUFXLEdBQUUsT0FBTyxDQUFDLGlCQUFpQixDQUFNLEVBRXZEO0lBRUQ7OztPQUdHO0lBQ0gsWUFBWSxDQUFDLFNBQVMsRUFBRSxVQUFVLEVBQUUsR0FBRyxJQUFJLENBRzFDO0lBRUQ7OztPQUdHO0lBQ0gsV0FBVyxDQUFDLFFBQVEsRUFBRSxVQUFVLEdBQUcsU0FBUyxHQUFHLElBQUksQ0FHbEQ7SUFFRDs7O09BR0c7SUFDSCxjQUFjLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxJQUFJLENBR3JDO0lBRUQ7OztPQUdHO0lBQ0gsa0JBQWtC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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test_epoch_cache.d.ts","sourceRoot":"","sources":["../../src/test/test_epoch_cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"test_epoch_cache.d.ts","sourceRoot":"","sources":["../../src/test/test_epoch_cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { SlotNumber } from '@aztec/foundation/branded-types';
|
|
2
2
|
import { getEpochAtSlot, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
|
|
3
|
+
import { PROPOSER_PIPELINING_SLOT_OFFSET } from '../epoch_cache.js';
|
|
3
4
|
/** Default L1 constants for testing. */ const DEFAULT_L1_CONSTANTS = {
|
|
4
5
|
l1StartBlock: 0n,
|
|
5
6
|
l1GenesisTime: 0n,
|
|
@@ -24,6 +25,7 @@ import { getEpochAtSlot, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@
|
|
|
24
25
|
seed = 0n;
|
|
25
26
|
registeredValidators = [];
|
|
26
27
|
l1Constants;
|
|
28
|
+
proposerPipeliningEnabled = false;
|
|
27
29
|
constructor(l1Constants = {}){
|
|
28
30
|
this.l1Constants = {
|
|
29
31
|
...DEFAULT_L1_CONSTANTS,
|
|
@@ -85,6 +87,9 @@ import { getEpochAtSlot, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@
|
|
|
85
87
|
getL1Constants() {
|
|
86
88
|
return this.l1Constants;
|
|
87
89
|
}
|
|
90
|
+
setProposerPipeliningEnabled(enabled) {
|
|
91
|
+
this.proposerPipeliningEnabled = enabled;
|
|
92
|
+
}
|
|
88
93
|
getCommittee(_slot) {
|
|
89
94
|
const epoch = getEpochAtSlot(this.currentSlot, this.l1Constants);
|
|
90
95
|
return Promise.resolve({
|
|
@@ -94,27 +99,55 @@ import { getEpochAtSlot, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@
|
|
|
94
99
|
isEscapeHatchOpen: this.escapeHatchOpen
|
|
95
100
|
});
|
|
96
101
|
}
|
|
102
|
+
getSlotNow() {
|
|
103
|
+
return this.currentSlot;
|
|
104
|
+
}
|
|
105
|
+
getTargetSlot() {
|
|
106
|
+
return this.proposerPipeliningEnabled ? SlotNumber(this.currentSlot + PROPOSER_PIPELINING_SLOT_OFFSET) : this.currentSlot;
|
|
107
|
+
}
|
|
108
|
+
getEpochNow() {
|
|
109
|
+
return getEpochAtSlot(this.currentSlot, this.l1Constants);
|
|
110
|
+
}
|
|
111
|
+
getTargetEpoch() {
|
|
112
|
+
return getEpochAtSlot(this.getTargetSlot(), this.l1Constants);
|
|
113
|
+
}
|
|
114
|
+
isProposerPipeliningEnabled() {
|
|
115
|
+
return this.proposerPipeliningEnabled;
|
|
116
|
+
}
|
|
117
|
+
pipeliningOffset() {
|
|
118
|
+
return this.proposerPipeliningEnabled ? PROPOSER_PIPELINING_SLOT_OFFSET : 0;
|
|
119
|
+
}
|
|
97
120
|
getEpochAndSlotNow() {
|
|
98
|
-
const
|
|
99
|
-
const ts = getTimestampRangeForEpoch(
|
|
121
|
+
const epochNow = getEpochAtSlot(this.currentSlot, this.l1Constants);
|
|
122
|
+
const ts = getTimestampRangeForEpoch(epochNow, this.l1Constants)[0];
|
|
100
123
|
return {
|
|
101
|
-
epoch,
|
|
124
|
+
epoch: epochNow,
|
|
102
125
|
slot: this.currentSlot,
|
|
103
126
|
ts,
|
|
104
127
|
nowMs: ts * 1000n
|
|
105
128
|
};
|
|
106
129
|
}
|
|
107
130
|
getEpochAndSlotInNextL1Slot() {
|
|
108
|
-
const
|
|
109
|
-
const nextSlotTs =
|
|
131
|
+
const nowTs = getTimestampRangeForEpoch(getEpochAtSlot(this.currentSlot, this.l1Constants), this.l1Constants)[0];
|
|
132
|
+
const nextSlotTs = nowTs + BigInt(this.l1Constants.ethereumSlotDuration);
|
|
110
133
|
const nextSlot = getSlotAtTimestamp(nextSlotTs, this.l1Constants);
|
|
111
|
-
const
|
|
112
|
-
const ts = getTimestampRangeForEpoch(
|
|
134
|
+
const epochNow = getEpochAtSlot(nextSlot, this.l1Constants);
|
|
135
|
+
const ts = getTimestampRangeForEpoch(epochNow, this.l1Constants)[0];
|
|
113
136
|
return {
|
|
114
|
-
epoch,
|
|
137
|
+
epoch: epochNow,
|
|
115
138
|
slot: nextSlot,
|
|
116
139
|
ts,
|
|
117
|
-
|
|
140
|
+
nowSeconds: nowTs
|
|
141
|
+
};
|
|
142
|
+
}
|
|
143
|
+
getTargetEpochAndSlotInNextL1Slot() {
|
|
144
|
+
const result = this.getEpochAndSlotInNextL1Slot();
|
|
145
|
+
const offset = this.isProposerPipeliningEnabled() ? PROPOSER_PIPELINING_SLOT_OFFSET : 0;
|
|
146
|
+
const targetSlot = SlotNumber(result.slot + offset);
|
|
147
|
+
return {
|
|
148
|
+
...result,
|
|
149
|
+
slot: targetSlot,
|
|
150
|
+
epoch: getEpochAtSlot(targetSlot, this.l1Constants)
|
|
118
151
|
};
|
|
119
152
|
}
|
|
120
153
|
getProposerIndexEncoding(epoch, slot, seed) {
|
|
@@ -128,9 +161,19 @@ import { getEpochAtSlot, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@
|
|
|
128
161
|
return BigInt(slot) % size;
|
|
129
162
|
}
|
|
130
163
|
getCurrentAndNextSlot() {
|
|
164
|
+
const currentSlot = this.getSlotNow();
|
|
165
|
+
const next = this.getEpochAndSlotInNextL1Slot();
|
|
131
166
|
return {
|
|
132
|
-
currentSlot
|
|
133
|
-
nextSlot:
|
|
167
|
+
currentSlot,
|
|
168
|
+
nextSlot: next.slot
|
|
169
|
+
};
|
|
170
|
+
}
|
|
171
|
+
getTargetAndNextSlot() {
|
|
172
|
+
const targetSlot = this.getTargetSlot();
|
|
173
|
+
const next = this.getTargetEpochAndSlotInNextL1Slot();
|
|
174
|
+
return {
|
|
175
|
+
targetSlot,
|
|
176
|
+
nextSlot: next.slot
|
|
134
177
|
};
|
|
135
178
|
}
|
|
136
179
|
getProposerAttesterAddressInSlot(_slot) {
|
|
@@ -146,6 +189,9 @@ import { getEpochAtSlot, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@
|
|
|
146
189
|
const committeeSet = new Set(this.committee.map((v)=>v.toString()));
|
|
147
190
|
return Promise.resolve(validators.filter((v)=>committeeSet.has(v.toString())));
|
|
148
191
|
}
|
|
192
|
+
isEscapeHatchOpen(_epoch) {
|
|
193
|
+
return Promise.resolve(this.escapeHatchOpen);
|
|
194
|
+
}
|
|
149
195
|
isEscapeHatchOpenAtSlot(_slot) {
|
|
150
196
|
return Promise.resolve(this.escapeHatchOpen);
|
|
151
197
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/epoch-cache",
|
|
3
|
-
"version": "0.0.1-commit.
|
|
3
|
+
"version": "0.0.1-commit.11bf3dd6e",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -26,10 +26,10 @@
|
|
|
26
26
|
"../package.common.json"
|
|
27
27
|
],
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
30
|
-
"@aztec/foundation": "0.0.1-commit.
|
|
31
|
-
"@aztec/l1-artifacts": "0.0.1-commit.
|
|
32
|
-
"@aztec/stdlib": "0.0.1-commit.
|
|
29
|
+
"@aztec/ethereum": "0.0.1-commit.11bf3dd6e",
|
|
30
|
+
"@aztec/foundation": "0.0.1-commit.11bf3dd6e",
|
|
31
|
+
"@aztec/l1-artifacts": "0.0.1-commit.11bf3dd6e",
|
|
32
|
+
"@aztec/stdlib": "0.0.1-commit.11bf3dd6e",
|
|
33
33
|
"dotenv": "^16.0.3",
|
|
34
34
|
"get-port": "^7.1.0",
|
|
35
35
|
"jest-mock-extended": "^4.0.0",
|
package/src/config.ts
CHANGED
|
@@ -1,11 +1,17 @@
|
|
|
1
1
|
import { type L1ContractsConfig, getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
|
|
2
2
|
import { type L1ReaderConfig, getL1ReaderConfigFromEnv } from '@aztec/ethereum/l1-reader';
|
|
3
|
+
import { type PipelineConfig, getPipelineConfigEnvVars } from '@aztec/stdlib/config';
|
|
3
4
|
|
|
4
5
|
export type EpochCacheConfig = Pick<
|
|
5
|
-
L1ReaderConfig & L1ContractsConfig,
|
|
6
|
-
|
|
6
|
+
L1ReaderConfig & L1ContractsConfig & PipelineConfig,
|
|
7
|
+
| 'l1RpcUrls'
|
|
8
|
+
| 'l1ChainId'
|
|
9
|
+
| 'viemPollingIntervalMS'
|
|
10
|
+
| 'ethereumSlotDuration'
|
|
11
|
+
| 'l1HttpTimeoutMS'
|
|
12
|
+
| 'enableProposerPipelining'
|
|
7
13
|
>;
|
|
8
14
|
|
|
9
15
|
export function getEpochCacheConfigEnvVars(): EpochCacheConfig {
|
|
10
|
-
return { ...getL1ReaderConfigFromEnv(), ...getL1ContractsConfigEnvVars() };
|
|
16
|
+
return { ...getL1ReaderConfigFromEnv(), ...getL1ContractsConfigEnvVars(), ...getPipelineConfigEnvVars() };
|
|
11
17
|
}
|