@aztec/aztec 3.0.0-nightly.20251211 → 3.0.0-nightly.20251213
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/bin/index.js +3 -2
- 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 -1
- 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 -12
- package/dest/cli/cmds/start_archiver.js +1 -1
- package/dest/cli/cmds/start_blob_sink.js +1 -1
- package/dest/cli/cmds/start_bot.js +1 -1
- package/dest/cli/cmds/start_node.js +1 -1
- package/dest/cli/cmds/start_p2p_bootstrap.js +1 -1
- package/dest/cli/cmds/start_prover_agent.js +1 -1
- package/dest/cli/cmds/start_prover_broker.js +1 -1
- package/dest/cli/cmds/start_prover_node.js +1 -1
- package/dest/cli/util.d.ts +4 -4
- package/dest/cli/util.d.ts.map +1 -1
- package/dest/cli/util.js +2 -2
- package/dest/local-network/local-network.d.ts +8 -10
- package/dest/local-network/local-network.d.ts.map +1 -1
- package/dest/local-network/local-network.js +11 -17
- package/package.json +33 -32
- package/src/bin/index.ts +4 -2
- package/src/cli/aztec_start_action.ts +0 -1
- package/src/cli/aztec_start_options.ts +5 -13
- package/src/cli/cmds/start_archiver.ts +1 -1
- package/src/cli/cmds/start_blob_sink.ts +1 -1
- package/src/cli/cmds/start_bot.ts +1 -1
- package/src/cli/cmds/start_node.ts +1 -1
- package/src/cli/cmds/start_p2p_bootstrap.ts +1 -1
- package/src/cli/cmds/start_prover_agent.ts +1 -1
- package/src/cli/cmds/start_prover_broker.ts +1 -1
- package/src/cli/cmds/start_prover_node.ts +1 -1
- package/src/cli/util.ts +5 -5
- package/src/local-network/local-network.ts +31 -45
package/dest/bin/index.js
CHANGED
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
//
|
|
3
3
|
import { injectCommands as injectBuilderCommands } from '@aztec/builder';
|
|
4
4
|
import { injectCommands as injectAztecNodeCommands } from '@aztec/cli/aztec_node';
|
|
5
|
-
import { enrichEnvironmentWithChainName
|
|
5
|
+
import { enrichEnvironmentWithChainName } from '@aztec/cli/config/chain';
|
|
6
|
+
import { enrichEnvironmentWithNetworkConfig } from '@aztec/cli/config/network';
|
|
6
7
|
import { injectCommands as injectContractCommands } from '@aztec/cli/contracts';
|
|
7
8
|
import { injectCommands as injectInfrastructureCommands } from '@aztec/cli/infrastructure';
|
|
8
9
|
import { injectCommands as injectL1Commands } from '@aztec/cli/l1';
|
|
@@ -11,9 +12,9 @@ import { injectCommands as injectValidatorKeysCommands } from '@aztec/cli/valida
|
|
|
11
12
|
import { getActiveNetworkName } from '@aztec/foundation/config';
|
|
12
13
|
import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
|
|
13
14
|
import { Command } from 'commander';
|
|
14
|
-
import { NETWORK_FLAG } from '../cli/aztec_start_options.js';
|
|
15
15
|
import { injectAztecCommands } from '../cli/index.js';
|
|
16
16
|
import { getCliVersion } from '../cli/release_version.js';
|
|
17
|
+
const NETWORK_FLAG = 'network';
|
|
17
18
|
const userLog = createConsoleLogger();
|
|
18
19
|
const debugLogger = createLogger('cli');
|
|
19
20
|
/** CLI & full node main entrypoint */ async function main() {
|
|
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfYWN0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2F6dGVjX3N0YXJ0X2FjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFZM0Qsd0JBQXNCLFVBQVUsQ0FBQyxPQUFPLEVBQUUsR0FBRyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBNEZqRiJ9
|
|
@@ -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,iBA4FjF"}
|
|
@@ -22,7 +22,6 @@ export async function aztecStart(options, userLog, debugLogger) {
|
|
|
22
22
|
const { node, stop } = await createLocalNetwork({
|
|
23
23
|
l1Mnemonic: localNetwork.l1Mnemonic,
|
|
24
24
|
l1RpcUrls: options.l1RpcUrls,
|
|
25
|
-
deployAztecContractsSalt: localNetwork.deployAztecContractsSalt,
|
|
26
25
|
testAccounts: localNetwork.testAccounts,
|
|
27
26
|
realProofs: false
|
|
28
27
|
}, userLog);
|
|
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfb3B0aW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9henRlY19zdGFydF9vcHRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sRUFDTCxLQUFLLGFBQWEsRUFDbEIsS0FBSyxNQUFNLEVBSVosTUFBTSwwQkFBMEIsQ0FBQztBQWVsQyxNQUFNLFdBQVcsZ0JBQWdCO0lBQy9CLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixXQUFXLEVBQUUsTUFBTSxDQUFDO0lBQ3BCLFlBQVksRUFBRSxHQUFHLENBQUM7SUFDbEIsWUFBWSxDQUFDLEVBQUUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxLQUFLLE1BQU0sQ0FBQztJQUNwQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUN4QixRQUFRLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNwQixRQUFRLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEtBQUssR0FBRyxDQUFDO0NBQ2pDO0FBRUQsZUFBTyxNQUFNLFVBQVUsMEZBb0J0QixDQUFDO0FBdUJGLGVBQU8sTUFBTSxnQkFBZ0IsVUFZNUIsQ0FBQztBQUVGLGVBQU8sTUFBTSxZQUFZLFlBQVksQ0FBQztBQUd0QyxlQUFPLE1BQU0saUJBQWlCLEVBQUU7SUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLEVBQUUsQ0FBQTtDQXlObEUsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aztec_start_options.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_options.ts"],"names":[],"mappings":"
|
|
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;CAyNlE,CAAC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { archiverConfigMappings } from '@aztec/archiver/config';
|
|
2
|
-
import {
|
|
3
|
-
import { blobSinkConfigMappings } from '@aztec/blob-sink/server';
|
|
2
|
+
import { blobSinkConfigMappings } from '@aztec/blob-sink/server/config';
|
|
4
3
|
import { botConfigMappings } from '@aztec/bot/config';
|
|
5
4
|
import { l1ContractsConfigMappings } from '@aztec/ethereum/config';
|
|
6
5
|
import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
|
|
@@ -10,12 +9,13 @@ import { booleanConfigHelper, isBooleanConfigValue, omitConfigMappings } from '@
|
|
|
10
9
|
import { dataConfigMappings } from '@aztec/kv-store/config';
|
|
11
10
|
import { sharedNodeConfigMappings } from '@aztec/node-lib/config';
|
|
12
11
|
import { bootnodeConfigMappings, p2pConfigMappings } from '@aztec/p2p/config';
|
|
13
|
-
import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/prover-client/broker';
|
|
12
|
+
import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/prover-client/broker/config';
|
|
14
13
|
import { proverNodeConfigMappings } from '@aztec/prover-node/config';
|
|
15
14
|
import { allPxeConfigMappings } from '@aztec/pxe/config';
|
|
15
|
+
import { sequencerClientConfigMappings } from '@aztec/sequencer-client/config';
|
|
16
16
|
import { chainConfigMappings } from '@aztec/stdlib/config';
|
|
17
|
-
import { telemetryClientConfigMappings } from '@aztec/telemetry-client';
|
|
18
|
-
import { worldStateConfigMappings } from '@aztec/world-state';
|
|
17
|
+
import { telemetryClientConfigMappings } from '@aztec/telemetry-client/config';
|
|
18
|
+
import { worldStateConfigMappings } from '@aztec/world-state/config';
|
|
19
19
|
import { DefaultMnemonic } from '../mnemonic.js';
|
|
20
20
|
export const getOptions = (namespace, configMappings)=>{
|
|
21
21
|
const options = [];
|
|
@@ -94,13 +94,6 @@ export const aztecStartOptions = {
|
|
|
94
94
|
description: 'Mnemonic for L1 accounts. Will be used ',
|
|
95
95
|
defaultValue: DefaultMnemonic,
|
|
96
96
|
env: 'MNEMONIC'
|
|
97
|
-
},
|
|
98
|
-
{
|
|
99
|
-
flag: '--local-network.deployAztecContractsSalt <value>',
|
|
100
|
-
description: 'Numeric salt for deploying L1 Aztec contracts before starting the local network. Needs mnemonic or private key to be set.',
|
|
101
|
-
env: 'DEPLOY_AZTEC_CONTRACTS_SALT',
|
|
102
|
-
defaultValue: undefined,
|
|
103
|
-
parseVal: (val)=>val ? parseInt(val) : undefined
|
|
104
97
|
}
|
|
105
98
|
],
|
|
106
99
|
API: [
|
|
@@ -31,7 +31,7 @@ import { extractRelevantOptions } from '../util.js';
|
|
|
31
31
|
const storeLog = createLogger('archiver:lmdb');
|
|
32
32
|
const store = await createStore('archiver', KVArchiverDataStore.SCHEMA_VERSION, archiverConfig, storeLog);
|
|
33
33
|
const archiverStore = new KVArchiverDataStore(store, archiverConfig.maxLogs);
|
|
34
|
-
const telemetry = initTelemetryClient(getTelemetryClientConfig());
|
|
34
|
+
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
35
35
|
const blobSinkClient = createBlobSinkClient(archiverConfig, {
|
|
36
36
|
logger: createLogger('archiver:blob-sink:client')
|
|
37
37
|
});
|
|
@@ -20,7 +20,7 @@ export async function startBlobSink(options, signalHandlers, userLog) {
|
|
|
20
20
|
if (typeof blobSinkConfig.l1ChainId !== 'number') {
|
|
21
21
|
throw new Error('L1_CHAIN_ID');
|
|
22
22
|
}
|
|
23
|
-
const telemetry = initTelemetryClient(getTelemetryClientConfig());
|
|
23
|
+
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
24
24
|
const { config: chainConfig, addresses } = await getL1Config(blobSinkConfig.l1Contracts.registryAddress, blobSinkConfig.l1RpcUrls, blobSinkConfig.l1ChainId, blobSinkConfig.rollupVersion);
|
|
25
25
|
blobSinkConfig = {
|
|
26
26
|
...blobSinkConfig,
|
|
@@ -24,7 +24,7 @@ export async function startBot(options, signalHandlers, services, userLog) {
|
|
|
24
24
|
const aztecNode = createAztecNodeClient(config.nodeUrl, getVersions(), fetch);
|
|
25
25
|
const pxeConfig = extractRelevantOptions(options, allPxeConfigMappings, 'pxe');
|
|
26
26
|
const wallet = await TestWallet.create(aztecNode, pxeConfig);
|
|
27
|
-
const telemetry = initTelemetryClient(getTelemetryClientConfig());
|
|
27
|
+
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
28
28
|
await addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, undefined);
|
|
29
29
|
}
|
|
30
30
|
export async function addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, aztecNodeAdmin) {
|
|
@@ -78,7 +78,7 @@ export async function startNode(options, signalHandlers, services, adminServices
|
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
80
|
const telemetryConfig = extractRelevantOptions(options, telemetryClientConfigMappings, 'tel');
|
|
81
|
-
const telemetry = initTelemetryClient(telemetryConfig);
|
|
81
|
+
const telemetry = await initTelemetryClient(telemetryConfig);
|
|
82
82
|
// Create and start Aztec Node
|
|
83
83
|
const node = await createAztecNode(nodeConfig, {
|
|
84
84
|
telemetry
|
|
@@ -15,7 +15,7 @@ export async function startP2PBootstrap(options, signalHandlers, services, userL
|
|
|
15
15
|
};
|
|
16
16
|
userLog(`Starting P2P bootstrap node with config: ${jsonStringify(safeConfig)}`);
|
|
17
17
|
const telemetryConfig = extractRelevantOptions(options, telemetryClientConfigMappings, 'tel');
|
|
18
|
-
const telemetryClient = initTelemetryClient(telemetryConfig);
|
|
18
|
+
const telemetryClient = await initTelemetryClient(telemetryConfig);
|
|
19
19
|
const store = await createStore('p2p-bootstrap', 1, config, createLogger('p2p:bootstrap:store'));
|
|
20
20
|
const node = new BootstrapNode(store, telemetryClient);
|
|
21
21
|
await node.start(config);
|
|
@@ -42,7 +42,7 @@ export async function startProverAgent(options, signalHandlers, services, userLo
|
|
|
42
42
|
connections: 10
|
|
43
43
|
})));
|
|
44
44
|
const broker = createProvingJobBrokerClient(config.proverBrokerUrl, getVersions(), fetch);
|
|
45
|
-
const telemetry = initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
|
|
45
|
+
const telemetry = await initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
|
|
46
46
|
const prover = await buildServerCircuitProver(config, telemetry);
|
|
47
47
|
const proofStore = new InlineProofStore();
|
|
48
48
|
const agents = times(config.proverAgentCount, ()=>new ProvingAgent(broker, proofStore, prover, config.proverAgentProofTypes, config.proverAgentPollIntervalMs, telemetry));
|
|
@@ -20,7 +20,7 @@ export async function startProverBroker(options, signalHandlers, services, userL
|
|
|
20
20
|
const { addresses, config: rollupConfig } = await getL1Config(config.l1Contracts.registryAddress, config.l1RpcUrls, config.l1ChainId, config.rollupVersion);
|
|
21
21
|
config.l1Contracts = addresses;
|
|
22
22
|
config.rollupVersion = rollupConfig.rollupVersion;
|
|
23
|
-
const client = initTelemetryClient(getTelemetryClientConfig());
|
|
23
|
+
const client = await initTelemetryClient(getTelemetryClientConfig());
|
|
24
24
|
const broker = await createAndStartProvingBroker(config, client);
|
|
25
25
|
if (options.autoUpdate !== 'disabled' && options.autoUpdateUrl) {
|
|
26
26
|
await setupUpdateMonitor(options.autoUpdate, new URL(options.autoUpdateUrl), followsCanonicalRollup, getPublicClient(config), config.l1Contracts.registryAddress, signalHandlers);
|
|
@@ -43,7 +43,7 @@ export async function startProverNode(options, signalHandlers, services, userLog
|
|
|
43
43
|
if (!Fr.fromHexString(config.genesisArchiveTreeRoot).equals(genesisArchiveRoot)) {
|
|
44
44
|
throw new Error(`The computed genesis archive tree root ${genesisArchiveRoot} does not match the expected genesis archive tree root ${config.genesisArchiveTreeRoot} for the rollup deployed at ${addresses.rollupAddress}`);
|
|
45
45
|
}
|
|
46
|
-
const telemetry = initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
|
|
46
|
+
const telemetry = await initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
|
|
47
47
|
let broker;
|
|
48
48
|
if (proverConfig.proverBrokerUrl) {
|
|
49
49
|
// at 1TPS we'd enqueue ~1k chonk verifier proofs and ~1k AVM proofs immediately
|
package/dest/cli/util.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import type { AztecNodeConfig } from '@aztec/aztec-node';
|
|
2
|
-
import {
|
|
3
|
-
import { Fr } from '@aztec/aztec.js/fields';
|
|
4
|
-
import { AccountManager } from '@aztec/aztec.js/wallet';
|
|
2
|
+
import type { AccountManager } from '@aztec/aztec.js/wallet';
|
|
5
3
|
import type { ViemClient } from '@aztec/ethereum/types';
|
|
6
4
|
import type { ConfigMappingsType } from '@aztec/foundation/config';
|
|
5
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
6
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
7
7
|
import { type LogFn } from '@aztec/foundation/log';
|
|
8
8
|
import type { SharedNodeConfig } from '@aztec/node-lib/config';
|
|
9
9
|
import type { ProverConfig } from '@aztec/stdlib/interfaces/server';
|
|
@@ -74,4 +74,4 @@ export declare function preloadCrsDataForVerifying({ realProofs }: Pick<AztecNod
|
|
|
74
74
|
*/
|
|
75
75
|
export declare function preloadCrsDataForServerSideProving({ realProofs }: Pick<ProverConfig, 'realProofs'>, log: LogFn): Promise<void>;
|
|
76
76
|
export declare function setupUpdateMonitor(autoUpdateMode: SharedNodeConfig['autoUpdate'], updatesLocation: URL, followsCanonicalRollup: boolean, publicClient: ViemClient, registryContractAddress: EthAddress, signalHandlers: Array<() => Promise<void>>, updateNodeConfig?: (config: object) => Promise<void>): Promise<void>;
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS91dGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3hELE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDbkUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsS0FBSyxLQUFLLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVwRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUc1RCxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFFekMsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQXFCLE1BQU0sMEJBQTBCLENBQUM7QUFFcEYsMEJBQWtCLFFBQVE7SUFDeEIsT0FBTyxJQUFJO0lBQ1gsS0FBSyxJQUFJO0lBQ1QsY0FBYyxLQUFLO0lBQ25CLGVBQWUsS0FBSztJQUVwQixNQUFNLE1BQU07SUFDWixNQUFNLE1BQU07SUFDWixPQUFPLE1BQU07SUFDYixPQUFPLE1BQU07Q0FDZDtBQUdELHdCQUFnQixRQUFRLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxFQUFFLEtBQUssQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FnQjFHO0FBRUQsd0JBQWdCLGNBQWMsSUFBSSxPQUFPLENBRXhDO0FBRUQsZUFBTyxNQUFNLHFCQUFxQixrRUFhakMsQ0FBQztBQUVGOzs7OztHQUtHO0FBQ0gsd0JBQXNCLGlCQUFpQixDQUNyQyxzQkFBc0IsRUFBRTtJQUN0Qjs7T0FFRztJQUNILE9BQU8sRUFBRSxjQUFjLENBQUM7SUFDeEI7O09BRUc7SUFDSCxTQUFTLEVBQUUsRUFBRSxDQUFDO0NBQ2YsRUFBRSxFQUNILE1BQU0sRUFBRSxVQUFVLHFCQXlCbkI7QUFFRCx3QkFBZ0IsYUFBYSxDQUFDLFFBQVEsRUFBRTtJQUFFLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxnQkFBZ0IsRUFBRSxDQUFBO0NBQUUsR0FBRyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FpQi9GO0FBRUQsd0JBQWdCLGNBQWMsQ0FDNUIsTUFBTSxFQUFFLE1BQU0sRUFDZCxZQUFZLEVBQUUsTUFBTSxFQUNwQixNQUFNLEVBQUUsTUFBTSxFQUNkLGVBQWUsRUFBRSxNQUFNLEVBQ3ZCLGdCQUFnQixFQUFFLE1BQU0sR0FDdkIsTUFBTSxDQUtSO0FBaUNELGVBQU8sTUFBTSxVQUFVLHFEQVN0QixDQUFDO0FBRUYsZUFBTyxNQUFNLHVCQUF1QixjQXlCbkMsQ0FBQztBQUVGOzs7OztHQUtHO0FBQ0gsZUFBTyxNQUFNLHdCQUF3QiwwRUFTcEMsQ0FBQztBQUVGOzs7Ozs7O0dBT0c7QUFDSCxlQUFPLE1BQU0sc0JBQXNCLEdBQUksQ0FBQyx3RkFrQ3ZDLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gsd0JBQXNCLDBCQUEwQixDQUM5QyxFQUFFLFVBQVUsRUFBRSxFQUFFLElBQUksQ0FBQyxlQUFlLEVBQUUsWUFBWSxDQUFDLEVBQ25ELEdBQUcsRUFBRSxLQUFLLEdBQ1QsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUtmO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFzQixrQ0FBa0MsQ0FDdEQsRUFBRSxVQUFVLEVBQUUsRUFBRSxJQUFJLENBQUMsWUFBWSxFQUFFLFlBQVksQ0FBQyxFQUNoRCxHQUFHLEVBQUUsS0FBSyxHQUNULE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FLZjtBQUVELHdCQUFzQixrQkFBa0IsQ0FDdEMsY0FBYyxFQUFFLGdCQUFnQixDQUFDLFlBQVksQ0FBQyxFQUM5QyxlQUFlLEVBQUUsR0FBRyxFQUNwQixzQkFBc0IsRUFBRSxPQUFPLEVBQy9CLFlBQVksRUFBRSxVQUFVLEVBQ3hCLHVCQUF1QixFQUFFLFVBQVUsRUFDbkMsY0FBYyxFQUFFLEtBQUssQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUMxQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLE1BQU0sS0FBSyxPQUFPLENBQUMsSUFBSSxDQUFDLGlCQStFckQifQ==
|
package/dest/cli/util.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/cli/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/cli/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAG5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAE,KAAK,gBAAgB,EAAqB,MAAM,0BAA0B,CAAC;AAEpF,0BAAkB,QAAQ;IACxB,OAAO,IAAI;IACX,KAAK,IAAI;IACT,cAAc,KAAK;IACnB,eAAe,KAAK;IAEpB,MAAM,MAAM;IACZ,MAAM,MAAM;IACZ,OAAO,MAAM;IACb,OAAO,MAAM;CACd;AAGD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAgB1G;AAED,wBAAgB,cAAc,IAAI,OAAO,CAExC;AAED,eAAO,MAAM,qBAAqB,kEAajC,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,sBAAsB,EAAE;IACtB;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;IACxB;;OAEG;IACH,SAAS,EAAE,EAAE,CAAC;CACf,EAAE,EACH,MAAM,EAAE,UAAU,qBAyBnB;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAiB/F;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAKR;AAiCD,eAAO,MAAM,UAAU,qDAStB,CAAC;AAEF,eAAO,MAAM,uBAAuB,cAyBnC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,0EASpC,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,GAAI,CAAC,wFAkCvC,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC9C,EAAE,UAAU,EAAE,EAAE,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,EACnD,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,IAAI,CAAC,CAKf;AAED;;;;GAIG;AACH,wBAAsB,kCAAkC,CACtD,EAAE,UAAU,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,EAChD,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,IAAI,CAAC,CAKf;AAED,wBAAsB,kBAAkB,CACtC,cAAc,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAC9C,eAAe,EAAE,GAAG,EACpB,sBAAsB,EAAE,OAAO,EAC/B,YAAY,EAAE,UAAU,EACxB,uBAAuB,EAAE,UAAU,EACnC,cAAc,EAAE,KAAK,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAC1C,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,iBA+ErD"}
|
package/dest/cli/util.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { createLogger } from '@aztec/foundation/log';
|
|
2
|
-
import {
|
|
3
|
-
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
2
|
+
import { getTelemetryClient } from '@aztec/telemetry-client/start';
|
|
4
3
|
import chalk from 'chalk';
|
|
5
4
|
import { aztecStartOptions } from './aztec_start_options.js';
|
|
6
5
|
export var ExitCode = /*#__PURE__*/ function(ExitCode) {
|
|
@@ -238,6 +237,7 @@ export const printAztecStartHelpText = ()=>{
|
|
|
238
237
|
}
|
|
239
238
|
export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, followsCanonicalRollup, publicClient, registryContractAddress, signalHandlers, updateNodeConfig) {
|
|
240
239
|
const logger = createLogger('update-check');
|
|
240
|
+
const { UpdateChecker } = await import('@aztec/stdlib/update-checker');
|
|
241
241
|
const checker = await UpdateChecker.new({
|
|
242
242
|
baseURL: updatesLocation,
|
|
243
243
|
publicClient,
|
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
#!/usr/bin/env -S node --no-warnings
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { AztecNodeService } from '@aztec/aztec-node';
|
|
3
|
+
import { type AztecNodeConfig } from '@aztec/aztec-node/config';
|
|
4
|
+
import { Fr } from '@aztec/aztec.js/fields';
|
|
4
5
|
import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
6
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
7
|
+
import type { LogFn } from '@aztec/foundation/log';
|
|
7
8
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
8
9
|
import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
|
|
9
10
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
10
|
-
import { type
|
|
11
|
+
import { type Hex } from 'viem';
|
|
11
12
|
/**
|
|
12
13
|
* Function to deploy our L1 contracts to the local network L1
|
|
13
14
|
* @param aztecNodeConfig - The Aztec Node Config
|
|
14
15
|
* @param hdAccount - Account for publishing L1 contracts
|
|
15
16
|
*/
|
|
16
|
-
export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig,
|
|
17
|
+
export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, privateKey: Hex, opts?: {
|
|
17
18
|
assumeProvenThroughBlockNumber?: number;
|
|
18
|
-
salt?: number;
|
|
19
19
|
genesisArchiveRoot?: Fr;
|
|
20
20
|
feeJuicePortalInitialBalance?: bigint;
|
|
21
21
|
}): Promise<{
|
|
@@ -46,8 +46,6 @@ export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hd
|
|
|
46
46
|
export type LocalNetworkConfig = AztecNodeConfig & {
|
|
47
47
|
/** Mnemonic used to derive the L1 deployer private key.*/
|
|
48
48
|
l1Mnemonic: string;
|
|
49
|
-
/** Salt used to deploy L1 contracts.*/
|
|
50
|
-
deployAztecContractsSalt: string;
|
|
51
49
|
/** Whether to deploy test accounts on local network start.*/
|
|
52
50
|
testAccounts: boolean;
|
|
53
51
|
};
|
|
@@ -71,4 +69,4 @@ export declare function createAztecNode(config?: Partial<AztecNodeConfig>, deps?
|
|
|
71
69
|
}, options?: {
|
|
72
70
|
prefilledPublicData?: PublicDataTreeLeaf[];
|
|
73
71
|
}): Promise<AztecNodeService>;
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFvQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsS0FBSyx1QkFBdUIsRUFBd0IsTUFBTSx5QkFBeUIsQ0FBQztBQVM3RixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFlBQVksRUFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUd6RSxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzlELE9BQU8sRUFDTCxLQUFLLGVBQWUsRUFHckIsTUFBTSx5QkFBeUIsQ0FBQztBQUlqQyxPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQTJELE1BQU0sTUFBTSxDQUFDO0FBY3pGOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQ3ZDLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLFVBQVUsRUFBRSxHQUFHLEVBQ2YsSUFBSSxHQUFFO0lBQ0osOEJBQThCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDeEMsa0JBQWtCLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDeEIsNEJBQTRCLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDbEM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JQO0FBRUQsOEJBQThCO0FBQzlCLE1BQU0sTUFBTSxrQkFBa0IsR0FBRyxlQUFlLEdBQUc7SUFDakQsMERBQTBEO0lBQzFELFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsNkRBQTZEO0lBQzdELFlBQVksRUFBRSxPQUFPLENBQUM7Q0FDdkIsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCx3QkFBc0Isa0JBQWtCLENBQUMsTUFBTSx5Q0FBa0MsRUFBRSxPQUFPLEVBQUUsS0FBSzs7O0dBbUhoRztBQUVEOzs7R0FHRztBQUNILHdCQUFzQixlQUFlLENBQ25DLE1BQU0sR0FBRSxPQUFPLENBQUMsZUFBZSxDQUFNLEVBQ3JDLElBQUksR0FBRTtJQUFFLFNBQVMsQ0FBQyxFQUFFLGVBQWUsQ0FBQztJQUFDLGNBQWMsQ0FBQyxFQUFFLHVCQUF1QixDQUFDO0lBQUMsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFBO0NBQU8sRUFDakgsT0FBTyxHQUFFO0lBQUUsbUJBQW1CLENBQUMsRUFBRSxrQkFBa0IsRUFBRSxDQUFBO0NBQU8sNkJBVzdEIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,
|
|
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,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAS7F,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;;;GAmHhG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,cAAc,CAAC,EAAE,uBAAuB,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,CAAA;CAAO,EACjH,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D"}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
#!/usr/bin/env -S node --no-warnings
|
|
2
|
-
import { getInitialTestAccountsData } from '@aztec/accounts/testing';
|
|
3
|
-
import { AztecNodeService
|
|
4
|
-
import {
|
|
2
|
+
import { getInitialTestAccountsData } from '@aztec/accounts/testing/lazy';
|
|
3
|
+
import { AztecNodeService } from '@aztec/aztec-node';
|
|
4
|
+
import { getConfigEnvVars } from '@aztec/aztec-node/config';
|
|
5
|
+
import { Fr } from '@aztec/aztec.js/fields';
|
|
6
|
+
import { createLogger } from '@aztec/aztec.js/log';
|
|
5
7
|
import { createBlobSinkClient } from '@aztec/blob-sink/client';
|
|
6
8
|
import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
|
|
7
9
|
import { createEthereumChain } from '@aztec/ethereum/chain';
|
|
8
10
|
import { waitForPublicClient } from '@aztec/ethereum/client';
|
|
9
11
|
import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
|
|
10
12
|
import { NULL_KEY } from '@aztec/ethereum/constants';
|
|
11
|
-
import {
|
|
12
|
-
import { deployL1Contracts } from '@aztec/ethereum/deploy-l1-contracts';
|
|
13
|
+
import { deployAztecL1Contracts } from '@aztec/ethereum/deploy-aztec-l1-contracts';
|
|
13
14
|
import { EthCheatCodes } from '@aztec/ethereum/test';
|
|
14
15
|
import { SecretValue } from '@aztec/foundation/config';
|
|
15
|
-
import {
|
|
16
|
-
import { createLogger } from '@aztec/foundation/log';
|
|
16
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
17
17
|
import { TestDateProvider } from '@aztec/foundation/timer';
|
|
18
18
|
import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
|
|
19
19
|
import { protocolContractsHash } from '@aztec/protocol-contracts';
|
|
@@ -34,24 +34,19 @@ const localAnvil = foundry;
|
|
|
34
34
|
* Function to deploy our L1 contracts to the local network L1
|
|
35
35
|
* @param aztecNodeConfig - The Aztec Node Config
|
|
36
36
|
* @param hdAccount - Account for publishing L1 contracts
|
|
37
|
-
*/ export async function deployContractsToL1(aztecNodeConfig,
|
|
38
|
-
const chain = aztecNodeConfig.l1RpcUrls.length > 0 ? createEthereumChain(aztecNodeConfig.l1RpcUrls, aztecNodeConfig.l1ChainId) : {
|
|
39
|
-
chainInfo: localAnvil
|
|
40
|
-
};
|
|
37
|
+
*/ export async function deployContractsToL1(aztecNodeConfig, privateKey, opts = {}) {
|
|
41
38
|
await waitForPublicClient(aztecNodeConfig);
|
|
42
|
-
const l1Contracts = await
|
|
39
|
+
const l1Contracts = await deployAztecL1Contracts(aztecNodeConfig.l1RpcUrls[0], privateKey, foundry.id, {
|
|
43
40
|
...getL1ContractsConfigEnvVars(),
|
|
44
41
|
...aztecNodeConfig,
|
|
45
42
|
vkTreeRoot: getVKTreeRoot(),
|
|
46
43
|
protocolContractsHash,
|
|
47
44
|
genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
|
|
48
|
-
salt: opts.salt,
|
|
49
45
|
feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
|
|
50
46
|
aztecTargetCommitteeSize: 0,
|
|
51
47
|
slasherFlavor: 'none',
|
|
52
48
|
realVerifier: false
|
|
53
49
|
});
|
|
54
|
-
await deployMulticall3(l1Contracts.l1Client, logger);
|
|
55
50
|
aztecNodeConfig.l1Contracts = l1Contracts.l1ContractAddresses;
|
|
56
51
|
aztecNodeConfig.rollupVersion = l1Contracts.rollupVersion;
|
|
57
52
|
return aztecNodeConfig.l1Contracts;
|
|
@@ -109,10 +104,9 @@ const localAnvil = foundry;
|
|
|
109
104
|
let watcher = undefined;
|
|
110
105
|
const dateProvider = new TestDateProvider();
|
|
111
106
|
if (!aztecNodeConfig.p2pEnabled) {
|
|
112
|
-
const l1ContractAddresses = await deployContractsToL1(aztecNodeConfig,
|
|
107
|
+
const l1ContractAddresses = await deployContractsToL1(aztecNodeConfig, aztecNodeConfig.validatorPrivateKeys.getValue()[0], {
|
|
113
108
|
assumeProvenThroughBlockNumber: Number.MAX_SAFE_INTEGER,
|
|
114
109
|
genesisArchiveRoot,
|
|
115
|
-
salt: config.deployAztecContractsSalt ? parseInt(config.deployAztecContractsSalt) : undefined,
|
|
116
110
|
feeJuicePortalInitialBalance: fundingNeeded
|
|
117
111
|
});
|
|
118
112
|
const chain = aztecNodeConfig.l1RpcUrls.length > 0 ? createEthereumChain([
|
|
@@ -132,7 +126,7 @@ const localAnvil = foundry;
|
|
|
132
126
|
watcher.setisLocalNetwork(true);
|
|
133
127
|
await watcher.start();
|
|
134
128
|
}
|
|
135
|
-
const telemetry = initTelemetryClient(getTelemetryClientConfig());
|
|
129
|
+
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
136
130
|
// Create a local blob sink client inside the local network, no http connectivity
|
|
137
131
|
const blobSinkClient = createBlobSinkClient();
|
|
138
132
|
const node = await createAztecNode(aztecNodeConfig, {
|
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.20251213",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -28,37 +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-sink": "3.0.0-nightly.
|
|
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/
|
|
58
|
-
"@aztec/
|
|
59
|
-
"@aztec/
|
|
60
|
-
"@aztec/
|
|
61
|
-
"@aztec/
|
|
31
|
+
"@aztec/accounts": "3.0.0-nightly.20251213",
|
|
32
|
+
"@aztec/archiver": "3.0.0-nightly.20251213",
|
|
33
|
+
"@aztec/aztec-faucet": "3.0.0-nightly.20251213",
|
|
34
|
+
"@aztec/aztec-node": "3.0.0-nightly.20251213",
|
|
35
|
+
"@aztec/aztec.js": "3.0.0-nightly.20251213",
|
|
36
|
+
"@aztec/bb-prover": "3.0.0-nightly.20251213",
|
|
37
|
+
"@aztec/bb.js": "3.0.0-nightly.20251213",
|
|
38
|
+
"@aztec/blob-sink": "3.0.0-nightly.20251213",
|
|
39
|
+
"@aztec/bot": "3.0.0-nightly.20251213",
|
|
40
|
+
"@aztec/builder": "3.0.0-nightly.20251213",
|
|
41
|
+
"@aztec/cli": "3.0.0-nightly.20251213",
|
|
42
|
+
"@aztec/constants": "3.0.0-nightly.20251213",
|
|
43
|
+
"@aztec/entrypoints": "3.0.0-nightly.20251213",
|
|
44
|
+
"@aztec/ethereum": "3.0.0-nightly.20251213",
|
|
45
|
+
"@aztec/foundation": "3.0.0-nightly.20251213",
|
|
46
|
+
"@aztec/kv-store": "3.0.0-nightly.20251213",
|
|
47
|
+
"@aztec/l1-artifacts": "3.0.0-nightly.20251213",
|
|
48
|
+
"@aztec/node-lib": "3.0.0-nightly.20251213",
|
|
49
|
+
"@aztec/noir-contracts.js": "3.0.0-nightly.20251213",
|
|
50
|
+
"@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251213",
|
|
51
|
+
"@aztec/p2p": "3.0.0-nightly.20251213",
|
|
52
|
+
"@aztec/p2p-bootstrap": "3.0.0-nightly.20251213",
|
|
53
|
+
"@aztec/protocol-contracts": "3.0.0-nightly.20251213",
|
|
54
|
+
"@aztec/prover-client": "3.0.0-nightly.20251213",
|
|
55
|
+
"@aztec/prover-node": "3.0.0-nightly.20251213",
|
|
56
|
+
"@aztec/pxe": "3.0.0-nightly.20251213",
|
|
57
|
+
"@aztec/sequencer-client": "3.0.0-nightly.20251213",
|
|
58
|
+
"@aztec/stdlib": "3.0.0-nightly.20251213",
|
|
59
|
+
"@aztec/telemetry-client": "3.0.0-nightly.20251213",
|
|
60
|
+
"@aztec/test-wallet": "3.0.0-nightly.20251213",
|
|
61
|
+
"@aztec/txe": "3.0.0-nightly.20251213",
|
|
62
|
+
"@aztec/world-state": "3.0.0-nightly.20251213",
|
|
62
63
|
"@types/chalk": "^2.2.0",
|
|
63
64
|
"abitype": "^0.8.11",
|
|
64
65
|
"chalk": "^5.3.0",
|
package/src/bin/index.ts
CHANGED
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
//
|
|
3
3
|
import { injectCommands as injectBuilderCommands } from '@aztec/builder';
|
|
4
4
|
import { injectCommands as injectAztecNodeCommands } from '@aztec/cli/aztec_node';
|
|
5
|
-
import { enrichEnvironmentWithChainName
|
|
5
|
+
import { enrichEnvironmentWithChainName } from '@aztec/cli/config/chain';
|
|
6
|
+
import { enrichEnvironmentWithNetworkConfig } from '@aztec/cli/config/network';
|
|
6
7
|
import { injectCommands as injectContractCommands } from '@aztec/cli/contracts';
|
|
7
8
|
import { injectCommands as injectInfrastructureCommands } from '@aztec/cli/infrastructure';
|
|
8
9
|
import { injectCommands as injectL1Commands } from '@aztec/cli/l1';
|
|
@@ -13,10 +14,11 @@ import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
|
|
|
13
14
|
|
|
14
15
|
import { Command } from 'commander';
|
|
15
16
|
|
|
16
|
-
import { NETWORK_FLAG } from '../cli/aztec_start_options.js';
|
|
17
17
|
import { injectAztecCommands } from '../cli/index.js';
|
|
18
18
|
import { getCliVersion } from '../cli/release_version.js';
|
|
19
19
|
|
|
20
|
+
const NETWORK_FLAG = 'network';
|
|
21
|
+
|
|
20
22
|
const userLog = createConsoleLogger();
|
|
21
23
|
const debugLogger = createLogger('cli');
|
|
22
24
|
|
|
@@ -33,7 +33,6 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
|
|
|
33
33
|
{
|
|
34
34
|
l1Mnemonic: localNetwork.l1Mnemonic,
|
|
35
35
|
l1RpcUrls: options.l1RpcUrls,
|
|
36
|
-
deployAztecContractsSalt: localNetwork.deployAztecContractsSalt,
|
|
37
36
|
testAccounts: localNetwork.testAccounts,
|
|
38
37
|
realProofs: false,
|
|
39
38
|
},
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
|
|
2
|
-
import {
|
|
3
|
-
import { blobSinkConfigMappings } from '@aztec/blob-sink/server';
|
|
2
|
+
import { blobSinkConfigMappings } from '@aztec/blob-sink/server/config';
|
|
4
3
|
import { botConfigMappings } from '@aztec/bot/config';
|
|
5
4
|
import { l1ContractsConfigMappings } from '@aztec/ethereum/config';
|
|
6
5
|
import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
|
|
@@ -16,12 +15,13 @@ import {
|
|
|
16
15
|
import { dataConfigMappings } from '@aztec/kv-store/config';
|
|
17
16
|
import { sharedNodeConfigMappings } from '@aztec/node-lib/config';
|
|
18
17
|
import { bootnodeConfigMappings, p2pConfigMappings } from '@aztec/p2p/config';
|
|
19
|
-
import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/prover-client/broker';
|
|
18
|
+
import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/prover-client/broker/config';
|
|
20
19
|
import { proverNodeConfigMappings } from '@aztec/prover-node/config';
|
|
21
20
|
import { allPxeConfigMappings } from '@aztec/pxe/config';
|
|
21
|
+
import { sequencerClientConfigMappings } from '@aztec/sequencer-client/config';
|
|
22
22
|
import { chainConfigMappings } from '@aztec/stdlib/config';
|
|
23
|
-
import { telemetryClientConfigMappings } from '@aztec/telemetry-client';
|
|
24
|
-
import { worldStateConfigMappings } from '@aztec/world-state';
|
|
23
|
+
import { telemetryClientConfigMappings } from '@aztec/telemetry-client/config';
|
|
24
|
+
import { worldStateConfigMappings } from '@aztec/world-state/config';
|
|
25
25
|
|
|
26
26
|
import { DefaultMnemonic } from '../mnemonic.js';
|
|
27
27
|
|
|
@@ -126,14 +126,6 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
126
126
|
defaultValue: DefaultMnemonic,
|
|
127
127
|
env: 'MNEMONIC',
|
|
128
128
|
},
|
|
129
|
-
{
|
|
130
|
-
flag: '--local-network.deployAztecContractsSalt <value>',
|
|
131
|
-
description:
|
|
132
|
-
'Numeric salt for deploying L1 Aztec contracts before starting the local network. Needs mnemonic or private key to be set.',
|
|
133
|
-
env: 'DEPLOY_AZTEC_CONTRACTS_SALT',
|
|
134
|
-
defaultValue: undefined,
|
|
135
|
-
parseVal: (val: string) => (val ? parseInt(val) : undefined),
|
|
136
|
-
},
|
|
137
129
|
],
|
|
138
130
|
API: [
|
|
139
131
|
{
|
|
@@ -51,7 +51,7 @@ export async function startArchiver(
|
|
|
51
51
|
const store = await createStore('archiver', KVArchiverDataStore.SCHEMA_VERSION, archiverConfig, storeLog);
|
|
52
52
|
const archiverStore = new KVArchiverDataStore(store, archiverConfig.maxLogs);
|
|
53
53
|
|
|
54
|
-
const telemetry = initTelemetryClient(getTelemetryClientConfig());
|
|
54
|
+
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
55
55
|
const blobSinkClient = createBlobSinkClient(archiverConfig, { logger: createLogger('archiver:blob-sink:client') });
|
|
56
56
|
const archiver = await Archiver.createAndSync(archiverConfig, archiverStore, { telemetry, blobSinkClient }, true);
|
|
57
57
|
services.archiver = [archiver, ArchiverApiSchema];
|
|
@@ -35,7 +35,7 @@ export async function startBlobSink(options: any, signalHandlers: (() => Promise
|
|
|
35
35
|
throw new Error('L1_CHAIN_ID');
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
-
const telemetry = initTelemetryClient(getTelemetryClientConfig());
|
|
38
|
+
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
39
39
|
|
|
40
40
|
const { config: chainConfig, addresses } = await getL1Config(
|
|
41
41
|
blobSinkConfig.l1Contracts.registryAddress,
|
|
@@ -40,7 +40,7 @@ export async function startBot(
|
|
|
40
40
|
const pxeConfig = extractRelevantOptions<PXEConfig & CliPXEOptions>(options, allPxeConfigMappings, 'pxe');
|
|
41
41
|
const wallet = await TestWallet.create(aztecNode, pxeConfig);
|
|
42
42
|
|
|
43
|
-
const telemetry = initTelemetryClient(getTelemetryClientConfig());
|
|
43
|
+
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
44
44
|
await addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, undefined);
|
|
45
45
|
}
|
|
46
46
|
|
|
@@ -117,7 +117,7 @@ export async function startNode(
|
|
|
117
117
|
}
|
|
118
118
|
|
|
119
119
|
const telemetryConfig = extractRelevantOptions<TelemetryClientConfig>(options, telemetryClientConfigMappings, 'tel');
|
|
120
|
-
const telemetry = initTelemetryClient(telemetryConfig);
|
|
120
|
+
const telemetry = await initTelemetryClient(telemetryConfig);
|
|
121
121
|
|
|
122
122
|
// Create and start Aztec Node
|
|
123
123
|
const node = await createAztecNode(nodeConfig, { telemetry }, { prefilledPublicData });
|
|
@@ -25,7 +25,7 @@ export async function startP2PBootstrap(
|
|
|
25
25
|
userLog(`Starting P2P bootstrap node with config: ${jsonStringify(safeConfig)}`);
|
|
26
26
|
|
|
27
27
|
const telemetryConfig = extractRelevantOptions<TelemetryClientConfig>(options, telemetryClientConfigMappings, 'tel');
|
|
28
|
-
const telemetryClient = initTelemetryClient(telemetryConfig);
|
|
28
|
+
const telemetryClient = await initTelemetryClient(telemetryConfig);
|
|
29
29
|
|
|
30
30
|
const store = await createStore('p2p-bootstrap', 1, config, createLogger('p2p:bootstrap:store'));
|
|
31
31
|
const node = new BootstrapNode(store, telemetryClient);
|
|
@@ -53,7 +53,7 @@ export async function startProverAgent(
|
|
|
53
53
|
);
|
|
54
54
|
const broker = createProvingJobBrokerClient(config.proverBrokerUrl, getVersions(), fetch);
|
|
55
55
|
|
|
56
|
-
const telemetry = initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
|
|
56
|
+
const telemetry = await initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
|
|
57
57
|
const prover = await buildServerCircuitProver(config, telemetry);
|
|
58
58
|
const proofStore = new InlineProofStore();
|
|
59
59
|
const agents = times(
|
|
@@ -45,7 +45,7 @@ export async function startProverBroker(
|
|
|
45
45
|
config.l1Contracts = addresses;
|
|
46
46
|
config.rollupVersion = rollupConfig.rollupVersion;
|
|
47
47
|
|
|
48
|
-
const client = initTelemetryClient(getTelemetryClientConfig());
|
|
48
|
+
const client = await initTelemetryClient(getTelemetryClientConfig());
|
|
49
49
|
const broker = await createAndStartProvingBroker(config, client);
|
|
50
50
|
|
|
51
51
|
if (options.autoUpdate !== 'disabled' && options.autoUpdateUrl) {
|
|
@@ -67,7 +67,7 @@ export async function startProverNode(
|
|
|
67
67
|
);
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
const telemetry = initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
|
|
70
|
+
const telemetry = await initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
|
|
71
71
|
|
|
72
72
|
let broker: ProvingJobBroker;
|
|
73
73
|
if (proverConfig.proverBrokerUrl) {
|
package/src/cli/util.ts
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
import type { AztecNodeConfig } from '@aztec/aztec-node';
|
|
2
|
-
import {
|
|
3
|
-
import { Fr } from '@aztec/aztec.js/fields';
|
|
4
|
-
import { AccountManager } from '@aztec/aztec.js/wallet';
|
|
2
|
+
import type { AccountManager } from '@aztec/aztec.js/wallet';
|
|
5
3
|
import type { ViemClient } from '@aztec/ethereum/types';
|
|
6
4
|
import type { ConfigMappingsType } from '@aztec/foundation/config';
|
|
5
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
6
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
7
7
|
import { type LogFn, createLogger } from '@aztec/foundation/log';
|
|
8
8
|
import type { SharedNodeConfig } from '@aztec/node-lib/config';
|
|
9
9
|
import type { ProverConfig } from '@aztec/stdlib/interfaces/server';
|
|
10
|
-
import {
|
|
11
|
-
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
10
|
+
import { getTelemetryClient } from '@aztec/telemetry-client/start';
|
|
12
11
|
import type { TestWallet } from '@aztec/test-wallet/server';
|
|
13
12
|
|
|
14
13
|
import chalk from 'chalk';
|
|
@@ -312,6 +311,7 @@ export async function setupUpdateMonitor(
|
|
|
312
311
|
updateNodeConfig?: (config: object) => Promise<void>,
|
|
313
312
|
) {
|
|
314
313
|
const logger = createLogger('update-check');
|
|
314
|
+
const { UpdateChecker } = await import('@aztec/stdlib/update-checker');
|
|
315
315
|
const checker = await UpdateChecker.new({
|
|
316
316
|
baseURL: updatesLocation,
|
|
317
317
|
publicClient,
|
|
@@ -1,19 +1,20 @@
|
|
|
1
1
|
#!/usr/bin/env -S node --no-warnings
|
|
2
|
-
import { getInitialTestAccountsData } from '@aztec/accounts/testing';
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
2
|
+
import { getInitialTestAccountsData } from '@aztec/accounts/testing/lazy';
|
|
3
|
+
import { AztecNodeService } from '@aztec/aztec-node';
|
|
4
|
+
import { type AztecNodeConfig, getConfigEnvVars } from '@aztec/aztec-node/config';
|
|
5
|
+
import { Fr } from '@aztec/aztec.js/fields';
|
|
6
|
+
import { createLogger } from '@aztec/aztec.js/log';
|
|
5
7
|
import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client';
|
|
6
8
|
import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
|
|
7
9
|
import { createEthereumChain } from '@aztec/ethereum/chain';
|
|
8
10
|
import { waitForPublicClient } from '@aztec/ethereum/client';
|
|
9
11
|
import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
|
|
10
12
|
import { NULL_KEY } from '@aztec/ethereum/constants';
|
|
11
|
-
import {
|
|
12
|
-
import { deployL1Contracts } from '@aztec/ethereum/deploy-l1-contracts';
|
|
13
|
+
import { deployAztecL1Contracts } from '@aztec/ethereum/deploy-aztec-l1-contracts';
|
|
13
14
|
import { EthCheatCodes } from '@aztec/ethereum/test';
|
|
14
15
|
import { SecretValue } from '@aztec/foundation/config';
|
|
15
|
-
import {
|
|
16
|
-
import {
|
|
16
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
17
|
+
import type { LogFn } from '@aztec/foundation/log';
|
|
17
18
|
import { DateProvider, TestDateProvider } from '@aztec/foundation/timer';
|
|
18
19
|
import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
|
|
19
20
|
import { protocolContractsHash } from '@aztec/protocol-contracts';
|
|
@@ -26,7 +27,7 @@ import {
|
|
|
26
27
|
import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
|
|
27
28
|
import { getGenesisValues } from '@aztec/world-state/testing';
|
|
28
29
|
|
|
29
|
-
import { type
|
|
30
|
+
import { type Hex, createPublicClient, fallback, http as httpViemTransport } from 'viem';
|
|
30
31
|
import { mnemonicToAccount, privateKeyToAddress } from 'viem/accounts';
|
|
31
32
|
import { foundry } from 'viem/chains';
|
|
32
33
|
|
|
@@ -47,42 +48,26 @@ const localAnvil = foundry;
|
|
|
47
48
|
*/
|
|
48
49
|
export async function deployContractsToL1(
|
|
49
50
|
aztecNodeConfig: AztecNodeConfig,
|
|
50
|
-
|
|
51
|
-
contractDeployLogger = logger,
|
|
51
|
+
privateKey: Hex,
|
|
52
52
|
opts: {
|
|
53
53
|
assumeProvenThroughBlockNumber?: number;
|
|
54
|
-
salt?: number;
|
|
55
54
|
genesisArchiveRoot?: Fr;
|
|
56
55
|
feeJuicePortalInitialBalance?: bigint;
|
|
57
56
|
} = {},
|
|
58
57
|
) {
|
|
59
|
-
const chain =
|
|
60
|
-
aztecNodeConfig.l1RpcUrls.length > 0
|
|
61
|
-
? createEthereumChain(aztecNodeConfig.l1RpcUrls, aztecNodeConfig.l1ChainId)
|
|
62
|
-
: { chainInfo: localAnvil };
|
|
63
|
-
|
|
64
58
|
await waitForPublicClient(aztecNodeConfig);
|
|
65
59
|
|
|
66
|
-
const l1Contracts = await
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
salt: opts.salt,
|
|
78
|
-
feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
|
|
79
|
-
aztecTargetCommitteeSize: 0, // no committee in local network
|
|
80
|
-
slasherFlavor: 'none', // no slashing in local network
|
|
81
|
-
realVerifier: false,
|
|
82
|
-
},
|
|
83
|
-
);
|
|
84
|
-
|
|
85
|
-
await deployMulticall3(l1Contracts.l1Client, logger);
|
|
60
|
+
const l1Contracts = await deployAztecL1Contracts(aztecNodeConfig.l1RpcUrls[0], privateKey, foundry.id, {
|
|
61
|
+
...getL1ContractsConfigEnvVars(), // TODO: We should not need to be loading config from env again, caller should handle this
|
|
62
|
+
...aztecNodeConfig,
|
|
63
|
+
vkTreeRoot: getVKTreeRoot(),
|
|
64
|
+
protocolContractsHash,
|
|
65
|
+
genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
|
|
66
|
+
feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
|
|
67
|
+
aztecTargetCommitteeSize: 0, // no committee in local network
|
|
68
|
+
slasherFlavor: 'none', // no slashing in local network
|
|
69
|
+
realVerifier: false,
|
|
70
|
+
});
|
|
86
71
|
|
|
87
72
|
aztecNodeConfig.l1Contracts = l1Contracts.l1ContractAddresses;
|
|
88
73
|
aztecNodeConfig.rollupVersion = l1Contracts.rollupVersion;
|
|
@@ -94,8 +79,6 @@ export async function deployContractsToL1(
|
|
|
94
79
|
export type LocalNetworkConfig = AztecNodeConfig & {
|
|
95
80
|
/** Mnemonic used to derive the L1 deployer private key.*/
|
|
96
81
|
l1Mnemonic: string;
|
|
97
|
-
/** Salt used to deploy L1 contracts.*/
|
|
98
|
-
deployAztecContractsSalt: string;
|
|
99
82
|
/** Whether to deploy test accounts on local network start.*/
|
|
100
83
|
testAccounts: boolean;
|
|
101
84
|
};
|
|
@@ -154,12 +137,15 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
|
|
|
154
137
|
let watcher: AnvilTestWatcher | undefined = undefined;
|
|
155
138
|
const dateProvider = new TestDateProvider();
|
|
156
139
|
if (!aztecNodeConfig.p2pEnabled) {
|
|
157
|
-
const l1ContractAddresses = await deployContractsToL1(
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
140
|
+
const l1ContractAddresses = await deployContractsToL1(
|
|
141
|
+
aztecNodeConfig,
|
|
142
|
+
aztecNodeConfig.validatorPrivateKeys.getValue()[0],
|
|
143
|
+
{
|
|
144
|
+
assumeProvenThroughBlockNumber: Number.MAX_SAFE_INTEGER,
|
|
145
|
+
genesisArchiveRoot,
|
|
146
|
+
feeJuicePortalInitialBalance: fundingNeeded,
|
|
147
|
+
},
|
|
148
|
+
);
|
|
163
149
|
|
|
164
150
|
const chain =
|
|
165
151
|
aztecNodeConfig.l1RpcUrls.length > 0
|
|
@@ -181,7 +167,7 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
|
|
|
181
167
|
await watcher.start();
|
|
182
168
|
}
|
|
183
169
|
|
|
184
|
-
const telemetry = initTelemetryClient(getTelemetryClientConfig());
|
|
170
|
+
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
185
171
|
// Create a local blob sink client inside the local network, no http connectivity
|
|
186
172
|
const blobSinkClient = createBlobSinkClient();
|
|
187
173
|
const node = await createAztecNode(
|