@aztec/node-lib 0.0.1-commit.ef17749e1 → 0.0.1-commit.f103f88
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.
|
@@ -4,6 +4,7 @@ import type { L1ContractsConfig } from '@aztec/ethereum/config';
|
|
|
4
4
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
5
5
|
import type { Logger } from '@aztec/foundation/log';
|
|
6
6
|
import type { ChainConfig } from '@aztec/stdlib/config';
|
|
7
|
+
import { type ReadOnlyFileStore } from '@aztec/stdlib/file-store';
|
|
7
8
|
import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
|
|
8
9
|
import { type SnapshotMetadata } from '@aztec/stdlib/snapshots';
|
|
9
10
|
import type { SharedNodeConfig } from '../config/index.js';
|
|
@@ -22,7 +23,7 @@ export declare function trySnapshotSync(config: SnapshotSyncConfig, log: Logger)
|
|
|
22
23
|
export declare function snapshotSync(snapshot: Pick<SnapshotMetadata, 'dataUrls'>, log: Logger, config: {
|
|
23
24
|
dataDirectory: string;
|
|
24
25
|
rollupAddress: EthAddress;
|
|
25
|
-
|
|
26
|
+
fileStore: ReadOnlyFileStore;
|
|
26
27
|
}): Promise<void>;
|
|
27
28
|
export {};
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3Qtc3luYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvc25hcHNob3Qtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTRDLEtBQUssY0FBYyxFQUF1QixNQUFNLGlCQUFpQixDQUFDO0FBRXJILE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFtQixNQUFNLHdCQUF3QixDQUFDO0FBQ3BGLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFeEQsT0FBTyxFQUFFLEtBQUssaUJBQWlCLEVBQTJCLE1BQU0sMEJBQTBCLENBQUM7QUFDM0YsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDOUQsT0FBTyxFQUNMLEtBQUssZ0JBQWdCLEVBS3RCLE1BQU0seUJBQXlCLENBQUM7QUFNakMsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUszRCxLQUFLLGtCQUFrQixHQUFHLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxVQUFVLENBQUMsR0FDMUQsSUFBSSxDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsZUFBZSxDQUFDLEdBQ2hELElBQUksQ0FBQyxpQkFBaUIsRUFBRSxvQkFBb0IsQ0FBQyxHQUM3QyxJQUFJLENBQUMsY0FBYyxFQUFFLHdCQUF3QixHQUFHLFNBQVMsQ0FBQyxHQUMxRCxlQUFlLEdBQ2YsUUFBUSxDQUFDLElBQUksQ0FBQyxlQUFlLEVBQUUsYUFBYSxDQUFDLENBQUMsR0FDOUMsb0JBQW9CLEdBQUc7SUFDckIsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDekIsMkJBQTJCLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDdEMsQ0FBQztBQUVKOzs7R0FHRztBQUNILHdCQUFzQixlQUFlLENBQUMsTUFBTSxFQUFFLGtCQUFrQixFQUFFLEdBQUcsRUFBRSxNQUFNLG9CQXFLNUU7QUFFRDs7R0FFRztBQUNILHdCQUFzQixZQUFZLENBQ2hDLFFBQVEsRUFBRSxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsVUFBVSxDQUFDLEVBQzVDLEdBQUcsRUFBRSxNQUFNLEVBQ1gsTUFBTSxFQUFFO0lBQUUsYUFBYSxFQUFFLE1BQU0sQ0FBQztJQUFDLGFBQWEsRUFBRSxVQUFVLENBQUM7SUFBQyxTQUFTLEVBQUUsaUJBQWlCLENBQUE7Q0FBRSxpQkFtRDNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot-sync.d.ts","sourceRoot":"","sources":["../../src/actions/snapshot-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,KAAK,cAAc,EAAuB,MAAM,iBAAiB,CAAC;AAErH,OAAO,EAAE,KAAK,oBAAoB,EAAmB,MAAM,wBAAwB,CAAC;AACpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"snapshot-sync.d.ts","sourceRoot":"","sources":["../../src/actions/snapshot-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,KAAK,cAAc,EAAuB,MAAM,iBAAiB,CAAC;AAErH,OAAO,EAAE,KAAK,oBAAoB,EAAmB,MAAM,wBAAwB,CAAC;AACpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,KAAK,iBAAiB,EAA2B,MAAM,0BAA0B,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EACL,KAAK,gBAAgB,EAKtB,MAAM,yBAAyB,CAAC;AAMjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAK3D,KAAK,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,GAC1D,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GAChD,IAAI,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAC7C,IAAI,CAAC,cAAc,EAAE,wBAAwB,GAAG,SAAS,CAAC,GAC1D,eAAe,GACf,QAAQ,CAAC,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC,GAC9C,oBAAoB,GAAG;IACrB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC,CAAC;AAEJ;;;GAGG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,oBAqK5E;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC5C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,iBAAiB,CAAA;CAAE,iBAmD3F"}
|
|
@@ -32,9 +32,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
32
32
|
}
|
|
33
33
|
// Create an archiver store to check the current state (do this only once)
|
|
34
34
|
log.verbose(`Creating temporary archiver data store`);
|
|
35
|
-
const archiverStore = await createArchiverStore(config
|
|
36
|
-
epochDuration: config.aztecEpochDuration
|
|
37
|
-
});
|
|
35
|
+
const archiverStore = await createArchiverStore(config);
|
|
38
36
|
let archiverL1BlockNumber;
|
|
39
37
|
let archiverL2BlockNumber;
|
|
40
38
|
try {
|
|
@@ -134,7 +132,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
134
132
|
// Sort candidates by L1 block number (highest first)
|
|
135
133
|
snapshotCandidates.sort((a, b)=>b.snapshot.l1BlockNumber - a.snapshot.l1BlockNumber);
|
|
136
134
|
// Try each candidate in order until one succeeds
|
|
137
|
-
for (const { snapshot, url } of snapshotCandidates){
|
|
135
|
+
for (const { snapshot, url, fileStore } of snapshotCandidates){
|
|
138
136
|
const { l1BlockNumber, l2BlockNumber } = snapshot;
|
|
139
137
|
log.info(`Attempting to sync from snapshot at L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
|
|
140
138
|
snapshot,
|
|
@@ -144,7 +142,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
144
142
|
await snapshotSync(snapshot, log, {
|
|
145
143
|
dataDirectory: config.dataDirectory,
|
|
146
144
|
rollupAddress: config.l1Contracts.rollupAddress,
|
|
147
|
-
|
|
145
|
+
fileStore
|
|
148
146
|
});
|
|
149
147
|
log.info(`Snapshot synced to L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
|
|
150
148
|
snapshot,
|
|
@@ -167,11 +165,10 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
167
165
|
/**
|
|
168
166
|
* Downloads the given snapshot replacing any local data stores.
|
|
169
167
|
*/ export async function snapshotSync(snapshot, log, config) {
|
|
170
|
-
const { dataDirectory, rollupAddress } = config;
|
|
168
|
+
const { dataDirectory, rollupAddress, fileStore } = config;
|
|
171
169
|
if (!dataDirectory) {
|
|
172
170
|
throw new Error(`No local data directory defined. Cannot sync snapshot.`);
|
|
173
171
|
}
|
|
174
|
-
const fileStore = await createReadOnlyFileStore(config.snapshotsUrl, log);
|
|
175
172
|
let downloadDir;
|
|
176
173
|
try {
|
|
177
174
|
// Download the snapshot to a temp location.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/node-lib",
|
|
3
|
-
"version": "0.0.1-commit.
|
|
3
|
+
"version": "0.0.1-commit.f103f88",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"typedocOptions": {
|
|
6
6
|
"entryPoints": [
|
|
@@ -66,29 +66,28 @@
|
|
|
66
66
|
]
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
|
-
"@aztec/archiver": "0.0.1-commit.
|
|
70
|
-
"@aztec/bb-prover": "0.0.1-commit.
|
|
71
|
-
"@aztec/blob-client": "0.0.1-commit.
|
|
72
|
-
"@aztec/constants": "0.0.1-commit.
|
|
73
|
-
"@aztec/epoch-cache": "0.0.1-commit.
|
|
74
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
75
|
-
"@aztec/foundation": "0.0.1-commit.
|
|
76
|
-
"@aztec/kv-store": "0.0.1-commit.
|
|
77
|
-
"@aztec/
|
|
78
|
-
"@aztec/
|
|
79
|
-
"@aztec/
|
|
80
|
-
"@aztec/
|
|
81
|
-
"@aztec/
|
|
82
|
-
"@aztec/
|
|
83
|
-
"@aztec/
|
|
84
|
-
"@aztec/
|
|
85
|
-
"@aztec/
|
|
86
|
-
"@aztec/world-state": "0.0.1-commit.ef17749e1",
|
|
69
|
+
"@aztec/archiver": "0.0.1-commit.f103f88",
|
|
70
|
+
"@aztec/bb-prover": "0.0.1-commit.f103f88",
|
|
71
|
+
"@aztec/blob-client": "0.0.1-commit.f103f88",
|
|
72
|
+
"@aztec/constants": "0.0.1-commit.f103f88",
|
|
73
|
+
"@aztec/epoch-cache": "0.0.1-commit.f103f88",
|
|
74
|
+
"@aztec/ethereum": "0.0.1-commit.f103f88",
|
|
75
|
+
"@aztec/foundation": "0.0.1-commit.f103f88",
|
|
76
|
+
"@aztec/kv-store": "0.0.1-commit.f103f88",
|
|
77
|
+
"@aztec/p2p": "0.0.1-commit.f103f88",
|
|
78
|
+
"@aztec/protocol-contracts": "0.0.1-commit.f103f88",
|
|
79
|
+
"@aztec/prover-client": "0.0.1-commit.f103f88",
|
|
80
|
+
"@aztec/sequencer-client": "0.0.1-commit.f103f88",
|
|
81
|
+
"@aztec/simulator": "0.0.1-commit.f103f88",
|
|
82
|
+
"@aztec/stdlib": "0.0.1-commit.f103f88",
|
|
83
|
+
"@aztec/telemetry-client": "0.0.1-commit.f103f88",
|
|
84
|
+
"@aztec/validator-client": "0.0.1-commit.f103f88",
|
|
85
|
+
"@aztec/world-state": "0.0.1-commit.f103f88",
|
|
87
86
|
"tslib": "^2.4.0"
|
|
88
87
|
},
|
|
89
88
|
"devDependencies": {
|
|
90
|
-
"@aztec/blob-lib": "0.0.1-commit.
|
|
91
|
-
"@aztec/node-keystore": "0.0.1-commit.
|
|
89
|
+
"@aztec/blob-lib": "0.0.1-commit.f103f88",
|
|
90
|
+
"@aztec/node-keystore": "0.0.1-commit.f103f88",
|
|
92
91
|
"@jest/globals": "^30.0.0",
|
|
93
92
|
"@types/jest": "^30.0.0",
|
|
94
93
|
"@types/node": "^22.15.17",
|
|
@@ -61,7 +61,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
|
|
|
61
61
|
|
|
62
62
|
// Create an archiver store to check the current state (do this only once)
|
|
63
63
|
log.verbose(`Creating temporary archiver data store`);
|
|
64
|
-
const archiverStore = await createArchiverStore(config
|
|
64
|
+
const archiverStore = await createArchiverStore(config);
|
|
65
65
|
let archiverL1BlockNumber: bigint | undefined;
|
|
66
66
|
let archiverL2BlockNumber: number | undefined;
|
|
67
67
|
try {
|
|
@@ -178,7 +178,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
|
|
|
178
178
|
snapshotCandidates.sort((a, b) => b.snapshot.l1BlockNumber - a.snapshot.l1BlockNumber);
|
|
179
179
|
|
|
180
180
|
// Try each candidate in order until one succeeds
|
|
181
|
-
for (const { snapshot, url } of snapshotCandidates) {
|
|
181
|
+
for (const { snapshot, url, fileStore } of snapshotCandidates) {
|
|
182
182
|
const { l1BlockNumber, l2BlockNumber } = snapshot;
|
|
183
183
|
log.info(`Attempting to sync from snapshot at L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
|
|
184
184
|
snapshot,
|
|
@@ -189,7 +189,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
|
|
|
189
189
|
await snapshotSync(snapshot, log, {
|
|
190
190
|
dataDirectory: config.dataDirectory!,
|
|
191
191
|
rollupAddress: config.l1Contracts.rollupAddress,
|
|
192
|
-
|
|
192
|
+
fileStore,
|
|
193
193
|
});
|
|
194
194
|
log.info(`Snapshot synced to L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
|
|
195
195
|
snapshot,
|
|
@@ -215,15 +215,13 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
|
|
|
215
215
|
export async function snapshotSync(
|
|
216
216
|
snapshot: Pick<SnapshotMetadata, 'dataUrls'>,
|
|
217
217
|
log: Logger,
|
|
218
|
-
config: { dataDirectory: string; rollupAddress: EthAddress;
|
|
218
|
+
config: { dataDirectory: string; rollupAddress: EthAddress; fileStore: ReadOnlyFileStore },
|
|
219
219
|
) {
|
|
220
|
-
const { dataDirectory, rollupAddress } = config;
|
|
220
|
+
const { dataDirectory, rollupAddress, fileStore } = config;
|
|
221
221
|
if (!dataDirectory) {
|
|
222
222
|
throw new Error(`No local data directory defined. Cannot sync snapshot.`);
|
|
223
223
|
}
|
|
224
224
|
|
|
225
|
-
const fileStore = await createReadOnlyFileStore(config.snapshotsUrl, log);
|
|
226
|
-
|
|
227
225
|
let downloadDir: string | undefined;
|
|
228
226
|
|
|
229
227
|
try {
|