@aztec/end-to-end 0.79.0 → 0.81.0
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/bench/utils.d.ts.map +1 -1
- package/dest/bench/utils.js +3 -0
- package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
- package/dest/fixtures/setup_p2p_test.js +2 -4
- package/dest/fixtures/utils.d.ts.map +1 -1
- package/dest/fixtures/utils.js +2 -1
- package/dest/sample-dapp/deploy.js +1 -0
- package/dest/spartan/utils.d.ts +14 -0
- package/dest/spartan/utils.d.ts.map +1 -1
- package/dest/spartan/utils.js +82 -13
- package/package.json +31 -31
- package/src/bench/utils.ts +3 -0
- package/src/fixtures/setup_p2p_test.ts +2 -4
- package/src/fixtures/utils.ts +1 -4
- package/src/sample-dapp/deploy.mjs +2 -0
- package/src/spartan/utils.ts +62 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAmC,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAG9G,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,KAAK,UAAU,EAA2C,MAAM,mBAAmB,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAA4C,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAOxH,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAS,MAAM,sBAAsB,CAAC;AAEtF;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAC5B,6BAA6B,CAAC,OAAO,EAAE,CAAC,WAAW,GAAG,YAAY,CAAC,EAAE,CAAC;IACtE,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;;;;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAmC,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAG9G,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,KAAK,UAAU,EAA2C,MAAM,mBAAmB,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAA4C,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAOxH,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAS,MAAM,sBAAsB,CAAC;AAEtF;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAC5B,6BAA6B,CAAC,OAAO,EAAE,CAAC,WAAW,GAAG,YAAY,CAAC,EAAE,CAAC;IACtE,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;;;;GAuBF;AAED,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AA0CF;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,UAK9C;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKlD;AA+BD;;;;;;;;GAQG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,GAAE,OAAe,GAClC,OAAO,CAAC,MAAM,EAAE,CAAC,CAMnB;AAED,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,QAAQ,iBAI3F;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,oBAAoB,EAC9B,aAAa,GAAE,MAA6B,GAC3C,OAAO,CAAC,UAAU,CAAC,CAerB"}
|
package/dest/bench/utils.js
CHANGED
|
@@ -28,6 +28,9 @@ import { setup } from '../fixtures/utils.js';
|
|
|
28
28
|
await telemetry.flush();
|
|
29
29
|
const data = telemetry.getMeters();
|
|
30
30
|
const formatted = formatMetricsForGithubBenchmarkAction(data, opts.metrics);
|
|
31
|
+
if (formatted.length === 0) {
|
|
32
|
+
throw new Error(`No benchmark data generated. Please review your test setup.`);
|
|
33
|
+
}
|
|
31
34
|
const benchOutput = opts.benchOutput ?? process.env.BENCH_OUTPUT ?? 'bench.json';
|
|
32
35
|
writeFileSync(benchOutput, JSON.stringify(formatted));
|
|
33
36
|
context.logger.info(`Wrote ${data.length} metrics to ${benchOutput}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup_p2p_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/setup_p2p_test.ts"],"names":[],"mappings":";AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAQrD,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iCAAiC,OAAO,CAAC;AAEtD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,gBAAgB,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,GAAG,EAAE,MAAM,EAAE,CAAC;CACf;AAED,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,EAAE,CAO7F;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CA4B7B;AAGD,wBAAsB,UAAU,CAC9B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,6BAQ5C;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,eAAe,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,GAAE,MAAU,EACxB,aAAa,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"setup_p2p_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/setup_p2p_test.ts"],"names":[],"mappings":";AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAQrD,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iCAAiC,OAAO,CAAC;AAEtD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,gBAAgB,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,GAAG,EAAE,MAAM,EAAE,CAAC;CACf;AAED,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,EAAE,CAO7F;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CA4B7B;AAGD,wBAAsB,UAAU,CAC9B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,6BAQ5C;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,eAAe,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,GAAE,MAAU,EACxB,aAAa,CAAC,EAAE,MAAM,4BA0BvB"}
|
|
@@ -57,10 +57,8 @@ export async function createValidatorConfig(config, bootstrapNodeEnr, port, acco
|
|
|
57
57
|
config.publisherPrivateKey = proposerPrivateKey;
|
|
58
58
|
const nodeConfig = {
|
|
59
59
|
...config,
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
tcpAnnounceAddress: `127.0.0.1:${port}`,
|
|
63
|
-
udpAnnounceAddress: `127.0.0.1:${port}`,
|
|
60
|
+
p2pIp: `127.0.0.1`,
|
|
61
|
+
p2pPort: port,
|
|
64
62
|
p2pEnabled: true,
|
|
65
63
|
peerCheckIntervalMS: TEST_PEER_CHECK_INTERVAL_MS,
|
|
66
64
|
blockCheckIntervalMS: 1000,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/utils.ts"],"names":[],"mappings":"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"}
|
package/dest/fixtures/utils.js
CHANGED
|
@@ -312,7 +312,8 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
312
312
|
const blobSinkClient = createBlobSinkClient(config);
|
|
313
313
|
const aztecNode = await AztecNodeService.createAndSync(config, {
|
|
314
314
|
dateProvider,
|
|
315
|
-
blobSinkClient
|
|
315
|
+
blobSinkClient,
|
|
316
|
+
telemetry
|
|
316
317
|
}, {
|
|
317
318
|
prefilledPublicData
|
|
318
319
|
});
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { getInitialTestAccountsWallets } from '@aztec/accounts/testing';
|
|
3
3
|
import { Contract, createPXEClient, waitForPXE } from '@aztec/aztec.js';
|
|
4
4
|
// docs:end:deploy-imports
|
|
5
|
+
// docs:start:import_artifact
|
|
5
6
|
import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
|
|
6
7
|
import { writeFileSync } from 'fs';
|
|
7
8
|
import { fileURLToPath } from 'url';
|
package/dest/spartan/utils.d.ts
CHANGED
|
@@ -302,6 +302,16 @@ export type EnvConfig = z.infer<typeof envSchema>;
|
|
|
302
302
|
export declare function isK8sConfig(config: EnvConfig): config is K8sLocalConfig | K8sGCloudConfig;
|
|
303
303
|
export declare function isGCloudConfig(config: EnvConfig): config is K8sGCloudConfig;
|
|
304
304
|
export declare function setupEnvironment(env: unknown): EnvConfig;
|
|
305
|
+
export declare function getAztecBin(): string;
|
|
306
|
+
/**
|
|
307
|
+
* Runs the Aztec binary
|
|
308
|
+
* @param args - The arguments to pass to the Aztec binary
|
|
309
|
+
* @param logger - The logger to use
|
|
310
|
+
* @param env - Optional environment variables to set for the process
|
|
311
|
+
* @returns The exit code of the Aztec binary
|
|
312
|
+
*/
|
|
313
|
+
export declare function runAztecBin(args: string[], logger: Logger, env?: Record<string, string>): Promise<number>;
|
|
314
|
+
export declare function runProjectScript(script: string, args: string[], logger: Logger, env?: Record<string, string>): Promise<number>;
|
|
305
315
|
export declare function startPortForward({ resource, namespace, containerPort, hostPort, }: {
|
|
306
316
|
resource: string;
|
|
307
317
|
namespace: string;
|
|
@@ -411,5 +421,9 @@ export declare function updateSequencersConfig(env: EnvConfig, config: Partial<S
|
|
|
411
421
|
* This is useful for testing, but you should be aware of the implications.
|
|
412
422
|
*/
|
|
413
423
|
export declare function rollAztecPods(namespace: string): Promise<void>;
|
|
424
|
+
/**
|
|
425
|
+
* Returns the absolute path to the git repository root
|
|
426
|
+
*/
|
|
427
|
+
export declare function getGitProjectRoot(): string;
|
|
414
428
|
export {};
|
|
415
429
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/spartan/utils.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/spartan/utils.ts"],"names":[],"mappings":"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"}
|
package/dest/spartan/utils.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { createAztecNodeClient, createLogger, sleep } from '@aztec/aztec.js';
|
|
2
|
+
import { makeBackoff, retry } from '@aztec/foundation/retry';
|
|
2
3
|
import { exec, execSync, spawn } from 'child_process';
|
|
3
4
|
import path from 'path';
|
|
4
5
|
import { promisify } from 'util';
|
|
@@ -65,10 +66,57 @@ export function setupEnvironment(env) {
|
|
|
65
66
|
}
|
|
66
67
|
return config;
|
|
67
68
|
}
|
|
69
|
+
/**
|
|
70
|
+
* @param path - The path to the script, relative to the project root
|
|
71
|
+
* @param args - The arguments to pass to the script
|
|
72
|
+
* @param logger - The logger to use
|
|
73
|
+
* @returns The exit code of the script
|
|
74
|
+
*/ function runScript(path, args, logger, env) {
|
|
75
|
+
const childProcess = spawn(path, args, {
|
|
76
|
+
stdio: [
|
|
77
|
+
'ignore',
|
|
78
|
+
'pipe',
|
|
79
|
+
'pipe'
|
|
80
|
+
],
|
|
81
|
+
env: env ? {
|
|
82
|
+
...process.env,
|
|
83
|
+
...env
|
|
84
|
+
} : process.env
|
|
85
|
+
});
|
|
86
|
+
return new Promise((resolve, reject)=>{
|
|
87
|
+
childProcess.on('close', (code)=>resolve(code ?? 0));
|
|
88
|
+
childProcess.on('error', reject);
|
|
89
|
+
childProcess.stdout?.on('data', (data)=>{
|
|
90
|
+
logger.info(data.toString());
|
|
91
|
+
});
|
|
92
|
+
childProcess.stderr?.on('data', (data)=>{
|
|
93
|
+
logger.error(data.toString());
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
export function getAztecBin() {
|
|
98
|
+
return path.join(getGitProjectRoot(), 'yarn-project/aztec/dest/bin/index.js');
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
* Runs the Aztec binary
|
|
102
|
+
* @param args - The arguments to pass to the Aztec binary
|
|
103
|
+
* @param logger - The logger to use
|
|
104
|
+
* @param env - Optional environment variables to set for the process
|
|
105
|
+
* @returns The exit code of the Aztec binary
|
|
106
|
+
*/ export function runAztecBin(args, logger, env) {
|
|
107
|
+
return runScript('node', [
|
|
108
|
+
getAztecBin(),
|
|
109
|
+
...args
|
|
110
|
+
], logger, env);
|
|
111
|
+
}
|
|
112
|
+
export function runProjectScript(script, args, logger, env) {
|
|
113
|
+
const scriptPath = script.startsWith('/') ? script : path.join(getGitProjectRoot(), script);
|
|
114
|
+
return runScript(scriptPath, args, logger, env);
|
|
115
|
+
}
|
|
68
116
|
export async function startPortForward({ resource, namespace, containerPort, hostPort }) {
|
|
69
117
|
const hostPortAsString = hostPort ? hostPort.toString() : '';
|
|
70
118
|
logger.info(`kubectl port-forward -n ${namespace} ${resource} ${hostPortAsString}:${containerPort}`);
|
|
71
|
-
const
|
|
119
|
+
const process1 = spawn('kubectl', [
|
|
72
120
|
'port-forward',
|
|
73
121
|
'-n',
|
|
74
122
|
namespace,
|
|
@@ -85,7 +133,7 @@ export async function startPortForward({ resource, namespace, containerPort, hos
|
|
|
85
133
|
});
|
|
86
134
|
let isResolved = false;
|
|
87
135
|
const connected = new Promise((resolve)=>{
|
|
88
|
-
|
|
136
|
+
process1.stdout?.on('data', (data)=>{
|
|
89
137
|
const str = data.toString();
|
|
90
138
|
if (!isResolved && str.includes('Forwarding from')) {
|
|
91
139
|
isResolved = true;
|
|
@@ -96,13 +144,12 @@ export async function startPortForward({ resource, namespace, containerPort, hos
|
|
|
96
144
|
}
|
|
97
145
|
const portNumber = parseInt(str.slice(port + 1));
|
|
98
146
|
logger.info(`Port forward connected: ${portNumber}`);
|
|
99
|
-
logger.info(`Port forward connected: ${portNumber}`);
|
|
100
147
|
resolve(portNumber);
|
|
101
148
|
} else {
|
|
102
149
|
logger.silent(str);
|
|
103
150
|
}
|
|
104
151
|
});
|
|
105
|
-
|
|
152
|
+
process1.stderr?.on('data', (data)=>{
|
|
106
153
|
logger.info(data.toString());
|
|
107
154
|
// It's a strange thing:
|
|
108
155
|
// If we don't pipe stderr, then the port forwarding does not work.
|
|
@@ -110,25 +157,25 @@ export async function startPortForward({ resource, namespace, containerPort, hos
|
|
|
110
157
|
// just extremely verbose debug logs.
|
|
111
158
|
logger.silent(data.toString());
|
|
112
159
|
});
|
|
113
|
-
|
|
160
|
+
process1.on('close', ()=>{
|
|
114
161
|
if (!isResolved) {
|
|
115
162
|
isResolved = true;
|
|
116
163
|
logger.warn('Port forward closed before connection established');
|
|
117
164
|
resolve(0);
|
|
118
165
|
}
|
|
119
166
|
});
|
|
120
|
-
|
|
167
|
+
process1.on('error', (error)=>{
|
|
121
168
|
logger.error(`Port forward error: ${error}`);
|
|
122
169
|
resolve(0);
|
|
123
170
|
});
|
|
124
|
-
|
|
171
|
+
process1.on('exit', (code)=>{
|
|
125
172
|
logger.info(`Port forward exited with code ${code}`);
|
|
126
173
|
resolve(0);
|
|
127
174
|
});
|
|
128
175
|
});
|
|
129
176
|
const port = await connected;
|
|
130
177
|
return {
|
|
131
|
-
process,
|
|
178
|
+
process: process1,
|
|
132
179
|
port
|
|
133
180
|
};
|
|
134
181
|
}
|
|
@@ -325,7 +372,7 @@ export async function enableValidatorDynamicBootNode(instanceName, namespace, sp
|
|
|
325
372
|
}
|
|
326
373
|
export async function runAlertCheck(config, alerts, logger) {
|
|
327
374
|
if (isK8sConfig(config)) {
|
|
328
|
-
const { process, port } = await startPortForward({
|
|
375
|
+
const { process: process1, port } = await startPortForward({
|
|
329
376
|
resource: `svc/metrics-grafana`,
|
|
330
377
|
namespace: 'metrics',
|
|
331
378
|
containerPort: config.CONTAINER_METRICS_PORT
|
|
@@ -335,14 +382,19 @@ export async function runAlertCheck(config, alerts, logger) {
|
|
|
335
382
|
grafanaCredentials: `admin:${config.GRAFANA_PASSWORD}`
|
|
336
383
|
});
|
|
337
384
|
await alertChecker.runAlertCheck(alerts);
|
|
338
|
-
|
|
385
|
+
process1.kill();
|
|
339
386
|
} else {
|
|
340
387
|
logger.info('Not running alert check in non-k8s environment');
|
|
341
388
|
}
|
|
342
389
|
}
|
|
343
390
|
export async function updateSequencerConfig(url, config) {
|
|
344
391
|
const node = createAztecNodeClient(url);
|
|
345
|
-
|
|
392
|
+
// Retry incase the port forward is not ready yet
|
|
393
|
+
await retry(()=>node.setConfig(config), 'Update sequencer config', makeBackoff([
|
|
394
|
+
1,
|
|
395
|
+
3,
|
|
396
|
+
6
|
|
397
|
+
]), logger);
|
|
346
398
|
}
|
|
347
399
|
export async function getSequencers(namespace) {
|
|
348
400
|
const command = `kubectl get pods -l app=validator -n ${namespace} -o jsonpath='{.items[*].metadata.name}'`;
|
|
@@ -353,14 +405,14 @@ export async function updateK8sSequencersConfig(args) {
|
|
|
353
405
|
const { containerPort, namespace, config } = args;
|
|
354
406
|
const sequencers = await getSequencers(namespace);
|
|
355
407
|
for (const sequencer of sequencers){
|
|
356
|
-
const { process, port } = await startPortForward({
|
|
408
|
+
const { process: process1, port } = await startPortForward({
|
|
357
409
|
resource: `pod/${sequencer}`,
|
|
358
410
|
namespace,
|
|
359
411
|
containerPort
|
|
360
412
|
});
|
|
361
413
|
const url = `http://localhost:${port}`;
|
|
362
414
|
await updateSequencerConfig(url, config);
|
|
363
|
-
|
|
415
|
+
process1.kill();
|
|
364
416
|
}
|
|
365
417
|
}
|
|
366
418
|
export async function updateSequencersConfig(env, config) {
|
|
@@ -443,3 +495,20 @@ export async function updateSequencersConfig(env, config) {
|
|
|
443
495
|
label: 'app=pxe'
|
|
444
496
|
});
|
|
445
497
|
}
|
|
498
|
+
/**
|
|
499
|
+
* Returns the absolute path to the git repository root
|
|
500
|
+
*/ export function getGitProjectRoot() {
|
|
501
|
+
try {
|
|
502
|
+
const rootDir = execSync('git rev-parse --show-toplevel', {
|
|
503
|
+
encoding: 'utf-8',
|
|
504
|
+
stdio: [
|
|
505
|
+
'ignore',
|
|
506
|
+
'pipe',
|
|
507
|
+
'ignore'
|
|
508
|
+
]
|
|
509
|
+
}).trim();
|
|
510
|
+
return rootDir;
|
|
511
|
+
} catch (error) {
|
|
512
|
+
throw new Error(`Failed to determine git project root: ${error}`);
|
|
513
|
+
}
|
|
514
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/end-to-end",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.81.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"inherits": [
|
|
@@ -26,36 +26,36 @@
|
|
|
26
26
|
"formatting": "run -T prettier --check ./src && run -T eslint ./src"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@aztec/accounts": "0.
|
|
30
|
-
"@aztec/archiver": "0.
|
|
31
|
-
"@aztec/aztec": "0.
|
|
32
|
-
"@aztec/aztec-node": "0.
|
|
33
|
-
"@aztec/aztec.js": "0.
|
|
34
|
-
"@aztec/bb-prover": "0.
|
|
35
|
-
"@aztec/blob-lib": "0.
|
|
36
|
-
"@aztec/blob-sink": "0.
|
|
37
|
-
"@aztec/bot": "0.
|
|
38
|
-
"@aztec/constants": "0.
|
|
39
|
-
"@aztec/entrypoints": "0.
|
|
40
|
-
"@aztec/epoch-cache": "0.
|
|
41
|
-
"@aztec/ethereum": "0.
|
|
42
|
-
"@aztec/foundation": "0.
|
|
43
|
-
"@aztec/kv-store": "0.
|
|
44
|
-
"@aztec/l1-artifacts": "0.
|
|
45
|
-
"@aztec/merkle-tree": "0.
|
|
46
|
-
"@aztec/noir-contracts.js": "0.
|
|
47
|
-
"@aztec/noir-protocol-circuits-types": "0.
|
|
48
|
-
"@aztec/p2p": "0.
|
|
49
|
-
"@aztec/protocol-contracts": "0.
|
|
50
|
-
"@aztec/prover-client": "0.
|
|
51
|
-
"@aztec/prover-node": "0.
|
|
52
|
-
"@aztec/pxe": "0.
|
|
53
|
-
"@aztec/sequencer-client": "0.
|
|
54
|
-
"@aztec/simulator": "0.
|
|
55
|
-
"@aztec/stdlib": "0.
|
|
56
|
-
"@aztec/telemetry-client": "0.
|
|
57
|
-
"@aztec/validator-client": "0.
|
|
58
|
-
"@aztec/world-state": "0.
|
|
29
|
+
"@aztec/accounts": "0.81.0",
|
|
30
|
+
"@aztec/archiver": "0.81.0",
|
|
31
|
+
"@aztec/aztec": "0.81.0",
|
|
32
|
+
"@aztec/aztec-node": "0.81.0",
|
|
33
|
+
"@aztec/aztec.js": "0.81.0",
|
|
34
|
+
"@aztec/bb-prover": "0.81.0",
|
|
35
|
+
"@aztec/blob-lib": "0.81.0",
|
|
36
|
+
"@aztec/blob-sink": "0.81.0",
|
|
37
|
+
"@aztec/bot": "0.81.0",
|
|
38
|
+
"@aztec/constants": "0.81.0",
|
|
39
|
+
"@aztec/entrypoints": "0.81.0",
|
|
40
|
+
"@aztec/epoch-cache": "0.81.0",
|
|
41
|
+
"@aztec/ethereum": "0.81.0",
|
|
42
|
+
"@aztec/foundation": "0.81.0",
|
|
43
|
+
"@aztec/kv-store": "0.81.0",
|
|
44
|
+
"@aztec/l1-artifacts": "0.81.0",
|
|
45
|
+
"@aztec/merkle-tree": "0.81.0",
|
|
46
|
+
"@aztec/noir-contracts.js": "0.81.0",
|
|
47
|
+
"@aztec/noir-protocol-circuits-types": "0.81.0",
|
|
48
|
+
"@aztec/p2p": "0.81.0",
|
|
49
|
+
"@aztec/protocol-contracts": "0.81.0",
|
|
50
|
+
"@aztec/prover-client": "0.81.0",
|
|
51
|
+
"@aztec/prover-node": "0.81.0",
|
|
52
|
+
"@aztec/pxe": "0.81.0",
|
|
53
|
+
"@aztec/sequencer-client": "0.81.0",
|
|
54
|
+
"@aztec/simulator": "0.81.0",
|
|
55
|
+
"@aztec/stdlib": "0.81.0",
|
|
56
|
+
"@aztec/telemetry-client": "0.81.0",
|
|
57
|
+
"@aztec/validator-client": "0.81.0",
|
|
58
|
+
"@aztec/world-state": "0.81.0",
|
|
59
59
|
"@iarna/toml": "^2.2.5",
|
|
60
60
|
"@jest/globals": "^29.5.0",
|
|
61
61
|
"@noble/curves": "^1.0.0",
|
package/src/bench/utils.ts
CHANGED
|
@@ -36,6 +36,9 @@ export async function benchmarkSetup(
|
|
|
36
36
|
await telemetry.flush();
|
|
37
37
|
const data = telemetry.getMeters();
|
|
38
38
|
const formatted = formatMetricsForGithubBenchmarkAction(data, opts.metrics);
|
|
39
|
+
if (formatted.length === 0) {
|
|
40
|
+
throw new Error(`No benchmark data generated. Please review your test setup.`);
|
|
41
|
+
}
|
|
39
42
|
const benchOutput = opts.benchOutput ?? process.env.BENCH_OUTPUT ?? 'bench.json';
|
|
40
43
|
writeFileSync(benchOutput, JSON.stringify(formatted));
|
|
41
44
|
context.logger.info(`Wrote ${data.length} metrics to ${benchOutput}`);
|
|
@@ -115,10 +115,8 @@ export async function createValidatorConfig(
|
|
|
115
115
|
|
|
116
116
|
const nodeConfig: AztecNodeConfig = {
|
|
117
117
|
...config,
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
tcpAnnounceAddress: `127.0.0.1:${port}`,
|
|
121
|
-
udpAnnounceAddress: `127.0.0.1:${port}`,
|
|
118
|
+
p2pIp: `127.0.0.1`,
|
|
119
|
+
p2pPort: port,
|
|
122
120
|
p2pEnabled: true,
|
|
123
121
|
peerCheckIntervalMS: TEST_PEER_CHECK_INTERVAL_MS,
|
|
124
122
|
blockCheckIntervalMS: 1000,
|
package/src/fixtures/utils.ts
CHANGED
|
@@ -502,10 +502,7 @@ export async function setup(
|
|
|
502
502
|
const blobSinkClient = createBlobSinkClient(config);
|
|
503
503
|
const aztecNode = await AztecNodeService.createAndSync(
|
|
504
504
|
config,
|
|
505
|
-
{
|
|
506
|
-
dateProvider,
|
|
507
|
-
blobSinkClient,
|
|
508
|
-
},
|
|
505
|
+
{ dateProvider, blobSinkClient, telemetry },
|
|
509
506
|
{ prefilledPublicData },
|
|
510
507
|
);
|
|
511
508
|
const sequencer = aztecNode.getSequencer();
|
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
import { getInitialTestAccountsWallets } from '@aztec/accounts/testing';
|
|
3
3
|
import { Contract, createPXEClient, loadContractArtifact, waitForPXE } from '@aztec/aztec.js';
|
|
4
4
|
// docs:end:deploy-imports
|
|
5
|
+
// docs:start:import_artifact
|
|
5
6
|
import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
|
|
7
|
+
// docs:end:import_artifact
|
|
6
8
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
7
9
|
|
|
8
10
|
import { writeFileSync } from 'fs';
|
package/src/spartan/utils.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { createAztecNodeClient, createLogger, sleep } from '@aztec/aztec.js';
|
|
2
2
|
import type { RollupCheatCodes } from '@aztec/aztec.js/testing';
|
|
3
3
|
import type { Logger } from '@aztec/foundation/log';
|
|
4
|
+
import { makeBackoff, retry } from '@aztec/foundation/retry';
|
|
4
5
|
import type { SequencerConfig } from '@aztec/sequencer-client';
|
|
5
6
|
|
|
6
7
|
import { ChildProcess, exec, execSync, spawn } from 'child_process';
|
|
@@ -86,6 +87,49 @@ export function setupEnvironment(env: unknown): EnvConfig {
|
|
|
86
87
|
return config;
|
|
87
88
|
}
|
|
88
89
|
|
|
90
|
+
/**
|
|
91
|
+
* @param path - The path to the script, relative to the project root
|
|
92
|
+
* @param args - The arguments to pass to the script
|
|
93
|
+
* @param logger - The logger to use
|
|
94
|
+
* @returns The exit code of the script
|
|
95
|
+
*/
|
|
96
|
+
function runScript(path: string, args: string[], logger: Logger, env?: Record<string, string>) {
|
|
97
|
+
const childProcess = spawn(path, args, {
|
|
98
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
99
|
+
env: env ? { ...process.env, ...env } : process.env,
|
|
100
|
+
});
|
|
101
|
+
return new Promise<number>((resolve, reject) => {
|
|
102
|
+
childProcess.on('close', (code: number | null) => resolve(code ?? 0));
|
|
103
|
+
childProcess.on('error', reject);
|
|
104
|
+
childProcess.stdout?.on('data', (data: Buffer) => {
|
|
105
|
+
logger.info(data.toString());
|
|
106
|
+
});
|
|
107
|
+
childProcess.stderr?.on('data', (data: Buffer) => {
|
|
108
|
+
logger.error(data.toString());
|
|
109
|
+
});
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
export function getAztecBin() {
|
|
114
|
+
return path.join(getGitProjectRoot(), 'yarn-project/aztec/dest/bin/index.js');
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
/**
|
|
118
|
+
* Runs the Aztec binary
|
|
119
|
+
* @param args - The arguments to pass to the Aztec binary
|
|
120
|
+
* @param logger - The logger to use
|
|
121
|
+
* @param env - Optional environment variables to set for the process
|
|
122
|
+
* @returns The exit code of the Aztec binary
|
|
123
|
+
*/
|
|
124
|
+
export function runAztecBin(args: string[], logger: Logger, env?: Record<string, string>) {
|
|
125
|
+
return runScript('node', [getAztecBin(), ...args], logger, env);
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
export function runProjectScript(script: string, args: string[], logger: Logger, env?: Record<string, string>) {
|
|
129
|
+
const scriptPath = script.startsWith('/') ? script : path.join(getGitProjectRoot(), script);
|
|
130
|
+
return runScript(scriptPath, args, logger, env);
|
|
131
|
+
}
|
|
132
|
+
|
|
89
133
|
export async function startPortForward({
|
|
90
134
|
resource,
|
|
91
135
|
namespace,
|
|
@@ -128,7 +172,6 @@ export async function startPortForward({
|
|
|
128
172
|
}
|
|
129
173
|
const portNumber = parseInt(str.slice(port + 1));
|
|
130
174
|
logger.info(`Port forward connected: ${portNumber}`);
|
|
131
|
-
logger.info(`Port forward connected: ${portNumber}`);
|
|
132
175
|
resolve(portNumber);
|
|
133
176
|
} else {
|
|
134
177
|
logger.silent(str);
|
|
@@ -517,7 +560,8 @@ export async function runAlertCheck(config: EnvConfig, alerts: AlertConfig[], lo
|
|
|
517
560
|
|
|
518
561
|
export async function updateSequencerConfig(url: string, config: Partial<SequencerConfig>) {
|
|
519
562
|
const node = createAztecNodeClient(url);
|
|
520
|
-
|
|
563
|
+
// Retry incase the port forward is not ready yet
|
|
564
|
+
await retry(() => node.setConfig(config), 'Update sequencer config', makeBackoff([1, 3, 6]), logger);
|
|
521
565
|
}
|
|
522
566
|
|
|
523
567
|
export async function getSequencers(namespace: string) {
|
|
@@ -580,3 +624,19 @@ export async function rollAztecPods(namespace: string) {
|
|
|
580
624
|
await waitForResourceByLabel({ resource: 'pods', namespace: namespace, label: 'app=validator' });
|
|
581
625
|
await waitForResourceByLabel({ resource: 'pods', namespace: namespace, label: 'app=pxe' });
|
|
582
626
|
}
|
|
627
|
+
|
|
628
|
+
/**
|
|
629
|
+
* Returns the absolute path to the git repository root
|
|
630
|
+
*/
|
|
631
|
+
export function getGitProjectRoot(): string {
|
|
632
|
+
try {
|
|
633
|
+
const rootDir = execSync('git rev-parse --show-toplevel', {
|
|
634
|
+
encoding: 'utf-8',
|
|
635
|
+
stdio: ['ignore', 'pipe', 'ignore'],
|
|
636
|
+
}).trim();
|
|
637
|
+
|
|
638
|
+
return rootDir;
|
|
639
|
+
} catch (error) {
|
|
640
|
+
throw new Error(`Failed to determine git project root: ${error}`);
|
|
641
|
+
}
|
|
642
|
+
}
|