@aztec/archiver 0.0.1-commit.a89ec08 → 0.0.1-commit.aa0c64f
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 +19 -11
- package/dest/archiver.d.ts +71 -16
- package/dest/archiver.d.ts.map +1 -1
- package/dest/archiver.js +276 -71
- package/dest/config.d.ts +7 -3
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +43 -14
- package/dest/errors.d.ts +50 -2
- package/dest/errors.d.ts.map +1 -1
- package/dest/errors.js +74 -2
- package/dest/factory.d.ts +19 -7
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +67 -24
- package/dest/index.d.ts +11 -3
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +10 -2
- package/dest/l1/calldata_retriever.d.ts +9 -1
- package/dest/l1/calldata_retriever.d.ts.map +1 -1
- package/dest/l1/calldata_retriever.js +22 -11
- package/dest/l1/data_retrieval.d.ts +30 -13
- package/dest/l1/data_retrieval.d.ts.map +1 -1
- package/dest/l1/data_retrieval.js +36 -37
- package/dest/l1/trace_tx.d.ts +12 -66
- package/dest/l1/trace_tx.d.ts.map +1 -1
- package/dest/l1/validate_historical_logs.d.ts +23 -0
- package/dest/l1/validate_historical_logs.d.ts.map +1 -0
- package/dest/l1/validate_historical_logs.js +108 -0
- package/dest/modules/contract_data_source_adapter.d.ts +25 -0
- package/dest/modules/contract_data_source_adapter.d.ts.map +1 -0
- package/dest/modules/contract_data_source_adapter.js +32 -0
- package/dest/modules/data_source_base.d.ts +71 -48
- package/dest/modules/data_source_base.d.ts.map +1 -1
- package/dest/modules/data_source_base.js +250 -144
- package/dest/modules/data_store_updater.d.ts +30 -13
- package/dest/modules/data_store_updater.d.ts.map +1 -1
- package/dest/modules/data_store_updater.js +129 -111
- package/dest/modules/instrumentation.d.ts +26 -2
- package/dest/modules/instrumentation.d.ts.map +1 -1
- package/dest/modules/instrumentation.js +58 -9
- package/dest/modules/l1_synchronizer.d.ts +13 -8
- package/dest/modules/l1_synchronizer.d.ts.map +1 -1
- package/dest/modules/l1_synchronizer.js +463 -224
- package/dest/modules/outbox_trees_resolver.d.ts +62 -0
- package/dest/modules/outbox_trees_resolver.d.ts.map +1 -0
- package/dest/modules/outbox_trees_resolver.js +162 -0
- package/dest/modules/validation.d.ts +30 -7
- package/dest/modules/validation.d.ts.map +1 -1
- package/dest/modules/validation.js +35 -17
- package/dest/store/block_store.d.ts +175 -68
- package/dest/store/block_store.d.ts.map +1 -1
- package/dest/store/block_store.js +627 -239
- package/dest/store/contract_class_store.d.ts +17 -4
- package/dest/store/contract_class_store.d.ts.map +1 -1
- package/dest/store/contract_class_store.js +37 -67
- package/dest/store/contract_instance_store.d.ts +28 -1
- package/dest/store/contract_instance_store.d.ts.map +1 -1
- package/dest/store/contract_instance_store.js +49 -1
- package/dest/store/data_stores.d.ts +68 -0
- package/dest/store/data_stores.d.ts.map +1 -0
- package/dest/store/data_stores.js +54 -0
- package/dest/store/function_names_cache.d.ts +17 -0
- package/dest/store/function_names_cache.d.ts.map +1 -0
- package/dest/store/function_names_cache.js +30 -0
- package/dest/store/l2_tips_cache.d.ts +13 -7
- package/dest/store/l2_tips_cache.d.ts.map +1 -1
- package/dest/store/l2_tips_cache.js +13 -76
- package/dest/store/log_store.d.ts +42 -37
- package/dest/store/log_store.d.ts.map +1 -1
- package/dest/store/log_store.js +259 -443
- package/dest/store/log_store_codec.d.ts +78 -0
- package/dest/store/log_store_codec.d.ts.map +1 -0
- package/dest/store/log_store_codec.js +110 -0
- package/dest/store/message_store.d.ts +11 -1
- package/dest/store/message_store.d.ts.map +1 -1
- package/dest/store/message_store.js +50 -8
- package/dest/test/fake_l1_state.d.ts +8 -3
- package/dest/test/fake_l1_state.d.ts.map +1 -1
- package/dest/test/fake_l1_state.js +78 -21
- package/dest/test/mock_l2_block_source.d.ts +48 -50
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +228 -179
- package/dest/test/mock_structs.d.ts +1 -1
- package/dest/test/mock_structs.d.ts.map +1 -1
- package/dest/test/mock_structs.js +2 -2
- package/dest/test/noop_l1_archiver.d.ts +14 -6
- package/dest/test/noop_l1_archiver.d.ts.map +1 -1
- package/dest/test/noop_l1_archiver.js +26 -10
- package/package.json +15 -14
- package/src/archiver.ts +361 -77
- package/src/config.ts +51 -13
- package/src/errors.ts +117 -2
- package/src/factory.ts +81 -22
- package/src/index.ts +18 -2
- package/src/l1/calldata_retriever.ts +29 -11
- package/src/l1/data_retrieval.ts +60 -54
- package/src/l1/validate_historical_logs.ts +140 -0
- package/src/modules/contract_data_source_adapter.ts +46 -0
- package/src/modules/data_source_base.ts +325 -187
- package/src/modules/data_store_updater.ts +155 -139
- package/src/modules/instrumentation.ts +63 -10
- package/src/modules/l1_synchronizer.ts +630 -273
- package/src/modules/outbox_trees_resolver.ts +199 -0
- package/src/modules/validation.ts +80 -23
- package/src/store/block_store.ts +766 -290
- package/src/store/contract_class_store.ts +43 -101
- package/src/store/contract_instance_store.ts +61 -1
- package/src/store/data_stores.ts +104 -0
- package/src/store/function_names_cache.ts +37 -0
- package/src/store/l2_tips_cache.ts +16 -70
- package/src/store/log_store.ts +298 -609
- package/src/store/log_store_codec.ts +143 -0
- package/src/store/message_store.ts +59 -9
- package/src/structs/inbox_message.ts +1 -1
- package/src/test/fake_l1_state.ts +99 -32
- package/src/test/mock_l2_block_source.ts +285 -232
- package/src/test/mock_structs.ts +5 -2
- package/src/test/noop_l1_archiver.ts +54 -11
- package/dest/store/kv_archiver_store.d.ts +0 -362
- package/dest/store/kv_archiver_store.d.ts.map +0 -1
- package/dest/store/kv_archiver_store.js +0 -475
- package/src/store/kv_archiver_store.ts +0 -685
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
2
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
|
+
import { BlockHash } from '@aztec/stdlib/block';
|
|
4
|
+
import { TxHash } from '@aztec/stdlib/tx';
|
|
5
|
+
|
|
6
|
+
export const NUMERIC_HEX_LEN = 8;
|
|
7
|
+
export const SEP = '-';
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* Sentinel appended after a numeric hex segment to build an end bound strictly greater than any
|
|
11
|
+
* real key for that namespace. `'g'` sorts lexicographically after every hex digit (`0`-`9`, `a`-`f`),
|
|
12
|
+
* so `prefix + '-g'` is a clean exclusive upper bound.
|
|
13
|
+
*/
|
|
14
|
+
export const HEX_SENTINEL = 'g';
|
|
15
|
+
|
|
16
|
+
export type ParsedKeyTail = {
|
|
17
|
+
blockNumber: BlockNumber;
|
|
18
|
+
txIndexWithinBlock: number;
|
|
19
|
+
logIndexWithinTx: number;
|
|
20
|
+
};
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* Per-kind stored value layout (no msgpackr):
|
|
24
|
+
* txHash(32) ++ blockHash(32) ++ blockTimestamp(u64 BE = 8) ++ logDataLen(u32 BE = 4) ++ logData[i].toBuffer()...
|
|
25
|
+
* `blockNumber`, `txIndexWithinBlock`, and `logIndexWithinTx` are decoded from the composite key.
|
|
26
|
+
*/
|
|
27
|
+
export type StoredLogValue = {
|
|
28
|
+
txHash: TxHash;
|
|
29
|
+
blockHash: BlockHash;
|
|
30
|
+
blockTimestamp: bigint;
|
|
31
|
+
logData: Fr[];
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
/** Returns the 64-char lowercase hex representation of a field, stripping the `0x` prefix. */
|
|
35
|
+
export function fieldHex(value: Fr | { toString: () => string }): string {
|
|
36
|
+
// Fr.toString() and AztecAddress.toString() both return `0x` + 64 lowercase hex chars.
|
|
37
|
+
return value.toString().slice(2);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* Tag prefix for a log: the hex of its first field, or the empty string when the log carries no fields.
|
|
42
|
+
* A protocol-valid public log can have zero fields (e.g. a raw AVM `EMITPUBLICLOG` with `logSize = 0`),
|
|
43
|
+
* which has no tag to index by. Encoding it under the empty tag keeps it retrievable via the per-block
|
|
44
|
+
* read (and droppable on reorg) while never matching a real 64-hex-char tag query — instead of reading
|
|
45
|
+
* `fields[0]` off an empty array and aborting the whole block-ingestion transaction.
|
|
46
|
+
*/
|
|
47
|
+
export function tagHexForLog(fields: Fr[]): string {
|
|
48
|
+
return fields.length > 0 ? fieldHex(fields[0]) : '';
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/** Encodes a number as 8-char zero-padded lowercase hex (matches a u32 big-endian byte buffer's lex order). */
|
|
52
|
+
export function u32Hex(n: number): string {
|
|
53
|
+
return n.toString(16).padStart(NUMERIC_HEX_LEN, '0');
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/**
|
|
57
|
+
* Encodes the composite primary key as `prefix-block-txIdx-logIdx` where `prefix` is the leading
|
|
58
|
+
* segment (`tag` for private; `contract-tag` for public) and the trailing triple is fixed-width
|
|
59
|
+
* 8-char zero-padded hex so byte-order matches `(blockNumber, txIndexWithinBlock, logIndexWithinTx)`.
|
|
60
|
+
*/
|
|
61
|
+
export function encodeKey(prefix: string, blockNumber: number, txIndex: number, logIndex: number): string {
|
|
62
|
+
return `${prefix}${SEP}${u32Hex(blockNumber)}${SEP}${u32Hex(txIndex)}${SEP}${u32Hex(logIndex)}`;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
/**
|
|
66
|
+
* Decodes the trailing `(blockNumber, txIndexWithinBlock, logIndexWithinTx)` triple from a composite
|
|
67
|
+
* key. The leading prefix segments are ignored — we only ever read them off the input query, never
|
|
68
|
+
* back off the key.
|
|
69
|
+
*/
|
|
70
|
+
export function decodeKeyTail(key: string): ParsedKeyTail {
|
|
71
|
+
const parts = key.split(SEP);
|
|
72
|
+
const len = parts.length;
|
|
73
|
+
return {
|
|
74
|
+
blockNumber: BlockNumber(parseInt(parts[len - 3], 16)),
|
|
75
|
+
txIndexWithinBlock: parseInt(parts[len - 2], 16),
|
|
76
|
+
logIndexWithinTx: parseInt(parts[len - 1], 16),
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
/**
|
|
81
|
+
* Exclusive end bound for a `(contract, tag)`-prefix scan. With an `upperBlockExclusive` we cut at
|
|
82
|
+
* `(prefix, upper, 0, 0)`. With no bound we use `prefix + '-' + HEX_SENTINEL`, which sorts strictly
|
|
83
|
+
* after every real key under `prefix` (`g` is greater than any hex digit).
|
|
84
|
+
*/
|
|
85
|
+
export function endOfTagRange(prefix: string, upperBlockExclusive: number | undefined): string {
|
|
86
|
+
if (upperBlockExclusive === undefined) {
|
|
87
|
+
return `${prefix}${SEP}${HEX_SENTINEL}`;
|
|
88
|
+
}
|
|
89
|
+
return encodeKey(prefix, upperBlockExclusive, 0, 0);
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
/**
|
|
93
|
+
* Exclusive end bound for a tx-strict scan: every key strictly inside `(prefix, txBlk, txIdx, *)`.
|
|
94
|
+
* `prefix-block-txIdx-` followed by the hex sentinel is the first key past every real logIndex for
|
|
95
|
+
* this tx and strictly less than the next tx's first key.
|
|
96
|
+
*/
|
|
97
|
+
export function endOfTxRange(prefix: string, txBlk: number, txIdx: number): string {
|
|
98
|
+
return `${prefix}${SEP}${u32Hex(txBlk)}${SEP}${u32Hex(txIdx)}${SEP}${HEX_SENTINEL}`;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
/**
|
|
102
|
+
* Returns the smallest string strictly greater than a fully-encoded composite key. The encoded key
|
|
103
|
+
* ends in a hex digit, and `'g'` sorts strictly after any hex digit, so appending `'g'` is the
|
|
104
|
+
* smallest possible successor in our key alphabet. Used to turn an inclusive cursor into an
|
|
105
|
+
* exclusive `start`.
|
|
106
|
+
*/
|
|
107
|
+
export function incKey(key: string): string {
|
|
108
|
+
return key + HEX_SENTINEL;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
export function encodeValue(value: StoredLogValue): Buffer {
|
|
112
|
+
const head = Buffer.allocUnsafe(32 + 32 + 8 + 4);
|
|
113
|
+
value.txHash.toBuffer().copy(head, 0);
|
|
114
|
+
value.blockHash.toBuffer().copy(head, 32);
|
|
115
|
+
head.writeBigUInt64BE(value.blockTimestamp, 64);
|
|
116
|
+
head.writeUInt32BE(value.logData.length, 72);
|
|
117
|
+
const fieldBufs = value.logData.map(f => f.toBuffer());
|
|
118
|
+
return Buffer.concat([head, ...fieldBufs]);
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
export function decodeValue(buffer: Buffer | Uint8Array): StoredLogValue {
|
|
122
|
+
const buf = Buffer.isBuffer(buffer) ? buffer : Buffer.from(buffer.buffer, buffer.byteOffset, buffer.byteLength);
|
|
123
|
+
let off = 0;
|
|
124
|
+
const txHash = TxHash.fromBuffer(buf.subarray(off, off + 32));
|
|
125
|
+
off += 32;
|
|
126
|
+
const blockHash = BlockHash.fromBuffer(buf.subarray(off, off + 32));
|
|
127
|
+
off += 32;
|
|
128
|
+
const blockTimestamp = buf.readBigUInt64BE(off);
|
|
129
|
+
off += 8;
|
|
130
|
+
const logDataLen = buf.readUInt32BE(off);
|
|
131
|
+
off += 4;
|
|
132
|
+
const logData: Fr[] = new Array(logDataLen);
|
|
133
|
+
for (let i = 0; i < logDataLen; i++) {
|
|
134
|
+
logData[i] = Fr.fromBuffer(buf.subarray(off, off + 32));
|
|
135
|
+
off += 32;
|
|
136
|
+
}
|
|
137
|
+
return { txHash, blockHash, blockTimestamp, logData };
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
/** Encodes the public-log key prefix as `contractHex-tagHex`. */
|
|
141
|
+
export function encodePublicPrefix(contractHex: string, tagHex: string): string {
|
|
142
|
+
return `${contractHex}${SEP}${tagHex}`;
|
|
143
|
+
}
|
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
} from '@aztec/kv-store';
|
|
15
15
|
import { InboxLeaf } from '@aztec/stdlib/messaging';
|
|
16
16
|
|
|
17
|
+
import { L1ToL2MessagesNotReadyError } from '../errors.js';
|
|
17
18
|
import {
|
|
18
19
|
type InboxMessage,
|
|
19
20
|
deserializeInboxMessage,
|
|
@@ -40,6 +41,10 @@ export class MessageStore {
|
|
|
40
41
|
#lastSynchedL1Block: AztecAsyncSingleton<Buffer>;
|
|
41
42
|
/** Stores total messages stored */
|
|
42
43
|
#totalMessageCount: AztecAsyncSingleton<bigint>;
|
|
44
|
+
/** Stores the checkpoint number whose message tree is currently being filled on L1. */
|
|
45
|
+
#inboxTreeInProgress: AztecAsyncSingleton<bigint>;
|
|
46
|
+
/** Stores the L1 finalized block as of the last successful message sync. */
|
|
47
|
+
#messagesFinalizedL1Block: AztecAsyncSingleton<Buffer>;
|
|
43
48
|
|
|
44
49
|
#log = createLogger('archiver:message_store');
|
|
45
50
|
|
|
@@ -48,6 +53,8 @@ export class MessageStore {
|
|
|
48
53
|
this.#l1ToL2MessageIndices = db.openMap('archiver_l1_to_l2_message_indices');
|
|
49
54
|
this.#lastSynchedL1Block = db.openSingleton('archiver_last_l1_block_id');
|
|
50
55
|
this.#totalMessageCount = db.openSingleton('archiver_l1_to_l2_message_count');
|
|
56
|
+
this.#inboxTreeInProgress = db.openSingleton('archiver_inbox_tree_in_progress');
|
|
57
|
+
this.#messagesFinalizedL1Block = db.openSingleton('archiver_messages_finalized_l1_block');
|
|
51
58
|
}
|
|
52
59
|
|
|
53
60
|
public async getTotalL1ToL2MessageCount(): Promise<bigint> {
|
|
@@ -71,6 +78,26 @@ export class MessageStore {
|
|
|
71
78
|
await this.#lastSynchedL1Block.set(buffer);
|
|
72
79
|
}
|
|
73
80
|
|
|
81
|
+
/** Gets the L1 finalized block as of the last successful message sync. */
|
|
82
|
+
public async getMessagesFinalizedL1Block(): Promise<L1BlockId | undefined> {
|
|
83
|
+
const buffer = await this.#messagesFinalizedL1Block.getAsync();
|
|
84
|
+
if (!buffer) {
|
|
85
|
+
return undefined;
|
|
86
|
+
}
|
|
87
|
+
const reader = BufferReader.asReader(buffer);
|
|
88
|
+
return { l1BlockNumber: reader.readUInt256(), l1BlockHash: Buffer32.fromBuffer(reader.readBytes(Buffer32.SIZE)) };
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
/** Monotonically advances the persisted L1 finalized block for message sync. Never regresses. */
|
|
92
|
+
private async maybeAdvanceFinalizedL1Block(l1Block: L1BlockId): Promise<void> {
|
|
93
|
+
const existing = await this.getMessagesFinalizedL1Block();
|
|
94
|
+
if (existing && l1Block.l1BlockNumber <= existing.l1BlockNumber) {
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
const buffer = serializeToBuffer([l1Block.l1BlockNumber, l1Block.l1BlockHash]);
|
|
98
|
+
await this.#messagesFinalizedL1Block.set(buffer);
|
|
99
|
+
}
|
|
100
|
+
|
|
74
101
|
/**
|
|
75
102
|
* Append L1 to L2 messages to the store.
|
|
76
103
|
* Requires new messages to be in order and strictly after the last message added.
|
|
@@ -157,15 +184,6 @@ export class MessageStore {
|
|
|
157
184
|
lastMessage = message;
|
|
158
185
|
}
|
|
159
186
|
|
|
160
|
-
// Update the L1 sync point to that of the last message added.
|
|
161
|
-
const currentSyncPoint = await this.getSynchedL1Block();
|
|
162
|
-
if (!currentSyncPoint || currentSyncPoint.l1BlockNumber < lastMessage!.l1BlockNumber) {
|
|
163
|
-
await this.setSynchedL1Block({
|
|
164
|
-
l1BlockNumber: lastMessage!.l1BlockNumber,
|
|
165
|
-
l1BlockHash: lastMessage!.l1BlockHash,
|
|
166
|
-
});
|
|
167
|
-
}
|
|
168
|
-
|
|
169
187
|
// Update total message count with the number of inserted messages.
|
|
170
188
|
await this.increaseTotalMessageCount(messageCount);
|
|
171
189
|
});
|
|
@@ -185,7 +203,39 @@ export class MessageStore {
|
|
|
185
203
|
return msg ? deserializeInboxMessage(msg) : undefined;
|
|
186
204
|
}
|
|
187
205
|
|
|
206
|
+
/** Returns the inbox tree-in-progress checkpoint number from L1, or undefined if not yet set. */
|
|
207
|
+
public getInboxTreeInProgress(): Promise<bigint | undefined> {
|
|
208
|
+
return this.#inboxTreeInProgress.getAsync();
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
/**
|
|
212
|
+
* Atomically updates the message sync state: the L1 sync point, the inbox tree-in-progress marker, and
|
|
213
|
+
* (optionally) the L1 finalized block as of this sync. The finalized block is advanced monotonically.
|
|
214
|
+
*/
|
|
215
|
+
public setMessageSyncState(
|
|
216
|
+
l1Block: L1BlockId,
|
|
217
|
+
treeInProgress: bigint | undefined,
|
|
218
|
+
finalizedL1Block?: L1BlockId,
|
|
219
|
+
): Promise<void> {
|
|
220
|
+
return this.db.transactionAsync(async () => {
|
|
221
|
+
await this.setSynchedL1Block(l1Block);
|
|
222
|
+
if (treeInProgress !== undefined) {
|
|
223
|
+
await this.#inboxTreeInProgress.set(treeInProgress);
|
|
224
|
+
} else {
|
|
225
|
+
await this.#inboxTreeInProgress.delete();
|
|
226
|
+
}
|
|
227
|
+
if (finalizedL1Block !== undefined) {
|
|
228
|
+
await this.maybeAdvanceFinalizedL1Block(finalizedL1Block);
|
|
229
|
+
}
|
|
230
|
+
});
|
|
231
|
+
}
|
|
232
|
+
|
|
188
233
|
public async getL1ToL2Messages(checkpointNumber: CheckpointNumber): Promise<Fr[]> {
|
|
234
|
+
const treeInProgress = await this.#inboxTreeInProgress.getAsync();
|
|
235
|
+
if (treeInProgress !== undefined && BigInt(checkpointNumber) >= treeInProgress) {
|
|
236
|
+
throw new L1ToL2MessagesNotReadyError(checkpointNumber, treeInProgress);
|
|
237
|
+
}
|
|
238
|
+
|
|
189
239
|
const messages: Fr[] = [];
|
|
190
240
|
|
|
191
241
|
const [startIndex, endIndex] = InboxLeaf.indexRangeForCheckpoint(checkpointNumber);
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { BlobClientInterface } from '@aztec/blob-client/client';
|
|
2
2
|
import { type Blob, getBlobsPerL1Block, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
|
|
3
|
+
import { INITIAL_CHECKPOINT_NUMBER } from '@aztec/constants';
|
|
3
4
|
import type { CheckpointProposedLog, InboxContract, MessageSentLog, RollupContract } from '@aztec/ethereum/contracts';
|
|
4
5
|
import { MULTI_CALL_3_ADDRESS } from '@aztec/ethereum/contracts';
|
|
5
6
|
import type { ViemPublicClient } from '@aztec/ethereum/types';
|
|
@@ -14,12 +15,8 @@ import { CommitteeAttestation, CommitteeAttestationsAndSigners, L2Block } from '
|
|
|
14
15
|
import { Checkpoint } from '@aztec/stdlib/checkpoint';
|
|
15
16
|
import { getSlotAtTimestamp } from '@aztec/stdlib/epoch-helpers';
|
|
16
17
|
import { InboxLeaf } from '@aztec/stdlib/messaging';
|
|
17
|
-
import { ConsensusPayload,
|
|
18
|
-
import {
|
|
19
|
-
makeAndSignCommitteeAttestationsAndSigners,
|
|
20
|
-
makeCheckpointAttestationFromCheckpoint,
|
|
21
|
-
mockCheckpointAndMessages,
|
|
22
|
-
} from '@aztec/stdlib/testing';
|
|
18
|
+
import { ConsensusPayload, getHashedSignaturePayloadTypedData } from '@aztec/stdlib/p2p';
|
|
19
|
+
import { mockCheckpointAndMessages } from '@aztec/stdlib/testing';
|
|
23
20
|
import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
|
|
24
21
|
|
|
25
22
|
import { type MockProxy, mock } from 'jest-mock-extended';
|
|
@@ -150,8 +147,10 @@ export class FakeL1State {
|
|
|
150
147
|
// Computed from checkpoints based on L1 block visibility
|
|
151
148
|
private pendingCheckpointNumber: CheckpointNumber = CheckpointNumber(0);
|
|
152
149
|
|
|
153
|
-
// The L1 block number reported as "finalized" (defaults to the start block)
|
|
154
|
-
|
|
150
|
+
// The L1 block number reported as "finalized" (defaults to the start block).
|
|
151
|
+
// `undefined` simulates the startup window on a fresh devnet where
|
|
152
|
+
// `getBlock({ blockTag: 'finalized' })` fails with "finalized block not found".
|
|
153
|
+
private finalizedL1BlockNumber: bigint | undefined;
|
|
155
154
|
|
|
156
155
|
constructor(private readonly config: FakeL1StateConfig) {
|
|
157
156
|
this.l1BlockNumber = config.l1StartBlock;
|
|
@@ -287,8 +286,11 @@ export class FakeL1State {
|
|
|
287
286
|
this.updatePendingCheckpointNumber();
|
|
288
287
|
}
|
|
289
288
|
|
|
290
|
-
/**
|
|
291
|
-
|
|
289
|
+
/**
|
|
290
|
+
* Sets the L1 block number that will be reported as "finalized". Pass `undefined` to
|
|
291
|
+
* simulate a chain that does not yet have a finalized block (devnet startup).
|
|
292
|
+
*/
|
|
293
|
+
setFinalizedL1BlockNumber(blockNumber: bigint | undefined): void {
|
|
292
294
|
this.finalizedL1BlockNumber = blockNumber;
|
|
293
295
|
}
|
|
294
296
|
|
|
@@ -465,21 +467,44 @@ export class FakeL1State {
|
|
|
465
467
|
createMockInboxContract(_publicClient: MockProxy<ViemPublicClient>): MockProxy<InboxContract> {
|
|
466
468
|
const mockInbox = mock<InboxContract>();
|
|
467
469
|
|
|
468
|
-
mockInbox.getState.mockImplementation(() =>
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
470
|
+
mockInbox.getState.mockImplementation((opts: { blockTag?: string; blockNumber?: bigint } = {}) => {
|
|
471
|
+
// Filter messages visible at the given block number (or all if not specified)
|
|
472
|
+
const blockNumber = opts.blockNumber ?? this.l1BlockNumber;
|
|
473
|
+
const visibleMessages = this.messages.filter(m => m.l1BlockNumber <= blockNumber);
|
|
474
|
+
|
|
475
|
+
// treeInProgress must be > any sealed checkpoint. On L1, a checkpoint can only be proposed
|
|
476
|
+
// after its messages are sealed, so treeInProgress > checkpointNumber for all published checkpoints.
|
|
477
|
+
const maxFromMessages =
|
|
478
|
+
visibleMessages.length > 0 ? Math.max(...visibleMessages.map(m => Number(m.checkpointNumber))) + 1 : 0;
|
|
479
|
+
const maxFromCheckpoints =
|
|
480
|
+
this.checkpoints.length > 0
|
|
481
|
+
? Math.max(
|
|
482
|
+
...this.checkpoints
|
|
483
|
+
.filter(cp => !cp.pruned && cp.l1BlockNumber <= blockNumber)
|
|
484
|
+
.map(cp => Number(cp.checkpointNumber)),
|
|
485
|
+
0,
|
|
486
|
+
) + 1
|
|
487
|
+
: 0;
|
|
488
|
+
const treeInProgress = Math.max(maxFromMessages, maxFromCheckpoints, INITIAL_CHECKPOINT_NUMBER);
|
|
489
|
+
|
|
490
|
+
// Compute rolling hash only for visible messages
|
|
491
|
+
const rollingHash =
|
|
492
|
+
visibleMessages.length > 0 ? visibleMessages[visibleMessages.length - 1].rollingHash : Buffer16.ZERO;
|
|
493
|
+
|
|
494
|
+
return Promise.resolve({
|
|
495
|
+
messagesRollingHash: rollingHash,
|
|
496
|
+
totalMessagesInserted: BigInt(visibleMessages.length),
|
|
497
|
+
treeInProgress: BigInt(treeInProgress),
|
|
498
|
+
});
|
|
499
|
+
});
|
|
475
500
|
|
|
476
501
|
// Mock the wrapper methods for fetching message events
|
|
477
502
|
mockInbox.getMessageSentEvents.mockImplementation((fromBlock: bigint, toBlock: bigint) =>
|
|
478
503
|
Promise.resolve(this.getMessageSentLogs(fromBlock, toBlock)),
|
|
479
504
|
);
|
|
480
505
|
|
|
481
|
-
mockInbox.getMessageSentEventByHash.mockImplementation((
|
|
482
|
-
Promise.resolve(this.
|
|
506
|
+
mockInbox.getMessageSentEventByHash.mockImplementation((msgHash: string, aroundL1BlockNumber: bigint) =>
|
|
507
|
+
Promise.resolve(this.getMessageSentLogByHash(msgHash, aroundL1BlockNumber) as MessageSentLog),
|
|
483
508
|
);
|
|
484
509
|
|
|
485
510
|
return mockInbox;
|
|
@@ -490,11 +515,19 @@ export class FakeL1State {
|
|
|
490
515
|
const publicClient = mock<ViemPublicClient>();
|
|
491
516
|
|
|
492
517
|
publicClient.getChainId.mockResolvedValue(1);
|
|
518
|
+
// Several consumers (CalldataRetriever, ArchiverL1Synchronizer) derive the EIP-712 signing
|
|
519
|
+
// context from `publicClient.chain.id`. Pin it so it matches `getSignatureContext()` below.
|
|
520
|
+
(publicClient as unknown as { chain: { id: number } }).chain = { id: 1 };
|
|
493
521
|
publicClient.getBlockNumber.mockImplementation(() => Promise.resolve(this.l1BlockNumber));
|
|
494
522
|
|
|
495
523
|
publicClient.getBlock.mockImplementation((async (args: { blockNumber?: bigint; blockTag?: string } = {}) => {
|
|
496
524
|
let blockNum: bigint;
|
|
497
525
|
if (args.blockTag === 'finalized') {
|
|
526
|
+
if (this.finalizedL1BlockNumber === undefined) {
|
|
527
|
+
throw Object.assign(new Error('finalized block not found'), {
|
|
528
|
+
details: 'finalized block not found',
|
|
529
|
+
});
|
|
530
|
+
}
|
|
498
531
|
blockNum = this.finalizedL1BlockNumber;
|
|
499
532
|
} else {
|
|
500
533
|
blockNum = args.blockNumber ?? (await publicClient.getBlockNumber());
|
|
@@ -520,10 +553,10 @@ export class FakeL1State {
|
|
|
520
553
|
createMockBlobClient(): MockProxy<BlobClientInterface> {
|
|
521
554
|
const blobClient = mock<BlobClientInterface>();
|
|
522
555
|
|
|
523
|
-
// The blockId is the
|
|
556
|
+
// The blockId is the L1 block hash, which we derive from the L1 block number
|
|
524
557
|
blobClient.getBlobSidecar.mockImplementation((blockId: `0x${string}`) =>
|
|
525
558
|
Promise.resolve(
|
|
526
|
-
this.checkpoints.find(cpData => cpData.
|
|
559
|
+
this.checkpoints.find(cpData => Buffer32.fromBigInt(cpData.l1BlockNumber).toString() === blockId)?.blobs ?? [],
|
|
527
560
|
),
|
|
528
561
|
);
|
|
529
562
|
|
|
@@ -599,13 +632,38 @@ export class FakeL1State {
|
|
|
599
632
|
}));
|
|
600
633
|
}
|
|
601
634
|
|
|
635
|
+
private getMessageSentLogByHash(msgHash: string, aroundL1BlockNumber: bigint): MessageSentLog | undefined {
|
|
636
|
+
const msg = this.messages.find(
|
|
637
|
+
msg =>
|
|
638
|
+
msg.leaf.toString() === msgHash &&
|
|
639
|
+
msg.l1BlockNumber >= aroundL1BlockNumber - 5n &&
|
|
640
|
+
msg.l1BlockNumber <= aroundL1BlockNumber + 5n,
|
|
641
|
+
);
|
|
642
|
+
if (!msg) {
|
|
643
|
+
return undefined;
|
|
644
|
+
}
|
|
645
|
+
return {
|
|
646
|
+
l1BlockNumber: msg.l1BlockNumber,
|
|
647
|
+
l1BlockHash: Buffer32.fromBigInt(msg.l1BlockNumber),
|
|
648
|
+
l1TransactionHash: `0x${msg.l1BlockNumber.toString(16)}` as `0x${string}`,
|
|
649
|
+
args: {
|
|
650
|
+
checkpointNumber: msg.checkpointNumber,
|
|
651
|
+
index: msg.index,
|
|
652
|
+
leaf: msg.leaf,
|
|
653
|
+
rollingHash: msg.rollingHash,
|
|
654
|
+
},
|
|
655
|
+
};
|
|
656
|
+
}
|
|
657
|
+
|
|
602
658
|
private async makeRollupTx(
|
|
603
659
|
checkpoint: Checkpoint,
|
|
604
660
|
signers: Secp256k1Signer[],
|
|
605
661
|
): Promise<{ tx: Transaction; attestationsHash: Buffer32; payloadDigest: Buffer32 }> {
|
|
662
|
+
const signatureContext = this.getSignatureContext();
|
|
663
|
+
const consensusPayload = ConsensusPayload.fromCheckpoint(checkpoint, signatureContext);
|
|
664
|
+
const attestationDigest = getHashedSignaturePayloadTypedData(consensusPayload);
|
|
606
665
|
const attestations = signers
|
|
607
|
-
.map(signer =>
|
|
608
|
-
.map(attestation => CommitteeAttestation.fromSignature(attestation.signature))
|
|
666
|
+
.map(signer => CommitteeAttestation.fromSignature(signer.sign(attestationDigest)))
|
|
609
667
|
.map(committeeAttestation => committeeAttestation.toViem());
|
|
610
668
|
|
|
611
669
|
const header = checkpoint.header.toViem();
|
|
@@ -613,14 +671,18 @@ export class FakeL1State {
|
|
|
613
671
|
const archive = toHex(checkpoint.archive.root.toBuffer());
|
|
614
672
|
const attestationsAndSigners = new CommitteeAttestationsAndSigners(
|
|
615
673
|
attestations.map(attestation => CommitteeAttestation.fromViem(attestation)),
|
|
674
|
+
signatureContext,
|
|
616
675
|
);
|
|
617
676
|
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
677
|
+
// Fall back to a random signer when no attesters are provided, so tests that
|
|
678
|
+
// don't care about the proposer identity (e.g. sync tests) still produce a
|
|
679
|
+
// valid-looking signature for the attestationsAndSigners struct.
|
|
680
|
+
const proposerSigner = signers[0] ?? Secp256k1Signer.random();
|
|
681
|
+
const attestationsAndSignersSignature = proposerSigner.sign(
|
|
682
|
+
getHashedSignaturePayloadTypedData(attestationsAndSigners),
|
|
621
683
|
);
|
|
622
684
|
|
|
623
|
-
const
|
|
685
|
+
const verbatimAttestations = attestationsAndSigners.getPackedAttestations();
|
|
624
686
|
|
|
625
687
|
const rollupInput = encodeFunctionData({
|
|
626
688
|
abi: RollupAbi,
|
|
@@ -631,7 +693,7 @@ export class FakeL1State {
|
|
|
631
693
|
archive,
|
|
632
694
|
oracleInput: { feeAssetPriceModifier: 0n },
|
|
633
695
|
},
|
|
634
|
-
|
|
696
|
+
verbatimAttestations,
|
|
635
697
|
attestationsAndSigners.getSigners().map(signer => signer.toString()),
|
|
636
698
|
attestationsAndSignersSignature.toViemSignature(),
|
|
637
699
|
blobInput,
|
|
@@ -654,13 +716,11 @@ export class FakeL1State {
|
|
|
654
716
|
|
|
655
717
|
// Compute attestationsHash (same logic as CalldataRetriever)
|
|
656
718
|
const attestationsHash = Buffer32.fromString(
|
|
657
|
-
keccak256(encodeAbiParameters([this.getCommitteeAttestationsStructDef()], [
|
|
719
|
+
keccak256(encodeAbiParameters([this.getCommitteeAttestationsStructDef()], [verbatimAttestations])),
|
|
658
720
|
);
|
|
659
721
|
|
|
660
722
|
// Compute payloadDigest (same logic as CalldataRetriever)
|
|
661
|
-
const
|
|
662
|
-
const payloadToSign = consensusPayload.getPayloadToSign(SignatureDomainSeparator.checkpointAttestation);
|
|
663
|
-
const payloadDigest = Buffer32.fromString(keccak256(payloadToSign));
|
|
723
|
+
const payloadDigest = getHashedSignaturePayloadTypedData(consensusPayload);
|
|
664
724
|
|
|
665
725
|
const tx = {
|
|
666
726
|
input: multiCallInput,
|
|
@@ -672,6 +732,13 @@ export class FakeL1State {
|
|
|
672
732
|
return { tx, attestationsHash, payloadDigest };
|
|
673
733
|
}
|
|
674
734
|
|
|
735
|
+
private getSignatureContext() {
|
|
736
|
+
return {
|
|
737
|
+
chainId: 1,
|
|
738
|
+
rollupAddress: this.config.rollupAddress,
|
|
739
|
+
};
|
|
740
|
+
}
|
|
741
|
+
|
|
675
742
|
/** Extracts the CommitteeAttestations struct definition from RollupAbi for hash computation. */
|
|
676
743
|
private getCommitteeAttestationsStructDef(): AbiParameter {
|
|
677
744
|
const proposeFunction = RollupAbi.find(item => item.type === 'function' && item.name === 'propose') as
|