@aztec/archiver 0.0.1-commit.b2a5d0dd1 → 0.0.1-commit.b3d3157a
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 +7 -5
- package/dest/archiver.d.ts +49 -14
- package/dest/archiver.d.ts.map +1 -1
- package/dest/archiver.js +216 -68
- package/dest/config.d.ts +4 -3
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +11 -16
- package/dest/errors.d.ts +19 -13
- package/dest/errors.d.ts.map +1 -1
- package/dest/errors.js +32 -16
- package/dest/factory.d.ts +12 -6
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +31 -21
- package/dest/index.d.ts +9 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +8 -1
- package/dest/l1/calldata_retriever.d.ts +2 -1
- package/dest/l1/calldata_retriever.d.ts.map +1 -1
- package/dest/l1/calldata_retriever.js +13 -4
- package/dest/l1/trace_tx.d.ts +12 -66
- package/dest/l1/trace_tx.d.ts.map +1 -1
- 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 +40 -0
- package/dest/modules/data_source_base.d.ts +71 -49
- package/dest/modules/data_source_base.d.ts.map +1 -1
- package/dest/modules/data_source_base.js +269 -143
- package/dest/modules/data_store_updater.d.ts +18 -6
- package/dest/modules/data_store_updater.d.ts.map +1 -1
- package/dest/modules/data_store_updater.js +108 -59
- package/dest/modules/instrumentation.js +3 -1
- package/dest/modules/l1_synchronizer.d.ts +6 -5
- package/dest/modules/l1_synchronizer.d.ts.map +1 -1
- package/dest/modules/l1_synchronizer.js +203 -100
- 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 +4 -3
- package/dest/modules/validation.d.ts.map +1 -1
- package/dest/modules/validation.js +4 -4
- package/dest/store/block_store.d.ts +155 -98
- package/dest/store/block_store.d.ts.map +1 -1
- package/dest/store/block_store.js +473 -265
- package/dest/store/contract_class_store.d.ts +17 -3
- package/dest/store/contract_class_store.d.ts.map +1 -1
- package/dest/store/contract_class_store.js +17 -1
- 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 +31 -0
- 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 -8
- package/dest/store/l2_tips_cache.d.ts.map +1 -1
- package/dest/store/l2_tips_cache.js +13 -96
- package/dest/store/log_store.d.ts +42 -40
- package/dest/store/log_store.d.ts.map +1 -1
- package/dest/store/log_store.js +257 -478
- package/dest/store/log_store_codec.d.ts +70 -0
- package/dest/store/log_store_codec.d.ts.map +1 -0
- package/dest/store/log_store_codec.js +101 -0
- package/dest/store/message_store.d.ts +9 -3
- package/dest/store/message_store.d.ts.map +1 -1
- package/dest/store/message_store.js +31 -1
- package/dest/test/fake_l1_state.d.ts +2 -1
- package/dest/test/fake_l1_state.d.ts.map +1 -1
- package/dest/test/fake_l1_state.js +25 -8
- package/dest/test/mock_l2_block_source.d.ts +47 -51
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +223 -185
- package/dest/test/noop_l1_archiver.d.ts +10 -6
- package/dest/test/noop_l1_archiver.d.ts.map +1 -1
- package/dest/test/noop_l1_archiver.js +19 -8
- package/package.json +14 -14
- package/src/archiver.ts +265 -72
- package/src/config.ts +12 -19
- package/src/errors.ts +46 -23
- package/src/factory.ts +38 -20
- package/src/index.ts +16 -1
- package/src/l1/calldata_retriever.ts +14 -4
- package/src/modules/contract_data_source_adapter.ts +55 -0
- package/src/modules/data_source_base.ts +335 -187
- package/src/modules/data_store_updater.ts +118 -61
- package/src/modules/instrumentation.ts +1 -1
- package/src/modules/l1_synchronizer.ts +278 -120
- package/src/modules/outbox_trees_resolver.ts +199 -0
- package/src/modules/validation.ts +8 -7
- package/src/store/block_store.ts +566 -323
- package/src/store/contract_class_store.ts +28 -2
- package/src/store/contract_instance_store.ts +43 -0
- 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 -115
- package/src/store/log_store.ts +296 -650
- package/src/store/log_store_codec.ts +132 -0
- package/src/store/message_store.ts +35 -2
- package/src/test/fake_l1_state.ts +24 -14
- package/src/test/mock_l2_block_source.ts +271 -239
- package/src/test/noop_l1_archiver.ts +39 -8
- package/dest/store/kv_archiver_store.d.ts +0 -383
- package/dest/store/kv_archiver_store.d.ts.map +0 -1
- package/dest/store/kv_archiver_store.js +0 -501
- package/src/store/kv_archiver_store.ts +0 -728
|
@@ -0,0 +1,70 @@
|
|
|
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
|
+
export declare const NUMERIC_HEX_LEN = 8;
|
|
6
|
+
export declare const SEP = "-";
|
|
7
|
+
/**
|
|
8
|
+
* Sentinel appended after a numeric hex segment to build an end bound strictly greater than any
|
|
9
|
+
* real key for that namespace. `'g'` sorts lexicographically after every hex digit (`0`-`9`, `a`-`f`),
|
|
10
|
+
* so `prefix + '-g'` is a clean exclusive upper bound.
|
|
11
|
+
*/
|
|
12
|
+
export declare const HEX_SENTINEL = "g";
|
|
13
|
+
export type ParsedKeyTail = {
|
|
14
|
+
blockNumber: BlockNumber;
|
|
15
|
+
txIndexWithinBlock: number;
|
|
16
|
+
logIndexWithinTx: number;
|
|
17
|
+
};
|
|
18
|
+
/**
|
|
19
|
+
* Per-kind stored value layout (no msgpackr):
|
|
20
|
+
* txHash(32) ++ blockHash(32) ++ blockTimestamp(u64 BE = 8) ++ logDataLen(u32 BE = 4) ++ logData[i].toBuffer()...
|
|
21
|
+
* `blockNumber`, `txIndexWithinBlock`, and `logIndexWithinTx` are decoded from the composite key.
|
|
22
|
+
*/
|
|
23
|
+
export type StoredLogValue = {
|
|
24
|
+
txHash: TxHash;
|
|
25
|
+
blockHash: BlockHash;
|
|
26
|
+
blockTimestamp: bigint;
|
|
27
|
+
logData: Fr[];
|
|
28
|
+
};
|
|
29
|
+
/** Returns the 64-char lowercase hex representation of a field, stripping the `0x` prefix. */
|
|
30
|
+
export declare function fieldHex(value: Fr | {
|
|
31
|
+
toString: () => string;
|
|
32
|
+
}): string;
|
|
33
|
+
/** Encodes a number as 8-char zero-padded lowercase hex (matches a u32 big-endian byte buffer's lex order). */
|
|
34
|
+
export declare function u32Hex(n: number): string;
|
|
35
|
+
/**
|
|
36
|
+
* Encodes the composite primary key as `prefix-block-txIdx-logIdx` where `prefix` is the leading
|
|
37
|
+
* segment (`tag` for private; `contract-tag` for public) and the trailing triple is fixed-width
|
|
38
|
+
* 8-char zero-padded hex so byte-order matches `(blockNumber, txIndexWithinBlock, logIndexWithinTx)`.
|
|
39
|
+
*/
|
|
40
|
+
export declare function encodeKey(prefix: string, blockNumber: number, txIndex: number, logIndex: number): string;
|
|
41
|
+
/**
|
|
42
|
+
* Decodes the trailing `(blockNumber, txIndexWithinBlock, logIndexWithinTx)` triple from a composite
|
|
43
|
+
* key. The leading prefix segments are ignored — we only ever read them off the input query, never
|
|
44
|
+
* back off the key.
|
|
45
|
+
*/
|
|
46
|
+
export declare function decodeKeyTail(key: string): ParsedKeyTail;
|
|
47
|
+
/**
|
|
48
|
+
* Exclusive end bound for a `(contract, tag)`-prefix scan. With an `upperBlockExclusive` we cut at
|
|
49
|
+
* `(prefix, upper, 0, 0)`. With no bound we use `prefix + '-' + HEX_SENTINEL`, which sorts strictly
|
|
50
|
+
* after every real key under `prefix` (`g` is greater than any hex digit).
|
|
51
|
+
*/
|
|
52
|
+
export declare function endOfTagRange(prefix: string, upperBlockExclusive: number | undefined): string;
|
|
53
|
+
/**
|
|
54
|
+
* Exclusive end bound for a tx-strict scan: every key strictly inside `(prefix, txBlk, txIdx, *)`.
|
|
55
|
+
* `prefix-block-txIdx-` followed by the hex sentinel is the first key past every real logIndex for
|
|
56
|
+
* this tx and strictly less than the next tx's first key.
|
|
57
|
+
*/
|
|
58
|
+
export declare function endOfTxRange(prefix: string, txBlk: number, txIdx: number): string;
|
|
59
|
+
/**
|
|
60
|
+
* Returns the smallest string strictly greater than a fully-encoded composite key. The encoded key
|
|
61
|
+
* ends in a hex digit, and `'g'` sorts strictly after any hex digit, so appending `'g'` is the
|
|
62
|
+
* smallest possible successor in our key alphabet. Used to turn an inclusive cursor into an
|
|
63
|
+
* exclusive `start`.
|
|
64
|
+
*/
|
|
65
|
+
export declare function incKey(key: string): string;
|
|
66
|
+
export declare function encodeValue(value: StoredLogValue): Buffer;
|
|
67
|
+
export declare function decodeValue(buffer: Buffer | Uint8Array): StoredLogValue;
|
|
68
|
+
/** Encodes the public-log key prefix as `contractHex-tagHex`. */
|
|
69
|
+
export declare function encodePublicPrefix(contractHex: string, tagHex: string): string;
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3N0b3JlX2NvZGVjLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RvcmUvbG9nX3N0b3JlX2NvZGVjLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUxQyxlQUFPLE1BQU0sZUFBZSxJQUFJLENBQUM7QUFDakMsZUFBTyxNQUFNLEdBQUcsTUFBTSxDQUFDO0FBRXZCOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sWUFBWSxNQUFNLENBQUM7QUFFaEMsTUFBTSxNQUFNLGFBQWEsR0FBRztJQUMxQixXQUFXLEVBQUUsV0FBVyxDQUFDO0lBQ3pCLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztJQUMzQixnQkFBZ0IsRUFBRSxNQUFNLENBQUM7Q0FDMUIsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxNQUFNLE1BQU0sY0FBYyxHQUFHO0lBQzNCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixTQUFTLEVBQUUsU0FBUyxDQUFDO0lBQ3JCLGNBQWMsRUFBRSxNQUFNLENBQUM7SUFDdkIsT0FBTyxFQUFFLEVBQUUsRUFBRSxDQUFDO0NBQ2YsQ0FBQztBQUVGLDhGQUE4RjtBQUM5Rix3QkFBZ0IsUUFBUSxDQUFDLEtBQUssRUFBRSxFQUFFLEdBQUc7SUFBRSxRQUFRLEVBQUUsTUFBTSxNQUFNLENBQUE7Q0FBRSxHQUFHLE1BQU0sQ0FHdkU7QUFFRCwrR0FBK0c7QUFDL0csd0JBQWdCLE1BQU0sQ0FBQyxDQUFDLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FFeEM7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQWdCLFNBQVMsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FFeEc7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQWdCLGFBQWEsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLGFBQWEsQ0FReEQ7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQWdCLGFBQWEsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLG1CQUFtQixFQUFFLE1BQU0sR0FBRyxTQUFTLEdBQUcsTUFBTSxDQUs3RjtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBZ0IsWUFBWSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FFakY7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFnQixNQUFNLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxNQUFNLENBRTFDO0FBRUQsd0JBQWdCLFdBQVcsQ0FBQyxLQUFLLEVBQUUsY0FBYyxHQUFHLE1BQU0sQ0FRekQ7QUFFRCx3QkFBZ0IsV0FBVyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsVUFBVSxHQUFHLGNBQWMsQ0FpQnZFO0FBRUQsaUVBQWlFO0FBQ2pFLHdCQUFnQixrQkFBa0IsQ0FBQyxXQUFXLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsTUFBTSxDQUU5RSJ9
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log_store_codec.d.ts","sourceRoot":"","sources":["../../src/store/log_store_codec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,eAAO,MAAM,eAAe,IAAI,CAAC;AACjC,eAAO,MAAM,GAAG,MAAM,CAAC;AAEvB;;;;GAIG;AACH,eAAO,MAAM,YAAY,MAAM,CAAC;AAEhC,MAAM,MAAM,aAAa,GAAG;IAC1B,WAAW,EAAE,WAAW,CAAC;IACzB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,EAAE,EAAE,CAAC;CACf,CAAC;AAEF,8FAA8F;AAC9F,wBAAgB,QAAQ,CAAC,KAAK,EAAE,EAAE,GAAG;IAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;CAAE,GAAG,MAAM,CAGvE;AAED,+GAA+G;AAC/G,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAExC;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAExG;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAQxD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAK7F;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAEjF;AAED;;;;;GAKG;AACH,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE1C;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAQzD;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,cAAc,CAiBvE;AAED,iEAAiE;AACjE,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAE9E"}
|
|
@@ -0,0 +1,101 @@
|
|
|
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
|
+
export const NUMERIC_HEX_LEN = 8;
|
|
6
|
+
export const SEP = '-';
|
|
7
|
+
/**
|
|
8
|
+
* Sentinel appended after a numeric hex segment to build an end bound strictly greater than any
|
|
9
|
+
* real key for that namespace. `'g'` sorts lexicographically after every hex digit (`0`-`9`, `a`-`f`),
|
|
10
|
+
* so `prefix + '-g'` is a clean exclusive upper bound.
|
|
11
|
+
*/ export const HEX_SENTINEL = 'g';
|
|
12
|
+
/** Returns the 64-char lowercase hex representation of a field, stripping the `0x` prefix. */ export function fieldHex(value) {
|
|
13
|
+
// Fr.toString() and AztecAddress.toString() both return `0x` + 64 lowercase hex chars.
|
|
14
|
+
return value.toString().slice(2);
|
|
15
|
+
}
|
|
16
|
+
/** Encodes a number as 8-char zero-padded lowercase hex (matches a u32 big-endian byte buffer's lex order). */ export function u32Hex(n) {
|
|
17
|
+
return n.toString(16).padStart(NUMERIC_HEX_LEN, '0');
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Encodes the composite primary key as `prefix-block-txIdx-logIdx` where `prefix` is the leading
|
|
21
|
+
* segment (`tag` for private; `contract-tag` for public) and the trailing triple is fixed-width
|
|
22
|
+
* 8-char zero-padded hex so byte-order matches `(blockNumber, txIndexWithinBlock, logIndexWithinTx)`.
|
|
23
|
+
*/ export function encodeKey(prefix, blockNumber, txIndex, logIndex) {
|
|
24
|
+
return `${prefix}${SEP}${u32Hex(blockNumber)}${SEP}${u32Hex(txIndex)}${SEP}${u32Hex(logIndex)}`;
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* Decodes the trailing `(blockNumber, txIndexWithinBlock, logIndexWithinTx)` triple from a composite
|
|
28
|
+
* key. The leading prefix segments are ignored — we only ever read them off the input query, never
|
|
29
|
+
* back off the key.
|
|
30
|
+
*/ export function decodeKeyTail(key) {
|
|
31
|
+
const parts = key.split(SEP);
|
|
32
|
+
const len = parts.length;
|
|
33
|
+
return {
|
|
34
|
+
blockNumber: BlockNumber(parseInt(parts[len - 3], 16)),
|
|
35
|
+
txIndexWithinBlock: parseInt(parts[len - 2], 16),
|
|
36
|
+
logIndexWithinTx: parseInt(parts[len - 1], 16)
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Exclusive end bound for a `(contract, tag)`-prefix scan. With an `upperBlockExclusive` we cut at
|
|
41
|
+
* `(prefix, upper, 0, 0)`. With no bound we use `prefix + '-' + HEX_SENTINEL`, which sorts strictly
|
|
42
|
+
* after every real key under `prefix` (`g` is greater than any hex digit).
|
|
43
|
+
*/ export function endOfTagRange(prefix, upperBlockExclusive) {
|
|
44
|
+
if (upperBlockExclusive === undefined) {
|
|
45
|
+
return `${prefix}${SEP}${HEX_SENTINEL}`;
|
|
46
|
+
}
|
|
47
|
+
return encodeKey(prefix, upperBlockExclusive, 0, 0);
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Exclusive end bound for a tx-strict scan: every key strictly inside `(prefix, txBlk, txIdx, *)`.
|
|
51
|
+
* `prefix-block-txIdx-` followed by the hex sentinel is the first key past every real logIndex for
|
|
52
|
+
* this tx and strictly less than the next tx's first key.
|
|
53
|
+
*/ export function endOfTxRange(prefix, txBlk, txIdx) {
|
|
54
|
+
return `${prefix}${SEP}${u32Hex(txBlk)}${SEP}${u32Hex(txIdx)}${SEP}${HEX_SENTINEL}`;
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* Returns the smallest string strictly greater than a fully-encoded composite key. The encoded key
|
|
58
|
+
* ends in a hex digit, and `'g'` sorts strictly after any hex digit, so appending `'g'` is the
|
|
59
|
+
* smallest possible successor in our key alphabet. Used to turn an inclusive cursor into an
|
|
60
|
+
* exclusive `start`.
|
|
61
|
+
*/ export function incKey(key) {
|
|
62
|
+
return key + HEX_SENTINEL;
|
|
63
|
+
}
|
|
64
|
+
export function encodeValue(value) {
|
|
65
|
+
const head = Buffer.allocUnsafe(32 + 32 + 8 + 4);
|
|
66
|
+
value.txHash.toBuffer().copy(head, 0);
|
|
67
|
+
value.blockHash.toBuffer().copy(head, 32);
|
|
68
|
+
head.writeBigUInt64BE(value.blockTimestamp, 64);
|
|
69
|
+
head.writeUInt32BE(value.logData.length, 72);
|
|
70
|
+
const fieldBufs = value.logData.map((f)=>f.toBuffer());
|
|
71
|
+
return Buffer.concat([
|
|
72
|
+
head,
|
|
73
|
+
...fieldBufs
|
|
74
|
+
]);
|
|
75
|
+
}
|
|
76
|
+
export function decodeValue(buffer) {
|
|
77
|
+
const buf = Buffer.isBuffer(buffer) ? buffer : Buffer.from(buffer.buffer, buffer.byteOffset, buffer.byteLength);
|
|
78
|
+
let off = 0;
|
|
79
|
+
const txHash = TxHash.fromBuffer(buf.subarray(off, off + 32));
|
|
80
|
+
off += 32;
|
|
81
|
+
const blockHash = BlockHash.fromBuffer(buf.subarray(off, off + 32));
|
|
82
|
+
off += 32;
|
|
83
|
+
const blockTimestamp = buf.readBigUInt64BE(off);
|
|
84
|
+
off += 8;
|
|
85
|
+
const logDataLen = buf.readUInt32BE(off);
|
|
86
|
+
off += 4;
|
|
87
|
+
const logData = new Array(logDataLen);
|
|
88
|
+
for(let i = 0; i < logDataLen; i++){
|
|
89
|
+
logData[i] = Fr.fromBuffer(buf.subarray(off, off + 32));
|
|
90
|
+
off += 32;
|
|
91
|
+
}
|
|
92
|
+
return {
|
|
93
|
+
txHash,
|
|
94
|
+
blockHash,
|
|
95
|
+
blockTimestamp,
|
|
96
|
+
logData
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
/** Encodes the public-log key prefix as `contractHex-tagHex`. */ export function encodePublicPrefix(contractHex, tagHex) {
|
|
100
|
+
return `${contractHex}${SEP}${tagHex}`;
|
|
101
|
+
}
|
|
@@ -16,6 +16,9 @@ export declare class MessageStore {
|
|
|
16
16
|
getSynchedL1Block(): Promise<L1BlockId | undefined>;
|
|
17
17
|
/** Sets the last L1 block synced */
|
|
18
18
|
setSynchedL1Block(l1Block: L1BlockId): Promise<void>;
|
|
19
|
+
/** Gets the L1 finalized block as of the last successful message sync. */
|
|
20
|
+
getMessagesFinalizedL1Block(): Promise<L1BlockId | undefined>;
|
|
21
|
+
private maybeAdvanceFinalizedL1Block;
|
|
19
22
|
/**
|
|
20
23
|
* Append L1 to L2 messages to the store.
|
|
21
24
|
* Requires new messages to be in order and strictly after the last message added.
|
|
@@ -31,8 +34,11 @@ export declare class MessageStore {
|
|
|
31
34
|
getLastMessage(): Promise<InboxMessage | undefined>;
|
|
32
35
|
/** Returns the inbox tree-in-progress checkpoint number from L1, or undefined if not yet set. */
|
|
33
36
|
getInboxTreeInProgress(): Promise<bigint | undefined>;
|
|
34
|
-
/**
|
|
35
|
-
|
|
37
|
+
/**
|
|
38
|
+
* Atomically updates the message sync state: the L1 sync point, the inbox tree-in-progress marker, and
|
|
39
|
+
* (optionally) the L1 finalized block as of this sync. The finalized block is advanced monotonically.
|
|
40
|
+
*/
|
|
41
|
+
setMessageSyncState(l1Block: L1BlockId, treeInProgress: bigint | undefined, finalizedL1Block?: L1BlockId): Promise<void>;
|
|
36
42
|
getL1ToL2Messages(checkpointNumber: CheckpointNumber): Promise<Fr[]>;
|
|
37
43
|
iterateL1ToL2Messages(range?: CustomRange<bigint>): AsyncIterableIterator<InboxMessage>;
|
|
38
44
|
removeL1ToL2Messages(startIndex: bigint): Promise<void>;
|
|
@@ -41,4 +47,4 @@ export declare class MessageStore {
|
|
|
41
47
|
private leafToIndexKey;
|
|
42
48
|
private increaseTotalMessageCount;
|
|
43
49
|
}
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzc2FnZV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0b3JlL21lc3NhZ2Vfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDMUQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFbkUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBSXBELE9BQU8sRUFDTCxLQUFLLGlCQUFpQixFQUd0QixLQUFLLFdBQVcsRUFFakIsTUFBTSxpQkFBaUIsQ0FBQztBQUl6QixPQUFPLEVBQ0wsS0FBSyxZQUFZLEVBSWxCLE1BQU0sNkJBQTZCLENBQUM7QUFFckMscUJBQWEsaUJBQWtCLFNBQVEsS0FBSzthQUd4QixZQUFZLEVBQUUsWUFBWTtJQUY1QyxZQUNFLE9BQU8sRUFBRSxNQUFNLEVBQ0MsWUFBWSxFQUFFLFlBQVksRUFJM0M7Q0FDRjtBQUVELHFCQUFhLFlBQVk7O0lBZ0JYLE9BQU8sQ0FBQyxFQUFFO0lBQXRCLFlBQW9CLEVBQUUsRUFBRSxpQkFBaUIsRUFPeEM7SUFFWSwwQkFBMEIsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBRXpEO0lBRUQscUNBQXFDO0lBQ3hCLGlCQUFpQixJQUFJLE9BQU8sQ0FBQyxTQUFTLEdBQUcsU0FBUyxDQUFDLENBUS9EO0lBRUQsb0NBQW9DO0lBQ3ZCLGlCQUFpQixDQUFDLE9BQU8sRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUdoRTtJQUVELDBFQUEwRTtJQUM3RCwyQkFBMkIsSUFBSSxPQUFPLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQyxDQU96RTtZQUdhLDRCQUE0QjtJQVMxQzs7OztPQUlHO0lBQ0ksaUJBQWlCLENBQUMsUUFBUSxFQUFFLFlBQVksRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FvRmhFO0lBRUQ7Ozs7T0FJRztJQUNJLHFCQUFxQixDQUFDLGFBQWEsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsQ0FFM0U7SUFFWSxjQUFjLElBQUksT0FBTyxDQUFDLFlBQVksR0FBRyxTQUFTLENBQUMsQ0FHL0Q7SUFFRCxpR0FBaUc7SUFDMUYsc0JBQXNCLElBQUksT0FBTyxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsQ0FFM0Q7SUFFRDs7O09BR0c7SUFDSSxtQkFBbUIsQ0FDeEIsT0FBTyxFQUFFLFNBQVMsRUFDbEIsY0FBYyxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQ2xDLGdCQUFnQixDQUFDLEVBQUUsU0FBUyxHQUMzQixPQUFPLENBQUMsSUFBSSxDQUFDLENBWWY7SUFFWSxpQkFBaUIsQ0FBQyxnQkFBZ0IsRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsQ0E0QmhGO0lBRWEscUJBQXFCLENBQUMsS0FBSyxHQUFFLFdBQVcsQ0FBQyxNQUFNLENBQU0sR0FBRyxxQkFBcUIsQ0FBQyxZQUFZLENBQUMsQ0FLeEc7SUFFTSxvQkFBb0IsQ0FBQyxVQUFVLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FnQjdEO0lBRU0sa0NBQWtDLENBQUMsc0JBQXNCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUlqRztJQUVELE9BQU8sQ0FBQyxVQUFVO0lBSWxCLE9BQU8sQ0FBQyxjQUFjO1lBSVIseUJBQXlCO0NBU3hDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message_store.d.ts","sourceRoot":"","sources":["../../src/store/message_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIpD,OAAO,EACL,KAAK,iBAAiB,EAGtB,KAAK,WAAW,EAEjB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EACL,KAAK,YAAY,EAIlB,MAAM,6BAA6B,CAAC;AAErC,qBAAa,iBAAkB,SAAQ,KAAK;aAGxB,YAAY,EAAE,YAAY;IAF5C,YACE,OAAO,EAAE,MAAM,EACC,YAAY,EAAE,YAAY,EAI3C;CACF;AAED,qBAAa,YAAY;;
|
|
1
|
+
{"version":3,"file":"message_store.d.ts","sourceRoot":"","sources":["../../src/store/message_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIpD,OAAO,EACL,KAAK,iBAAiB,EAGtB,KAAK,WAAW,EAEjB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EACL,KAAK,YAAY,EAIlB,MAAM,6BAA6B,CAAC;AAErC,qBAAa,iBAAkB,SAAQ,KAAK;aAGxB,YAAY,EAAE,YAAY;IAF5C,YACE,OAAO,EAAE,MAAM,EACC,YAAY,EAAE,YAAY,EAI3C;CACF;AAED,qBAAa,YAAY;;IAgBX,OAAO,CAAC,EAAE;IAAtB,YAAoB,EAAE,EAAE,iBAAiB,EAOxC;IAEY,0BAA0B,IAAI,OAAO,CAAC,MAAM,CAAC,CAEzD;IAED,qCAAqC;IACxB,iBAAiB,IAAI,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAQ/D;IAED,oCAAoC;IACvB,iBAAiB,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhE;IAED,0EAA0E;IAC7D,2BAA2B,IAAI,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAOzE;YAGa,4BAA4B;IAS1C;;;;OAIG;IACI,iBAAiB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAoFhE;IAED;;;;OAIG;IACI,qBAAqB,CAAC,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE3E;IAEY,cAAc,IAAI,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAG/D;IAED,iGAAiG;IAC1F,sBAAsB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE3D;IAED;;;OAGG;IACI,mBAAmB,CACxB,OAAO,EAAE,SAAS,EAClB,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,gBAAgB,CAAC,EAAE,SAAS,GAC3B,OAAO,CAAC,IAAI,CAAC,CAYf;IAEY,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CA4BhF;IAEa,qBAAqB,CAAC,KAAK,GAAE,WAAW,CAAC,MAAM,CAAM,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAKxG;IAEM,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB7D;IAEM,kCAAkC,CAAC,sBAAsB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIjG;IAED,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,cAAc;YAIR,yBAAyB;CASxC"}
|
|
@@ -21,6 +21,7 @@ export class MessageStore {
|
|
|
21
21
|
/** Stores L1 block number and hash of the L1 synchpoint */ #lastSynchedL1Block;
|
|
22
22
|
/** Stores total messages stored */ #totalMessageCount;
|
|
23
23
|
/** Stores the checkpoint number whose message tree is currently being filled on L1. */ #inboxTreeInProgress;
|
|
24
|
+
/** Stores the L1 finalized block as of the last successful message sync. */ #messagesFinalizedL1Block;
|
|
24
25
|
#log;
|
|
25
26
|
constructor(db){
|
|
26
27
|
this.db = db;
|
|
@@ -30,6 +31,7 @@ export class MessageStore {
|
|
|
30
31
|
this.#lastSynchedL1Block = db.openSingleton('archiver_last_l1_block_id');
|
|
31
32
|
this.#totalMessageCount = db.openSingleton('archiver_l1_to_l2_message_count');
|
|
32
33
|
this.#inboxTreeInProgress = db.openSingleton('archiver_inbox_tree_in_progress');
|
|
34
|
+
this.#messagesFinalizedL1Block = db.openSingleton('archiver_messages_finalized_l1_block');
|
|
33
35
|
}
|
|
34
36
|
async getTotalL1ToL2MessageCount() {
|
|
35
37
|
return await this.#totalMessageCount.getAsync() ?? 0n;
|
|
@@ -52,6 +54,28 @@ export class MessageStore {
|
|
|
52
54
|
]);
|
|
53
55
|
await this.#lastSynchedL1Block.set(buffer);
|
|
54
56
|
}
|
|
57
|
+
/** Gets the L1 finalized block as of the last successful message sync. */ async getMessagesFinalizedL1Block() {
|
|
58
|
+
const buffer = await this.#messagesFinalizedL1Block.getAsync();
|
|
59
|
+
if (!buffer) {
|
|
60
|
+
return undefined;
|
|
61
|
+
}
|
|
62
|
+
const reader = BufferReader.asReader(buffer);
|
|
63
|
+
return {
|
|
64
|
+
l1BlockNumber: reader.readUInt256(),
|
|
65
|
+
l1BlockHash: Buffer32.fromBuffer(reader.readBytes(Buffer32.SIZE))
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
/** Monotonically advances the persisted L1 finalized block for message sync. Never regresses. */ async maybeAdvanceFinalizedL1Block(l1Block) {
|
|
69
|
+
const existing = await this.getMessagesFinalizedL1Block();
|
|
70
|
+
if (existing && l1Block.l1BlockNumber <= existing.l1BlockNumber) {
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
const buffer = serializeToBuffer([
|
|
74
|
+
l1Block.l1BlockNumber,
|
|
75
|
+
l1Block.l1BlockHash
|
|
76
|
+
]);
|
|
77
|
+
await this.#messagesFinalizedL1Block.set(buffer);
|
|
78
|
+
}
|
|
55
79
|
/**
|
|
56
80
|
* Append L1 to L2 messages to the store.
|
|
57
81
|
* Requires new messages to be in order and strictly after the last message added.
|
|
@@ -122,7 +146,10 @@ export class MessageStore {
|
|
|
122
146
|
/** Returns the inbox tree-in-progress checkpoint number from L1, or undefined if not yet set. */ getInboxTreeInProgress() {
|
|
123
147
|
return this.#inboxTreeInProgress.getAsync();
|
|
124
148
|
}
|
|
125
|
-
/**
|
|
149
|
+
/**
|
|
150
|
+
* Atomically updates the message sync state: the L1 sync point, the inbox tree-in-progress marker, and
|
|
151
|
+
* (optionally) the L1 finalized block as of this sync. The finalized block is advanced monotonically.
|
|
152
|
+
*/ setMessageSyncState(l1Block, treeInProgress, finalizedL1Block) {
|
|
126
153
|
return this.db.transactionAsync(async ()=>{
|
|
127
154
|
await this.setSynchedL1Block(l1Block);
|
|
128
155
|
if (treeInProgress !== undefined) {
|
|
@@ -130,6 +157,9 @@ export class MessageStore {
|
|
|
130
157
|
} else {
|
|
131
158
|
await this.#inboxTreeInProgress.delete();
|
|
132
159
|
}
|
|
160
|
+
if (finalizedL1Block !== undefined) {
|
|
161
|
+
await this.maybeAdvanceFinalizedL1Block(finalizedL1Block);
|
|
162
|
+
}
|
|
133
163
|
});
|
|
134
164
|
}
|
|
135
165
|
async getL1ToL2Messages(checkpointNumber) {
|
|
@@ -204,10 +204,11 @@ export declare class FakeL1State {
|
|
|
204
204
|
private getMessageSentLogs;
|
|
205
205
|
private getMessageSentLogByHash;
|
|
206
206
|
private makeRollupTx;
|
|
207
|
+
private getSignatureContext;
|
|
207
208
|
/** Extracts the CommitteeAttestations struct definition from RollupAbi for hash computation. */
|
|
208
209
|
private getCommitteeAttestationsStructDef;
|
|
209
210
|
private makeVersionedBlobHashes;
|
|
210
211
|
private makeBlobsFromCheckpoint;
|
|
211
212
|
}
|
|
212
213
|
export {};
|
|
213
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
214
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFrZV9sMV9zdGF0ZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvZmFrZV9sMV9zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3JFLE9BQU8sRUFBRSxLQUFLLElBQUksRUFBcUQsTUFBTSxpQkFBaUIsQ0FBQztBQUUvRixPQUFPLEtBQUssRUFBeUIsYUFBYSxFQUFrQixjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV0SCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzlELE9BQU8sRUFBb0IsZ0JBQWdCLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFakcsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBQzVFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFHM0QsT0FBTyxFQUF5RCxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNyRyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFLdEQsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFN0QsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFRLE1BQU0sb0JBQW9CLENBQUM7QUFjMUQsMkNBQTJDO0FBQzNDLE1BQU0sTUFBTSxpQkFBaUIsR0FBRztJQUM5Qiw0QkFBNEI7SUFDNUIsa0JBQWtCLEVBQUUsRUFBRSxDQUFDO0lBQ3ZCLDZCQUE2QjtJQUM3QixZQUFZLEVBQUUsTUFBTSxDQUFDO0lBQ3JCLGtDQUFrQztJQUNsQyxhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLHlDQUF5QztJQUN6QyxvQkFBb0IsRUFBRSxNQUFNLENBQUM7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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fake_l1_state.d.ts","sourceRoot":"","sources":["../../src/test/fake_l1_state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,KAAK,IAAI,EAAqD,MAAM,iBAAiB,CAAC;AAE/F,OAAO,KAAK,EAAyB,aAAa,EAAkB,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEtH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAoB,gBAAgB,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAEjG,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAyD,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACrG,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"fake_l1_state.d.ts","sourceRoot":"","sources":["../../src/test/fake_l1_state.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,13 +3,14 @@ import { INITIAL_CHECKPOINT_NUMBER } from '@aztec/constants';
|
|
|
3
3
|
import { MULTI_CALL_3_ADDRESS } from '@aztec/ethereum/contracts';
|
|
4
4
|
import { CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
5
5
|
import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
|
|
6
|
+
import { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
|
|
6
7
|
import { createLogger } from '@aztec/foundation/log';
|
|
7
8
|
import { RollupAbi } from '@aztec/l1-artifacts';
|
|
8
9
|
import { CommitteeAttestation, CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
|
|
9
10
|
import { getSlotAtTimestamp } from '@aztec/stdlib/epoch-helpers';
|
|
10
11
|
import { InboxLeaf } from '@aztec/stdlib/messaging';
|
|
11
|
-
import { ConsensusPayload,
|
|
12
|
-
import {
|
|
12
|
+
import { ConsensusPayload, getHashedSignaturePayloadTypedData } from '@aztec/stdlib/p2p';
|
|
13
|
+
import { mockCheckpointAndMessages } from '@aztec/stdlib/testing';
|
|
13
14
|
import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
|
|
14
15
|
import { mock } from 'jest-mock-extended';
|
|
15
16
|
import { encodeAbiParameters, encodeFunctionData, keccak256, multicall3Abi, toHex } from 'viem';
|
|
@@ -322,6 +323,11 @@ import { updateRollingHash } from '../structs/inbox_message.js';
|
|
|
322
323
|
/** Creates mock PublicClient that reads from this fake state. */ createMockPublicClient() {
|
|
323
324
|
const publicClient = mock();
|
|
324
325
|
publicClient.getChainId.mockResolvedValue(1);
|
|
326
|
+
// Several consumers (CalldataRetriever, ArchiverL1Synchronizer) derive the EIP-712 signing
|
|
327
|
+
// context from `publicClient.chain.id`. Pin it so it matches `getSignatureContext()` below.
|
|
328
|
+
publicClient.chain = {
|
|
329
|
+
id: 1
|
|
330
|
+
};
|
|
325
331
|
publicClient.getBlockNumber.mockImplementation(()=>Promise.resolve(this.l1BlockNumber));
|
|
326
332
|
publicClient.getBlock.mockImplementation(async (args = {})=>{
|
|
327
333
|
let blockNum;
|
|
@@ -417,12 +423,19 @@ import { updateRollingHash } from '../structs/inbox_message.js';
|
|
|
417
423
|
};
|
|
418
424
|
}
|
|
419
425
|
async makeRollupTx(checkpoint, signers) {
|
|
420
|
-
const
|
|
426
|
+
const signatureContext = this.getSignatureContext();
|
|
427
|
+
const consensusPayload = ConsensusPayload.fromCheckpoint(checkpoint, signatureContext);
|
|
428
|
+
const attestationDigest = getHashedSignaturePayloadTypedData(consensusPayload);
|
|
429
|
+
const attestations = signers.map((signer)=>CommitteeAttestation.fromSignature(signer.sign(attestationDigest))).map((committeeAttestation)=>committeeAttestation.toViem());
|
|
421
430
|
const header = checkpoint.header.toViem();
|
|
422
431
|
const blobInput = getPrefixedEthBlobCommitments(await getBlobsPerL1Block(checkpoint.toBlobFields()));
|
|
423
432
|
const archive = toHex(checkpoint.archive.root.toBuffer());
|
|
424
|
-
const attestationsAndSigners = new CommitteeAttestationsAndSigners(attestations.map((attestation)=>CommitteeAttestation.fromViem(attestation)));
|
|
425
|
-
|
|
433
|
+
const attestationsAndSigners = new CommitteeAttestationsAndSigners(attestations.map((attestation)=>CommitteeAttestation.fromViem(attestation)), signatureContext);
|
|
434
|
+
// Fall back to a random signer when no attesters are provided, so tests that
|
|
435
|
+
// don't care about the proposer identity (e.g. sync tests) still produce a
|
|
436
|
+
// valid-looking signature for the attestationsAndSigners struct.
|
|
437
|
+
const proposerSigner = signers[0] ?? Secp256k1Signer.random();
|
|
438
|
+
const attestationsAndSignersSignature = proposerSigner.sign(getHashedSignaturePayloadTypedData(attestationsAndSigners));
|
|
426
439
|
const packedAttestations = attestationsAndSigners.getPackedAttestations();
|
|
427
440
|
const rollupInput = encodeFunctionData({
|
|
428
441
|
abi: RollupAbi,
|
|
@@ -461,9 +474,7 @@ import { updateRollingHash } from '../structs/inbox_message.js';
|
|
|
461
474
|
packedAttestations
|
|
462
475
|
])));
|
|
463
476
|
// Compute payloadDigest (same logic as CalldataRetriever)
|
|
464
|
-
const
|
|
465
|
-
const payloadToSign = consensusPayload.getPayloadToSign(SignatureDomainSeparator.checkpointAttestation);
|
|
466
|
-
const payloadDigest = Buffer32.fromString(keccak256(payloadToSign));
|
|
477
|
+
const payloadDigest = getHashedSignaturePayloadTypedData(consensusPayload);
|
|
467
478
|
const tx = {
|
|
468
479
|
input: multiCallInput,
|
|
469
480
|
hash: archive,
|
|
@@ -476,6 +487,12 @@ import { updateRollingHash } from '../structs/inbox_message.js';
|
|
|
476
487
|
payloadDigest
|
|
477
488
|
};
|
|
478
489
|
}
|
|
490
|
+
getSignatureContext() {
|
|
491
|
+
return {
|
|
492
|
+
chainId: 1,
|
|
493
|
+
rollupAddress: this.config.rollupAddress
|
|
494
|
+
};
|
|
495
|
+
}
|
|
479
496
|
/** Extracts the CommitteeAttestations struct definition from RollupAbi for hash computation. */ getCommitteeAttestationsStructDef() {
|
|
480
497
|
const proposeFunction = RollupAbi.find((item)=>item.type === 'function' && item.name === 'propose');
|
|
481
498
|
if (!proposeFunction) {
|
|
@@ -3,11 +3,11 @@ import { Fr } from '@aztec/foundation/curves/bn254';
|
|
|
3
3
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import type { FunctionSelector } from '@aztec/stdlib/abi';
|
|
5
5
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
6
|
-
import { type BlockData, BlockHash,
|
|
6
|
+
import { type BlockData, type BlockHash, type BlockQuery, type BlocksQuery, type CheckpointQuery, type CheckpointsQuery, L2Block, type L2BlockSource, type L2Tips, type ProposedCheckpointQuery, type ValidateCheckpointResult } from '@aztec/stdlib/block';
|
|
7
7
|
import { Checkpoint, type CheckpointData, type ProposedCheckpointData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
|
|
8
8
|
import type { ContractClassPublic, ContractDataSource, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
|
|
9
9
|
import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
|
|
10
|
-
import {
|
|
10
|
+
import { BlockHeader, TxHash } from '@aztec/stdlib/tx';
|
|
11
11
|
import type { UInt64 } from '@aztec/stdlib/types';
|
|
12
12
|
/**
|
|
13
13
|
* A mocked implementation of L2BlockSource to be used in tests.
|
|
@@ -19,7 +19,34 @@ export declare class MockL2BlockSource implements L2BlockSource, ContractDataSou
|
|
|
19
19
|
private finalizedBlockNumber;
|
|
20
20
|
private checkpointedBlockNumber;
|
|
21
21
|
private proposedCheckpointBlockNumber;
|
|
22
|
+
private initialHeader;
|
|
23
|
+
private initialHeaderHash;
|
|
24
|
+
private genesisArchiveRoot?;
|
|
25
|
+
private genesisBlock?;
|
|
22
26
|
private log;
|
|
27
|
+
/** Returns the initial header used to synthesize block 0. */
|
|
28
|
+
getInitialHeader(): BlockHeader;
|
|
29
|
+
/**
|
|
30
|
+
* Sets the initial header used to synthesize block 0. Tests that wire up a real
|
|
31
|
+
* world-state should call this with `worldState.getInitialHeader()` so the L2BlockStream
|
|
32
|
+
* agrees on the genesis hash on both sides. Precomputes and caches the header hash so
|
|
33
|
+
* `getGenesisBlockHash()` can return synchronously.
|
|
34
|
+
*/
|
|
35
|
+
setInitialHeader(header: BlockHeader): Promise<void>;
|
|
36
|
+
/**
|
|
37
|
+
* Returns the precomputed hash of the genesis block header. Defaults to the static
|
|
38
|
+
* {@link GENESIS_BLOCK_HEADER_HASH} unless {@link setInitialHeader} has been called with a
|
|
39
|
+
* custom header.
|
|
40
|
+
*/
|
|
41
|
+
getGenesisBlockHash(): BlockHash;
|
|
42
|
+
/**
|
|
43
|
+
* Sets the post-genesis archive root used to synthesize block 0. Mirrors the real archiver,
|
|
44
|
+
* whose synthetic block 0 carries `new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1)` rather
|
|
45
|
+
* than `AppendOnlyTreeSnapshot.empty()`. Tests wiring up a real world-state should set this so
|
|
46
|
+
* archive-based block lookups against the mock match production semantics.
|
|
47
|
+
*/
|
|
48
|
+
setGenesisArchiveRoot(root: Fr): void;
|
|
49
|
+
private getGenesisBlock;
|
|
23
50
|
/** Creates blocks grouped into single-block checkpoints. */
|
|
24
51
|
createBlocks(numBlocks: number): Promise<void>;
|
|
25
52
|
getCheckpointNumber(): Promise<CheckpointNumber>;
|
|
@@ -46,47 +73,17 @@ export declare class MockL2BlockSource implements L2BlockSource, ContractDataSou
|
|
|
46
73
|
* @returns In this mock instance, returns the number of L2 blocks that we've mocked.
|
|
47
74
|
*/
|
|
48
75
|
getBlockNumber(): Promise<BlockNumber>;
|
|
49
|
-
|
|
50
|
-
getCheckpointedL2BlockNumber(): Promise<BlockNumber>;
|
|
51
|
-
getFinalizedL2BlockNumber(): Promise<BlockNumber>;
|
|
76
|
+
getBlockNumber(query: BlockQuery): Promise<BlockNumber | undefined>;
|
|
52
77
|
getProposedCheckpointL2BlockNumber(): Promise<BlockNumber>;
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
/**
|
|
56
|
-
* Gets an l2 block.
|
|
57
|
-
* @param number - The block number to return (inclusive).
|
|
58
|
-
* @returns The requested L2 block.
|
|
59
|
-
*/
|
|
60
|
-
getBlock(number: number): Promise<L2Block | undefined>;
|
|
61
|
-
/**
|
|
62
|
-
* Gets an L2 block (new format).
|
|
63
|
-
* @param number - The block number to return.
|
|
64
|
-
* @returns The requested L2 block.
|
|
65
|
-
*/
|
|
66
|
-
getL2Block(number: BlockNumber): Promise<L2Block | undefined>;
|
|
67
|
-
/**
|
|
68
|
-
* Gets up to `limit` amount of L2 blocks starting from `from`.
|
|
69
|
-
* @param from - Number of the first block to return (inclusive).
|
|
70
|
-
* @param limit - The maximum number of blocks to return.
|
|
71
|
-
* @returns The requested mocked L2 blocks.
|
|
72
|
-
*/
|
|
73
|
-
getBlocks(from: number, limit: number): Promise<L2Block[]>;
|
|
74
|
-
getCheckpoints(from: CheckpointNumber, limit: number): Promise<PublishedCheckpoint[]>;
|
|
78
|
+
getCheckpoint(query: CheckpointQuery): Promise<PublishedCheckpoint | undefined>;
|
|
79
|
+
getCheckpoints(query: CheckpointsQuery): Promise<PublishedCheckpoint[]>;
|
|
75
80
|
getCheckpointByArchive(archive: Fr): Promise<Checkpoint | undefined>;
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
getBlockHeaderByArchive(archive: Fr): Promise<BlockHeader | undefined>;
|
|
82
|
-
getBlockData(number: BlockNumber): Promise<BlockData | undefined>;
|
|
83
|
-
getBlockDataByArchive(archive: Fr): Promise<BlockData | undefined>;
|
|
84
|
-
getBlockHeader(number: number | 'latest'): Promise<BlockHeader | undefined>;
|
|
85
|
-
getCheckpointsForEpoch(epochNumber: EpochNumber): Promise<Checkpoint[]>;
|
|
86
|
-
getCheckpointsDataForEpoch(epochNumber: EpochNumber): Promise<CheckpointData[]>;
|
|
87
|
-
getCheckpointedBlocksForEpoch(epochNumber: EpochNumber): Promise<CheckpointedL2Block[]>;
|
|
81
|
+
getCheckpointData(query: CheckpointQuery): Promise<CheckpointData | undefined>;
|
|
82
|
+
getCheckpointsData(query: CheckpointsQuery): Promise<CheckpointData[]>;
|
|
83
|
+
private checkpointToData;
|
|
84
|
+
private resolveCheckpointQuery;
|
|
85
|
+
private resolveCheckpointsQuery;
|
|
88
86
|
getBlocksForSlot(slotNumber: SlotNumber): Promise<L2Block[]>;
|
|
89
|
-
getCheckpointedBlockHeadersForEpoch(epochNumber: EpochNumber): Promise<BlockHeader[]>;
|
|
90
87
|
/**
|
|
91
88
|
* Gets a tx effect.
|
|
92
89
|
* @param txHash - The hash of the tx corresponding to the tx effect.
|
|
@@ -97,18 +94,15 @@ export declare class MockL2BlockSource implements L2BlockSource, ContractDataSou
|
|
|
97
94
|
l2BlockNumber: BlockNumber;
|
|
98
95
|
l2BlockHash: BlockHash;
|
|
99
96
|
txIndexInBlock: number;
|
|
97
|
+
slotNumber: SlotNumber;
|
|
100
98
|
} | undefined>;
|
|
101
|
-
|
|
102
|
-
* Gets a receipt of a settled tx.
|
|
103
|
-
* @param txHash - The hash of a tx we try to get the receipt for.
|
|
104
|
-
* @returns The requested tx receipt (or undefined if not found).
|
|
105
|
-
*/
|
|
106
|
-
getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined>;
|
|
99
|
+
getL2ToL1MembershipWitness(): Promise<undefined>;
|
|
107
100
|
getL2Tips(): Promise<L2Tips>;
|
|
108
101
|
getSyncedL2EpochNumber(): Promise<EpochNumber>;
|
|
109
102
|
getSyncedL2SlotNumber(): Promise<SlotNumber>;
|
|
110
103
|
isEpochComplete(_epochNumber: EpochNumber): Promise<boolean>;
|
|
111
104
|
getL1Constants(): Promise<L1RollupConstants>;
|
|
105
|
+
isPruneDueAtSlot(_slot: SlotNumber): Promise<boolean>;
|
|
112
106
|
getGenesisValues(): Promise<{
|
|
113
107
|
genesisArchiveRoot: Fr;
|
|
114
108
|
}>;
|
|
@@ -130,17 +124,19 @@ export declare class MockL2BlockSource implements L2BlockSource, ContractDataSou
|
|
|
130
124
|
getDebugFunctionName(_address: AztecAddress, _selector: FunctionSelector): Promise<string | undefined>;
|
|
131
125
|
registerContractFunctionSignatures(_signatures: string[]): Promise<void>;
|
|
132
126
|
syncImmediate(): Promise<void>;
|
|
127
|
+
getBlock(query: BlockQuery): Promise<L2Block | undefined>;
|
|
128
|
+
private resolveBlockTag;
|
|
129
|
+
getBlocks(query: BlocksQuery): Promise<L2Block[]>;
|
|
130
|
+
getBlockData(query: BlockQuery): Promise<BlockData | undefined>;
|
|
131
|
+
getBlocksData(query: BlocksQuery): Promise<BlockData[]>;
|
|
133
132
|
isPendingChainInvalid(): Promise<boolean>;
|
|
134
133
|
getPendingChainValidationStatus(): Promise<ValidateCheckpointResult>;
|
|
135
|
-
|
|
136
|
-
getProposedCheckpointOnly(): Promise<ProposedCheckpointData | undefined>;
|
|
134
|
+
getProposedCheckpointData(_query?: ProposedCheckpointQuery): Promise<ProposedCheckpointData | undefined>;
|
|
137
135
|
/** Returns checkpoints whose slot falls within the given epoch. */
|
|
138
136
|
private getCheckpointsInEpoch;
|
|
139
137
|
/** Creates a mock L1PublishedData for a checkpoint. */
|
|
140
138
|
private mockL1DataForCheckpoint;
|
|
141
|
-
/** Creates a CheckpointedL2Block from a block using stored checkpoint info. */
|
|
142
|
-
private toCheckpointedBlock;
|
|
143
139
|
/** Finds the checkpoint number for a block, or undefined if the block is not in any checkpoint. */
|
|
144
140
|
private findCheckpointNumberForBlock;
|
|
145
141
|
}
|
|
146
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
142
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19sMl9ibG9ja19zb3VyY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L21vY2tfbDJfYmxvY2tfc291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFDTCxXQUFXLEVBQ1gsZ0JBQWdCLEVBQ2hCLFdBQVcsRUFFWCxVQUFVLEVBQ1gsTUFBTSxpQ0FBaUMsQ0FBQztBQUV6QyxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTNELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDMUQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxFQUNMLEtBQUssU0FBUyxFQUNkLEtBQUssU0FBUyxFQUNkLEtBQUssVUFBVSxFQUVmLEtBQUssV0FBVyxFQUVoQixLQUFLLGVBQWUsRUFDcEIsS0FBSyxnQkFBZ0IsRUFHckIsT0FBTyxFQUNQLEtBQUssYUFBYSxFQUNsQixLQUFLLE1BQU0sRUFDWCxLQUFLLHVCQUF1QixFQUM1QixLQUFLLHdCQUF3QixFQUM5QixNQUFNLHFCQUFxQixDQUFDO0FBQzdCLE9BQU8sRUFDTCxVQUFVLEVBQ1YsS0FBSyxjQUFjLEVBRW5CLEtBQUssc0JBQXNCLEVBQzNCLG1CQUFtQixFQUNwQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xDLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLGtCQUFrQixFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDbkgsT0FBTyxFQUEwQixLQUFLLGlCQUFpQixFQUF3QixNQUFNLDZCQUE2QixDQUFDO0FBSW5ILE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDdkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFbEQ7O0dBRUc7QUFDSCxxQkFBYSxpQkFBa0IsWUFBVyxhQUFhLEVBQUUsa0JBQWtCO0lBQ3pFLFNBQVMsQ0FBQyxRQUFRLEVBQUUsT0FBTyxFQUFFLENBQU07SUFDbkMsU0FBUyxDQUFDLGNBQWMsRUFBRSxVQUFVLEVBQUUsQ0FBTTtJQUU1QyxPQUFPLENBQUMsaUJBQWlCLENBQWE7SUFDdEMsT0FBTyxDQUFDLG9CQUFvQixDQUFhO0lBQ3pDLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBYTtJQUM1QyxPQUFPLENBQUMsNkJBQTZCLENBQWE7SUFFbEQsT0FBTyxDQUFDLGFBQWEsQ0FBb0M7SUFDekQsT0FBTyxDQUFDLGlCQUFpQixDQUF3QztJQUNqRSxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FBSztJQUNoQyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQVU7SUFFL0IsT0FBTyxDQUFDLEdBQUcsQ0FBaUQ7SUFFNUQsNkRBQTZEO0lBQ3RELGdCQUFnQixJQUFJLFdBQVcsQ0FFckM7SUFFRDs7Ozs7T0FLRztJQUNVLGdCQUFnQixDQUFDLE1BQU0sRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUloRTtJQUVEOzs7O09BSUc7SUFDSSxtQkFBbUIsSUFBSSxTQUFTLENBRXRDO0lBRUQ7Ozs7O09BS0c7SUFDSSxxQkFBcUIsQ0FBQyxJQUFJLEVBQUUsRUFBRSxHQUFHLElBQUksQ0FHM0M7SUFFRCxPQUFPLENBQUMsZUFBZTtJQWdCdkIsNERBQTREO0lBQy9DLFlBQVksQ0FBQyxTQUFTLEVBQUUsTUFBTSxpQkFFMUM7SUFFTSxtQkFBbUIsSUFBSSxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FJdEQ7SUFFRCx5RUFBeUU7SUFDNUQsaUJBQWlCLENBQUMsY0FBYyxFQUFFLE1BQU0sRUFBRSxtQkFBbUIsR0FBRSxNQUFVLGlCQWtCckY7SUFFTSxpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLFFBR3pDO0lBRU0sWUFBWSxDQUFDLFNBQVMsRUFBRSxNQUFNLFFBY3BDO0lBRU0sb0JBQW9CLENBQUMsaUJBQWlCLEVBQUUsTUFBTSxRQUVwRDtJQUVNLHVCQUF1QixDQUFDLG9CQUFvQixFQUFFLE1BQU0sUUFLMUQ7SUFFTSxnQ0FBZ0MsQ0FBQyxXQUFXLEVBQUUsTUFBTSxRQUUxRDtJQUVNLDBCQUEwQixDQUFDLHVCQUF1QixFQUFFLE1BQU0sUUFnQ2hFO0lBRUQ7OztPQUdHO0lBQ0gsZ0JBQWdCLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUV0QztJQUVEOzs7T0FHRztJQUNILGtCQUFrQixJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FFeEM7SUFFRDs7O09BR0c7SUFDSSxjQUFjLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ3ZDLGNBQWMsQ0FBQyxLQUFLLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxXQUFXLEdBQUcsU0FBUyxDQUFDLENBQUM7SUFlcEUsa0NBQWtDLHlCQUV4QztJQUVNLGFBQWEsQ0FBQyxLQUFLLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsR0FBRyxTQUFTLENBQUMsQ0FNckY7SUFFTSxjQUFjLENBQUMsS0FBSyxFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsRUFBRSxDQUFDLENBSzdFO0lBRU0sc0JBQXNCLENBQUMsT0FBTyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsVUFBVSxHQUFHLFNBQVMsQ0FBQyxDQUcxRTtJQUVNLGlCQUFpQixDQUFDLEtBQUssRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLGNBQWMsR0FBRyxTQUFTLENBQUMsQ0FNcEY7SUFFTSxrQkFBa0IsQ0FBQyxLQUFLLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLGNBQWMsRUFBRSxDQUFDLENBRzVFO0lBRUQsT0FBTyxDQUFDLGdCQUFnQjtJQWdCeEIsT0FBTyxDQUFDLHNCQUFzQjtJQXlCOUIsT0FBTyxDQUFDLHVCQUF1QjtJQU8vQixnQkFBZ0IsQ0FBQyxVQUFVLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUczRDtJQUVEOzs7O09BSUc7SUFDVSxXQUFXLENBQUMsTUFBTSxFQUFFLE1BQU07Ozs7OzttQkFldEM7SUFFTSwwQkFBMEIsSUFBSSxPQUFPLENBQUMsU0FBUyxDQUFDLENBR3REO0lBRUssU0FBUyxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FpRWpDO0lBRUQsc0JBQXNCLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUU3QztJQUVELHFCQUFxQixJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FFM0M7SUFFRCxlQUFlLENBQUMsWUFBWSxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBRTNEO0lBRUQsY0FBYyxJQUFJLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUUzQztJQUVELGdCQUFnQixDQUFDLEtBQUssRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUVwRDtJQUVELGdCQUFnQixJQUFJLE9BQU8sQ0FBQztRQUFFLGtCQUFrQixFQUFFLEVBQUUsQ0FBQTtLQUFFLENBQUMsQ0FFdEQ7SUFFRCxjQUFjLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUVoQztJQUVEOzs7T0FHRztJQUNJLEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBRzVCO0lBRUQ7OztPQUdHO0lBQ0ksSUFBSSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHM0I7SUFFRCxnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsR0FBRyxTQUFTLENBQUMsQ0FFbEU7SUFFRCxxQkFBcUIsQ0FBQyxHQUFHLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLEdBQUcsU0FBUyxDQUFDLENBRXREO0lBRUQsV0FBVyxDQUFDLFFBQVEsRUFBRSxZQUFZLEVBQUUsVUFBVSxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQywyQkFBMkIsR0FBRyxTQUFTLENBQUMsQ0FFekc7SUFFRCxtQkFBbUIsSUFBSSxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FFbkM7SUFFRCxvQkFBb0IsQ0FBQyxRQUFRLEVBQUUsWUFBWSxFQUFFLFNBQVMsRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUVyRztJQUVELGtDQUFrQyxDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRXZFO0lBRUQsYUFBYSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFN0I7SUFFSyxRQUFRLENBQUMsS0FBSyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsT0FBTyxHQUFHLFNBQVMsQ0FBQyxDQWdDOUQ7SUFFRCxPQUFPLENBQUMsZUFBZTtJQWN2QixTQUFTLENBQUMsS0FBSyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FZaEQ7SUFFSyxZQUFZLENBQUMsS0FBSyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQyxDQVlwRTtJQUVLLGFBQWEsQ0FBQyxLQUFLLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQVc1RDtJQUVELHFCQUFxQixJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FFeEM7SUFFRCwrQkFBK0IsSUFBSSxPQUFPLENBQUMsd0JBQXdCLENBQUMsQ0FFbkU7SUFFRCx5QkFBeUIsQ0FBQyxNQUFNLENBQUMsRUFBRSx1QkFBdUIsR0FBRyxPQUFPLENBQUMsc0JBQXNCLEdBQUcsU0FBUyxDQUFDLENBRXZHO0lBRUQsbUVBQW1FO0lBQ25FLE9BQU8sQ0FBQyxxQkFBcUI7SUFNN0IsdURBQXVEO0lBQ3ZELE9BQU8sQ0FBQyx1QkFBdUI7SUFJL0IsbUdBQW1HO0lBQ25HLE9BQU8sQ0FBQyw0QkFBNEI7Q0FJckMifQ==
|