@aztec/node-lib 0.0.1-commit.f2ce05ee → 0.0.1-commit.f504929
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 +1 -1
- package/dest/actions/snapshot-sync.d.ts.map +1 -1
- package/dest/actions/snapshot-sync.js +1 -1
- package/dest/config/index.d.ts +3 -1
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +6 -0
- package/dest/factories/l1_tx_utils.d.ts +26 -39
- package/dest/factories/l1_tx_utils.d.ts.map +1 -1
- package/dest/factories/l1_tx_utils.js +47 -43
- package/package.json +21 -21
- package/src/actions/snapshot-sync.ts +5 -1
- package/src/config/index.ts +12 -0
- package/src/factories/l1_tx_utils.ts +43 -99
|
@@ -25,4 +25,4 @@ export declare function snapshotSync(snapshot: Pick<SnapshotMetadata, 'dataUrls'
|
|
|
25
25
|
snapshotsUrl: string;
|
|
26
26
|
}): Promise<void>;
|
|
27
27
|
export {};
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3Qtc3luYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvc25hcHNob3Qtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTRDLEtBQUssY0FBYyxFQUF1QixNQUFNLGlCQUFpQixDQUFDO0FBRXJILE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFtQixNQUFNLHdCQUF3QixDQUFDO0FBQ3BGLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHeEQsT0FBTyxFQUNMLEtBQUssZ0JBQWdCLEVBS3RCLE1BQU0seUJBQXlCLENBQUM7QUFNakMsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUszRCxLQUFLLGtCQUFrQixHQUFHLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxVQUFVLENBQUMsR0FDMUQsSUFBSSxDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsZUFBZSxDQUFDLEdBQ2hELElBQUksQ0FBQyxpQkFBaUIsRUFBRSxvQkFBb0IsQ0FBQyxHQUM3QyxJQUFJLENBQUMsY0FBYyxFQUFFLHdCQUF3QixHQUFHLFNBQVMsQ0FBQyxHQUMxRCxRQUFRLENBQUMsZUFBZSxDQUFDLEdBQ3pCLG9CQUFvQixHQUFHO0lBQ3JCLGFBQWEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3pCLDJCQUEyQixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3RDLENBQUM7QUFFSjs7O0dBR0c7QUFDSCx3QkFBc0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxHQUFHLEVBQUUsTUFBTSxvQkFxSzVFO0FBRUQ7O0dBRUc7QUFDSCx3QkFBc0IsWUFBWSxDQUNoQyxRQUFRLEVBQUUsSUFBSSxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxFQUM1QyxHQUFHLEVBQUUsTUFBTSxFQUNYLE1BQU0sRUFBRTtJQUFFLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFBQyxhQUFhLEVBQUUsVUFBVSxDQUFDO0lBQUMsWUFBWSxFQUFFLE1BQU0sQ0FBQTtDQUFFLGlCQXFEbkYifQ==
|
|
@@ -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;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,iBAAiB,EAAE,oBAAoB,CAAC,GAC7C,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,
|
|
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;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,iBAAiB,EAAE,oBAAoB,CAAC,GAC7C,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,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,YAAY,EAAE,MAAM,CAAA;CAAE,iBAqDnF"}
|
|
@@ -55,7 +55,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
55
55
|
return false;
|
|
56
56
|
}
|
|
57
57
|
const currentL1BlockNumber = await getPublicClient(config).getBlockNumber();
|
|
58
|
-
if (archiverL1BlockNumber && currentL1BlockNumber - archiverL1BlockNumber < minL1BlocksToTriggerReplace) {
|
|
58
|
+
if (archiverL1BlockNumber && currentL1BlockNumber >= archiverL1BlockNumber && currentL1BlockNumber - archiverL1BlockNumber < minL1BlocksToTriggerReplace) {
|
|
59
59
|
log.verbose(`Skipping snapshot sync as archiver is less than ${currentL1BlockNumber - archiverL1BlockNumber} L1 blocks behind.`, {
|
|
60
60
|
archiverL1BlockNumber,
|
|
61
61
|
currentL1BlockNumber,
|
package/dest/config/index.d.ts
CHANGED
|
@@ -4,6 +4,8 @@ export type SharedNodeConfig = {
|
|
|
4
4
|
testAccounts: boolean;
|
|
5
5
|
/** Whether to populate the genesis state with initial fee juice for the sponsored FPC */
|
|
6
6
|
sponsoredFPC: boolean;
|
|
7
|
+
/** Additional addresses to prefund with fee juice at genesis */
|
|
8
|
+
prefundAddresses: string[];
|
|
7
9
|
/** 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
10
|
syncMode: 'full' | 'snapshot' | 'force-snapshot';
|
|
9
11
|
/** Base URLs for snapshots index. Index file will be searched at `SNAPSHOTS_BASE_URL/aztec-L1_CHAIN_ID-VERSION-ROLLUP_ADDRESS/index.json` */
|
|
@@ -20,4 +22,4 @@ export type SharedNodeConfig = {
|
|
|
20
22
|
debugForceTxProofVerification: boolean;
|
|
21
23
|
};
|
|
22
24
|
export declare const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig>;
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQXVCLE1BQU0sMEJBQTBCLENBQUM7QUFFeEYsTUFBTSxNQUFNLGdCQUFnQixHQUFHO0lBQzdCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLGdFQUFnRTtJQUNoRSxnQkFBZ0IsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUMzQixnS0FBZ0s7SUFDaEssUUFBUSxFQUFFLE1BQU0sR0FBRyxVQUFVLEdBQUcsZ0JBQWdCLENBQUM7SUFDakQsNklBQTZJO0lBQzdJLGFBQWEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBRXpCLHFPQUFxTztJQUNyTyxVQUFVLENBQUMsRUFBRSxVQUFVLEdBQUcsUUFBUSxHQUFHLFFBQVEsR0FBRyxvQkFBb0IsQ0FBQztJQUNyRSxzREFBc0Q7SUFDdEQsYUFBYSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRXZCLHFDQUFxQztJQUNyQyxhQUFhLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDdkIsdUNBQXVDO0lBQ3ZDLGFBQWEsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUV4QixtRUFBbUU7SUFDbkUsNkJBQTZCLEVBQUUsT0FBTyxDQUFDO0NBQ3hDLENBQUM7QUFFRixlQUFPLE1BQU0sd0JBQXdCLEVBQUUsa0JBQWtCLENBQUMsZ0JBQWdCLENBOER6RSxDQUFDIn0=
|
|
@@ -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,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,
|
|
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;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,CA8DzE,CAAC"}
|
package/dest/config/index.js
CHANGED
|
@@ -10,6 +10,12 @@ export const sharedNodeConfigMappings = {
|
|
|
10
10
|
description: 'Whether to populate the genesis state with initial fee juice for the sponsored FPC.',
|
|
11
11
|
...booleanConfigHelper(false)
|
|
12
12
|
},
|
|
13
|
+
prefundAddresses: {
|
|
14
|
+
env: 'PREFUND_ADDRESSES',
|
|
15
|
+
description: 'Comma-separated list of Aztec addresses to prefund with fee juice at genesis (local network only).',
|
|
16
|
+
parseEnv: (val)=>val.split(',').map((a)=>a.trim()).filter((a)=>a.length > 0),
|
|
17
|
+
defaultValue: []
|
|
18
|
+
},
|
|
13
19
|
syncMode: {
|
|
14
20
|
env: 'SYNC_MODE',
|
|
15
21
|
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.',
|
|
@@ -1,79 +1,66 @@
|
|
|
1
|
+
import type { BlobKzgInstance } from '@aztec/blob-lib/types';
|
|
1
2
|
import type { EthSigner } from '@aztec/ethereum/eth-signer';
|
|
2
3
|
import type { L1TxUtilsConfig } from '@aztec/ethereum/l1-tx-utils';
|
|
3
4
|
import type { ExtendedViemWalletClient, ViemClient } from '@aztec/ethereum/types';
|
|
5
|
+
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
6
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
7
|
import type { DateProvider } from '@aztec/foundation/timer';
|
|
6
8
|
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
7
9
|
import type { TelemetryClient } from '@aztec/telemetry-client';
|
|
8
10
|
import type { L1TxScope } from '../metrics/l1_tx_metrics.js';
|
|
9
11
|
/**
|
|
10
|
-
* Creates L1TxUtils
|
|
12
|
+
* Creates L1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
|
|
13
|
+
* When kzg is provided in deps, blob support is enabled.
|
|
11
14
|
*/
|
|
12
|
-
export declare function
|
|
15
|
+
export declare function createL1TxUtilsFromWallets(clients: ExtendedViemWalletClient[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
|
|
13
16
|
debugMaxGasLimit?: boolean;
|
|
14
17
|
scope?: L1TxScope;
|
|
15
18
|
}, deps: {
|
|
16
19
|
telemetry: TelemetryClient;
|
|
17
20
|
logger?: ReturnType<typeof createLogger>;
|
|
18
|
-
dateProvider
|
|
19
|
-
|
|
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;
|
|
21
|
+
dateProvider: DateProvider;
|
|
22
|
+
kzg?: BlobKzgInstance;
|
|
42
23
|
}): Promise<import("@aztec/ethereum/l1-tx-utils").L1TxUtils[]>;
|
|
43
24
|
/**
|
|
44
|
-
* Creates L1TxUtils
|
|
25
|
+
* Creates L1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
|
|
26
|
+
* When kzg is provided in deps, blob support is enabled.
|
|
27
|
+
* Deduplicates signers by address to avoid creating multiple instances for the same publisher.
|
|
45
28
|
*/
|
|
46
|
-
export declare function
|
|
29
|
+
export declare function createL1TxUtilsFromSigners(client: ViemClient, signers: EthSigner[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
|
|
47
30
|
debugMaxGasLimit?: boolean;
|
|
48
31
|
scope?: L1TxScope;
|
|
49
32
|
}, deps: {
|
|
50
33
|
telemetry: TelemetryClient;
|
|
51
34
|
logger?: ReturnType<typeof createLogger>;
|
|
52
|
-
dateProvider
|
|
53
|
-
|
|
35
|
+
dateProvider: DateProvider;
|
|
36
|
+
kzg?: BlobKzgInstance;
|
|
54
37
|
}): Promise<import("@aztec/ethereum/l1-tx-utils").L1TxUtils[]>;
|
|
55
38
|
/**
|
|
56
|
-
* Creates ForwarderL1TxUtils from multiple Viem
|
|
57
|
-
*
|
|
39
|
+
* Creates ForwarderL1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
|
|
40
|
+
* Wraps all transactions through a forwarder contract for testing purposes.
|
|
41
|
+
* When kzg is provided in deps, blob support is enabled.
|
|
58
42
|
*/
|
|
59
|
-
export declare function
|
|
43
|
+
export declare function createForwarderL1TxUtilsFromWallets(clients: ExtendedViemWalletClient[], forwarderAddress: EthAddress, config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
|
|
60
44
|
debugMaxGasLimit?: boolean;
|
|
61
45
|
scope?: L1TxScope;
|
|
62
46
|
}, deps: {
|
|
63
47
|
telemetry: TelemetryClient;
|
|
64
48
|
logger?: ReturnType<typeof createLogger>;
|
|
65
|
-
dateProvider
|
|
49
|
+
dateProvider: DateProvider;
|
|
50
|
+
kzg?: BlobKzgInstance;
|
|
66
51
|
}): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").ForwarderL1TxUtils[]>;
|
|
67
52
|
/**
|
|
68
|
-
* Creates ForwarderL1TxUtils from multiple EthSigners, sharing store and
|
|
69
|
-
*
|
|
53
|
+
* Creates ForwarderL1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
|
|
54
|
+
* Wraps all transactions through a forwarder contract for testing purposes.
|
|
55
|
+
* When kzg is provided in deps, blob support is enabled.
|
|
70
56
|
*/
|
|
71
|
-
export declare function
|
|
57
|
+
export declare function createForwarderL1TxUtilsFromSigners(client: ViemClient, signers: EthSigner[], forwarderAddress: EthAddress, config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
|
|
72
58
|
debugMaxGasLimit?: boolean;
|
|
73
59
|
scope?: L1TxScope;
|
|
74
60
|
}, deps: {
|
|
75
61
|
telemetry: TelemetryClient;
|
|
76
62
|
logger?: ReturnType<typeof createLogger>;
|
|
77
|
-
dateProvider
|
|
63
|
+
dateProvider: DateProvider;
|
|
64
|
+
kzg?: BlobKzgInstance;
|
|
78
65
|
}): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").ForwarderL1TxUtils[]>;
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mYWN0b3JpZXMvbDFfdHhfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFNUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFbkUsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEYsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBc0M3RDs7O0dBR0c7QUFDSCx3QkFBc0IsMEJBQTBCLENBQzlDLE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxFQUNuQyxNQUFNLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsR0FBRztJQUFFLGdCQUFnQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxDQUFBO0NBQUUsRUFDdEcsSUFBSSxFQUFFO0lBQ0osU0FBUyxFQUFFLGVBQWUsQ0FBQztJQUMzQixNQUFNLENBQUMsRUFBRSxVQUFVLENBQUMsT0FBTyxZQUFZLENBQUMsQ0FBQztJQUN6QyxZQUFZLEVBQUUsWUFBWSxDQUFDO0lBQzNCLEdBQUcsQ0FBQyxFQUFFLGVBQWUsQ0FBQztDQUN2Qiw4REFLRjtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsMEJBQTBCLENBQzlDLE1BQU0sRUFBRSxVQUFVLEVBQ2xCLE9BQU8sRUFBRSxTQUFTLEVBQUUsRUFDcEIsTUFBTSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQTtDQUFFLEVBQ3RHLElBQUksRUFBRTtJQUNKLFNBQVMsRUFBRSxlQUFlLENBQUM7SUFDM0IsTUFBTSxDQUFDLEVBQUUsVUFBVSxDQUFDLE9BQU8sWUFBWSxDQUFDLENBQUM7SUFDekMsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixHQUFHLENBQUMsRUFBRSxlQUFlLENBQUM7Q0FDdkIsOERBdUJGO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFzQixtQ0FBbUMsQ0FDdkQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLEVBQ25DLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsTUFBTSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQTtDQUFFLEVBQ3RHLElBQUksRUFBRTtJQUNKLFNBQVMsRUFBRSxlQUFlLENBQUM7SUFDM0IsTUFBTSxDQUFDLEVBQUUsVUFBVSxDQUFDLE9BQU8sWUFBWSxDQUFDLENBQUM7SUFDekMsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixHQUFHLENBQUMsRUFBRSxlQUFlLENBQUM7Q0FDdkIsa0ZBT0Y7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQXNCLG1DQUFtQyxDQUN2RCxNQUFNLEVBQUUsVUFBVSxFQUNsQixPQUFPLEVBQUUsU0FBUyxFQUFFLEVBQ3BCLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsTUFBTSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQTtDQUFFLEVBQ3RHLElBQUksRUFBRTtJQUNKLFNBQVMsRUFBRSxlQUFlLENBQUM7SUFDM0IsTUFBTSxDQUFDLEVBQUUsVUFBVSxDQUFDLE9BQU8sWUFBWSxDQUFDLENBQUM7SUFDekMsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixHQUFHLENBQUMsRUFBRSxlQUFlLENBQUM7Q0FDdkIsa0ZBT0YifQ==
|
|
@@ -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,
|
|
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;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { createDelayer, createL1TxUtils as createL1TxUtilsBase } from '@aztec/ethereum/l1-tx-utils';
|
|
2
|
+
import { createForwarderL1TxUtils as createForwarderL1TxUtilsBase } from '@aztec/ethereum/l1-tx-utils-with-blobs';
|
|
3
3
|
import { omit } from '@aztec/foundation/collection';
|
|
4
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
5
|
import { createStore } from '@aztec/kv-store/lmdb-v2';
|
|
@@ -7,7 +7,8 @@ import { L1TxMetrics } from '../metrics/l1_tx_metrics.js';
|
|
|
7
7
|
import { L1TxStore } from '../stores/l1_tx_store.js';
|
|
8
8
|
const L1_TX_STORE_NAME = 'l1-tx-utils';
|
|
9
9
|
/**
|
|
10
|
-
* Creates shared dependencies (logger, store, metrics) for L1TxUtils instances.
|
|
10
|
+
* Creates shared dependencies (logger, store, metrics, delayer) for L1TxUtils instances.
|
|
11
|
+
* When enableDelayer is set in config, a single shared delayer is created and passed to all instances.
|
|
11
12
|
*/ async function createSharedDeps(config, deps) {
|
|
12
13
|
const logger = deps.logger ?? createLogger('l1-tx-utils');
|
|
13
14
|
// Note that we do NOT bind them to the rollup address, since we still need to
|
|
@@ -17,22 +18,33 @@ const L1_TX_STORE_NAME = 'l1-tx-utils';
|
|
|
17
18
|
const store = new L1TxStore(kvStore, logger);
|
|
18
19
|
const meter = deps.telemetry.getMeter('L1TxUtils');
|
|
19
20
|
const metrics = new L1TxMetrics(meter, config.scope ?? 'other', logger);
|
|
21
|
+
// Create a single shared delayer for all L1TxUtils instances in this group
|
|
22
|
+
const delayer = config.enableDelayer && config.ethereumSlotDuration !== undefined ? createDelayer(deps.dateProvider, {
|
|
23
|
+
ethereumSlotDuration: config.ethereumSlotDuration
|
|
24
|
+
}, logger.getBindings()) : undefined;
|
|
20
25
|
return {
|
|
21
26
|
logger,
|
|
22
27
|
store,
|
|
23
28
|
metrics,
|
|
24
|
-
dateProvider: deps.dateProvider
|
|
29
|
+
dateProvider: deps.dateProvider,
|
|
30
|
+
delayer
|
|
25
31
|
};
|
|
26
32
|
}
|
|
27
33
|
/**
|
|
28
|
-
* Creates L1TxUtils
|
|
29
|
-
|
|
34
|
+
* Creates L1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
|
|
35
|
+
* When kzg is provided in deps, blob support is enabled.
|
|
36
|
+
*/ export async function createL1TxUtilsFromWallets(clients, config, deps) {
|
|
30
37
|
const sharedDeps = await createSharedDeps(config, deps);
|
|
31
|
-
return clients.map((client)=>
|
|
38
|
+
return clients.map((client)=>createL1TxUtilsBase(client, {
|
|
39
|
+
...sharedDeps,
|
|
40
|
+
kzg: deps.kzg
|
|
41
|
+
}, config));
|
|
32
42
|
}
|
|
33
43
|
/**
|
|
34
|
-
* Creates L1TxUtils
|
|
35
|
-
|
|
44
|
+
* Creates L1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
|
|
45
|
+
* When kzg is provided in deps, blob support is enabled.
|
|
46
|
+
* Deduplicates signers by address to avoid creating multiple instances for the same publisher.
|
|
47
|
+
*/ export async function createL1TxUtilsFromSigners(client, signers, config, deps) {
|
|
36
48
|
const sharedDeps = await createSharedDeps(config, deps);
|
|
37
49
|
// Deduplicate signers by address to avoid creating multiple L1TxUtils instances
|
|
38
50
|
// for the same publisher address (e.g., when multiple attesters share the same publisher key)
|
|
@@ -47,44 +59,36 @@ const L1_TX_STORE_NAME = 'l1-tx-utils';
|
|
|
47
59
|
if (uniqueSigners.length < signers.length) {
|
|
48
60
|
sharedDeps.logger.info(`Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`);
|
|
49
61
|
}
|
|
50
|
-
return uniqueSigners.map((signer)=>
|
|
62
|
+
return uniqueSigners.map((signer)=>createL1TxUtilsBase({
|
|
63
|
+
client,
|
|
64
|
+
signer
|
|
65
|
+
}, {
|
|
66
|
+
...sharedDeps,
|
|
67
|
+
kzg: deps.kzg
|
|
68
|
+
}, config));
|
|
51
69
|
}
|
|
52
70
|
/**
|
|
53
|
-
* Creates
|
|
54
|
-
|
|
71
|
+
* Creates ForwarderL1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
|
|
72
|
+
* Wraps all transactions through a forwarder contract for testing purposes.
|
|
73
|
+
* When kzg is provided in deps, blob support is enabled.
|
|
74
|
+
*/ export async function createForwarderL1TxUtilsFromWallets(clients, forwarderAddress, config, deps) {
|
|
55
75
|
const sharedDeps = await createSharedDeps(config, deps);
|
|
56
|
-
return clients.map((client)=>
|
|
76
|
+
return clients.map((client)=>createForwarderL1TxUtilsBase(client, forwarderAddress, {
|
|
77
|
+
...sharedDeps,
|
|
78
|
+
kzg: deps.kzg
|
|
79
|
+
}, config));
|
|
57
80
|
}
|
|
58
81
|
/**
|
|
59
|
-
* Creates
|
|
60
|
-
|
|
82
|
+
* Creates ForwarderL1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
|
|
83
|
+
* Wraps all transactions through a forwarder contract for testing purposes.
|
|
84
|
+
* When kzg is provided in deps, blob support is enabled.
|
|
85
|
+
*/ export async function createForwarderL1TxUtilsFromSigners(client, signers, forwarderAddress, config, deps) {
|
|
61
86
|
const sharedDeps = await createSharedDeps(config, deps);
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
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));
|
|
87
|
+
return signers.map((signer)=>createForwarderL1TxUtilsBase({
|
|
88
|
+
client,
|
|
89
|
+
signer
|
|
90
|
+
}, forwarderAddress, {
|
|
91
|
+
...sharedDeps,
|
|
92
|
+
kzg: deps.kzg
|
|
93
|
+
}, config));
|
|
90
94
|
}
|
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.f504929",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"typedocOptions": {
|
|
6
6
|
"entryPoints": [
|
|
@@ -66,29 +66,29 @@
|
|
|
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/merkle-tree": "0.0.1-commit.
|
|
78
|
-
"@aztec/p2p": "0.0.1-commit.
|
|
79
|
-
"@aztec/protocol-contracts": "0.0.1-commit.
|
|
80
|
-
"@aztec/prover-client": "0.0.1-commit.
|
|
81
|
-
"@aztec/sequencer-client": "0.0.1-commit.
|
|
82
|
-
"@aztec/simulator": "0.0.1-commit.
|
|
83
|
-
"@aztec/stdlib": "0.0.1-commit.
|
|
84
|
-
"@aztec/telemetry-client": "0.0.1-commit.
|
|
85
|
-
"@aztec/validator-client": "0.0.1-commit.
|
|
86
|
-
"@aztec/world-state": "0.0.1-commit.
|
|
69
|
+
"@aztec/archiver": "0.0.1-commit.f504929",
|
|
70
|
+
"@aztec/bb-prover": "0.0.1-commit.f504929",
|
|
71
|
+
"@aztec/blob-client": "0.0.1-commit.f504929",
|
|
72
|
+
"@aztec/constants": "0.0.1-commit.f504929",
|
|
73
|
+
"@aztec/epoch-cache": "0.0.1-commit.f504929",
|
|
74
|
+
"@aztec/ethereum": "0.0.1-commit.f504929",
|
|
75
|
+
"@aztec/foundation": "0.0.1-commit.f504929",
|
|
76
|
+
"@aztec/kv-store": "0.0.1-commit.f504929",
|
|
77
|
+
"@aztec/merkle-tree": "0.0.1-commit.f504929",
|
|
78
|
+
"@aztec/p2p": "0.0.1-commit.f504929",
|
|
79
|
+
"@aztec/protocol-contracts": "0.0.1-commit.f504929",
|
|
80
|
+
"@aztec/prover-client": "0.0.1-commit.f504929",
|
|
81
|
+
"@aztec/sequencer-client": "0.0.1-commit.f504929",
|
|
82
|
+
"@aztec/simulator": "0.0.1-commit.f504929",
|
|
83
|
+
"@aztec/stdlib": "0.0.1-commit.f504929",
|
|
84
|
+
"@aztec/telemetry-client": "0.0.1-commit.f504929",
|
|
85
|
+
"@aztec/validator-client": "0.0.1-commit.f504929",
|
|
86
|
+
"@aztec/world-state": "0.0.1-commit.f504929",
|
|
87
87
|
"tslib": "^2.4.0"
|
|
88
88
|
},
|
|
89
89
|
"devDependencies": {
|
|
90
|
-
"@aztec/blob-lib": "0.0.1-commit.
|
|
91
|
-
"@aztec/node-keystore": "0.0.1-commit.
|
|
90
|
+
"@aztec/blob-lib": "0.0.1-commit.f504929",
|
|
91
|
+
"@aztec/node-keystore": "0.0.1-commit.f504929",
|
|
92
92
|
"@jest/globals": "^30.0.0",
|
|
93
93
|
"@types/jest": "^30.0.0",
|
|
94
94
|
"@types/node": "^22.15.17",
|
|
@@ -82,7 +82,11 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
|
|
|
82
82
|
}
|
|
83
83
|
|
|
84
84
|
const currentL1BlockNumber = await getPublicClient(config).getBlockNumber();
|
|
85
|
-
if (
|
|
85
|
+
if (
|
|
86
|
+
archiverL1BlockNumber &&
|
|
87
|
+
currentL1BlockNumber >= archiverL1BlockNumber &&
|
|
88
|
+
currentL1BlockNumber - archiverL1BlockNumber < minL1BlocksToTriggerReplace
|
|
89
|
+
) {
|
|
86
90
|
log.verbose(
|
|
87
91
|
`Skipping snapshot sync as archiver is less than ${
|
|
88
92
|
currentL1BlockNumber - archiverL1BlockNumber
|
package/src/config/index.ts
CHANGED
|
@@ -5,6 +5,8 @@ export type SharedNodeConfig = {
|
|
|
5
5
|
testAccounts: boolean;
|
|
6
6
|
/** Whether to populate the genesis state with initial fee juice for the sponsored FPC */
|
|
7
7
|
sponsoredFPC: boolean;
|
|
8
|
+
/** Additional addresses to prefund with fee juice at genesis */
|
|
9
|
+
prefundAddresses: string[];
|
|
8
10
|
/** 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. */
|
|
9
11
|
syncMode: 'full' | 'snapshot' | 'force-snapshot';
|
|
10
12
|
/** Base URLs for snapshots index. Index file will be searched at `SNAPSHOTS_BASE_URL/aztec-L1_CHAIN_ID-VERSION-ROLLUP_ADDRESS/index.json` */
|
|
@@ -35,6 +37,16 @@ export const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig> = {
|
|
|
35
37
|
description: 'Whether to populate the genesis state with initial fee juice for the sponsored FPC.',
|
|
36
38
|
...booleanConfigHelper(false),
|
|
37
39
|
},
|
|
40
|
+
prefundAddresses: {
|
|
41
|
+
env: 'PREFUND_ADDRESSES',
|
|
42
|
+
description: 'Comma-separated list of Aztec addresses to prefund with fee juice at genesis (local network only).',
|
|
43
|
+
parseEnv: (val: string) =>
|
|
44
|
+
val
|
|
45
|
+
.split(',')
|
|
46
|
+
.map(a => a.trim())
|
|
47
|
+
.filter(a => a.length > 0),
|
|
48
|
+
defaultValue: [],
|
|
49
|
+
},
|
|
38
50
|
syncMode: {
|
|
39
51
|
env: 'SYNC_MODE',
|
|
40
52
|
description:
|
|
@@ -1,17 +1,11 @@
|
|
|
1
|
+
import type { BlobKzgInstance } from '@aztec/blob-lib/types';
|
|
1
2
|
import type { EthSigner } from '@aztec/ethereum/eth-signer';
|
|
2
|
-
import {
|
|
3
|
-
createL1TxUtilsFromEthSigner as createL1TxUtilsFromEthSignerBase,
|
|
4
|
-
createL1TxUtilsFromViemWallet as createL1TxUtilsFromViemWalletBase,
|
|
5
|
-
} from '@aztec/ethereum/l1-tx-utils';
|
|
3
|
+
import { createDelayer, createL1TxUtils as createL1TxUtilsBase } from '@aztec/ethereum/l1-tx-utils';
|
|
6
4
|
import type { L1TxUtilsConfig } from '@aztec/ethereum/l1-tx-utils';
|
|
7
|
-
import {
|
|
8
|
-
createForwarderL1TxUtilsFromEthSigner as createForwarderL1TxUtilsFromEthSignerBase,
|
|
9
|
-
createForwarderL1TxUtilsFromViemWallet as createForwarderL1TxUtilsFromViemWalletBase,
|
|
10
|
-
createL1TxUtilsWithBlobsFromEthSigner as createL1TxUtilsWithBlobsFromEthSignerBase,
|
|
11
|
-
createL1TxUtilsWithBlobsFromViemWallet as createL1TxUtilsWithBlobsFromViemWalletBase,
|
|
12
|
-
} from '@aztec/ethereum/l1-tx-utils-with-blobs';
|
|
5
|
+
import { createForwarderL1TxUtils as createForwarderL1TxUtilsBase } from '@aztec/ethereum/l1-tx-utils-with-blobs';
|
|
13
6
|
import type { ExtendedViemWalletClient, ViemClient } from '@aztec/ethereum/types';
|
|
14
7
|
import { omit } from '@aztec/foundation/collection';
|
|
8
|
+
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
15
9
|
import { createLogger } from '@aztec/foundation/log';
|
|
16
10
|
import type { DateProvider } from '@aztec/foundation/timer';
|
|
17
11
|
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
@@ -25,14 +19,15 @@ import { L1TxStore } from '../stores/l1_tx_store.js';
|
|
|
25
19
|
const L1_TX_STORE_NAME = 'l1-tx-utils';
|
|
26
20
|
|
|
27
21
|
/**
|
|
28
|
-
* Creates shared dependencies (logger, store, metrics) for L1TxUtils instances.
|
|
22
|
+
* Creates shared dependencies (logger, store, metrics, delayer) for L1TxUtils instances.
|
|
23
|
+
* When enableDelayer is set in config, a single shared delayer is created and passed to all instances.
|
|
29
24
|
*/
|
|
30
25
|
async function createSharedDeps(
|
|
31
|
-
config: DataStoreConfig & { scope?: L1TxScope },
|
|
26
|
+
config: DataStoreConfig & Partial<L1TxUtilsConfig> & { scope?: L1TxScope },
|
|
32
27
|
deps: {
|
|
33
28
|
telemetry: TelemetryClient;
|
|
34
29
|
logger?: ReturnType<typeof createLogger>;
|
|
35
|
-
dateProvider
|
|
30
|
+
dateProvider: DateProvider;
|
|
36
31
|
},
|
|
37
32
|
) {
|
|
38
33
|
const logger = deps.logger ?? createLogger('l1-tx-utils');
|
|
@@ -46,96 +41,48 @@ async function createSharedDeps(
|
|
|
46
41
|
const meter = deps.telemetry.getMeter('L1TxUtils');
|
|
47
42
|
const metrics = new L1TxMetrics(meter, config.scope ?? 'other', logger);
|
|
48
43
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
*/
|
|
55
|
-
export async function createL1TxUtilsWithBlobsFromViemWallet(
|
|
56
|
-
clients: ExtendedViemWalletClient[],
|
|
57
|
-
config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
|
|
58
|
-
deps: {
|
|
59
|
-
telemetry: TelemetryClient;
|
|
60
|
-
logger?: ReturnType<typeof createLogger>;
|
|
61
|
-
dateProvider?: DateProvider;
|
|
62
|
-
},
|
|
63
|
-
) {
|
|
64
|
-
const sharedDeps = await createSharedDeps(config, deps);
|
|
44
|
+
// Create a single shared delayer for all L1TxUtils instances in this group
|
|
45
|
+
const delayer =
|
|
46
|
+
config.enableDelayer && config.ethereumSlotDuration !== undefined
|
|
47
|
+
? createDelayer(deps.dateProvider, { ethereumSlotDuration: config.ethereumSlotDuration }, logger.getBindings())
|
|
48
|
+
: undefined;
|
|
65
49
|
|
|
66
|
-
return
|
|
67
|
-
createL1TxUtilsWithBlobsFromViemWalletBase(client, sharedDeps, config, config.debugMaxGasLimit),
|
|
68
|
-
);
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
/**
|
|
72
|
-
* Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
|
|
73
|
-
*/
|
|
74
|
-
export async function createL1TxUtilsWithBlobsFromEthSigner(
|
|
75
|
-
client: ViemClient,
|
|
76
|
-
signers: EthSigner[],
|
|
77
|
-
config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
|
|
78
|
-
deps: {
|
|
79
|
-
telemetry: TelemetryClient;
|
|
80
|
-
logger?: ReturnType<typeof createLogger>;
|
|
81
|
-
dateProvider?: DateProvider;
|
|
82
|
-
},
|
|
83
|
-
) {
|
|
84
|
-
const sharedDeps = await createSharedDeps(config, deps);
|
|
85
|
-
|
|
86
|
-
// Deduplicate signers by address to avoid creating multiple L1TxUtils instances
|
|
87
|
-
// for the same publisher address (e.g., when multiple attesters share the same publisher key)
|
|
88
|
-
const signersByAddress = new Map<string, EthSigner>();
|
|
89
|
-
for (const signer of signers) {
|
|
90
|
-
const addressKey = signer.address.toString().toLowerCase();
|
|
91
|
-
if (!signersByAddress.has(addressKey)) {
|
|
92
|
-
signersByAddress.set(addressKey, signer);
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
const uniqueSigners = Array.from(signersByAddress.values());
|
|
97
|
-
|
|
98
|
-
if (uniqueSigners.length < signers.length) {
|
|
99
|
-
sharedDeps.logger.info(
|
|
100
|
-
`Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`,
|
|
101
|
-
);
|
|
102
|
-
}
|
|
103
|
-
|
|
104
|
-
return uniqueSigners.map(signer =>
|
|
105
|
-
createL1TxUtilsWithBlobsFromEthSignerBase(client, signer, sharedDeps, config, config.debugMaxGasLimit),
|
|
106
|
-
);
|
|
50
|
+
return { logger, store, metrics, dateProvider: deps.dateProvider, delayer };
|
|
107
51
|
}
|
|
108
52
|
|
|
109
53
|
/**
|
|
110
|
-
* Creates L1TxUtils
|
|
54
|
+
* Creates L1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
|
|
55
|
+
* When kzg is provided in deps, blob support is enabled.
|
|
111
56
|
*/
|
|
112
|
-
export async function
|
|
57
|
+
export async function createL1TxUtilsFromWallets(
|
|
113
58
|
clients: ExtendedViemWalletClient[],
|
|
114
59
|
config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
|
|
115
60
|
deps: {
|
|
116
61
|
telemetry: TelemetryClient;
|
|
117
62
|
logger?: ReturnType<typeof createLogger>;
|
|
118
|
-
dateProvider
|
|
119
|
-
|
|
63
|
+
dateProvider: DateProvider;
|
|
64
|
+
kzg?: BlobKzgInstance;
|
|
120
65
|
},
|
|
121
66
|
) {
|
|
122
67
|
const sharedDeps = await createSharedDeps(config, deps);
|
|
123
68
|
|
|
124
|
-
return clients.map(client =>
|
|
69
|
+
return clients.map(client => createL1TxUtilsBase(client, { ...sharedDeps, kzg: deps.kzg }, config));
|
|
125
70
|
}
|
|
126
71
|
|
|
127
72
|
/**
|
|
128
|
-
* Creates L1TxUtils
|
|
73
|
+
* Creates L1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
|
|
74
|
+
* When kzg is provided in deps, blob support is enabled.
|
|
75
|
+
* Deduplicates signers by address to avoid creating multiple instances for the same publisher.
|
|
129
76
|
*/
|
|
130
|
-
export async function
|
|
77
|
+
export async function createL1TxUtilsFromSigners(
|
|
131
78
|
client: ViemClient,
|
|
132
79
|
signers: EthSigner[],
|
|
133
80
|
config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
|
|
134
81
|
deps: {
|
|
135
82
|
telemetry: TelemetryClient;
|
|
136
83
|
logger?: ReturnType<typeof createLogger>;
|
|
137
|
-
dateProvider
|
|
138
|
-
|
|
84
|
+
dateProvider: DateProvider;
|
|
85
|
+
kzg?: BlobKzgInstance;
|
|
139
86
|
},
|
|
140
87
|
) {
|
|
141
88
|
const sharedDeps = await createSharedDeps(config, deps);
|
|
@@ -158,55 +105,52 @@ export async function createL1TxUtilsFromEthSignerWithStore(
|
|
|
158
105
|
);
|
|
159
106
|
}
|
|
160
107
|
|
|
161
|
-
return uniqueSigners.map(signer =>
|
|
108
|
+
return uniqueSigners.map(signer => createL1TxUtilsBase({ client, signer }, { ...sharedDeps, kzg: deps.kzg }, config));
|
|
162
109
|
}
|
|
163
110
|
|
|
164
111
|
/**
|
|
165
|
-
* Creates ForwarderL1TxUtils from multiple Viem
|
|
166
|
-
*
|
|
112
|
+
* Creates ForwarderL1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
|
|
113
|
+
* Wraps all transactions through a forwarder contract for testing purposes.
|
|
114
|
+
* When kzg is provided in deps, blob support is enabled.
|
|
167
115
|
*/
|
|
168
|
-
export async function
|
|
116
|
+
export async function createForwarderL1TxUtilsFromWallets(
|
|
169
117
|
clients: ExtendedViemWalletClient[],
|
|
170
|
-
forwarderAddress:
|
|
118
|
+
forwarderAddress: EthAddress,
|
|
171
119
|
config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
|
|
172
120
|
deps: {
|
|
173
121
|
telemetry: TelemetryClient;
|
|
174
122
|
logger?: ReturnType<typeof createLogger>;
|
|
175
|
-
dateProvider
|
|
123
|
+
dateProvider: DateProvider;
|
|
124
|
+
kzg?: BlobKzgInstance;
|
|
176
125
|
},
|
|
177
126
|
) {
|
|
178
127
|
const sharedDeps = await createSharedDeps(config, deps);
|
|
179
128
|
|
|
180
129
|
return clients.map(client =>
|
|
181
|
-
|
|
130
|
+
createForwarderL1TxUtilsBase(client, forwarderAddress, { ...sharedDeps, kzg: deps.kzg }, config),
|
|
182
131
|
);
|
|
183
132
|
}
|
|
184
133
|
|
|
185
134
|
/**
|
|
186
|
-
* Creates ForwarderL1TxUtils from multiple EthSigners, sharing store and
|
|
187
|
-
*
|
|
135
|
+
* Creates ForwarderL1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
|
|
136
|
+
* Wraps all transactions through a forwarder contract for testing purposes.
|
|
137
|
+
* When kzg is provided in deps, blob support is enabled.
|
|
188
138
|
*/
|
|
189
|
-
export async function
|
|
139
|
+
export async function createForwarderL1TxUtilsFromSigners(
|
|
190
140
|
client: ViemClient,
|
|
191
141
|
signers: EthSigner[],
|
|
192
|
-
forwarderAddress:
|
|
142
|
+
forwarderAddress: EthAddress,
|
|
193
143
|
config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
|
|
194
144
|
deps: {
|
|
195
145
|
telemetry: TelemetryClient;
|
|
196
146
|
logger?: ReturnType<typeof createLogger>;
|
|
197
|
-
dateProvider
|
|
147
|
+
dateProvider: DateProvider;
|
|
148
|
+
kzg?: BlobKzgInstance;
|
|
198
149
|
},
|
|
199
150
|
) {
|
|
200
151
|
const sharedDeps = await createSharedDeps(config, deps);
|
|
201
152
|
|
|
202
153
|
return signers.map(signer =>
|
|
203
|
-
|
|
204
|
-
client,
|
|
205
|
-
signer,
|
|
206
|
-
forwarderAddress,
|
|
207
|
-
sharedDeps,
|
|
208
|
-
config,
|
|
209
|
-
config.debugMaxGasLimit,
|
|
210
|
-
),
|
|
154
|
+
createForwarderL1TxUtilsBase({ client, signer }, forwarderAddress, { ...sharedDeps, kzg: deps.kzg }, config),
|
|
211
155
|
);
|
|
212
156
|
}
|