@aztec-labs/aztec 6.0.0-rc.1 → 6.0.0-rc.2
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/cmds/start_bot.js +5 -3
- package/dest/cli/cmds/start_prover_agent.js +1 -1
- package/dest/local-network/local-network.d.ts +1 -1
- package/dest/local-network/local-network.d.ts.map +1 -1
- package/dest/local-network/local-network.js +3 -0
- package/package.json +30 -30
- package/src/cli/cmds/start_bot.ts +3 -3
- package/src/cli/cmds/start_prover_agent.ts +1 -1
- package/src/local-network/local-network.ts +3 -0
|
@@ -5,7 +5,7 @@ import { createAztecNodeClient } from '@aztec-labs/stdlib/interfaces/client';
|
|
|
5
5
|
import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient, makeTracedFetch } from '@aztec-labs/telemetry-client';
|
|
6
6
|
import { EmbeddedWallet } from '@aztec-labs/wallets/embedded';
|
|
7
7
|
import { join } from 'node:path';
|
|
8
|
-
import { extractRelevantOptions
|
|
8
|
+
import { extractRelevantOptions } from '../util.js';
|
|
9
9
|
import { getVersions } from '../versioning.js';
|
|
10
10
|
export async function startBot(options, signalHandlers, services, userLog) {
|
|
11
11
|
const { proverNode, sequencer, p2pBootstrap, txe, prover } = options;
|
|
@@ -27,7 +27,7 @@ export async function startBot(options, signalHandlers, services, userLog) {
|
|
|
27
27
|
fetch
|
|
28
28
|
});
|
|
29
29
|
const pxeConfig = extractRelevantOptions(options, allPxeConfigMappings, 'pxe');
|
|
30
|
-
userLog(
|
|
30
|
+
userLog('Creating bot wallet');
|
|
31
31
|
const wallet = await EmbeddedWallet.create(aztecNode, {
|
|
32
32
|
pxeConfig
|
|
33
33
|
});
|
|
@@ -36,7 +36,9 @@ export async function startBot(options, signalHandlers, services, userLog) {
|
|
|
36
36
|
}
|
|
37
37
|
export async function addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, aztecNodeAdmin, userLog) {
|
|
38
38
|
const config = extractRelevantOptions(options, botConfigMappings, 'bot');
|
|
39
|
-
userLog?.(
|
|
39
|
+
userLog?.('Starting bot', {
|
|
40
|
+
botMode: config.botMode
|
|
41
|
+
});
|
|
40
42
|
// The bot wallet's embedded PXE syncs to this tip (see start_bot.ts/start_node.ts which build the wallet from the
|
|
41
43
|
// same options). L1-to-L2 readiness checks must be evaluated at this tip rather than at 'latest', or the bot can
|
|
42
44
|
// consider a message ready while the PXE simulation anchors to an older block that cannot prove its membership yet.
|
|
@@ -52,7 +52,7 @@ export async function startProverAgent(options, signalHandlers, services, userLo
|
|
|
52
52
|
}
|
|
53
53
|
await Promise.all(agents.map((agent)=>agent.start()));
|
|
54
54
|
signalHandlers.push(async ()=>{
|
|
55
|
-
await Promise.all(agents.map((agent)=>agent.
|
|
55
|
+
await Promise.all(agents.map((agent)=>agent.drain()));
|
|
56
56
|
await telemetry.stop();
|
|
57
57
|
});
|
|
58
58
|
}
|
|
@@ -48,4 +48,4 @@ export declare function createAztecNode(config?: Partial<AztecNodeConfig>, deps?
|
|
|
48
48
|
}, options?: {
|
|
49
49
|
genesis?: GenesisData;
|
|
50
50
|
}): Promise<import("@aztec-labs/aztec-node").AztecNodeService>;
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBR0EsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFvQixNQUFNLCtCQUErQixDQUFDO0FBQ3ZGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVqRCxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBb0IsTUFBTSxnQ0FBZ0MsQ0FBQztBQU01RixPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBR3RGLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ3hELE9BQU8sRUFBRSxZQUFZLEVBQW9CLE1BQU0sOEJBQThCLENBQUM7QUFJOUUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUU3RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNsRSxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBR3JCLE1BQU0sOEJBQThCLENBQUM7QUFJdEMsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBbUJoQzs7OztHQUlHO0FBQ0gsd0JBQXNCLG1CQUFtQixDQUN2QyxlQUFlLEVBQUUsZUFBZSxFQUNoQyxVQUFVLEVBQUUsR0FBRyxFQUNmLElBQUksR0FBRTtJQUNKLGtCQUFrQixDQUFDLEVBQUUsRUFBRSxDQUFDO0lBQ3hCLDRCQUE0QixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ2xDLEdBQ0wsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBbUI5QjtBQUVELDhCQUE4QjtBQUM5QixNQUFNLE1BQU0sa0JBQWtCLEdBQUcsZUFBZSxHQUFHO0lBQ2pELDBEQUEwRDtJQUMxRCxVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQ25CLDZEQUE2RDtJQUM3RCxZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLHlGQUF5RjtJQUN6RixzQkFBc0IsQ0FBQyxFQUFFLEVBQUUsQ0FBQztDQUM3QixDQUFDO0FBRUY7Ozs7R0FJRztBQUNILHdCQUFzQixrQkFBa0IsQ0FBQyxNQUFNLHlDQUFrQyxFQUFFLE9BQU8sRUFBRSxLQUFLOzs7R0FrSWhHO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLGVBQWUsQ0FDbkMsTUFBTSxHQUFFLE9BQU8sQ0FBQyxlQUFlLENBQU0sRUFDckMsSUFBSSxHQUFFO0lBQ0osU0FBUyxDQUFDLEVBQUUsZUFBZSxDQUFDO0lBQzVCLFVBQVUsQ0FBQyxFQUFFLG1CQUFtQixDQUFDO0lBQ2pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztJQUM1QixZQUFZLENBQUMsRUFBRSxnQkFBZ0IsQ0FBQztDQUM1QixFQUNOLE9BQU8sR0FBRTtJQUFFLE9BQU8sQ0FBQyxFQUFFLFdBQVcsQ0FBQTtDQUFPLDhEQWN4QyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AAEjD,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,gCAAgC,CAAC;AAM5F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AAGtF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAoB,MAAM,8BAA8B,CAAC;AAI9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAE7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,8BAA8B,CAAC;AAItC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAmBhC;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,GAAG,EACf,IAAI,GAAE;IACJ,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC,GACL,OAAO,CAAC,mBAAmB,CAAC,CAmB9B;AAED,8BAA8B;AAC9B,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG;IACjD,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,6DAA6D;IAC7D,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,sBAAsB,CAAC,EAAE,EAAE,CAAC;CAC7B,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,yCAAkC,EAAE,OAAO,EAAE,KAAK;;;
|
|
1
|
+
{"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AAEjD,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,gCAAgC,CAAC;AAM5F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AAGtF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAoB,MAAM,8BAA8B,CAAC;AAI9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAE7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,8BAA8B,CAAC;AAItC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAmBhC;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,GAAG,EACf,IAAI,GAAE;IACJ,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC,GACL,OAAO,CAAC,mBAAmB,CAAC,CAmB9B;AAED,8BAA8B;AAC9B,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG;IACjD,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,6DAA6D;IAC7D,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,sBAAsB,CAAC,EAAE,EAAE,CAAC;CAC7B,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,yCAAkC,EAAE,OAAO,EAAE,KAAK;;;GAkIhG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IACJ,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,YAAY,CAAC,EAAE,gBAAgB,CAAC;CAC5B,EACN,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,WAAW,CAAA;CAAO,8DAcxC"}
|
|
@@ -83,6 +83,9 @@ const setupWaitOpts = {
|
|
|
83
83
|
// local signing protection runs against an ephemeral store. That is acceptable for this dev
|
|
84
84
|
// network; production validators must persist it and fail-fast when the data directory is unset.
|
|
85
85
|
allowEphemeralSigningProtection: config.allowEphemeralSigningProtection ?? true,
|
|
86
|
+
// The local network runs one or two blocks per slot against an Inbox nobody is filling with a cap-sized
|
|
87
|
+
// backlog, which is below the catch-up floor a production sequencer refuses to start under.
|
|
88
|
+
allowUnsafeInboxCatchupCapacity: config.allowUnsafeInboxCatchupCapacity ?? true,
|
|
86
89
|
txPublicSetupAllowListExtend: [
|
|
87
90
|
...tokenAllowList,
|
|
88
91
|
...config.txPublicSetupAllowListExtend ?? []
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec-labs/aztec",
|
|
3
|
-
"version": "6.0.0-rc.
|
|
3
|
+
"version": "6.0.0-rc.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -28,35 +28,35 @@
|
|
|
28
28
|
"../package.common.json"
|
|
29
29
|
],
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@aztec-foundation/bb.js": "6.0.0-rc.
|
|
32
|
-
"@aztec-labs/accounts": "6.0.0-rc.
|
|
33
|
-
"@aztec-labs/archiver": "6.0.0-rc.
|
|
34
|
-
"@aztec-labs/aztec-node": "6.0.0-rc.
|
|
35
|
-
"@aztec-labs/aztec.js": "6.0.0-rc.
|
|
36
|
-
"@aztec-labs/blob-client": "6.0.0-rc.
|
|
37
|
-
"@aztec-labs/bot": "6.0.0-rc.
|
|
38
|
-
"@aztec-labs/builder": "6.0.0-rc.
|
|
39
|
-
"@aztec-labs/cli": "6.0.0-rc.
|
|
40
|
-
"@aztec-labs/constants": "6.0.0-rc.
|
|
41
|
-
"@aztec-labs/ethereum": "6.0.0-rc.
|
|
42
|
-
"@aztec-labs/foundation": "6.0.0-rc.
|
|
43
|
-
"@aztec-labs/kv-store": "6.0.0-rc.
|
|
44
|
-
"@aztec-labs/node-lib": "6.0.0-rc.
|
|
45
|
-
"@aztec-labs/noir-contracts.js": "6.0.0-rc.
|
|
46
|
-
"@aztec-labs/noir-protocol-circuits-types": "6.0.0-rc.
|
|
47
|
-
"@aztec-labs/p2p": "6.0.0-rc.
|
|
48
|
-
"@aztec-labs/protocol-contracts": "6.0.0-rc.
|
|
49
|
-
"@aztec-labs/prover-client": "6.0.0-rc.
|
|
50
|
-
"@aztec-labs/prover-node": "6.0.0-rc.
|
|
51
|
-
"@aztec-labs/pxe": "6.0.0-rc.
|
|
52
|
-
"@aztec-labs/sequencer-client": "6.0.0-rc.
|
|
53
|
-
"@aztec-labs/standard-contracts": "6.0.0-rc.
|
|
54
|
-
"@aztec-labs/stdlib": "6.0.0-rc.
|
|
55
|
-
"@aztec-labs/telemetry-client": "6.0.0-rc.
|
|
56
|
-
"@aztec-labs/txe": "6.0.0-rc.
|
|
57
|
-
"@aztec-labs/validator-ha-signer": "6.0.0-rc.
|
|
58
|
-
"@aztec-labs/wallets": "6.0.0-rc.
|
|
59
|
-
"@aztec-labs/world-state": "6.0.0-rc.
|
|
31
|
+
"@aztec-foundation/bb.js": "6.0.0-rc.5",
|
|
32
|
+
"@aztec-labs/accounts": "6.0.0-rc.2",
|
|
33
|
+
"@aztec-labs/archiver": "6.0.0-rc.2",
|
|
34
|
+
"@aztec-labs/aztec-node": "6.0.0-rc.2",
|
|
35
|
+
"@aztec-labs/aztec.js": "6.0.0-rc.2",
|
|
36
|
+
"@aztec-labs/blob-client": "6.0.0-rc.2",
|
|
37
|
+
"@aztec-labs/bot": "6.0.0-rc.2",
|
|
38
|
+
"@aztec-labs/builder": "6.0.0-rc.2",
|
|
39
|
+
"@aztec-labs/cli": "6.0.0-rc.2",
|
|
40
|
+
"@aztec-labs/constants": "6.0.0-rc.2",
|
|
41
|
+
"@aztec-labs/ethereum": "6.0.0-rc.2",
|
|
42
|
+
"@aztec-labs/foundation": "6.0.0-rc.2",
|
|
43
|
+
"@aztec-labs/kv-store": "6.0.0-rc.2",
|
|
44
|
+
"@aztec-labs/node-lib": "6.0.0-rc.2",
|
|
45
|
+
"@aztec-labs/noir-contracts.js": "6.0.0-rc.2",
|
|
46
|
+
"@aztec-labs/noir-protocol-circuits-types": "6.0.0-rc.2",
|
|
47
|
+
"@aztec-labs/p2p": "6.0.0-rc.2",
|
|
48
|
+
"@aztec-labs/protocol-contracts": "6.0.0-rc.2",
|
|
49
|
+
"@aztec-labs/prover-client": "6.0.0-rc.2",
|
|
50
|
+
"@aztec-labs/prover-node": "6.0.0-rc.2",
|
|
51
|
+
"@aztec-labs/pxe": "6.0.0-rc.2",
|
|
52
|
+
"@aztec-labs/sequencer-client": "6.0.0-rc.2",
|
|
53
|
+
"@aztec-labs/standard-contracts": "6.0.0-rc.2",
|
|
54
|
+
"@aztec-labs/stdlib": "6.0.0-rc.2",
|
|
55
|
+
"@aztec-labs/telemetry-client": "6.0.0-rc.2",
|
|
56
|
+
"@aztec-labs/txe": "6.0.0-rc.2",
|
|
57
|
+
"@aztec-labs/validator-ha-signer": "6.0.0-rc.2",
|
|
58
|
+
"@aztec-labs/wallets": "6.0.0-rc.2",
|
|
59
|
+
"@aztec-labs/world-state": "6.0.0-rc.2",
|
|
60
60
|
"@iarna/toml": "^2.2.5",
|
|
61
61
|
"@types/chalk": "^2.2.0",
|
|
62
62
|
"abitype": "^0.8.11",
|
|
@@ -20,7 +20,7 @@ import {
|
|
|
20
20
|
import { EmbeddedWallet } from '@aztec-labs/wallets/embedded';
|
|
21
21
|
import { join } from 'node:path';
|
|
22
22
|
|
|
23
|
-
import { extractRelevantOptions
|
|
23
|
+
import { extractRelevantOptions } from '../util.js';
|
|
24
24
|
import { getVersions } from '../versioning.js';
|
|
25
25
|
|
|
26
26
|
export async function startBot(
|
|
@@ -44,7 +44,7 @@ export async function startBot(
|
|
|
44
44
|
const aztecNode = createAztecNodeClient(config.nodeUrl, { versions: getVersions(), fetch });
|
|
45
45
|
|
|
46
46
|
const pxeConfig = extractRelevantOptions<PXEConfig & CliPXEOptions>(options, allPxeConfigMappings, 'pxe');
|
|
47
|
-
userLog(
|
|
47
|
+
userLog('Creating bot wallet');
|
|
48
48
|
const wallet = await EmbeddedWallet.create(aztecNode, { pxeConfig });
|
|
49
49
|
|
|
50
50
|
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
@@ -62,7 +62,7 @@ export async function addBot(
|
|
|
62
62
|
userLog?: LogFn,
|
|
63
63
|
) {
|
|
64
64
|
const config = extractRelevantOptions<BotConfig>(options, botConfigMappings, 'bot');
|
|
65
|
-
userLog?.(
|
|
65
|
+
userLog?.('Starting bot', { botMode: config.botMode });
|
|
66
66
|
|
|
67
67
|
// The bot wallet's embedded PXE syncs to this tip (see start_bot.ts/start_node.ts which build the wallet from the
|
|
68
68
|
// same options). L1-to-L2 readiness checks must be evaluated at this tip rather than at 'latest', or the bot can
|
|
@@ -71,7 +71,7 @@ export async function startProverAgent(
|
|
|
71
71
|
await Promise.all(agents.map(agent => agent.start()));
|
|
72
72
|
|
|
73
73
|
signalHandlers.push(async () => {
|
|
74
|
-
await Promise.all(agents.map(agent => agent.
|
|
74
|
+
await Promise.all(agents.map(agent => agent.drain()));
|
|
75
75
|
await telemetry.stop();
|
|
76
76
|
});
|
|
77
77
|
}
|
|
@@ -119,6 +119,9 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
|
|
|
119
119
|
// local signing protection runs against an ephemeral store. That is acceptable for this dev
|
|
120
120
|
// network; production validators must persist it and fail-fast when the data directory is unset.
|
|
121
121
|
allowEphemeralSigningProtection: config.allowEphemeralSigningProtection ?? true,
|
|
122
|
+
// The local network runs one or two blocks per slot against an Inbox nobody is filling with a cap-sized
|
|
123
|
+
// backlog, which is below the catch-up floor a production sequencer refuses to start under.
|
|
124
|
+
allowUnsafeInboxCatchupCapacity: config.allowUnsafeInboxCatchupCapacity ?? true,
|
|
122
125
|
txPublicSetupAllowListExtend: [...tokenAllowList, ...(config.txPublicSetupAllowListExtend ?? [])],
|
|
123
126
|
// The local network runs against anvil with no committee, so it defaults to the deterministic
|
|
124
127
|
// AutomineSequencer, which owns L1 time control (warps the dateProvider and L1 timestamps to slot
|