@aztec/node-lib 0.0.1-commit.f504929 → 0.0.1-commit.f5a9928
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/snapshot-sync.d.ts +5 -4
- package/dest/actions/snapshot-sync.d.ts.map +1 -1
- package/dest/actions/snapshot-sync.js +15 -15
- package/dest/actions/upload-snapshot.d.ts +2 -2
- package/dest/actions/upload-snapshot.d.ts.map +1 -1
- package/dest/config/index.d.ts +3 -5
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +5 -9
- package/dest/factories/l1_tx_utils.d.ts +2 -2
- package/dest/factories/l1_tx_utils.d.ts.map +1 -1
- package/dest/factories/l1_tx_utils.js +1 -1
- package/dest/metrics/l1_tx_metrics.d.ts +1 -1
- package/dest/metrics/l1_tx_metrics.d.ts.map +1 -1
- package/dest/metrics/l1_tx_metrics.js +12 -12
- package/package.json +20 -21
- package/src/actions/snapshot-sync.ts +26 -18
- package/src/actions/upload-snapshot.ts +1 -1
- package/src/config/index.ts +10 -15
- package/src/factories/l1_tx_utils.ts +2 -2
- package/src/metrics/l1_tx_metrics.ts +16 -14
|
@@ -3,11 +3,12 @@ import { type EthereumClientConfig } from '@aztec/ethereum/client';
|
|
|
3
3
|
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
|
-
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
7
6
|
import type { ChainConfig } from '@aztec/stdlib/config';
|
|
7
|
+
import { type ReadOnlyFileStore } from '@aztec/stdlib/file-store';
|
|
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';
|
|
10
|
-
type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<L1ContractsConfig, 'aztecEpochDuration'> & Pick<ArchiverConfig, 'archiverStoreMapSizeKb'
|
|
11
|
+
type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<L1ContractsConfig, 'aztecEpochDuration'> & Pick<ArchiverConfig, 'archiverStoreMapSizeKb'> & DataStoreConfig & Required<Pick<DataStoreConfig, 'rollupAddress'>> & EthereumClientConfig & {
|
|
11
12
|
snapshotsUrls?: string[];
|
|
12
13
|
minL1BlocksToTriggerReplace?: number;
|
|
13
14
|
};
|
|
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3Qtc3luYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvc25hcHNob3Qtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBR0wsS0FBSyxjQUFjLEVBR3BCLE1BQU0saUJBQWlCLENBQUM7QUFFekIsT0FBTyxFQUFFLEtBQUssb0JBQW9CLEVBQW1CLE1BQU0sd0JBQXdCLENBQUM7QUFDcEYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUV4RCxPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBMkIsTUFBTSwwQkFBMEIsQ0FBQztBQUMzRixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFLdEIsTUFBTSx5QkFBeUIsQ0FBQztBQU1qQyxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSzNELEtBQUssa0JBQWtCLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxHQUMxRCxJQUFJLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxlQUFlLENBQUMsR0FDaEQsSUFBSSxDQUFDLGlCQUFpQixFQUFFLG9CQUFvQixDQUFDLEdBQzdDLElBQUksQ0FBQyxjQUFjLEVBQUUsd0JBQXdCLENBQUMsR0FDOUMsZUFBZSxHQUNmLFFBQVEsQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLGVBQWUsQ0FBQyxDQUFDLEdBQ2hELG9CQUFvQixHQUFHO0lBQ3JCLGFBQWEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3pCLDJCQUEyQixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3RDLENBQUM7QUFFSjs7O0dBR0c7QUFDSCx3QkFBc0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxHQUFHLEVBQUUsTUFBTSxvQkF1SzVFO0FBRUQ7O0dBRUc7QUFDSCx3QkFBc0IsWUFBWSxDQUNoQyxRQUFRLEVBQUUsSUFBSSxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxFQUM1QyxHQUFHLEVBQUUsTUFBTSxFQUNYLE1BQU0sRUFBRTtJQUFFLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFBQyxhQUFhLEVBQUUsVUFBVSxDQUFDO0lBQUMsU0FBUyxFQUFFLGlCQUFpQixDQUFBO0NBQUUsaUJBbUQzRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot-sync.d.ts","sourceRoot":"","sources":["../../src/actions/snapshot-sync.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"snapshot-sync.d.ts","sourceRoot":"","sources":["../../src/actions/snapshot-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AAEzB,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;AAGpD,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,CAAC,GAC9C,eAAe,GACf,QAAQ,CAAC,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,GAChD,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,oBAuK5E;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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, createArchiverStore } from '@aztec/archiver';
|
|
1
|
+
import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, createArchiverStore, getArchiverSynchPoint } from '@aztec/archiver';
|
|
2
2
|
import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
|
|
3
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
|
+
import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/stdlib/block';
|
|
6
7
|
import { DatabaseVersionManager } from '@aztec/stdlib/database-version/manager';
|
|
7
8
|
import { createReadOnlyFileStore } from '@aztec/stdlib/file-store';
|
|
8
9
|
import { downloadSnapshot, getLatestSnapshotMetadata, makeSnapshotPaths } from '@aztec/stdlib/snapshots';
|
|
@@ -15,7 +16,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
15
16
|
* Connects to a remote snapshot index and downloads the latest snapshot if the local archiver is behind.
|
|
16
17
|
* Behaviour depends on syncing mode.
|
|
17
18
|
*/ export async function trySnapshotSync(config, log) {
|
|
18
|
-
const { syncMode, snapshotsUrls, dataDirectory, l1ChainId, rollupVersion,
|
|
19
|
+
const { syncMode, snapshotsUrls, dataDirectory, l1ChainId, rollupVersion, rollupAddress } = config;
|
|
19
20
|
if (syncMode === 'full') {
|
|
20
21
|
log.debug('Snapshot sync is disabled. Running full sync.', {
|
|
21
22
|
syncMode: syncMode
|
|
@@ -30,24 +31,24 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
30
31
|
log.verbose('Snapshot sync is disabled. No local data directory defined.');
|
|
31
32
|
return false;
|
|
32
33
|
}
|
|
33
|
-
// Create an archiver store to check the current state (do this only once)
|
|
34
|
+
// Create an archiver store to check the current state (do this only once). This temporary store is only
|
|
35
|
+
// read for its sync point and never serves tagged-log queries, so the genesis block hash it carries is
|
|
36
|
+
// immaterial — pass the protocol constant.
|
|
34
37
|
log.verbose(`Creating temporary archiver data store`);
|
|
35
|
-
const archiverStore = await createArchiverStore(config,
|
|
36
|
-
epochDuration: config.aztecEpochDuration
|
|
37
|
-
});
|
|
38
|
+
const archiverStore = await createArchiverStore(config, GENESIS_BLOCK_HEADER_HASH);
|
|
38
39
|
let archiverL1BlockNumber;
|
|
39
40
|
let archiverL2BlockNumber;
|
|
40
41
|
try {
|
|
41
42
|
[archiverL1BlockNumber, archiverL2BlockNumber] = await Promise.all([
|
|
42
|
-
archiverStore
|
|
43
|
-
archiverStore.
|
|
43
|
+
getArchiverSynchPoint(archiverStore).then((s)=>s.blocksSynchedTo),
|
|
44
|
+
archiverStore.blocks.getLatestL2BlockNumber()
|
|
44
45
|
]);
|
|
45
46
|
} finally{
|
|
46
47
|
log.verbose(`Closing temporary archiver data store`, {
|
|
47
48
|
archiverL1BlockNumber,
|
|
48
49
|
archiverL2BlockNumber
|
|
49
50
|
});
|
|
50
|
-
await archiverStore.close();
|
|
51
|
+
await archiverStore.db.close();
|
|
51
52
|
}
|
|
52
53
|
const minL1BlocksToTriggerReplace = config.minL1BlocksToTriggerReplace ?? MIN_L1_BLOCKS_TO_TRIGGER_REPLACE;
|
|
53
54
|
if (syncMode === 'snapshot' && archiverL2BlockNumber !== undefined && archiverL2BlockNumber >= INITIAL_L2_BLOCK_NUM) {
|
|
@@ -66,7 +67,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
66
67
|
const indexMetadata = {
|
|
67
68
|
l1ChainId,
|
|
68
69
|
rollupVersion,
|
|
69
|
-
rollupAddress
|
|
70
|
+
rollupAddress
|
|
70
71
|
};
|
|
71
72
|
const snapshotCandidates = [];
|
|
72
73
|
for (const snapshotsUrl of snapshotsUrls){
|
|
@@ -134,7 +135,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
134
135
|
// Sort candidates by L1 block number (highest first)
|
|
135
136
|
snapshotCandidates.sort((a, b)=>b.snapshot.l1BlockNumber - a.snapshot.l1BlockNumber);
|
|
136
137
|
// Try each candidate in order until one succeeds
|
|
137
|
-
for (const { snapshot, url } of snapshotCandidates){
|
|
138
|
+
for (const { snapshot, url, fileStore } of snapshotCandidates){
|
|
138
139
|
const { l1BlockNumber, l2BlockNumber } = snapshot;
|
|
139
140
|
log.info(`Attempting to sync from snapshot at L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
|
|
140
141
|
snapshot,
|
|
@@ -143,8 +144,8 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
143
144
|
try {
|
|
144
145
|
await snapshotSync(snapshot, log, {
|
|
145
146
|
dataDirectory: config.dataDirectory,
|
|
146
|
-
rollupAddress: config.
|
|
147
|
-
|
|
147
|
+
rollupAddress: config.rollupAddress,
|
|
148
|
+
fileStore
|
|
148
149
|
});
|
|
149
150
|
log.info(`Snapshot synced to L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
|
|
150
151
|
snapshot,
|
|
@@ -167,11 +168,10 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
167
168
|
/**
|
|
168
169
|
* Downloads the given snapshot replacing any local data stores.
|
|
169
170
|
*/ export async function snapshotSync(snapshot, log, config) {
|
|
170
|
-
const { dataDirectory, rollupAddress } = config;
|
|
171
|
+
const { dataDirectory, rollupAddress, fileStore } = config;
|
|
171
172
|
if (!dataDirectory) {
|
|
172
173
|
throw new Error(`No local data directory defined. Cannot sync snapshot.`);
|
|
173
174
|
}
|
|
174
|
-
const fileStore = await createReadOnlyFileStore(config.snapshotsUrl, log);
|
|
175
175
|
let downloadDir;
|
|
176
176
|
try {
|
|
177
177
|
// Download the snapshot to a temp location.
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { type Archiver } from '@aztec/archiver';
|
|
2
2
|
import type { Logger } from '@aztec/foundation/log';
|
|
3
|
-
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
4
3
|
import type { ChainConfig } from '@aztec/stdlib/config';
|
|
5
4
|
import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
5
|
+
import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
|
|
6
6
|
export type UploadSnapshotConfig = Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<DataStoreConfig, 'dataDirectory'>;
|
|
7
7
|
/**
|
|
8
8
|
* Pauses the archiver and world state sync, creates backups of the archiver and world state lmdb environments,
|
|
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=data:application/json;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLXNuYXBzaG90LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWN0aW9ucy91cGxvYWQtc25hcHNob3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUF1QixLQUFLLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXJFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXhELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUUsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFXOUQsTUFBTSxNQUFNLG9CQUFvQixHQUFHLElBQUksQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLGVBQWUsQ0FBQyxHQUNqRixJQUFJLENBQUMsZUFBZSxFQUFFLGVBQWUsQ0FBQyxDQUFDO0FBRXpDOzs7R0FHRztBQUNILHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLFVBQVUsRUFBRSxzQkFBc0IsRUFDbEMsTUFBTSxFQUFFLG9CQUFvQixFQUM1QixHQUFHLEVBQUUsTUFBTSxpQkFvQloifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-snapshot.d.ts","sourceRoot":"","sources":["../../src/actions/upload-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAErE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"upload-snapshot.d.ts","sourceRoot":"","sources":["../../src/actions/upload-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAErE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAW9D,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GACjF,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;AAEzC;;;GAGG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,sBAAsB,EAClC,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,MAAM,iBAoBZ"}
|
package/dest/config/index.d.ts
CHANGED
|
@@ -10,16 +10,14 @@ export type SharedNodeConfig = {
|
|
|
10
10
|
syncMode: 'full' | 'snapshot' | 'force-snapshot';
|
|
11
11
|
/** Base URLs for snapshots index. Index file will be searched at `SNAPSHOTS_BASE_URL/aztec-L1_CHAIN_ID-VERSION-ROLLUP_ADDRESS/index.json` */
|
|
12
12
|
snapshotsUrls?: string[];
|
|
13
|
-
/** 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*/
|
|
14
|
-
autoUpdate?: 'disabled' | 'notify' | 'config' | 'config-and-version';
|
|
15
|
-
/** The base URL against which to check for updates */
|
|
16
|
-
autoUpdateUrl?: string;
|
|
17
13
|
/** URL of the Web3Signer instance */
|
|
18
14
|
web3SignerUrl?: string;
|
|
19
15
|
/** Whether to run in fisherman mode */
|
|
20
16
|
fishermanMode?: boolean;
|
|
21
17
|
/** Force verification of tx Chonk proofs. Only used for testnet */
|
|
22
18
|
debugForceTxProofVerification: boolean;
|
|
19
|
+
/** Soft-shutdown the node when the canonical rollup is no longer compatible, keeping the health server up for K8s probes */
|
|
20
|
+
enableAutoShutdown: boolean;
|
|
23
21
|
};
|
|
24
22
|
export declare const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig>;
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQXVCLE1BQU0sMEJBQTBCLENBQUM7QUFFeEYsTUFBTSxNQUFNLGdCQUFnQixHQUFHO0lBQzdCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLGdFQUFnRTtJQUNoRSxnQkFBZ0IsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUMzQixnS0FBZ0s7SUFDaEssUUFBUSxFQUFFLE1BQU0sR0FBRyxVQUFVLEdBQUcsZ0JBQWdCLENBQUM7SUFDakQsNklBQTZJO0lBQzdJLGFBQWEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3pCLHFDQUFxQztJQUNyQyxhQUFhLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDdkIsdUNBQXVDO0lBQ3ZDLGFBQWEsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUV4QixtRUFBbUU7SUFDbkUsNkJBQTZCLEVBQUUsT0FBTyxDQUFDO0lBRXZDLDRIQUE0SDtJQUM1SCxrQkFBa0IsRUFBRSxPQUFPLENBQUM7Q0FDN0IsQ0FBQztBQUVGLGVBQU8sTUFBTSx3QkFBd0IsRUFBRSxrQkFBa0IsQ0FBQyxnQkFBZ0IsQ0E0RHpFLENBQUMifQ==
|
|
@@ -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,gEAAgE;IAChE,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,gKAAgK;IAChK,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,gBAAgB,CAAC;IACjD,6IAA6I;IAC7I,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;
|
|
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,gEAAgE;IAChE,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,gKAAgK;IAChK,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,gBAAgB,CAAC;IACjD,6IAA6I;IAC7I,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,qCAAqC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uCAAuC;IACvC,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,mEAAmE;IACnE,6BAA6B,EAAE,OAAO,CAAC;IAEvC,4HAA4H;IAC5H,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CA4DzE,CAAC"}
|
package/dest/config/index.js
CHANGED
|
@@ -30,15 +30,6 @@ export const sharedNodeConfigMappings = {
|
|
|
30
30
|
],
|
|
31
31
|
defaultValue: []
|
|
32
32
|
},
|
|
33
|
-
autoUpdate: {
|
|
34
|
-
env: 'AUTO_UPDATE',
|
|
35
|
-
description: 'The auto update mode for this node',
|
|
36
|
-
defaultValue: 'disabled'
|
|
37
|
-
},
|
|
38
|
-
autoUpdateUrl: {
|
|
39
|
-
env: 'AUTO_UPDATE_URL',
|
|
40
|
-
description: 'Base URL to check for updates'
|
|
41
|
-
},
|
|
42
33
|
web3SignerUrl: {
|
|
43
34
|
env: 'WEB3_SIGNER_URL',
|
|
44
35
|
description: 'URL of the Web3Signer instance',
|
|
@@ -53,5 +44,10 @@ export const sharedNodeConfigMappings = {
|
|
|
53
44
|
env: 'DEBUG_FORCE_TX_PROOF_VERIFICATION',
|
|
54
45
|
description: 'Whether to force tx proof verification. Only has an effect if real proving is turned off',
|
|
55
46
|
...booleanConfigHelper(false)
|
|
47
|
+
},
|
|
48
|
+
enableAutoShutdown: {
|
|
49
|
+
env: 'ENABLE_AUTO_SHUTDOWN',
|
|
50
|
+
description: 'Soft-shutdown the node when the canonical rollup is no longer compatible (protocol constants diverge), keeping the health server up so K8s probes keep passing. Only applies to nodes following the canonical rollup.',
|
|
51
|
+
...booleanConfigHelper(false)
|
|
56
52
|
}
|
|
57
53
|
};
|
|
@@ -5,7 +5,7 @@ import type { ExtendedViemWalletClient, ViemClient } from '@aztec/ethereum/types
|
|
|
5
5
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
6
6
|
import { createLogger } from '@aztec/foundation/log';
|
|
7
7
|
import type { DateProvider } from '@aztec/foundation/timer';
|
|
8
|
-
import type { DataStoreConfig } from '@aztec/kv-store
|
|
8
|
+
import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
|
|
9
9
|
import type { TelemetryClient } from '@aztec/telemetry-client';
|
|
10
10
|
import type { L1TxScope } from '../metrics/l1_tx_metrics.js';
|
|
11
11
|
/**
|
|
@@ -63,4 +63,4 @@ export declare function createForwarderL1TxUtilsFromSigners(client: ViemClient,
|
|
|
63
63
|
dateProvider: DateProvider;
|
|
64
64
|
kzg?: BlobKzgInstance;
|
|
65
65
|
}): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").ForwarderL1TxUtils[]>;
|
|
66
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mYWN0b3JpZXMvbDFfdHhfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFNUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFbkUsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEYsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTVELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBc0M3RDs7O0dBR0c7QUFDSCx3QkFBc0IsMEJBQTBCLENBQzlDLE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxFQUNuQyxNQUFNLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsR0FBRztJQUFFLGdCQUFnQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxDQUFBO0NBQUUsRUFDdEcsSUFBSSxFQUFFO0lBQ0osU0FBUyxFQUFFLGVBQWUsQ0FBQztJQUMzQixNQUFNLENBQUMsRUFBRSxVQUFVLENBQUMsT0FBTyxZQUFZLENBQUMsQ0FBQztJQUN6QyxZQUFZLEVBQUUsWUFBWSxDQUFDO0lBQzNCLEdBQUcsQ0FBQyxFQUFFLGVBQWUsQ0FBQztDQUN2Qiw4REFLRjtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsMEJBQTBCLENBQzlDLE1BQU0sRUFBRSxVQUFVLEVBQ2xCLE9BQU8sRUFBRSxTQUFTLEVBQUUsRUFDcEIsTUFBTSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQTtDQUFFLEVBQ3RHLElBQUksRUFBRTtJQUNKLFNBQVMsRUFBRSxlQUFlLENBQUM7SUFDM0IsTUFBTSxDQUFDLEVBQUUsVUFBVSxDQUFDLE9BQU8sWUFBWSxDQUFDLENBQUM7SUFDekMsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixHQUFHLENBQUMsRUFBRSxlQUFlLENBQUM7Q0FDdkIsOERBdUJGO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFzQixtQ0FBbUMsQ0FDdkQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLEVBQ25DLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsTUFBTSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQTtDQUFFLEVBQ3RHLElBQUksRUFBRTtJQUNKLFNBQVMsRUFBRSxlQUFlLENBQUM7SUFDM0IsTUFBTSxDQUFDLEVBQUUsVUFBVSxDQUFDLE9BQU8sWUFBWSxDQUFDLENBQUM7SUFDekMsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixHQUFHLENBQUMsRUFBRSxlQUFlLENBQUM7Q0FDdkIsa0ZBT0Y7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQXNCLG1DQUFtQyxDQUN2RCxNQUFNLEVBQUUsVUFBVSxFQUNsQixPQUFPLEVBQUUsU0FBUyxFQUFFLEVBQ3BCLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsTUFBTSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQTtDQUFFLEVBQ3RHLElBQUksRUFBRTtJQUNKLFNBQVMsRUFBRSxlQUFlLENBQUM7SUFDM0IsTUFBTSxDQUFDLEVBQUUsVUFBVSxDQUFDLE9BQU8sWUFBWSxDQUFDLENBQUM7SUFDekMsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixHQUFHLENBQUMsRUFBRSxlQUFlLENBQUM7Q0FDdkIsa0ZBT0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"l1_tx_utils.d.ts","sourceRoot":"","sources":["../../src/factories/l1_tx_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE,OAAO,KAAK,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAElF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"l1_tx_utils.d.ts","sourceRoot":"","sources":["../../src/factories/l1_tx_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE,OAAO,KAAK,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAElF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAsC7D;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,wBAAwB,EAAE,EACnC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,8DAKF;AAED;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,SAAS,EAAE,EACpB,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,8DAuBF;AAED;;;;GAIG;AACH,wBAAsB,mCAAmC,CACvD,OAAO,EAAE,wBAAwB,EAAE,EACnC,gBAAgB,EAAE,UAAU,EAC5B,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,kFAOF;AAED;;;;GAIG;AACH,wBAAsB,mCAAmC,CACvD,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,SAAS,EAAE,EACpB,gBAAgB,EAAE,UAAU,EAC5B,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,kFAOF"}
|
|
@@ -13,7 +13,7 @@ const L1_TX_STORE_NAME = 'l1-tx-utils';
|
|
|
13
13
|
const logger = deps.logger ?? createLogger('l1-tx-utils');
|
|
14
14
|
// Note that we do NOT bind them to the rollup address, since we still need to
|
|
15
15
|
// monitor and cancel txs for previous rollups to free up our nonces.
|
|
16
|
-
const noRollupConfig = omit(config, '
|
|
16
|
+
const noRollupConfig = omit(config, 'rollupAddress');
|
|
17
17
|
const kvStore = await createStore(L1_TX_STORE_NAME, L1TxStore.SCHEMA_VERSION, noRollupConfig, logger.getBindings());
|
|
18
18
|
const store = new L1TxStore(kvStore, logger);
|
|
19
19
|
const meter = deps.telemetry.getMeter('L1TxUtils');
|
|
@@ -26,4 +26,4 @@ export declare class L1TxMetrics implements IL1TxMetrics {
|
|
|
26
26
|
recordMinedTx(state: L1TxState, l1Timestamp: Date): void;
|
|
27
27
|
recordDroppedTx(state: L1TxState): void;
|
|
28
28
|
}
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfbWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21ldHJpY3MvbDFfdHhfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHM0UsT0FBTyxFQUdMLEtBQUssS0FBSyxFQUlYLE1BQU0seUJBQXlCLENBQUM7QUFFakMsTUFBTSxNQUFNLFNBQVMsR0FBRyxXQUFXLEdBQUcsUUFBUSxHQUFHLE9BQU8sQ0FBQztBQUV6RDs7R0FFRztBQUNILHFCQUFhLFdBQVksWUFBVyxZQUFZO0lBbUI1QyxPQUFPLENBQUMsS0FBSztJQUNiLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLE1BQU07SUFuQmhCLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFHbkMsT0FBTyxDQUFDLG9CQUFvQixDQUFZO0lBR3hDLE9BQU8sQ0FBQyxZQUFZLENBQWdCO0lBQ3BDLE9BQU8sQ0FBQyxlQUFlLENBQWdCO0lBQ3ZDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBZ0I7SUFDeEMsT0FBTyxDQUFDLGVBQWUsQ0FBZ0I7SUFHdkMsT0FBTyxDQUFDLHVCQUF1QixDQUFZO0lBQzNDLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFDbkMsT0FBTyxDQUFDLGdCQUFnQixDQUFZO0lBRXBDLFlBQ1UsS0FBSyxFQUFFLEtBQUssRUFDWixLQUFLLEdBQUUsU0FBbUIsRUFDMUIsTUFBTSx5Q0FBc0MsRUFvQnJEO0lBRUQ7Ozs7T0FJRztJQUNJLGFBQWEsQ0FBQyxLQUFLLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxJQUFJLEdBQUcsSUFBSSxDQXNEOUQ7SUFFTSxlQUFlLENBQUMsS0FBSyxFQUFFLFNBQVMsR0FBRyxJQUFJLENBaUI3QztDQUNGIn0=
|
|
@@ -1 +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,EAoBrD;IAED;;;;OAIG;IACI,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,GAAG,IAAI,
|
|
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,EAoBrD;IAED;;;;OAIG;IACI,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,GAAG,IAAI,CAsD9D;IAEM,eAAe,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAiB7C;CACF"}
|
|
@@ -69,15 +69,15 @@ import { Attributes, Metrics, createUpDownCounterWithDefault } from '@aztec/tele
|
|
|
69
69
|
// Record number of attempts until mined
|
|
70
70
|
const attempts = isCancelTx ? state.cancelTxHashes.length : state.txHashes.length;
|
|
71
71
|
this.txAttemptsUntilMined.record(attempts, attributes);
|
|
72
|
-
// Record gas prices at end state
|
|
73
|
-
const
|
|
74
|
-
const
|
|
75
|
-
const
|
|
76
|
-
|
|
77
|
-
this.
|
|
78
|
-
|
|
79
|
-
if (
|
|
80
|
-
this.blobFeeHistogram.record(
|
|
72
|
+
// Record gas prices at end state, converted from wei to gwei to match metric unit definitions
|
|
73
|
+
const weiToGwei = 1e9;
|
|
74
|
+
const maxPriorityFeeGwei = Number(state.gasPrice.maxPriorityFeePerGas) / weiToGwei;
|
|
75
|
+
const maxFeeGwei = Number(state.gasPrice.maxFeePerGas) / weiToGwei;
|
|
76
|
+
const blobFeeGwei = state.gasPrice.maxFeePerBlobGas ? Number(state.gasPrice.maxFeePerBlobGas) / weiToGwei : undefined;
|
|
77
|
+
this.maxPriorityFeeHistogram.record(maxPriorityFeeGwei, attributes);
|
|
78
|
+
this.maxFeeHistogram.record(maxFeeGwei, attributes);
|
|
79
|
+
if (blobFeeGwei !== undefined) {
|
|
80
|
+
this.blobFeeHistogram.record(blobFeeGwei, attributes);
|
|
81
81
|
}
|
|
82
82
|
this.logger.debug(`Recorded tx end state metrics`, {
|
|
83
83
|
status: TxUtilsState[state.status],
|
|
@@ -85,9 +85,9 @@ import { Attributes, Metrics, createUpDownCounterWithDefault } from '@aztec/tele
|
|
|
85
85
|
isCancelTx,
|
|
86
86
|
isReverted,
|
|
87
87
|
scope: this.scope,
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
88
|
+
maxPriorityFeeGwei,
|
|
89
|
+
maxFeeGwei,
|
|
90
|
+
blobFeeGwei
|
|
91
91
|
});
|
|
92
92
|
}
|
|
93
93
|
recordDroppedTx(state) {
|
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.f5a9928",
|
|
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.f504929",
|
|
69
|
+
"@aztec/archiver": "0.0.1-commit.f5a9928",
|
|
70
|
+
"@aztec/bb-prover": "0.0.1-commit.f5a9928",
|
|
71
|
+
"@aztec/blob-client": "0.0.1-commit.f5a9928",
|
|
72
|
+
"@aztec/constants": "0.0.1-commit.f5a9928",
|
|
73
|
+
"@aztec/epoch-cache": "0.0.1-commit.f5a9928",
|
|
74
|
+
"@aztec/ethereum": "0.0.1-commit.f5a9928",
|
|
75
|
+
"@aztec/foundation": "0.0.1-commit.f5a9928",
|
|
76
|
+
"@aztec/kv-store": "0.0.1-commit.f5a9928",
|
|
77
|
+
"@aztec/p2p": "0.0.1-commit.f5a9928",
|
|
78
|
+
"@aztec/protocol-contracts": "0.0.1-commit.f5a9928",
|
|
79
|
+
"@aztec/prover-client": "0.0.1-commit.f5a9928",
|
|
80
|
+
"@aztec/sequencer-client": "0.0.1-commit.f5a9928",
|
|
81
|
+
"@aztec/simulator": "0.0.1-commit.f5a9928",
|
|
82
|
+
"@aztec/stdlib": "0.0.1-commit.f5a9928",
|
|
83
|
+
"@aztec/telemetry-client": "0.0.1-commit.f5a9928",
|
|
84
|
+
"@aztec/validator-client": "0.0.1-commit.f5a9928",
|
|
85
|
+
"@aztec/world-state": "0.0.1-commit.f5a9928",
|
|
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.f5a9928",
|
|
90
|
+
"@aztec/node-keystore": "0.0.1-commit.f5a9928",
|
|
92
91
|
"@jest/globals": "^30.0.0",
|
|
93
92
|
"@types/jest": "^30.0.0",
|
|
94
93
|
"@types/node": "^22.15.17",
|
|
@@ -1,15 +1,22 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
ARCHIVER_DB_VERSION,
|
|
3
|
+
ARCHIVER_STORE_NAME,
|
|
4
|
+
type ArchiverConfig,
|
|
5
|
+
createArchiverStore,
|
|
6
|
+
getArchiverSynchPoint,
|
|
7
|
+
} from '@aztec/archiver';
|
|
2
8
|
import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
|
|
3
9
|
import { type EthereumClientConfig, getPublicClient } from '@aztec/ethereum/client';
|
|
4
10
|
import type { L1ContractsConfig } from '@aztec/ethereum/config';
|
|
5
11
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
6
12
|
import { tryRmDir } from '@aztec/foundation/fs';
|
|
7
13
|
import type { Logger } from '@aztec/foundation/log';
|
|
8
|
-
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
9
14
|
import { P2P_STORE_NAME } from '@aztec/p2p';
|
|
15
|
+
import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/stdlib/block';
|
|
10
16
|
import type { ChainConfig } from '@aztec/stdlib/config';
|
|
11
17
|
import { DatabaseVersionManager } from '@aztec/stdlib/database-version/manager';
|
|
12
18
|
import { type ReadOnlyFileStore, createReadOnlyFileStore } from '@aztec/stdlib/file-store';
|
|
19
|
+
import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
|
|
13
20
|
import {
|
|
14
21
|
type SnapshotMetadata,
|
|
15
22
|
type SnapshotsIndexMetadata,
|
|
@@ -30,8 +37,9 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
30
37
|
type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> &
|
|
31
38
|
Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> &
|
|
32
39
|
Pick<L1ContractsConfig, 'aztecEpochDuration'> &
|
|
33
|
-
Pick<ArchiverConfig, 'archiverStoreMapSizeKb'
|
|
34
|
-
|
|
40
|
+
Pick<ArchiverConfig, 'archiverStoreMapSizeKb'> &
|
|
41
|
+
DataStoreConfig &
|
|
42
|
+
Required<Pick<DataStoreConfig, 'rollupAddress'>> &
|
|
35
43
|
EthereumClientConfig & {
|
|
36
44
|
snapshotsUrls?: string[];
|
|
37
45
|
minL1BlocksToTriggerReplace?: number;
|
|
@@ -42,7 +50,7 @@ type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> &
|
|
|
42
50
|
* Behaviour depends on syncing mode.
|
|
43
51
|
*/
|
|
44
52
|
export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
|
|
45
|
-
const { syncMode, snapshotsUrls, dataDirectory, l1ChainId, rollupVersion,
|
|
53
|
+
const { syncMode, snapshotsUrls, dataDirectory, l1ChainId, rollupVersion, rollupAddress } = config;
|
|
46
54
|
if (syncMode === 'full') {
|
|
47
55
|
log.debug('Snapshot sync is disabled. Running full sync.', { syncMode: syncMode });
|
|
48
56
|
return false;
|
|
@@ -58,19 +66,21 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
|
|
|
58
66
|
return false;
|
|
59
67
|
}
|
|
60
68
|
|
|
61
|
-
// Create an archiver store to check the current state (do this only once)
|
|
69
|
+
// Create an archiver store to check the current state (do this only once). This temporary store is only
|
|
70
|
+
// read for its sync point and never serves tagged-log queries, so the genesis block hash it carries is
|
|
71
|
+
// immaterial — pass the protocol constant.
|
|
62
72
|
log.verbose(`Creating temporary archiver data store`);
|
|
63
|
-
const archiverStore = await createArchiverStore(config,
|
|
73
|
+
const archiverStore = await createArchiverStore(config, GENESIS_BLOCK_HEADER_HASH);
|
|
64
74
|
let archiverL1BlockNumber: bigint | undefined;
|
|
65
75
|
let archiverL2BlockNumber: number | undefined;
|
|
66
76
|
try {
|
|
67
77
|
[archiverL1BlockNumber, archiverL2BlockNumber] = await Promise.all([
|
|
68
|
-
archiverStore
|
|
69
|
-
archiverStore.
|
|
78
|
+
getArchiverSynchPoint(archiverStore).then(s => s.blocksSynchedTo),
|
|
79
|
+
archiverStore.blocks.getLatestL2BlockNumber(),
|
|
70
80
|
] as const);
|
|
71
81
|
} finally {
|
|
72
82
|
log.verbose(`Closing temporary archiver data store`, { archiverL1BlockNumber, archiverL2BlockNumber });
|
|
73
|
-
await archiverStore.close();
|
|
83
|
+
await archiverStore.db.close();
|
|
74
84
|
}
|
|
75
85
|
|
|
76
86
|
const minL1BlocksToTriggerReplace = config.minL1BlocksToTriggerReplace ?? MIN_L1_BLOCKS_TO_TRIGGER_REPLACE;
|
|
@@ -99,7 +109,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
|
|
|
99
109
|
const indexMetadata: SnapshotsIndexMetadata = {
|
|
100
110
|
l1ChainId,
|
|
101
111
|
rollupVersion,
|
|
102
|
-
rollupAddress
|
|
112
|
+
rollupAddress,
|
|
103
113
|
};
|
|
104
114
|
|
|
105
115
|
// Fetch latest snapshot from each URL
|
|
@@ -177,7 +187,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
|
|
|
177
187
|
snapshotCandidates.sort((a, b) => b.snapshot.l1BlockNumber - a.snapshot.l1BlockNumber);
|
|
178
188
|
|
|
179
189
|
// Try each candidate in order until one succeeds
|
|
180
|
-
for (const { snapshot, url } of snapshotCandidates) {
|
|
190
|
+
for (const { snapshot, url, fileStore } of snapshotCandidates) {
|
|
181
191
|
const { l1BlockNumber, l2BlockNumber } = snapshot;
|
|
182
192
|
log.info(`Attempting to sync from snapshot at L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
|
|
183
193
|
snapshot,
|
|
@@ -187,8 +197,8 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
|
|
|
187
197
|
try {
|
|
188
198
|
await snapshotSync(snapshot, log, {
|
|
189
199
|
dataDirectory: config.dataDirectory!,
|
|
190
|
-
rollupAddress: config.
|
|
191
|
-
|
|
200
|
+
rollupAddress: config.rollupAddress,
|
|
201
|
+
fileStore,
|
|
192
202
|
});
|
|
193
203
|
log.info(`Snapshot synced to L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
|
|
194
204
|
snapshot,
|
|
@@ -214,15 +224,13 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
|
|
|
214
224
|
export async function snapshotSync(
|
|
215
225
|
snapshot: Pick<SnapshotMetadata, 'dataUrls'>,
|
|
216
226
|
log: Logger,
|
|
217
|
-
config: { dataDirectory: string; rollupAddress: EthAddress;
|
|
227
|
+
config: { dataDirectory: string; rollupAddress: EthAddress; fileStore: ReadOnlyFileStore },
|
|
218
228
|
) {
|
|
219
|
-
const { dataDirectory, rollupAddress } = config;
|
|
229
|
+
const { dataDirectory, rollupAddress, fileStore } = config;
|
|
220
230
|
if (!dataDirectory) {
|
|
221
231
|
throw new Error(`No local data directory defined. Cannot sync snapshot.`);
|
|
222
232
|
}
|
|
223
233
|
|
|
224
|
-
const fileStore = await createReadOnlyFileStore(config.snapshotsUrl, log);
|
|
225
|
-
|
|
226
234
|
let downloadDir: string | undefined;
|
|
227
235
|
|
|
228
236
|
try {
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { ARCHIVER_DB_VERSION, type Archiver } from '@aztec/archiver';
|
|
2
2
|
import { tryRmDir } from '@aztec/foundation/fs';
|
|
3
3
|
import type { Logger } from '@aztec/foundation/log';
|
|
4
|
-
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
5
4
|
import type { ChainConfig } from '@aztec/stdlib/config';
|
|
6
5
|
import { createFileStore } from '@aztec/stdlib/file-store';
|
|
7
6
|
import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
7
|
+
import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
|
|
8
8
|
import { uploadSnapshotToIndex } from '@aztec/stdlib/snapshots';
|
|
9
9
|
import { WORLD_STATE_DB_VERSION } from '@aztec/world-state';
|
|
10
10
|
|
package/src/config/index.ts
CHANGED
|
@@ -11,12 +11,6 @@ export type SharedNodeConfig = {
|
|
|
11
11
|
syncMode: 'full' | 'snapshot' | 'force-snapshot';
|
|
12
12
|
/** Base URLs for snapshots index. Index file will be searched at `SNAPSHOTS_BASE_URL/aztec-L1_CHAIN_ID-VERSION-ROLLUP_ADDRESS/index.json` */
|
|
13
13
|
snapshotsUrls?: string[];
|
|
14
|
-
|
|
15
|
-
/** 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*/
|
|
16
|
-
autoUpdate?: 'disabled' | 'notify' | 'config' | 'config-and-version';
|
|
17
|
-
/** The base URL against which to check for updates */
|
|
18
|
-
autoUpdateUrl?: string;
|
|
19
|
-
|
|
20
14
|
/** URL of the Web3Signer instance */
|
|
21
15
|
web3SignerUrl?: string;
|
|
22
16
|
/** Whether to run in fisherman mode */
|
|
@@ -24,6 +18,9 @@ export type SharedNodeConfig = {
|
|
|
24
18
|
|
|
25
19
|
/** Force verification of tx Chonk proofs. Only used for testnet */
|
|
26
20
|
debugForceTxProofVerification: boolean;
|
|
21
|
+
|
|
22
|
+
/** Soft-shutdown the node when the canonical rollup is no longer compatible, keeping the health server up for K8s probes */
|
|
23
|
+
enableAutoShutdown: boolean;
|
|
27
24
|
};
|
|
28
25
|
|
|
29
26
|
export const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig> = {
|
|
@@ -64,15 +61,6 @@ export const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig> = {
|
|
|
64
61
|
fallback: ['SYNC_SNAPSHOTS_URL'],
|
|
65
62
|
defaultValue: [],
|
|
66
63
|
},
|
|
67
|
-
autoUpdate: {
|
|
68
|
-
env: 'AUTO_UPDATE',
|
|
69
|
-
description: 'The auto update mode for this node',
|
|
70
|
-
defaultValue: 'disabled',
|
|
71
|
-
},
|
|
72
|
-
autoUpdateUrl: {
|
|
73
|
-
env: 'AUTO_UPDATE_URL',
|
|
74
|
-
description: 'Base URL to check for updates',
|
|
75
|
-
},
|
|
76
64
|
web3SignerUrl: {
|
|
77
65
|
env: 'WEB3_SIGNER_URL',
|
|
78
66
|
description: 'URL of the Web3Signer instance',
|
|
@@ -88,4 +76,11 @@ export const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig> = {
|
|
|
88
76
|
description: 'Whether to force tx proof verification. Only has an effect if real proving is turned off',
|
|
89
77
|
...booleanConfigHelper(false),
|
|
90
78
|
},
|
|
79
|
+
|
|
80
|
+
enableAutoShutdown: {
|
|
81
|
+
env: 'ENABLE_AUTO_SHUTDOWN',
|
|
82
|
+
description:
|
|
83
|
+
'Soft-shutdown the node when the canonical rollup is no longer compatible (protocol constants diverge), keeping the health server up so K8s probes keep passing. Only applies to nodes following the canonical rollup.',
|
|
84
|
+
...booleanConfigHelper(false),
|
|
85
|
+
},
|
|
91
86
|
};
|
|
@@ -8,8 +8,8 @@ import { omit } from '@aztec/foundation/collection';
|
|
|
8
8
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
9
9
|
import { createLogger } from '@aztec/foundation/log';
|
|
10
10
|
import type { DateProvider } from '@aztec/foundation/timer';
|
|
11
|
-
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
12
11
|
import { createStore } from '@aztec/kv-store/lmdb-v2';
|
|
12
|
+
import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
|
|
13
13
|
import type { TelemetryClient } from '@aztec/telemetry-client';
|
|
14
14
|
|
|
15
15
|
import type { L1TxScope } from '../metrics/l1_tx_metrics.js';
|
|
@@ -34,7 +34,7 @@ async function createSharedDeps(
|
|
|
34
34
|
|
|
35
35
|
// Note that we do NOT bind them to the rollup address, since we still need to
|
|
36
36
|
// monitor and cancel txs for previous rollups to free up our nonces.
|
|
37
|
-
const noRollupConfig = omit(config, '
|
|
37
|
+
const noRollupConfig = omit(config, 'rollupAddress');
|
|
38
38
|
const kvStore = await createStore(L1_TX_STORE_NAME, L1TxStore.SCHEMA_VERSION, noRollupConfig, logger.getBindings());
|
|
39
39
|
const store = new L1TxStore(kvStore, logger);
|
|
40
40
|
|
|
@@ -92,17 +92,19 @@ export class L1TxMetrics implements IL1TxMetrics {
|
|
|
92
92
|
const attempts = isCancelTx ? state.cancelTxHashes.length : state.txHashes.length;
|
|
93
93
|
this.txAttemptsUntilMined.record(attempts, attributes);
|
|
94
94
|
|
|
95
|
-
// Record gas prices at end state
|
|
96
|
-
const
|
|
97
|
-
const
|
|
98
|
-
const
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
95
|
+
// Record gas prices at end state, converted from wei to gwei to match metric unit definitions
|
|
96
|
+
const weiToGwei = 1e9;
|
|
97
|
+
const maxPriorityFeeGwei = Number(state.gasPrice.maxPriorityFeePerGas) / weiToGwei;
|
|
98
|
+
const maxFeeGwei = Number(state.gasPrice.maxFeePerGas) / weiToGwei;
|
|
99
|
+
const blobFeeGwei = state.gasPrice.maxFeePerBlobGas
|
|
100
|
+
? Number(state.gasPrice.maxFeePerBlobGas) / weiToGwei
|
|
101
|
+
: undefined;
|
|
102
|
+
|
|
103
|
+
this.maxPriorityFeeHistogram.record(maxPriorityFeeGwei, attributes);
|
|
104
|
+
this.maxFeeHistogram.record(maxFeeGwei, attributes);
|
|
105
|
+
|
|
106
|
+
if (blobFeeGwei !== undefined) {
|
|
107
|
+
this.blobFeeHistogram.record(blobFeeGwei, attributes);
|
|
106
108
|
}
|
|
107
109
|
|
|
108
110
|
this.logger.debug(`Recorded tx end state metrics`, {
|
|
@@ -111,9 +113,9 @@ export class L1TxMetrics implements IL1TxMetrics {
|
|
|
111
113
|
isCancelTx,
|
|
112
114
|
isReverted,
|
|
113
115
|
scope: this.scope,
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
116
|
+
maxPriorityFeeGwei,
|
|
117
|
+
maxFeeGwei,
|
|
118
|
+
blobFeeGwei,
|
|
117
119
|
});
|
|
118
120
|
}
|
|
119
121
|
|