@aztec/node-lib 4.0.0-nightly.20250907 → 4.0.0-nightly.20260107
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/dest/actions/build-snapshot-metadata.d.ts +1 -1
- package/dest/actions/create-backups.d.ts +1 -1
- package/dest/actions/index.d.ts +1 -1
- package/dest/actions/snapshot-sync.d.ts +4 -3
- package/dest/actions/snapshot-sync.d.ts.map +1 -1
- package/dest/actions/snapshot-sync.js +91 -56
- package/dest/actions/upload-snapshot.d.ts +1 -1
- package/dest/config/index.d.ts +7 -3
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +18 -3
- package/dest/factories/index.d.ts +2 -0
- package/dest/factories/index.d.ts.map +1 -0
- package/dest/factories/index.js +1 -0
- package/dest/factories/l1_tx_utils.d.ts +79 -0
- package/dest/factories/l1_tx_utils.d.ts.map +1 -0
- package/dest/factories/l1_tx_utils.js +90 -0
- package/dest/metrics/index.d.ts +2 -0
- package/dest/metrics/index.d.ts.map +1 -0
- package/dest/metrics/index.js +1 -0
- package/dest/metrics/l1_tx_metrics.d.ts +29 -0
- package/dest/metrics/l1_tx_metrics.d.ts.map +1 -0
- package/dest/metrics/l1_tx_metrics.js +138 -0
- package/dest/stores/index.d.ts +2 -0
- package/dest/stores/index.d.ts.map +1 -0
- package/dest/stores/index.js +1 -0
- package/dest/stores/l1_tx_store.d.ts +89 -0
- package/dest/stores/l1_tx_store.d.ts.map +1 -0
- package/dest/stores/l1_tx_store.js +272 -0
- package/package.json +30 -23
- package/src/actions/snapshot-sync.ts +103 -64
- package/src/config/index.ts +27 -5
- package/src/factories/index.ts +1 -0
- package/src/factories/l1_tx_utils.ts +212 -0
- package/src/metrics/index.ts +1 -0
- package/src/metrics/l1_tx_metrics.ts +169 -0
- package/src/stores/index.ts +1 -0
- package/src/stores/l1_tx_store.ts +396 -0
|
@@ -2,4 +2,4 @@ import type { Archiver } from '@aztec/archiver';
|
|
|
2
2
|
import type { UploadSnapshotMetadata } from '@aztec/stdlib/snapshots';
|
|
3
3
|
import type { UploadSnapshotConfig } from './upload-snapshot.js';
|
|
4
4
|
export declare function buildSnapshotMetadata(archiver: Archiver, config: UploadSnapshotConfig): Promise<UploadSnapshotMetadata>;
|
|
5
|
-
//# sourceMappingURL=
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGQtc25hcHNob3QtbWV0YWRhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL2J1aWxkLXNuYXBzaG90LW1ldGFkYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFdEUsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVqRSx3QkFBc0IscUJBQXFCLENBQ3pDLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLE1BQU0sRUFBRSxvQkFBb0IsR0FDM0IsT0FBTyxDQUFDLHNCQUFzQixDQUFDLENBb0JqQyJ9
|
|
@@ -3,4 +3,4 @@ import type { Logger } from '@aztec/foundation/log';
|
|
|
3
3
|
import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
4
4
|
import type { SnapshotDataUrls } from '@aztec/stdlib/snapshots';
|
|
5
5
|
export declare function createBackups(backupDir: string, archiver: Archiver, worldState: WorldStateSynchronizer, log: Logger): Promise<SnapshotDataUrls>;
|
|
6
|
-
//# sourceMappingURL=
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLWJhY2t1cHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL2NyZWF0ZS1iYWNrdXBzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUtoRSx3QkFBc0IsYUFBYSxDQUNqQyxTQUFTLEVBQUUsTUFBTSxFQUNqQixRQUFRLEVBQUUsUUFBUSxFQUNsQixVQUFVLEVBQUUsc0JBQXNCLEVBQ2xDLEdBQUcsRUFBRSxNQUFNLDZCQTRCWiJ9
|
package/dest/actions/index.d.ts
CHANGED
|
@@ -2,4 +2,4 @@ export * from './snapshot-sync.js';
|
|
|
2
2
|
export * from './upload-snapshot.js';
|
|
3
3
|
export * from './create-backups.js';
|
|
4
4
|
export * from './build-snapshot-metadata.js';
|
|
5
|
-
//# sourceMappingURL=
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsOEJBQThCLENBQUMifQ==
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { type ArchiverConfig } from '@aztec/archiver';
|
|
2
|
-
import { type EthereumClientConfig } from '@aztec/ethereum';
|
|
2
|
+
import { type EthereumClientConfig } from '@aztec/ethereum/client';
|
|
3
3
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import type { Logger } from '@aztec/foundation/log';
|
|
5
5
|
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
6
6
|
import type { ChainConfig } from '@aztec/stdlib/config';
|
|
7
7
|
import { type SnapshotMetadata } from '@aztec/stdlib/snapshots';
|
|
8
8
|
import type { SharedNodeConfig } from '../config/index.js';
|
|
9
|
-
type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'
|
|
9
|
+
type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & Required<DataStoreConfig> & EthereumClientConfig & {
|
|
10
|
+
snapshotsUrls?: string[];
|
|
10
11
|
minL1BlocksToTriggerReplace?: number;
|
|
11
12
|
};
|
|
12
13
|
/**
|
|
@@ -23,4 +24,4 @@ export declare function snapshotSync(snapshot: Pick<SnapshotMetadata, 'dataUrls'
|
|
|
23
24
|
snapshotsUrl: string;
|
|
24
25
|
}): Promise<void>;
|
|
25
26
|
export {};
|
|
26
|
-
//# sourceMappingURL=
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3Qtc3luYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvc25hcHNob3Qtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTRDLEtBQUssY0FBYyxFQUF1QixNQUFNLGlCQUFpQixDQUFDO0FBRXJILE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFtQixNQUFNLHdCQUF3QixDQUFDO0FBQ3BGLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBR3hELE9BQU8sRUFDTCxLQUFLLGdCQUFnQixFQUt0QixNQUFNLHlCQUF5QixDQUFDO0FBTWpDLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFLM0QsS0FBSyxrQkFBa0IsR0FBRyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsVUFBVSxDQUFDLEdBQzFELElBQUksQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLGVBQWUsQ0FBQyxHQUNoRCxJQUFJLENBQUMsY0FBYyxFQUFFLHdCQUF3QixHQUFHLFNBQVMsQ0FBQyxHQUMxRCxRQUFRLENBQUMsZUFBZSxDQUFDLEdBQ3pCLG9CQUFvQixHQUFHO0lBQ3JCLGFBQWEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3pCLDJCQUEyQixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3RDLENBQUM7QUFFSjs7O0dBR0c7QUFDSCx3QkFBc0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxHQUFHLEVBQUUsTUFBTSxvQkFpSzVFO0FBRUQ7O0dBRUc7QUFDSCx3QkFBc0IsWUFBWSxDQUNoQyxRQUFRLEVBQUUsSUFBSSxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxFQUM1QyxHQUFHLEVBQUUsTUFBTSxFQUNYLE1BQU0sRUFBRTtJQUFFLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFBQyxhQUFhLEVBQUUsVUFBVSxDQUFDO0lBQUMsWUFBWSxFQUFFLE1BQU0sQ0FBQTtDQUFFLGlCQXFEbkYifQ==
|
|
@@ -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,
|
|
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,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,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,cAAc,EAAE,wBAAwB,GAAG,SAAS,CAAC,GAC1D,QAAQ,CAAC,eAAe,CAAC,GACzB,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,oBAiK5E;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,YAAY,EAAE,MAAM,CAAA;CAAE,iBAqDnF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, createArchiverStore } from '@aztec/archiver';
|
|
2
2
|
import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
|
|
3
|
-
import { getPublicClient } from '@aztec/ethereum';
|
|
3
|
+
import { getPublicClient } from '@aztec/ethereum/client';
|
|
4
4
|
import { tryRmDir } from '@aztec/foundation/fs';
|
|
5
5
|
import { P2P_STORE_NAME } from '@aztec/p2p';
|
|
6
6
|
import { DatabaseVersionManager } from '@aztec/stdlib/database-version';
|
|
@@ -15,29 +15,22 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
15
15
|
* Connects to a remote snapshot index and downloads the latest snapshot if the local archiver is behind.
|
|
16
16
|
* Behaviour depends on syncing mode.
|
|
17
17
|
*/ export async function trySnapshotSync(config, log) {
|
|
18
|
-
const { syncMode,
|
|
18
|
+
const { syncMode, snapshotsUrls, dataDirectory, l1ChainId, rollupVersion, l1Contracts } = config;
|
|
19
19
|
if (syncMode === 'full') {
|
|
20
20
|
log.debug('Snapshot sync is disabled. Running full sync.', {
|
|
21
21
|
syncMode: syncMode
|
|
22
22
|
});
|
|
23
23
|
return false;
|
|
24
24
|
}
|
|
25
|
-
if (!
|
|
26
|
-
log.verbose('Snapshot sync is disabled. No snapshots
|
|
25
|
+
if (!snapshotsUrls || snapshotsUrls.length === 0) {
|
|
26
|
+
log.verbose('Snapshot sync is disabled. No snapshots URLs provided.');
|
|
27
27
|
return false;
|
|
28
28
|
}
|
|
29
29
|
if (!dataDirectory) {
|
|
30
30
|
log.verbose('Snapshot sync is disabled. No local data directory defined.');
|
|
31
31
|
return false;
|
|
32
32
|
}
|
|
33
|
-
|
|
34
|
-
try {
|
|
35
|
-
fileStore = await createReadOnlyFileStore(snapshotsUrl, log);
|
|
36
|
-
} catch (err) {
|
|
37
|
-
log.error(`Invalid config for downloading snapshots`, err);
|
|
38
|
-
return false;
|
|
39
|
-
}
|
|
40
|
-
// Create an archiver store to check the current state
|
|
33
|
+
// Create an archiver store to check the current state (do this only once)
|
|
41
34
|
log.verbose(`Creating temporary archiver data store`);
|
|
42
35
|
const archiverStore = await createArchiverStore(config);
|
|
43
36
|
let archiverL1BlockNumber;
|
|
@@ -45,7 +38,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
45
38
|
try {
|
|
46
39
|
[archiverL1BlockNumber, archiverL2BlockNumber] = await Promise.all([
|
|
47
40
|
archiverStore.getSynchPoint().then((s)=>s.blocksSynchedTo),
|
|
48
|
-
archiverStore.
|
|
41
|
+
archiverStore.getLatestBlockNumber()
|
|
49
42
|
]);
|
|
50
43
|
} finally{
|
|
51
44
|
log.verbose(`Closing temporary archiver data store`, {
|
|
@@ -73,59 +66,101 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
73
66
|
rollupVersion,
|
|
74
67
|
rollupAddress: l1Contracts.rollupAddress
|
|
75
68
|
};
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
snapshotsUrl
|
|
69
|
+
const snapshotCandidates = [];
|
|
70
|
+
for (const snapshotsUrl of snapshotsUrls){
|
|
71
|
+
let fileStore;
|
|
72
|
+
try {
|
|
73
|
+
fileStore = await createReadOnlyFileStore(snapshotsUrl, log);
|
|
74
|
+
} catch (err) {
|
|
75
|
+
log.error(`Invalid config for downloading snapshots from ${snapshotsUrl}`, err);
|
|
76
|
+
continue;
|
|
77
|
+
}
|
|
78
|
+
let snapshot;
|
|
79
|
+
try {
|
|
80
|
+
snapshot = await getLatestSnapshotMetadata(indexMetadata, fileStore);
|
|
81
|
+
} catch (err) {
|
|
82
|
+
log.error(`Failed to get latest snapshot metadata from ${snapshotsUrl}. Skipping this URL.`, err, {
|
|
83
|
+
...indexMetadata,
|
|
84
|
+
snapshotsUrl
|
|
85
|
+
});
|
|
86
|
+
continue;
|
|
87
|
+
}
|
|
88
|
+
if (!snapshot) {
|
|
89
|
+
log.verbose(`No snapshot found at ${snapshotsUrl}. Skipping this URL.`, {
|
|
90
|
+
...indexMetadata,
|
|
91
|
+
snapshotsUrl
|
|
92
|
+
});
|
|
93
|
+
continue;
|
|
94
|
+
}
|
|
95
|
+
if (snapshot.schemaVersions.archiver !== ARCHIVER_DB_VERSION) {
|
|
96
|
+
log.warn(`Skipping snapshot from ${snapshotsUrl} as it has schema version ${snapshot.schemaVersions.archiver} but expected ${ARCHIVER_DB_VERSION}.`, snapshot);
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
if (snapshot.schemaVersions.worldState !== WORLD_STATE_DB_VERSION) {
|
|
100
|
+
log.warn(`Skipping snapshot from ${snapshotsUrl} as it has world state schema version ${snapshot.schemaVersions.worldState} but we expected ${WORLD_STATE_DB_VERSION}.`, snapshot);
|
|
101
|
+
continue;
|
|
102
|
+
}
|
|
103
|
+
if (archiverL1BlockNumber && snapshot.l1BlockNumber < archiverL1BlockNumber) {
|
|
104
|
+
log.verbose(`Skipping snapshot from ${snapshotsUrl} since local archiver is at L1 block ${archiverL1BlockNumber} which is further than snapshot at ${snapshot.l1BlockNumber}`, {
|
|
105
|
+
snapshot,
|
|
106
|
+
archiverL1BlockNumber,
|
|
107
|
+
snapshotsUrl
|
|
108
|
+
});
|
|
109
|
+
continue;
|
|
110
|
+
}
|
|
111
|
+
if (archiverL1BlockNumber && snapshot.l1BlockNumber - Number(archiverL1BlockNumber) < minL1BlocksToTriggerReplace) {
|
|
112
|
+
log.verbose(`Skipping snapshot from ${snapshotsUrl} as archiver is less than ${snapshot.l1BlockNumber - Number(archiverL1BlockNumber)} L1 blocks behind this snapshot.`, {
|
|
113
|
+
snapshot,
|
|
114
|
+
archiverL1BlockNumber,
|
|
115
|
+
snapshotsUrl
|
|
116
|
+
});
|
|
117
|
+
continue;
|
|
118
|
+
}
|
|
119
|
+
snapshotCandidates.push({
|
|
120
|
+
snapshot,
|
|
121
|
+
url: snapshotsUrl,
|
|
122
|
+
fileStore
|
|
83
123
|
});
|
|
84
|
-
return false;
|
|
85
124
|
}
|
|
86
|
-
if (
|
|
87
|
-
log.verbose(`No
|
|
125
|
+
if (snapshotCandidates.length === 0) {
|
|
126
|
+
log.verbose(`No valid snapshots found from any URL, skipping snapshot sync`, {
|
|
88
127
|
...indexMetadata,
|
|
89
|
-
|
|
90
|
-
});
|
|
91
|
-
return false;
|
|
92
|
-
}
|
|
93
|
-
if (snapshot.schemaVersions.archiver !== ARCHIVER_DB_VERSION) {
|
|
94
|
-
log.warn(`Skipping snapshot sync as last snapshot has schema version ${snapshot.schemaVersions.archiver} but expected ${ARCHIVER_DB_VERSION}.`, snapshot);
|
|
95
|
-
return false;
|
|
96
|
-
}
|
|
97
|
-
if (snapshot.schemaVersions.worldState !== WORLD_STATE_DB_VERSION) {
|
|
98
|
-
log.warn(`Skipping snapshot sync as last snapshot has world state schema version ${snapshot.schemaVersions.worldState} but we expected ${WORLD_STATE_DB_VERSION}.`, snapshot);
|
|
99
|
-
return false;
|
|
100
|
-
}
|
|
101
|
-
if (archiverL1BlockNumber && snapshot.l1BlockNumber < archiverL1BlockNumber) {
|
|
102
|
-
log.verbose(`Skipping snapshot sync since local archiver is at L1 block ${archiverL1BlockNumber} which is further than last snapshot at ${snapshot.l1BlockNumber}`, {
|
|
103
|
-
snapshot,
|
|
104
|
-
archiverL1BlockNumber
|
|
128
|
+
snapshotsUrls
|
|
105
129
|
});
|
|
106
130
|
return false;
|
|
107
131
|
}
|
|
108
|
-
|
|
109
|
-
|
|
132
|
+
// Sort candidates by L1 block number (highest first)
|
|
133
|
+
snapshotCandidates.sort((a, b)=>b.snapshot.l1BlockNumber - a.snapshot.l1BlockNumber);
|
|
134
|
+
// Try each candidate in order until one succeeds
|
|
135
|
+
for (const { snapshot, url } of snapshotCandidates){
|
|
136
|
+
const { l1BlockNumber, l2BlockNumber } = snapshot;
|
|
137
|
+
log.info(`Attempting to sync from snapshot at L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
|
|
110
138
|
snapshot,
|
|
111
|
-
|
|
139
|
+
snapshotsUrl: url
|
|
112
140
|
});
|
|
113
|
-
|
|
141
|
+
try {
|
|
142
|
+
await snapshotSync(snapshot, log, {
|
|
143
|
+
dataDirectory: config.dataDirectory,
|
|
144
|
+
rollupAddress: config.l1Contracts.rollupAddress,
|
|
145
|
+
snapshotsUrl: url
|
|
146
|
+
});
|
|
147
|
+
log.info(`Snapshot synced to L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
|
|
148
|
+
snapshot,
|
|
149
|
+
snapshotsUrl: url
|
|
150
|
+
});
|
|
151
|
+
return true;
|
|
152
|
+
} catch (err) {
|
|
153
|
+
log.error(`Failed to download snapshot from ${url}, trying next candidate`, err, {
|
|
154
|
+
snapshot,
|
|
155
|
+
snapshotsUrl: url
|
|
156
|
+
});
|
|
157
|
+
continue;
|
|
158
|
+
}
|
|
114
159
|
}
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
snapshot,
|
|
118
|
-
snapshotsUrl
|
|
119
|
-
});
|
|
120
|
-
await snapshotSync(snapshot, log, {
|
|
121
|
-
dataDirectory: config.dataDirectory,
|
|
122
|
-
rollupAddress: config.l1Contracts.rollupAddress,
|
|
123
|
-
snapshotsUrl
|
|
124
|
-
});
|
|
125
|
-
log.info(`Snapshot synced to L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
|
|
126
|
-
snapshot
|
|
160
|
+
log.error(`Failed to download snapshot from all URLs`, {
|
|
161
|
+
snapshotsUrls
|
|
127
162
|
});
|
|
128
|
-
return
|
|
163
|
+
return false;
|
|
129
164
|
}
|
|
130
165
|
/**
|
|
131
166
|
* Downloads the given snapshot replacing any local data stores.
|
|
@@ -9,4 +9,4 @@ export type UploadSnapshotConfig = Pick<ChainConfig, 'l1ChainId' | 'rollupVersio
|
|
|
9
9
|
* and uploads them to the specified location. Location must be a URL supported by our file store (eg `gs://bucketname/path`).
|
|
10
10
|
*/
|
|
11
11
|
export declare function uploadSnapshot(location: string, archiver: Archiver, worldState: WorldStateSynchronizer, config: UploadSnapshotConfig, log: Logger): Promise<void>;
|
|
12
|
-
//# sourceMappingURL=
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLXNuYXBzaG90LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWN0aW9ucy91cGxvYWQtc25hcHNob3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUF1QixLQUFLLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXJFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXhELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFXOUUsTUFBTSxNQUFNLG9CQUFvQixHQUFHLElBQUksQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLGVBQWUsQ0FBQyxHQUNqRixJQUFJLENBQUMsZUFBZSxFQUFFLGVBQWUsQ0FBQyxDQUFDO0FBRXpDOzs7R0FHRztBQUNILHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLFVBQVUsRUFBRSxzQkFBc0IsRUFDbEMsTUFBTSxFQUFFLG9CQUFvQixFQUM1QixHQUFHLEVBQUUsTUFBTSxpQkFvQloifQ==
|
package/dest/config/index.d.ts
CHANGED
|
@@ -6,14 +6,18 @@ export type SharedNodeConfig = {
|
|
|
6
6
|
sponsoredFPC: boolean;
|
|
7
7
|
/** Sync mode: full to always sync via L1, snapshot to download a snapshot if there is no local data, force-snapshot to download even if there is local data. */
|
|
8
8
|
syncMode: 'full' | 'snapshot' | 'force-snapshot';
|
|
9
|
-
/** Base
|
|
10
|
-
|
|
9
|
+
/** Base URLs for snapshots index. Index file will be searched at `SNAPSHOTS_BASE_URL/aztec-L1_CHAIN_ID-VERSION-ROLLUP_ADDRESS/index.json` */
|
|
10
|
+
snapshotsUrls?: string[];
|
|
11
11
|
/** Auto update mode: disabled - to completely ignore remote signals to update the node. enabled - to respect the signals (potentially shutting this node down). log - check for updates but log a warning instead of applying them*/
|
|
12
12
|
autoUpdate?: 'disabled' | 'notify' | 'config' | 'config-and-version';
|
|
13
13
|
/** The base URL against which to check for updates */
|
|
14
14
|
autoUpdateUrl?: string;
|
|
15
15
|
/** URL of the Web3Signer instance */
|
|
16
16
|
web3SignerUrl?: string;
|
|
17
|
+
/** Whether to run in fisherman mode */
|
|
18
|
+
fishermanMode?: boolean;
|
|
19
|
+
/** Force verification of tx Chonk proofs. Only used for testnet */
|
|
20
|
+
debugForceTxProofVerification: boolean;
|
|
17
21
|
};
|
|
18
22
|
export declare const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig>;
|
|
19
|
-
//# sourceMappingURL=
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQXVCLE1BQU0sMEJBQTBCLENBQUM7QUFFeEYsTUFBTSxNQUFNLGdCQUFnQixHQUFHO0lBQzdCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLGdLQUFnSztJQUNoSyxRQUFRLEVBQUUsTUFBTSxHQUFHLFVBQVUsR0FBRyxnQkFBZ0IsQ0FBQztJQUNqRCw2SUFBNkk7SUFDN0ksYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFFekIscU9BQXFPO0lBQ3JPLFVBQVUsQ0FBQyxFQUFFLFVBQVUsR0FBRyxRQUFRLEdBQUcsUUFBUSxHQUFHLG9CQUFvQixDQUFDO0lBQ3JFLHNEQUFzRDtJQUN0RCxhQUFhLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFdkIscUNBQXFDO0lBQ3JDLGFBQWEsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN2Qix1Q0FBdUM7SUFDdkMsYUFBYSxDQUFDLEVBQUUsT0FBTyxDQUFDO0lBRXhCLG1FQUFtRTtJQUNuRSw2QkFBNkIsRUFBRSxPQUFPLENBQUM7Q0FDeEMsQ0FBQztBQUVGLGVBQU8sTUFBTSx3QkFBd0IsRUFBRSxrQkFBa0IsQ0FBQyxnQkFBZ0IsQ0FvRHpFLENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAuB,MAAM,0BAA0B,CAAC;AAExF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,gKAAgK;IAChK,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,gBAAgB,CAAC;IACjD,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAuB,MAAM,0BAA0B,CAAC;AAExF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,gKAAgK;IAChK,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,gBAAgB,CAAC;IACjD,6IAA6I;IAC7I,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IAEzB,qOAAqO;IACrO,UAAU,CAAC,EAAE,UAAU,GAAG,QAAQ,GAAG,QAAQ,GAAG,oBAAoB,CAAC;IACrE,sDAAsD;IACtD,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,qCAAqC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uCAAuC;IACvC,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,mEAAmE;IACnE,6BAA6B,EAAE,OAAO,CAAC;CACxC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAoDzE,CAAC"}
|
package/dest/config/index.js
CHANGED
|
@@ -15,9 +15,14 @@ export const sharedNodeConfigMappings = {
|
|
|
15
15
|
description: 'Set sync mode to `full` to always sync via L1, `snapshot` to download a snapshot if there is no local data, `force-snapshot` to download even if there is local data.',
|
|
16
16
|
defaultValue: 'snapshot'
|
|
17
17
|
},
|
|
18
|
-
|
|
19
|
-
env: '
|
|
20
|
-
description: 'Base
|
|
18
|
+
snapshotsUrls: {
|
|
19
|
+
env: 'SYNC_SNAPSHOTS_URLS',
|
|
20
|
+
description: 'Base URLs for snapshots index, comma-separated.',
|
|
21
|
+
parseEnv: (val)=>val.split(',').map((url)=>url.trim()).filter((url)=>url.length > 0),
|
|
22
|
+
fallback: [
|
|
23
|
+
'SYNC_SNAPSHOTS_URL'
|
|
24
|
+
],
|
|
25
|
+
defaultValue: []
|
|
21
26
|
},
|
|
22
27
|
autoUpdate: {
|
|
23
28
|
env: 'AUTO_UPDATE',
|
|
@@ -32,5 +37,15 @@ export const sharedNodeConfigMappings = {
|
|
|
32
37
|
env: 'WEB3_SIGNER_URL',
|
|
33
38
|
description: 'URL of the Web3Signer instance',
|
|
34
39
|
parseEnv: (val)=>val.trim()
|
|
40
|
+
},
|
|
41
|
+
fishermanMode: {
|
|
42
|
+
env: 'FISHERMAN_MODE',
|
|
43
|
+
description: 'Whether to run in fisherman mode.',
|
|
44
|
+
...booleanConfigHelper(false)
|
|
45
|
+
},
|
|
46
|
+
debugForceTxProofVerification: {
|
|
47
|
+
env: 'DEBUG_FORCE_TX_PROOF_VERIFICATION',
|
|
48
|
+
description: 'Whether to force tx proof verification. Only has an effect if real proving is turned off',
|
|
49
|
+
...booleanConfigHelper(false)
|
|
35
50
|
}
|
|
36
51
|
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './l1_tx_utils.js';
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import type { EthSigner } from '@aztec/ethereum/eth-signer';
|
|
2
|
+
import type { L1TxUtilsConfig } from '@aztec/ethereum/l1-tx-utils';
|
|
3
|
+
import type { ExtendedViemWalletClient, ViemClient } from '@aztec/ethereum/types';
|
|
4
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
5
|
+
import type { DateProvider } from '@aztec/foundation/timer';
|
|
6
|
+
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
7
|
+
import type { TelemetryClient } from '@aztec/telemetry-client';
|
|
8
|
+
import type { L1TxScope } from '../metrics/l1_tx_metrics.js';
|
|
9
|
+
/**
|
|
10
|
+
* Creates L1TxUtils with blobs from multiple Viem wallets, sharing store and metrics.
|
|
11
|
+
*/
|
|
12
|
+
export declare function createL1TxUtilsWithBlobsFromViemWallet(clients: ExtendedViemWalletClient[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
|
|
13
|
+
debugMaxGasLimit?: boolean;
|
|
14
|
+
scope?: L1TxScope;
|
|
15
|
+
}, deps: {
|
|
16
|
+
telemetry: TelemetryClient;
|
|
17
|
+
logger?: ReturnType<typeof createLogger>;
|
|
18
|
+
dateProvider?: DateProvider;
|
|
19
|
+
}): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").L1TxUtilsWithBlobs[]>;
|
|
20
|
+
/**
|
|
21
|
+
* Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
|
|
22
|
+
*/
|
|
23
|
+
export declare function createL1TxUtilsWithBlobsFromEthSigner(client: ViemClient, signers: EthSigner[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
|
|
24
|
+
debugMaxGasLimit?: boolean;
|
|
25
|
+
scope?: L1TxScope;
|
|
26
|
+
}, deps: {
|
|
27
|
+
telemetry: TelemetryClient;
|
|
28
|
+
logger?: ReturnType<typeof createLogger>;
|
|
29
|
+
dateProvider?: DateProvider;
|
|
30
|
+
}): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").L1TxUtilsWithBlobs[]>;
|
|
31
|
+
/**
|
|
32
|
+
* Creates L1TxUtils (without blobs) from multiple Viem wallets, sharing store and metrics.
|
|
33
|
+
*/
|
|
34
|
+
export declare function createL1TxUtilsFromViemWalletWithStore(clients: ExtendedViemWalletClient[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
|
|
35
|
+
debugMaxGasLimit?: boolean;
|
|
36
|
+
scope?: L1TxScope;
|
|
37
|
+
}, deps: {
|
|
38
|
+
telemetry: TelemetryClient;
|
|
39
|
+
logger?: ReturnType<typeof createLogger>;
|
|
40
|
+
dateProvider?: DateProvider;
|
|
41
|
+
scope?: L1TxScope;
|
|
42
|
+
}): Promise<import("@aztec/ethereum/l1-tx-utils").L1TxUtils[]>;
|
|
43
|
+
/**
|
|
44
|
+
* Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
|
|
45
|
+
*/
|
|
46
|
+
export declare function createL1TxUtilsFromEthSignerWithStore(client: ViemClient, signers: EthSigner[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
|
|
47
|
+
debugMaxGasLimit?: boolean;
|
|
48
|
+
scope?: L1TxScope;
|
|
49
|
+
}, deps: {
|
|
50
|
+
telemetry: TelemetryClient;
|
|
51
|
+
logger?: ReturnType<typeof createLogger>;
|
|
52
|
+
dateProvider?: DateProvider;
|
|
53
|
+
scope?: L1TxScope;
|
|
54
|
+
}): Promise<import("@aztec/ethereum/l1-tx-utils").L1TxUtils[]>;
|
|
55
|
+
/**
|
|
56
|
+
* Creates ForwarderL1TxUtils from multiple Viem wallets, sharing store and metrics.
|
|
57
|
+
* This wraps all transactions through a forwarder contract for testing purposes.
|
|
58
|
+
*/
|
|
59
|
+
export declare function createForwarderL1TxUtilsFromViemWallet(clients: ExtendedViemWalletClient[], forwarderAddress: import('@aztec/foundation/eth-address').EthAddress, config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
|
|
60
|
+
debugMaxGasLimit?: boolean;
|
|
61
|
+
scope?: L1TxScope;
|
|
62
|
+
}, deps: {
|
|
63
|
+
telemetry: TelemetryClient;
|
|
64
|
+
logger?: ReturnType<typeof createLogger>;
|
|
65
|
+
dateProvider?: DateProvider;
|
|
66
|
+
}): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").ForwarderL1TxUtils[]>;
|
|
67
|
+
/**
|
|
68
|
+
* Creates ForwarderL1TxUtils from multiple EthSigners, sharing store and metrics.
|
|
69
|
+
* This wraps all transactions through a forwarder contract for testing purposes.
|
|
70
|
+
*/
|
|
71
|
+
export declare function createForwarderL1TxUtilsFromEthSigner(client: ViemClient, signers: EthSigner[], forwarderAddress: import('@aztec/foundation/eth-address').EthAddress, config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
|
|
72
|
+
debugMaxGasLimit?: boolean;
|
|
73
|
+
scope?: L1TxScope;
|
|
74
|
+
}, deps: {
|
|
75
|
+
telemetry: TelemetryClient;
|
|
76
|
+
logger?: ReturnType<typeof createLogger>;
|
|
77
|
+
dateProvider?: DateProvider;
|
|
78
|
+
}): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").ForwarderL1TxUtils[]>;
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mYWN0b3JpZXMvbDFfdHhfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFLNUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFPbkUsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBK0I3RDs7R0FFRztBQUNILHdCQUFzQixzQ0FBc0MsQ0FDMUQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLEVBQ25DLE1BQU0sRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxHQUFHO0lBQUUsZ0JBQWdCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFBQyxLQUFLLENBQUMsRUFBRSxTQUFTLENBQUE7Q0FBRSxFQUN0RyxJQUFJLEVBQUU7SUFDSixTQUFTLEVBQUUsZUFBZSxDQUFDO0lBQzNCLE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQyxPQUFPLFlBQVksQ0FBQyxDQUFDO0lBQ3pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztDQUM3QixrRkFPRjtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLHFDQUFxQyxDQUN6RCxNQUFNLEVBQUUsVUFBVSxFQUNsQixPQUFPLEVBQUUsU0FB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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"l1_tx_utils.d.ts","sourceRoot":"","sources":["../../src/factories/l1_tx_utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
import { createL1TxUtilsFromEthSigner as createL1TxUtilsFromEthSignerBase, createL1TxUtilsFromViemWallet as createL1TxUtilsFromViemWalletBase } from '@aztec/ethereum/l1-tx-utils';
|
|
2
|
+
import { createForwarderL1TxUtilsFromEthSigner as createForwarderL1TxUtilsFromEthSignerBase, createForwarderL1TxUtilsFromViemWallet as createForwarderL1TxUtilsFromViemWalletBase, createL1TxUtilsWithBlobsFromEthSigner as createL1TxUtilsWithBlobsFromEthSignerBase, createL1TxUtilsWithBlobsFromViemWallet as createL1TxUtilsWithBlobsFromViemWalletBase } from '@aztec/ethereum/l1-tx-utils-with-blobs';
|
|
3
|
+
import { omit } from '@aztec/foundation/collection';
|
|
4
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
5
|
+
import { createStore } from '@aztec/kv-store/lmdb-v2';
|
|
6
|
+
import { L1TxMetrics } from '../metrics/l1_tx_metrics.js';
|
|
7
|
+
import { L1TxStore } from '../stores/l1_tx_store.js';
|
|
8
|
+
const L1_TX_STORE_NAME = 'l1-tx-utils';
|
|
9
|
+
/**
|
|
10
|
+
* Creates shared dependencies (logger, store, metrics) for L1TxUtils instances.
|
|
11
|
+
*/ async function createSharedDeps(config, deps) {
|
|
12
|
+
const logger = deps.logger ?? createLogger('l1-tx-utils');
|
|
13
|
+
// Note that we do NOT bind them to the rollup address, since we still need to
|
|
14
|
+
// monitor and cancel txs for previous rollups to free up our nonces.
|
|
15
|
+
const noRollupConfig = omit(config, 'l1Contracts');
|
|
16
|
+
const kvStore = await createStore(L1_TX_STORE_NAME, L1TxStore.SCHEMA_VERSION, noRollupConfig, logger);
|
|
17
|
+
const store = new L1TxStore(kvStore, logger);
|
|
18
|
+
const meter = deps.telemetry.getMeter('L1TxUtils');
|
|
19
|
+
const metrics = new L1TxMetrics(meter, config.scope ?? 'other', logger);
|
|
20
|
+
return {
|
|
21
|
+
logger,
|
|
22
|
+
store,
|
|
23
|
+
metrics,
|
|
24
|
+
dateProvider: deps.dateProvider
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Creates L1TxUtils with blobs from multiple Viem wallets, sharing store and metrics.
|
|
29
|
+
*/ export async function createL1TxUtilsWithBlobsFromViemWallet(clients, config, deps) {
|
|
30
|
+
const sharedDeps = await createSharedDeps(config, deps);
|
|
31
|
+
return clients.map((client)=>createL1TxUtilsWithBlobsFromViemWalletBase(client, sharedDeps, config, config.debugMaxGasLimit));
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
|
|
35
|
+
*/ export async function createL1TxUtilsWithBlobsFromEthSigner(client, signers, config, deps) {
|
|
36
|
+
const sharedDeps = await createSharedDeps(config, deps);
|
|
37
|
+
// Deduplicate signers by address to avoid creating multiple L1TxUtils instances
|
|
38
|
+
// for the same publisher address (e.g., when multiple attesters share the same publisher key)
|
|
39
|
+
const signersByAddress = new Map();
|
|
40
|
+
for (const signer of signers){
|
|
41
|
+
const addressKey = signer.address.toString().toLowerCase();
|
|
42
|
+
if (!signersByAddress.has(addressKey)) {
|
|
43
|
+
signersByAddress.set(addressKey, signer);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
const uniqueSigners = Array.from(signersByAddress.values());
|
|
47
|
+
if (uniqueSigners.length < signers.length) {
|
|
48
|
+
sharedDeps.logger.info(`Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`);
|
|
49
|
+
}
|
|
50
|
+
return uniqueSigners.map((signer)=>createL1TxUtilsWithBlobsFromEthSignerBase(client, signer, sharedDeps, config, config.debugMaxGasLimit));
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* Creates L1TxUtils (without blobs) from multiple Viem wallets, sharing store and metrics.
|
|
54
|
+
*/ export async function createL1TxUtilsFromViemWalletWithStore(clients, config, deps) {
|
|
55
|
+
const sharedDeps = await createSharedDeps(config, deps);
|
|
56
|
+
return clients.map((client)=>createL1TxUtilsFromViemWalletBase(client, sharedDeps, config));
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
|
|
60
|
+
*/ export async function createL1TxUtilsFromEthSignerWithStore(client, signers, config, deps) {
|
|
61
|
+
const sharedDeps = await createSharedDeps(config, deps);
|
|
62
|
+
// Deduplicate signers by address to avoid creating multiple L1TxUtils instances
|
|
63
|
+
// for the same publisher address (e.g., when multiple attesters share the same publisher key)
|
|
64
|
+
const signersByAddress = new Map();
|
|
65
|
+
for (const signer of signers){
|
|
66
|
+
const addressKey = signer.address.toString().toLowerCase();
|
|
67
|
+
if (!signersByAddress.has(addressKey)) {
|
|
68
|
+
signersByAddress.set(addressKey, signer);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
const uniqueSigners = Array.from(signersByAddress.values());
|
|
72
|
+
if (uniqueSigners.length < signers.length) {
|
|
73
|
+
sharedDeps.logger.info(`Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`);
|
|
74
|
+
}
|
|
75
|
+
return uniqueSigners.map((signer)=>createL1TxUtilsFromEthSignerBase(client, signer, sharedDeps, config));
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* Creates ForwarderL1TxUtils from multiple Viem wallets, sharing store and metrics.
|
|
79
|
+
* This wraps all transactions through a forwarder contract for testing purposes.
|
|
80
|
+
*/ export async function createForwarderL1TxUtilsFromViemWallet(clients, forwarderAddress, config, deps) {
|
|
81
|
+
const sharedDeps = await createSharedDeps(config, deps);
|
|
82
|
+
return clients.map((client)=>createForwarderL1TxUtilsFromViemWalletBase(client, forwarderAddress, sharedDeps, config, config.debugMaxGasLimit));
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* Creates ForwarderL1TxUtils from multiple EthSigners, sharing store and metrics.
|
|
86
|
+
* This wraps all transactions through a forwarder contract for testing purposes.
|
|
87
|
+
*/ export async function createForwarderL1TxUtilsFromEthSigner(client, signers, forwarderAddress, config, deps) {
|
|
88
|
+
const sharedDeps = await createSharedDeps(config, deps);
|
|
89
|
+
return signers.map((signer)=>createForwarderL1TxUtilsFromEthSignerBase(client, signer, forwarderAddress, sharedDeps, config, config.debugMaxGasLimit));
|
|
90
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/metrics/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './l1_tx_metrics.js';
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import type { IL1TxMetrics, L1TxState } from '@aztec/ethereum/l1-tx-utils';
|
|
2
|
+
import { type Meter } from '@aztec/telemetry-client';
|
|
3
|
+
export type L1TxScope = 'sequencer' | 'prover' | 'other';
|
|
4
|
+
/**
|
|
5
|
+
* Metrics for L1 transaction utils tracking tx lifecycle and gas costs.
|
|
6
|
+
*/
|
|
7
|
+
export declare class L1TxMetrics implements IL1TxMetrics {
|
|
8
|
+
private meter;
|
|
9
|
+
private scope;
|
|
10
|
+
private logger;
|
|
11
|
+
private txMinedDuration;
|
|
12
|
+
private txAttemptsUntilMined;
|
|
13
|
+
private txMinedCount;
|
|
14
|
+
private txRevertedCount;
|
|
15
|
+
private txCancelledCount;
|
|
16
|
+
private txNotMinedCount;
|
|
17
|
+
private maxPriorityFeeHistogram;
|
|
18
|
+
private maxFeeHistogram;
|
|
19
|
+
private blobFeeHistogram;
|
|
20
|
+
constructor(meter: Meter, scope?: L1TxScope, logger?: import("@aztec/foundation/log").Logger);
|
|
21
|
+
/**
|
|
22
|
+
* Records metrics when a transaction is mined.
|
|
23
|
+
* @param state - The L1 transaction state
|
|
24
|
+
* @param l1Timestamp - The current L1 timestamp
|
|
25
|
+
*/
|
|
26
|
+
recordMinedTx(state: L1TxState, l1Timestamp: Date): void;
|
|
27
|
+
recordDroppedTx(state: L1TxState): void;
|
|
28
|
+
}
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfbWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21ldHJpY3MvbDFfdHhfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHM0UsT0FBTyxFQUdMLEtBQUssS0FBSyxFQUlYLE1BQU0seUJBQXlCLENBQUM7QUFFakMsTUFBTSxNQUFNLFNBQVMsR0FBRyxXQUFXLEdBQUcsUUFBUSxHQUFHLE9BQU8sQ0FBQztBQUV6RDs7R0FFRztBQUNILHFCQUFhLFdBQVksWUFBVyxZQUFZO0lBbUI1QyxPQUFPLENBQUMsS0FBSztJQUNiLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLE1BQU07SUFuQmhCLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFHbkMsT0FBTyxDQUFDLG9CQUFvQixDQUFZO0lBR3hDLE9BQU8sQ0FBQyxZQUFZLENBQWdCO0lBQ3BDLE9BQU8sQ0FBQyxlQUFlLENBQWdCO0lBQ3ZDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBZ0I7SUFDeEMsT0FBTyxDQUFDLGVBQWUsQ0FBZ0I7SUFHdkMsT0FBTyxDQUFDLHVCQUF1QixDQUFZO0lBQzNDLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFDbkMsT0FBTyxDQUFDLGdCQUFnQixDQUFZO0lBRXBDLFlBQ1UsS0FBSyxFQUFFLEtBQUssRUFDWixLQUFLLEdBQUUsU0FBbUIsRUFDMUIsTUFBTSx5Q0FBc0MsRUFtRHJEO0lBRUQ7Ozs7T0FJRztJQUNJLGFBQWEsQ0FBQyxLQUFLLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxJQUFJLEdBQUcsSUFBSSxDQW9EOUQ7SUFFTSxlQUFlLENBQUMsS0FBSyxFQUFFLFNBQVMsR0FBRyxJQUFJLENBaUI3QztDQUNGIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"l1_tx_metrics.d.ts","sourceRoot":"","sources":["../../src/metrics/l1_tx_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAG3E,OAAO,EAGL,KAAK,KAAK,EAIX,MAAM,yBAAyB,CAAC;AAEjC,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEzD;;GAEG;AACH,qBAAa,WAAY,YAAW,YAAY;IAmB5C,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,MAAM;IAnBhB,OAAO,CAAC,eAAe,CAAY;IAGnC,OAAO,CAAC,oBAAoB,CAAY;IAGxC,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,eAAe,CAAgB;IAGvC,OAAO,CAAC,uBAAuB,CAAY;IAC3C,OAAO,CAAC,eAAe,CAAY;IACnC,OAAO,CAAC,gBAAgB,CAAY;IAEpC,YACU,KAAK,EAAE,KAAK,EACZ,KAAK,GAAE,SAAmB,EAC1B,MAAM,yCAAsC,EAmDrD;IAED;;;;OAIG;IACI,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,GAAG,IAAI,CAoD9D;IAEM,eAAe,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAiB7C;CACF"}
|