@aztec/aztec 3.0.0-nightly.20251221 → 3.0.0-nightly.20251223
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/cli/aztec_start_action.d.ts +1 -1
- package/dest/cli/aztec_start_action.d.ts.map +1 -1
- package/dest/cli/aztec_start_action.js +0 -3
- package/dest/cli/aztec_start_options.d.ts +1 -1
- package/dest/cli/aztec_start_options.d.ts.map +1 -1
- package/dest/cli/aztec_start_options.js +5 -13
- package/dest/cli/cmds/start_archiver.js +5 -5
- package/dest/local-network/local-network.d.ts +3 -3
- package/dest/local-network/local-network.d.ts.map +1 -1
- package/dest/local-network/local-network.js +4 -4
- package/package.json +33 -33
- package/src/cli/aztec_start_action.ts +0 -3
- package/src/cli/aztec_start_options.ts +5 -13
- package/src/cli/cmds/start_archiver.ts +5 -5
- package/src/local-network/local-network.ts +5 -9
- package/dest/cli/cmds/start_blob_sink.d.ts +0 -3
- package/dest/cli/cmds/start_blob_sink.d.ts.map +0 -1
- package/dest/cli/cmds/start_blob_sink.js +0 -33
- package/src/cli/cmds/start_blob_sink.ts +0 -57
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
2
2
|
export declare function aztecStart(options: any, userLog: LogFn, debugLogger: Logger): Promise<void>;
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfYWN0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2F6dGVjX3N0YXJ0X2FjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFZM0Qsd0JBQXNCLFVBQVUsQ0FBQyxPQUFPLEVBQUUsR0FBRyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBeUZqRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aztec_start_action.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_action.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAY3D,wBAAsB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"aztec_start_action.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_action.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAY3D,wBAAsB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,iBAyFjF"}
|
|
@@ -41,9 +41,6 @@ export async function aztecStart(options, userLog, debugLogger) {
|
|
|
41
41
|
} else if (options.proverNode) {
|
|
42
42
|
const { startProverNode } = await import('./cmds/start_prover_node.js');
|
|
43
43
|
({ config } = await startProverNode(options, signalHandlers, services, userLog));
|
|
44
|
-
} else if (options.blobSink) {
|
|
45
|
-
const { startBlobSink } = await import('./cmds/start_blob_sink.js');
|
|
46
|
-
await startBlobSink(options, signalHandlers, userLog);
|
|
47
44
|
} else if (options.archiver) {
|
|
48
45
|
const { startArchiver } = await import('./cmds/start_archiver.js');
|
|
49
46
|
({ config } = await startArchiver(options, signalHandlers, services));
|
|
@@ -14,4 +14,4 @@ export declare const NETWORK_FLAG = "network";
|
|
|
14
14
|
export declare const aztecStartOptions: {
|
|
15
15
|
[key: string]: AztecStartOption[];
|
|
16
16
|
};
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfb3B0aW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9henRlY19zdGFydF9vcHRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sRUFDTCxLQUFLLGFBQWEsRUFDbEIsS0FBSyxNQUFNLEVBSVosTUFBTSwwQkFBMEIsQ0FBQztBQWVsQyxNQUFNLFdBQVcsZ0JBQWdCO0lBQy9CLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixXQUFXLEVBQUUsTUFBTSxDQUFDO0lBQ3BCLFlBQVksRUFBRSxHQUFHLENBQUM7SUFDbEIsWUFBWSxDQUFDLEVBQUUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxLQUFLLE1BQU0sQ0FBQztJQUNwQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUN4QixRQUFRLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNwQixRQUFRLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEtBQUssR0FBRyxDQUFDO0NBQ2pDO0FBRUQsZUFBTyxNQUFNLFVBQVUsMEZBb0J0QixDQUFDO0FBdUJGLGVBQU8sTUFBTSxnQkFBZ0IsVUFZNUIsQ0FBQztBQUVGLGVBQU8sTUFBTSxZQUFZLFlBQVksQ0FBQztBQUd0QyxlQUFPLE1BQU0saUJBQWlCLEVBQUU7SUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLEVBQUUsQ0FBQTtDQWlObEUsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aztec_start_options.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_options.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,MAAM,EAIZ,MAAM,0BAA0B,CAAC;AAelC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC;IACpC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;CACjC;AAED,eAAO,MAAM,UAAU,0FAoBtB,CAAC;AAuBF,eAAO,MAAM,gBAAgB,UAY5B,CAAC;AAEF,eAAO,MAAM,YAAY,YAAY,CAAC;AAGtC,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"aztec_start_options.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_options.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,MAAM,EAIZ,MAAM,0BAA0B,CAAC;AAelC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC;IACpC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;CACjC;AAED,eAAO,MAAM,UAAU,0FAoBtB,CAAC;AAuBF,eAAO,MAAM,gBAAgB,UAY5B,CAAC;AAEF,eAAO,MAAM,YAAY,YAAY,CAAC;AAGtC,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAiNlE,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { archiverConfigMappings } from '@aztec/archiver/config';
|
|
2
|
-
import {
|
|
2
|
+
import { blobClientConfigMapping } from '@aztec/blob-client/client/config';
|
|
3
3
|
import { botConfigMappings } from '@aztec/bot/config';
|
|
4
4
|
import { l1ContractsConfigMappings } from '@aztec/ethereum/config';
|
|
5
5
|
import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
|
|
@@ -125,9 +125,9 @@ export const aztecStartOptions = {
|
|
|
125
125
|
...l1ReaderConfigMappings.l1RpcUrls,
|
|
126
126
|
defaultValue: undefined
|
|
127
127
|
}),
|
|
128
|
-
configToFlag('--l1-consensus-host-urls',
|
|
129
|
-
configToFlag('--l1-consensus-host-api-keys',
|
|
130
|
-
configToFlag('--l1-consensus-host-api-key-headers',
|
|
128
|
+
configToFlag('--l1-consensus-host-urls', blobClientConfigMapping.l1ConsensusHostUrls),
|
|
129
|
+
configToFlag('--l1-consensus-host-api-keys', blobClientConfigMapping.l1ConsensusHostApiKeys),
|
|
130
|
+
configToFlag('--l1-consensus-host-api-key-headers', blobClientConfigMapping.l1ConsensusHostApiKeyHeaders)
|
|
131
131
|
],
|
|
132
132
|
'L1 CONTRACTS': [
|
|
133
133
|
configToFlag('--registry-address', l1ContractAddressesMapping.registryAddress),
|
|
@@ -169,20 +169,12 @@ export const aztecStartOptions = {
|
|
|
169
169
|
},
|
|
170
170
|
...getOptions('sequencer', omitConfigMappings(sequencerClientConfigMappings, [
|
|
171
171
|
'fakeProcessingDelayPerTxMs',
|
|
172
|
+
'fakeThrowAfterProcessingTxCount',
|
|
172
173
|
'skipCollectingAttestations',
|
|
173
174
|
'skipInvalidateBlockAsProposer',
|
|
174
175
|
'blobSinkMapSizeKb'
|
|
175
176
|
]))
|
|
176
177
|
],
|
|
177
|
-
'BLOB SINK': [
|
|
178
|
-
{
|
|
179
|
-
flag: '--blob-sink',
|
|
180
|
-
description: 'Starts Aztec Blob Sink with options',
|
|
181
|
-
defaultValue: undefined,
|
|
182
|
-
env: undefined
|
|
183
|
-
},
|
|
184
|
-
...getOptions('blobSink', blobSinkConfigMappings)
|
|
185
|
-
],
|
|
186
178
|
'PROVER NODE': [
|
|
187
179
|
{
|
|
188
180
|
flag: '--prover-node',
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Archiver, KVArchiverDataStore, archiverConfigMappings, getArchiverConfigFromEnv } from '@aztec/archiver';
|
|
2
2
|
import { createLogger } from '@aztec/aztec.js/log';
|
|
3
|
-
import {
|
|
3
|
+
import { blobClientConfigMapping, createBlobClient } from '@aztec/blob-client/client';
|
|
4
4
|
import { getL1Config } from '@aztec/cli/config';
|
|
5
5
|
import { dataConfigMappings } from '@aztec/kv-store/config';
|
|
6
6
|
import { createStore } from '@aztec/kv-store/lmdb-v2';
|
|
@@ -12,7 +12,7 @@ import { extractRelevantOptions } from '../util.js';
|
|
|
12
12
|
const cliOptions = extractRelevantOptions(options, {
|
|
13
13
|
...archiverConfigMappings,
|
|
14
14
|
...dataConfigMappings,
|
|
15
|
-
...
|
|
15
|
+
...blobClientConfigMapping
|
|
16
16
|
}, 'archiver');
|
|
17
17
|
let archiverConfig = {
|
|
18
18
|
...envConfig,
|
|
@@ -32,12 +32,12 @@ import { extractRelevantOptions } from '../util.js';
|
|
|
32
32
|
const store = await createStore('archiver', KVArchiverDataStore.SCHEMA_VERSION, archiverConfig, storeLog);
|
|
33
33
|
const archiverStore = new KVArchiverDataStore(store, archiverConfig.maxLogs);
|
|
34
34
|
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
35
|
-
const
|
|
36
|
-
logger: createLogger('archiver:blob-
|
|
35
|
+
const blobClient = createBlobClient(archiverConfig, {
|
|
36
|
+
logger: createLogger('archiver:blob-client:client')
|
|
37
37
|
});
|
|
38
38
|
const archiver = await Archiver.createAndSync(archiverConfig, archiverStore, {
|
|
39
39
|
telemetry,
|
|
40
|
-
|
|
40
|
+
blobClient
|
|
41
41
|
}, true);
|
|
42
42
|
services.archiver = [
|
|
43
43
|
archiver,
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { AztecNodeService } from '@aztec/aztec-node';
|
|
3
3
|
import { type AztecNodeConfig } from '@aztec/aztec-node/config';
|
|
4
4
|
import { Fr } from '@aztec/aztec.js/fields';
|
|
5
|
-
import { type
|
|
5
|
+
import { type BlobClientInterface } from '@aztec/blob-client/client';
|
|
6
6
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
7
7
|
import type { LogFn } from '@aztec/foundation/log';
|
|
8
8
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
@@ -64,9 +64,9 @@ export declare function createLocalNetwork(config: Partial<LocalNetworkConfig> |
|
|
|
64
64
|
*/
|
|
65
65
|
export declare function createAztecNode(config?: Partial<AztecNodeConfig>, deps?: {
|
|
66
66
|
telemetry?: TelemetryClient;
|
|
67
|
-
|
|
67
|
+
blobClient?: BlobClientInterface;
|
|
68
68
|
dateProvider?: DateProvider;
|
|
69
69
|
}, options?: {
|
|
70
70
|
prefilledPublicData?: PublicDataTreeLeaf[];
|
|
71
71
|
}): Promise<AztecNodeService>;
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFvQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBb0IsTUFBTSwyQkFBMkIsQ0FBQztBQVN2RixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFlBQVksRUFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUd6RSxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzlELE9BQU8sRUFDTCxLQUFLLGVBQWUsRUFHckIsTUFBTSx5QkFBeUIsQ0FBQztBQUlqQyxPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQTJELE1BQU0sTUFBTSxDQUFDO0FBY3pGOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQ3ZDLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLFVBQVUsRUFBRSxHQUFHLEVBQ2YsSUFBSSxHQUFFO0lBQ0osOEJBQThCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDeEMsa0JBQWtCLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDeEIsNEJBQTRCLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDbEM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JQO0FBRUQsOEJBQThCO0FBQzlCLE1BQU0sTUFBTSxrQkFBa0IsR0FBRyxlQUFlLEdBQUc7SUFDakQsMERBQTBEO0lBQzFELFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsNkRBQTZEO0lBQzdELFlBQVksRUFBRSxPQUFPLENBQUM7Q0FDdkIsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCx3QkFBc0Isa0JBQWtCLENBQUMsTUFBTSx5Q0FBa0MsRUFBRSxPQUFPLEVBQUUsS0FBSzs7O0dBK0doRztBQUVEOzs7R0FHRztBQUNILHdCQUFzQixlQUFlLENBQ25DLE1BQU0sR0FBRSxPQUFPLENBQUMsZUFBZSxDQUFNLEVBQ3JDLElBQUksR0FBRTtJQUFFLFNBQVMsQ0FBQyxFQUFFLGVBQWUsQ0FBQztJQUFDLFVBQVUsQ0FBQyxFQUFFLG1CQUFtQixDQUFDO0lBQUMsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFBO0NBQU8sRUFDekcsT0FBTyxHQUFFO0lBQUUsbUJBQW1CLENBQUMsRUFBRSxrQkFBa0IsRUFBRSxDQUFBO0NBQU8sNkJBVzdEIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,2BAA2B,CAAC;AASvF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAGzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,KAAK,GAAG,EAA2D,MAAM,MAAM,CAAC;AAczF;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,GAAG,EACf,IAAI,GAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;;GAoBP;AAED,8BAA8B;AAC9B,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG;IACjD,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,6DAA6D;IAC7D,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,yCAAkC,EAAE,OAAO,EAAE,KAAK;;;GA+GhG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,UAAU,CAAC,EAAE,mBAAmB,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,CAAA;CAAO,EACzG,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D"}
|
|
@@ -4,7 +4,7 @@ import { AztecNodeService } from '@aztec/aztec-node';
|
|
|
4
4
|
import { getConfigEnvVars } from '@aztec/aztec-node/config';
|
|
5
5
|
import { Fr } from '@aztec/aztec.js/fields';
|
|
6
6
|
import { createLogger } from '@aztec/aztec.js/log';
|
|
7
|
-
import {
|
|
7
|
+
import { createBlobClient } from '@aztec/blob-client/client';
|
|
8
8
|
import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
|
|
9
9
|
import { createEthereumChain } from '@aztec/ethereum/chain';
|
|
10
10
|
import { waitForPublicClient } from '@aztec/ethereum/client';
|
|
@@ -127,11 +127,11 @@ const localAnvil = foundry;
|
|
|
127
127
|
await watcher.start();
|
|
128
128
|
}
|
|
129
129
|
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
130
|
-
// Create a local blob
|
|
131
|
-
const
|
|
130
|
+
// Create a local blob client client inside the local network, no http connectivity
|
|
131
|
+
const blobClient = createBlobClient();
|
|
132
132
|
const node = await createAztecNode(aztecNodeConfig, {
|
|
133
133
|
telemetry,
|
|
134
|
-
|
|
134
|
+
blobClient,
|
|
135
135
|
dateProvider
|
|
136
136
|
}, {
|
|
137
137
|
prefilledPublicData
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec",
|
|
3
|
-
"version": "3.0.0-nightly.
|
|
3
|
+
"version": "3.0.0-nightly.20251223",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -28,38 +28,38 @@
|
|
|
28
28
|
"../package.common.json"
|
|
29
29
|
],
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@aztec/accounts": "3.0.0-nightly.
|
|
32
|
-
"@aztec/archiver": "3.0.0-nightly.
|
|
33
|
-
"@aztec/aztec-faucet": "3.0.0-nightly.
|
|
34
|
-
"@aztec/aztec-node": "3.0.0-nightly.
|
|
35
|
-
"@aztec/aztec.js": "3.0.0-nightly.
|
|
36
|
-
"@aztec/bb-prover": "3.0.0-nightly.
|
|
37
|
-
"@aztec/bb.js": "3.0.0-nightly.
|
|
38
|
-
"@aztec/blob-
|
|
39
|
-
"@aztec/bot": "3.0.0-nightly.
|
|
40
|
-
"@aztec/builder": "3.0.0-nightly.
|
|
41
|
-
"@aztec/cli": "3.0.0-nightly.
|
|
42
|
-
"@aztec/constants": "3.0.0-nightly.
|
|
43
|
-
"@aztec/entrypoints": "3.0.0-nightly.
|
|
44
|
-
"@aztec/ethereum": "3.0.0-nightly.
|
|
45
|
-
"@aztec/foundation": "3.0.0-nightly.
|
|
46
|
-
"@aztec/kv-store": "3.0.0-nightly.
|
|
47
|
-
"@aztec/l1-artifacts": "3.0.0-nightly.
|
|
48
|
-
"@aztec/node-lib": "3.0.0-nightly.
|
|
49
|
-
"@aztec/noir-contracts.js": "3.0.0-nightly.
|
|
50
|
-
"@aztec/noir-protocol-circuits-types": "3.0.0-nightly.
|
|
51
|
-
"@aztec/p2p": "3.0.0-nightly.
|
|
52
|
-
"@aztec/p2p-bootstrap": "3.0.0-nightly.
|
|
53
|
-
"@aztec/protocol-contracts": "3.0.0-nightly.
|
|
54
|
-
"@aztec/prover-client": "3.0.0-nightly.
|
|
55
|
-
"@aztec/prover-node": "3.0.0-nightly.
|
|
56
|
-
"@aztec/pxe": "3.0.0-nightly.
|
|
57
|
-
"@aztec/sequencer-client": "3.0.0-nightly.
|
|
58
|
-
"@aztec/stdlib": "3.0.0-nightly.
|
|
59
|
-
"@aztec/telemetry-client": "3.0.0-nightly.
|
|
60
|
-
"@aztec/test-wallet": "3.0.0-nightly.
|
|
61
|
-
"@aztec/txe": "3.0.0-nightly.
|
|
62
|
-
"@aztec/world-state": "3.0.0-nightly.
|
|
31
|
+
"@aztec/accounts": "3.0.0-nightly.20251223",
|
|
32
|
+
"@aztec/archiver": "3.0.0-nightly.20251223",
|
|
33
|
+
"@aztec/aztec-faucet": "3.0.0-nightly.20251223",
|
|
34
|
+
"@aztec/aztec-node": "3.0.0-nightly.20251223",
|
|
35
|
+
"@aztec/aztec.js": "3.0.0-nightly.20251223",
|
|
36
|
+
"@aztec/bb-prover": "3.0.0-nightly.20251223",
|
|
37
|
+
"@aztec/bb.js": "3.0.0-nightly.20251223",
|
|
38
|
+
"@aztec/blob-client": "3.0.0-nightly.20251223",
|
|
39
|
+
"@aztec/bot": "3.0.0-nightly.20251223",
|
|
40
|
+
"@aztec/builder": "3.0.0-nightly.20251223",
|
|
41
|
+
"@aztec/cli": "3.0.0-nightly.20251223",
|
|
42
|
+
"@aztec/constants": "3.0.0-nightly.20251223",
|
|
43
|
+
"@aztec/entrypoints": "3.0.0-nightly.20251223",
|
|
44
|
+
"@aztec/ethereum": "3.0.0-nightly.20251223",
|
|
45
|
+
"@aztec/foundation": "3.0.0-nightly.20251223",
|
|
46
|
+
"@aztec/kv-store": "3.0.0-nightly.20251223",
|
|
47
|
+
"@aztec/l1-artifacts": "3.0.0-nightly.20251223",
|
|
48
|
+
"@aztec/node-lib": "3.0.0-nightly.20251223",
|
|
49
|
+
"@aztec/noir-contracts.js": "3.0.0-nightly.20251223",
|
|
50
|
+
"@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251223",
|
|
51
|
+
"@aztec/p2p": "3.0.0-nightly.20251223",
|
|
52
|
+
"@aztec/p2p-bootstrap": "3.0.0-nightly.20251223",
|
|
53
|
+
"@aztec/protocol-contracts": "3.0.0-nightly.20251223",
|
|
54
|
+
"@aztec/prover-client": "3.0.0-nightly.20251223",
|
|
55
|
+
"@aztec/prover-node": "3.0.0-nightly.20251223",
|
|
56
|
+
"@aztec/pxe": "3.0.0-nightly.20251223",
|
|
57
|
+
"@aztec/sequencer-client": "3.0.0-nightly.20251223",
|
|
58
|
+
"@aztec/stdlib": "3.0.0-nightly.20251223",
|
|
59
|
+
"@aztec/telemetry-client": "3.0.0-nightly.20251223",
|
|
60
|
+
"@aztec/test-wallet": "3.0.0-nightly.20251223",
|
|
61
|
+
"@aztec/txe": "3.0.0-nightly.20251223",
|
|
62
|
+
"@aztec/world-state": "3.0.0-nightly.20251223",
|
|
63
63
|
"@types/chalk": "^2.2.0",
|
|
64
64
|
"abitype": "^0.8.11",
|
|
65
65
|
"chalk": "^5.3.0",
|
|
@@ -52,9 +52,6 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
|
|
|
52
52
|
} else if (options.proverNode) {
|
|
53
53
|
const { startProverNode } = await import('./cmds/start_prover_node.js');
|
|
54
54
|
({ config } = await startProverNode(options, signalHandlers, services, userLog));
|
|
55
|
-
} else if (options.blobSink) {
|
|
56
|
-
const { startBlobSink } = await import('./cmds/start_blob_sink.js');
|
|
57
|
-
await startBlobSink(options, signalHandlers, userLog);
|
|
58
55
|
} else if (options.archiver) {
|
|
59
56
|
const { startArchiver } = await import('./cmds/start_archiver.js');
|
|
60
57
|
({ config } = await startArchiver(options, signalHandlers, services));
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
|
|
2
|
-
import {
|
|
2
|
+
import { blobClientConfigMapping } from '@aztec/blob-client/client/config';
|
|
3
3
|
import { botConfigMappings } from '@aztec/bot/config';
|
|
4
4
|
import { l1ContractsConfigMappings } from '@aztec/ethereum/config';
|
|
5
5
|
import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
|
|
@@ -153,9 +153,9 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
153
153
|
configToFlag('--l1-chain-id', l1ReaderConfigMappings.l1ChainId),
|
|
154
154
|
// Do not set default for CLI: keep undefined unless provided via flag or env
|
|
155
155
|
configToFlag('--l1-rpc-urls', { ...l1ReaderConfigMappings.l1RpcUrls, defaultValue: undefined }),
|
|
156
|
-
configToFlag('--l1-consensus-host-urls',
|
|
157
|
-
configToFlag('--l1-consensus-host-api-keys',
|
|
158
|
-
configToFlag('--l1-consensus-host-api-key-headers',
|
|
156
|
+
configToFlag('--l1-consensus-host-urls', blobClientConfigMapping.l1ConsensusHostUrls),
|
|
157
|
+
configToFlag('--l1-consensus-host-api-keys', blobClientConfigMapping.l1ConsensusHostApiKeys),
|
|
158
|
+
configToFlag('--l1-consensus-host-api-key-headers', blobClientConfigMapping.l1ConsensusHostApiKeyHeaders),
|
|
159
159
|
],
|
|
160
160
|
'L1 CONTRACTS': [
|
|
161
161
|
configToFlag('--registry-address', l1ContractAddressesMapping.registryAddress),
|
|
@@ -202,21 +202,13 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
202
202
|
'sequencer',
|
|
203
203
|
omitConfigMappings(sequencerClientConfigMappings, [
|
|
204
204
|
'fakeProcessingDelayPerTxMs',
|
|
205
|
+
'fakeThrowAfterProcessingTxCount',
|
|
205
206
|
'skipCollectingAttestations',
|
|
206
207
|
'skipInvalidateBlockAsProposer',
|
|
207
208
|
'blobSinkMapSizeKb',
|
|
208
209
|
]),
|
|
209
210
|
),
|
|
210
211
|
],
|
|
211
|
-
'BLOB SINK': [
|
|
212
|
-
{
|
|
213
|
-
flag: '--blob-sink',
|
|
214
|
-
description: 'Starts Aztec Blob Sink with options',
|
|
215
|
-
defaultValue: undefined,
|
|
216
|
-
env: undefined,
|
|
217
|
-
},
|
|
218
|
-
...getOptions('blobSink', blobSinkConfigMappings),
|
|
219
|
-
],
|
|
220
212
|
'PROVER NODE': [
|
|
221
213
|
{
|
|
222
214
|
flag: '--prover-node',
|
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
getArchiverConfigFromEnv,
|
|
7
7
|
} from '@aztec/archiver';
|
|
8
8
|
import { createLogger } from '@aztec/aztec.js/log';
|
|
9
|
-
import { type
|
|
9
|
+
import { type BlobClientConfig, blobClientConfigMapping, createBlobClient } from '@aztec/blob-client/client';
|
|
10
10
|
import { getL1Config } from '@aztec/cli/config';
|
|
11
11
|
import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
|
|
12
12
|
import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
|
|
@@ -25,9 +25,9 @@ export async function startArchiver(
|
|
|
25
25
|
services: NamespacedApiHandlers,
|
|
26
26
|
): Promise<{ config: ArchiverConfig & DataStoreConfig }> {
|
|
27
27
|
const envConfig = getArchiverConfigFromEnv();
|
|
28
|
-
const cliOptions = extractRelevantOptions<ArchiverConfig & DataStoreConfig &
|
|
28
|
+
const cliOptions = extractRelevantOptions<ArchiverConfig & DataStoreConfig & BlobClientConfig>(
|
|
29
29
|
options,
|
|
30
|
-
{ ...archiverConfigMappings, ...dataConfigMappings, ...
|
|
30
|
+
{ ...archiverConfigMappings, ...dataConfigMappings, ...blobClientConfigMapping },
|
|
31
31
|
'archiver',
|
|
32
32
|
);
|
|
33
33
|
|
|
@@ -52,8 +52,8 @@ export async function startArchiver(
|
|
|
52
52
|
const archiverStore = new KVArchiverDataStore(store, archiverConfig.maxLogs);
|
|
53
53
|
|
|
54
54
|
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
55
|
-
const
|
|
56
|
-
const archiver = await Archiver.createAndSync(archiverConfig, archiverStore, { telemetry,
|
|
55
|
+
const blobClient = createBlobClient(archiverConfig, { logger: createLogger('archiver:blob-client:client') });
|
|
56
|
+
const archiver = await Archiver.createAndSync(archiverConfig, archiverStore, { telemetry, blobClient }, true);
|
|
57
57
|
services.archiver = [archiver, ArchiverApiSchema];
|
|
58
58
|
signalHandlers.push(archiver.stop);
|
|
59
59
|
|
|
@@ -4,7 +4,7 @@ import { AztecNodeService } from '@aztec/aztec-node';
|
|
|
4
4
|
import { type AztecNodeConfig, getConfigEnvVars } from '@aztec/aztec-node/config';
|
|
5
5
|
import { Fr } from '@aztec/aztec.js/fields';
|
|
6
6
|
import { createLogger } from '@aztec/aztec.js/log';
|
|
7
|
-
import { type
|
|
7
|
+
import { type BlobClientInterface, createBlobClient } from '@aztec/blob-client/client';
|
|
8
8
|
import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
|
|
9
9
|
import { createEthereumChain } from '@aztec/ethereum/chain';
|
|
10
10
|
import { waitForPublicClient } from '@aztec/ethereum/client';
|
|
@@ -168,13 +168,9 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
|
|
|
168
168
|
}
|
|
169
169
|
|
|
170
170
|
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
171
|
-
// Create a local blob
|
|
172
|
-
const
|
|
173
|
-
const node = await createAztecNode(
|
|
174
|
-
aztecNodeConfig,
|
|
175
|
-
{ telemetry, blobSinkClient, dateProvider },
|
|
176
|
-
{ prefilledPublicData },
|
|
177
|
-
);
|
|
171
|
+
// Create a local blob client client inside the local network, no http connectivity
|
|
172
|
+
const blobClient = createBlobClient();
|
|
173
|
+
const node = await createAztecNode(aztecNodeConfig, { telemetry, blobClient, dateProvider }, { prefilledPublicData });
|
|
178
174
|
|
|
179
175
|
if (initialAccounts.length) {
|
|
180
176
|
const PXEConfig = { proverEnabled: aztecNodeConfig.realProofs };
|
|
@@ -211,7 +207,7 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
|
|
|
211
207
|
*/
|
|
212
208
|
export async function createAztecNode(
|
|
213
209
|
config: Partial<AztecNodeConfig> = {},
|
|
214
|
-
deps: { telemetry?: TelemetryClient;
|
|
210
|
+
deps: { telemetry?: TelemetryClient; blobClient?: BlobClientInterface; dateProvider?: DateProvider } = {},
|
|
215
211
|
options: { prefilledPublicData?: PublicDataTreeLeaf[] } = {},
|
|
216
212
|
) {
|
|
217
213
|
// TODO(#12272): will clean this up. This is criminal.
|
|
@@ -1,3 +0,0 @@
|
|
|
1
|
-
import type { LogFn } from '@aztec/foundation/log';
|
|
2
|
-
export declare function startBlobSink(options: any, signalHandlers: (() => Promise<void>)[], userLog: LogFn): Promise<void>;
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfYmxvYl9zaW5rLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2NtZHMvc3RhcnRfYmxvYl9zaW5rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBS25ELHdCQUFzQixhQUFhLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxjQUFjLEVBQUUsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQUUsT0FBTyxFQUFFLEtBQUssaUJBNEN4RyJ9
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"start_blob_sink.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_blob_sink.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAKnD,wBAAsB,aAAa,CAAC,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,iBA4CxG"}
|
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
import { blobSinkConfigMappings, createBlobSinkServer, getBlobSinkConfigFromEnv } from '@aztec/blob-sink/server';
|
|
2
|
-
import { getL1Config } from '@aztec/cli/config';
|
|
3
|
-
import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
|
|
4
|
-
import { extractRelevantOptions } from '../util.js';
|
|
5
|
-
export async function startBlobSink(options, signalHandlers, userLog) {
|
|
6
|
-
if (options.prover || options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
|
|
7
|
-
userLog(`Starting a blob sink with --node, --sequencer, --pxe, --p2p-bootstrap, --prover or --txe is not supported.`);
|
|
8
|
-
process.exit(1);
|
|
9
|
-
}
|
|
10
|
-
let blobSinkConfig = {
|
|
11
|
-
...getBlobSinkConfigFromEnv(),
|
|
12
|
-
...extractRelevantOptions(options, blobSinkConfigMappings, 'blobSink')
|
|
13
|
-
};
|
|
14
|
-
if (!blobSinkConfig.l1Contracts?.registryAddress || blobSinkConfig.l1Contracts.registryAddress.isZero()) {
|
|
15
|
-
throw new Error('REGISTRY_CONTRACT_ADDRESS not set');
|
|
16
|
-
}
|
|
17
|
-
if (!blobSinkConfig.l1RpcUrls || blobSinkConfig.l1RpcUrls.length === 0) {
|
|
18
|
-
throw new Error('ETHEREUM_HOSTS not set');
|
|
19
|
-
}
|
|
20
|
-
if (typeof blobSinkConfig.l1ChainId !== 'number') {
|
|
21
|
-
throw new Error('L1_CHAIN_ID');
|
|
22
|
-
}
|
|
23
|
-
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
24
|
-
const { config: chainConfig, addresses } = await getL1Config(blobSinkConfig.l1Contracts.registryAddress, blobSinkConfig.l1RpcUrls, blobSinkConfig.l1ChainId, blobSinkConfig.rollupVersion);
|
|
25
|
-
blobSinkConfig = {
|
|
26
|
-
...blobSinkConfig,
|
|
27
|
-
l1Contracts: addresses,
|
|
28
|
-
...chainConfig
|
|
29
|
-
};
|
|
30
|
-
const blobSink = await createBlobSinkServer(blobSinkConfig, telemetry);
|
|
31
|
-
signalHandlers.push(blobSink.stop.bind(blobSink));
|
|
32
|
-
await blobSink.start();
|
|
33
|
-
}
|
|
@@ -1,57 +0,0 @@
|
|
|
1
|
-
import {
|
|
2
|
-
type BlobSinkConfig,
|
|
3
|
-
blobSinkConfigMappings,
|
|
4
|
-
createBlobSinkServer,
|
|
5
|
-
getBlobSinkConfigFromEnv,
|
|
6
|
-
} from '@aztec/blob-sink/server';
|
|
7
|
-
import { getL1Config } from '@aztec/cli/config';
|
|
8
|
-
import type { LogFn } from '@aztec/foundation/log';
|
|
9
|
-
import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
|
|
10
|
-
|
|
11
|
-
import { extractRelevantOptions } from '../util.js';
|
|
12
|
-
|
|
13
|
-
export async function startBlobSink(options: any, signalHandlers: (() => Promise<void>)[], userLog: LogFn) {
|
|
14
|
-
if (options.prover || options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
|
|
15
|
-
userLog(
|
|
16
|
-
`Starting a blob sink with --node, --sequencer, --pxe, --p2p-bootstrap, --prover or --txe is not supported.`,
|
|
17
|
-
);
|
|
18
|
-
process.exit(1);
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
let blobSinkConfig: BlobSinkConfig = {
|
|
22
|
-
...getBlobSinkConfigFromEnv(), // get default config from env
|
|
23
|
-
...extractRelevantOptions<BlobSinkConfig>(options, blobSinkConfigMappings, 'blobSink'), // override with command line options
|
|
24
|
-
};
|
|
25
|
-
|
|
26
|
-
if (!blobSinkConfig.l1Contracts?.registryAddress || blobSinkConfig.l1Contracts.registryAddress.isZero()) {
|
|
27
|
-
throw new Error('REGISTRY_CONTRACT_ADDRESS not set');
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
if (!blobSinkConfig.l1RpcUrls || blobSinkConfig.l1RpcUrls.length === 0) {
|
|
31
|
-
throw new Error('ETHEREUM_HOSTS not set');
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
if (typeof blobSinkConfig.l1ChainId !== 'number') {
|
|
35
|
-
throw new Error('L1_CHAIN_ID');
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
39
|
-
|
|
40
|
-
const { config: chainConfig, addresses } = await getL1Config(
|
|
41
|
-
blobSinkConfig.l1Contracts.registryAddress,
|
|
42
|
-
blobSinkConfig.l1RpcUrls,
|
|
43
|
-
blobSinkConfig.l1ChainId,
|
|
44
|
-
blobSinkConfig.rollupVersion,
|
|
45
|
-
);
|
|
46
|
-
|
|
47
|
-
blobSinkConfig = {
|
|
48
|
-
...blobSinkConfig,
|
|
49
|
-
l1Contracts: addresses,
|
|
50
|
-
...chainConfig,
|
|
51
|
-
};
|
|
52
|
-
|
|
53
|
-
const blobSink = await createBlobSinkServer(blobSinkConfig, telemetry);
|
|
54
|
-
signalHandlers.push(blobSink.stop.bind(blobSink));
|
|
55
|
-
|
|
56
|
-
await blobSink.start();
|
|
57
|
-
}
|