@aztec/end-to-end 0.0.1-commit.9ef841308 → 0.0.1-commit.a89ec08

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.
Files changed (99) hide show
  1. package/README.md +27 -0
  2. package/dest/bench/client_flows/client_flows_benchmark.d.ts +1 -1
  3. package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
  4. package/dest/bench/client_flows/client_flows_benchmark.js +26 -12
  5. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +3 -2
  6. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
  7. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js +1 -1
  8. package/dest/e2e_fees/fees_test.js +1 -1
  9. package/dest/e2e_p2p/inactivity_slash_test.d.ts +1 -1
  10. package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +1 -1
  11. package/dest/e2e_p2p/inactivity_slash_test.js +1 -0
  12. package/dest/e2e_p2p/p2p_network.d.ts +1 -1
  13. package/dest/e2e_p2p/p2p_network.js +1 -1
  14. package/dest/e2e_p2p/reqresp/utils.d.ts +1 -1
  15. package/dest/e2e_p2p/reqresp/utils.d.ts.map +1 -1
  16. package/dest/e2e_p2p/reqresp/utils.js +2 -15
  17. package/dest/e2e_p2p/shared.d.ts +13 -1
  18. package/dest/e2e_p2p/shared.d.ts.map +1 -1
  19. package/dest/e2e_p2p/shared.js +23 -0
  20. package/dest/fixtures/authwit_proxy.d.ts +1 -1
  21. package/dest/fixtures/authwit_proxy.d.ts.map +1 -1
  22. package/dest/fixtures/authwit_proxy.js +4 -0
  23. package/dest/fixtures/e2e_prover_test.d.ts +3 -4
  24. package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
  25. package/dest/fixtures/e2e_prover_test.js +10 -5
  26. package/dest/fixtures/get_bb_config.d.ts +1 -1
  27. package/dest/fixtures/get_bb_config.d.ts.map +1 -1
  28. package/dest/fixtures/get_bb_config.js +5 -5
  29. package/dest/fixtures/setup.d.ts +4 -5
  30. package/dest/fixtures/setup.d.ts.map +1 -1
  31. package/dest/fixtures/token_utils.d.ts +1 -1
  32. package/dest/fixtures/token_utils.d.ts.map +1 -1
  33. package/dest/fixtures/token_utils.js +5 -2
  34. package/dest/forward-compatibility/wallet_rpc_client.d.ts +7 -0
  35. package/dest/forward-compatibility/wallet_rpc_client.d.ts.map +1 -0
  36. package/dest/forward-compatibility/wallet_rpc_client.js +15 -0
  37. package/dest/forward-compatibility/wallet_service.d.ts +3 -0
  38. package/dest/forward-compatibility/wallet_service.d.ts.map +1 -0
  39. package/dest/forward-compatibility/wallet_service.js +109 -0
  40. package/dest/legacy-jest-resolver.d.cts +3 -0
  41. package/dest/legacy-jest-resolver.d.cts.map +1 -0
  42. package/dest/shared/jest_setup.js +1 -41
  43. package/dest/shared/submit-transactions.d.ts +1 -1
  44. package/dest/shared/submit-transactions.d.ts.map +1 -1
  45. package/dest/simulators/token_simulator.js +1 -1
  46. package/dest/spartan/setup_test_wallets.d.ts +1 -1
  47. package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
  48. package/dest/spartan/setup_test_wallets.js +5 -55
  49. package/dest/spartan/tx_metrics.js +1 -1
  50. package/dest/spartan/utils/config.d.ts +1 -7
  51. package/dest/spartan/utils/config.d.ts.map +1 -1
  52. package/dest/spartan/utils/config.js +1 -3
  53. package/dest/spartan/utils/index.d.ts +1 -2
  54. package/dest/spartan/utils/index.d.ts.map +1 -1
  55. package/dest/spartan/utils/index.js +0 -2
  56. package/dest/spartan/utils/nodes.d.ts +5 -4
  57. package/dest/spartan/utils/nodes.d.ts.map +1 -1
  58. package/dest/spartan/utils/nodes.js +9 -9
  59. package/dest/test-wallet/test_wallet.d.ts +16 -8
  60. package/dest/test-wallet/test_wallet.d.ts.map +1 -1
  61. package/dest/test-wallet/test_wallet.js +82 -46
  62. package/dest/test-wallet/worker_wallet.d.ts +4 -4
  63. package/dest/test-wallet/worker_wallet.d.ts.map +1 -1
  64. package/dest/test-wallet/worker_wallet_schema.d.ts +1 -1
  65. package/package.json +45 -42
  66. package/src/bench/client_flows/client_flows_benchmark.ts +21 -30
  67. package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +3 -6
  68. package/src/e2e_fees/fees_test.ts +1 -1
  69. package/src/e2e_p2p/inactivity_slash_test.ts +1 -0
  70. package/src/e2e_p2p/p2p_network.ts +1 -1
  71. package/src/e2e_p2p/reqresp/utils.ts +2 -23
  72. package/src/e2e_p2p/shared.ts +42 -0
  73. package/src/fixtures/authwit_proxy.ts +4 -0
  74. package/src/fixtures/dumps/epoch_proof_result.json +1 -1
  75. package/src/fixtures/e2e_prover_test.ts +15 -7
  76. package/src/fixtures/get_bb_config.ts +6 -7
  77. package/src/fixtures/setup.ts +3 -4
  78. package/src/fixtures/token_utils.ts +4 -1
  79. package/src/forward-compatibility/wallet_rpc_client.ts +14 -0
  80. package/src/forward-compatibility/wallet_service.ts +104 -0
  81. package/src/legacy-jest-resolver.cjs +135 -0
  82. package/src/shared/jest_setup.ts +1 -51
  83. package/src/shared/submit-transactions.ts +4 -1
  84. package/src/simulators/token_simulator.ts +1 -1
  85. package/src/spartan/setup_test_wallets.ts +6 -55
  86. package/src/spartan/tx_metrics.ts +1 -1
  87. package/src/spartan/utils/config.ts +0 -2
  88. package/src/spartan/utils/index.ts +0 -3
  89. package/src/spartan/utils/nodes.ts +10 -15
  90. package/src/test-wallet/test_wallet.ts +100 -50
  91. package/src/test-wallet/worker_wallet.ts +3 -2
  92. package/dest/fixtures/elu_monitor.d.ts +0 -21
  93. package/dest/fixtures/elu_monitor.d.ts.map +0 -1
  94. package/dest/fixtures/elu_monitor.js +0 -102
  95. package/dest/spartan/utils/pod_logs.d.ts +0 -25
  96. package/dest/spartan/utils/pod_logs.d.ts.map +0 -1
  97. package/dest/spartan/utils/pod_logs.js +0 -74
  98. package/src/fixtures/elu_monitor.ts +0 -126
  99. package/src/spartan/utils/pod_logs.ts +0 -99
@@ -1,7 +1,9 @@
1
1
  import { EcdsaKAccountContract, EcdsaRAccountContract } from '@aztec/accounts/ecdsa';
2
2
  import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
3
- import { StubAccountContractArtifact, createStubAccount } from '@aztec/accounts/stub';
3
+ import { StubEcdsaAccountContractArtifact, createStubEcdsaAccount } from '@aztec/accounts/stub/ecdsa';
4
+ import { StubSchnorrAccountContractArtifact, createStubSchnorrAccount } from '@aztec/accounts/stub/schnorr';
4
5
  import { type Account, type AccountContract, NO_FROM } from '@aztec/aztec.js/account';
6
+ import type { CompleteAddress } from '@aztec/aztec.js/addresses';
5
7
  import {
6
8
  type CallIntent,
7
9
  type ContractFunctionInteractionCallIntent,
@@ -13,6 +15,7 @@ import {
13
15
  } from '@aztec/aztec.js/authorization';
14
16
  import type { AztecNode } from '@aztec/aztec.js/node';
15
17
  import { AccountManager, type SendOptions } from '@aztec/aztec.js/wallet';
18
+ import { TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
16
19
  import type { DefaultAccountEntrypointOptions } from '@aztec/entrypoints/account';
17
20
  import { DefaultEntrypoint } from '@aztec/entrypoints/default';
18
21
  import { Fq, Fr } from '@aztec/foundation/curves/bn254';
@@ -25,16 +28,17 @@ import { AztecAddress } from '@aztec/stdlib/aztec-address';
25
28
  import { getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
26
29
  import { deriveSigningKey } from '@aztec/stdlib/keys';
27
30
  import type { NoteDao } from '@aztec/stdlib/note';
28
- import type {
29
- BlockHeader,
31
+ import {
32
+ type BlockHeader,
33
+ type ContractOverrides,
30
34
  SimulationOverrides,
31
- TxExecutionRequest,
32
- TxHash,
33
- TxReceipt,
34
- TxSimulationResult,
35
+ type TxExecutionRequest,
36
+ type TxHash,
37
+ type TxReceipt,
35
38
  } from '@aztec/stdlib/tx';
36
39
  import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/stdlib/tx';
37
40
  import { BaseWallet, type SimulateViaEntrypointOptions } from '@aztec/wallet-sdk/base-wallet';
41
+ import type { AccountType } from '@aztec/wallets/embedded';
38
42
 
39
43
  import { AztecNodeProxy, ProvenTx } from './utils.js';
40
44
 
@@ -44,6 +48,7 @@ import { AztecNodeProxy, ProvenTx } from './utils.js';
44
48
  export interface AccountData {
45
49
  secret: Fr;
46
50
  salt: Fr;
51
+ type?: AccountType;
47
52
  contract: AccountContract;
48
53
  }
49
54
 
@@ -84,50 +89,81 @@ export class TestWallet extends BaseWallet {
84
89
 
85
90
  createSchnorrAccount(secret: Fr, salt: Fr, signingKey?: Fq): Promise<AccountManager> {
86
91
  signingKey = signingKey ?? deriveSigningKey(secret);
87
- const accountData = {
88
- secret,
89
- salt,
90
- contract: new SchnorrAccountContract(signingKey),
91
- };
92
- return this.createAccount(accountData);
92
+ return this.createAccount({ secret, salt, type: 'schnorr', contract: new SchnorrAccountContract(signingKey) });
93
93
  }
94
94
 
95
95
  createECDSARAccount(secret: Fr, salt: Fr, signingKey: Buffer): Promise<AccountManager> {
96
- const accountData = {
96
+ return this.createAccount({
97
97
  secret,
98
98
  salt,
99
+ type: 'ecdsasecp256r1',
99
100
  contract: new EcdsaRAccountContract(signingKey),
100
- };
101
- return this.createAccount(accountData);
101
+ });
102
102
  }
103
103
 
104
104
  createECDSAKAccount(secret: Fr, salt: Fr, signingKey: Buffer): Promise<AccountManager> {
105
- const accountData = {
105
+ return this.createAccount({
106
106
  secret,
107
107
  salt,
108
+ type: 'ecdsasecp256k1',
108
109
  contract: new EcdsaKAccountContract(signingKey),
109
- };
110
- return this.createAccount(accountData);
110
+ });
111
111
  }
112
112
 
113
- async getFakeAccountDataFor(address: AztecAddress) {
114
- const originalAccount = await this.getAccountFromAddress(address);
115
- const originalAddress = originalAccount.getCompleteAddress();
116
- const contractInstance = await this.pxe.getContractInstance(originalAddress.address);
117
- if (!contractInstance) {
118
- throw new Error(`No contract instance found for address: ${originalAddress.address}`);
113
+ /**
114
+ * Builds contract overrides for all provided addresses by replacing their account contracts with stub implementations.
115
+ */
116
+ protected async buildAccountOverrides(addresses: AztecAddress[]): Promise<ContractOverrides> {
117
+ const accounts = await this.getAccounts();
118
+ const contracts: ContractOverrides = {};
119
+
120
+ const filtered = accounts.filter(acc => addresses.some(addr => addr.equals(acc.item)));
121
+
122
+ for (const account of filtered) {
123
+ const address = account.item;
124
+ const originalAccount = await this.getAccountFromAddress(address);
125
+ const completeAddress = originalAccount.getCompleteAddress();
126
+ const contractInstance = await this.pxe.getContractInstance(completeAddress.address);
127
+ if (!contractInstance) {
128
+ throw new Error(
129
+ `No contract instance found for address: ${completeAddress.address} during account override building. This is a bug!`,
130
+ );
131
+ }
132
+
133
+ const stubArtifact = this.getStubArtifactFor(address);
134
+ const stubConstructorArgs =
135
+ this.getTypeFor(address) === 'schnorr' ? [Fr.ZERO, Fr.ZERO] : [Buffer.alloc(32), Buffer.alloc(32)];
136
+ const stubInstance = await getContractInstanceFromInstantiationParams(stubArtifact, {
137
+ salt: Fr.random(),
138
+ constructorArgs: stubConstructorArgs,
139
+ });
140
+
141
+ contracts[address.toString()] = {
142
+ instance: stubInstance,
143
+ artifact: stubArtifact,
144
+ };
119
145
  }
120
- const stubAccount = createStubAccount(originalAddress);
121
- const instance = await getContractInstanceFromInstantiationParams(StubAccountContractArtifact, {
122
- salt: Fr.random(),
123
- });
124
- return {
125
- account: stubAccount,
126
- instance,
127
- artifact: StubAccountContractArtifact,
128
- };
146
+
147
+ return contracts;
148
+ }
149
+
150
+ protected accounts: Map<string, { account: Account; type: AccountType }> = new Map();
151
+
152
+ private getTypeFor(address: AztecAddress): AccountType {
153
+ return this.accounts.get(address.toString())?.type ?? 'schnorr';
154
+ }
155
+
156
+ private getStubArtifactFor(address: AztecAddress) {
157
+ return this.getTypeFor(address) === 'schnorr'
158
+ ? StubSchnorrAccountContractArtifact
159
+ : StubEcdsaAccountContractArtifact;
160
+ }
161
+
162
+ private getStubAccountFor(address: AztecAddress, completeAddress: CompleteAddress) {
163
+ return this.getTypeFor(address) === 'schnorr'
164
+ ? createStubSchnorrAccount(completeAddress)
165
+ : createStubEcdsaAccount(completeAddress);
129
166
  }
130
- protected accounts: Map<string, Account> = new Map();
131
167
 
132
168
  /**
133
169
  * Controls how the test wallet simulates transactions:
@@ -146,22 +182,25 @@ export class TestWallet extends BaseWallet {
146
182
  }
147
183
 
148
184
  protected getAccountFromAddress(address: AztecAddress): Promise<Account> {
149
- const account = this.accounts.get(address?.toString() ?? '');
185
+ const entry = this.accounts.get(address?.toString() ?? '');
150
186
 
151
- if (!account) {
187
+ if (!entry) {
152
188
  throw new Error(`Account not found in wallet for address: ${address}`);
153
189
  }
154
190
 
155
- return Promise.resolve(account);
191
+ return Promise.resolve(entry.account);
156
192
  }
157
193
 
158
194
  getAccounts() {
159
- return Promise.resolve(Array.from(this.accounts.values()).map(acc => ({ alias: '', item: acc.getAddress() })));
195
+ return Promise.resolve(
196
+ Array.from(this.accounts.values()).map(entry => ({ alias: '', item: entry.account.getAddress() })),
197
+ );
160
198
  }
161
199
 
162
200
  async createAccount(accountData?: AccountData): Promise<AccountManager> {
163
201
  const secret = accountData?.secret ?? Fr.random();
164
202
  const salt = accountData?.salt ?? Fr.random();
203
+ const type = accountData?.type ?? 'schnorr';
165
204
  const contract = accountData?.contract ?? new SchnorrAccountContract(GrumpkinScalar.random());
166
205
 
167
206
  const accountManager = await AccountManager.create(this, secret, contract, salt);
@@ -171,7 +210,8 @@ export class TestWallet extends BaseWallet {
171
210
 
172
211
  await this.registerContract(instance, artifact, secret);
173
212
 
174
- this.accounts.set(accountManager.address.toString(), await accountManager.getAccount());
213
+ const address = accountManager.address.toString();
214
+ this.accounts.set(address, { account: await accountManager.getAccount(), type });
175
215
 
176
216
  return accountManager;
177
217
  }
@@ -217,9 +257,12 @@ export class TestWallet extends BaseWallet {
217
257
  protected override async simulateViaEntrypoint(
218
258
  executionPayload: ExecutionPayload,
219
259
  opts: SimulateViaEntrypointOptions,
220
- ): Promise<TxSimulationResult> {
221
- const { from, feeOptions, scopes, skipTxValidation, skipFeeEnforcement } = opts;
260
+ ): Promise<TxSimulationResultWithAppOffset> {
261
+ const { from, feeOptions, additionalScopes, skipTxValidation, skipFeeEnforcement } = opts;
262
+ const scopes = this.scopesFrom(from, additionalScopes);
222
263
  const skipKernels = this.simulationMode !== 'full';
264
+ const useOverride = this.simulationMode === 'kernelless-override';
265
+
223
266
  const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
224
267
  const finalExecutionPayload = feeExecutionPayload
225
268
  ? mergeExecutionPayloads([feeExecutionPayload, executionPayload])
@@ -228,18 +271,19 @@ export class TestWallet extends BaseWallet {
228
271
 
229
272
  let overrides: SimulationOverrides | undefined;
230
273
  let txRequest: TxExecutionRequest;
274
+ if (useOverride) {
275
+ const accountOverrides = await this.buildAccountOverrides(scopes);
276
+ overrides = new SimulationOverrides(accountOverrides);
277
+ }
278
+
231
279
  if (from === NO_FROM) {
232
280
  const entrypoint = new DefaultEntrypoint();
233
281
  txRequest = await entrypoint.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo);
234
282
  } else {
235
- const useOverride = this.simulationMode === 'kernelless-override';
236
283
  let fromAccount: Account;
237
284
  if (useOverride) {
238
- const { account, instance, artifact } = await this.getFakeAccountDataFor(from);
239
- fromAccount = account;
240
- overrides = {
241
- contracts: { [from.toString()]: { instance, artifact } },
242
- };
285
+ const originalAccount = await this.getAccountFromAddress(from);
286
+ fromAccount = this.getStubAccountFor(from, originalAccount.getCompleteAddress());
243
287
  } else {
244
288
  fromAccount = await this.getAccountFromAddress(from);
245
289
  }
@@ -257,7 +301,7 @@ export class TestWallet extends BaseWallet {
257
301
  );
258
302
  }
259
303
 
260
- return this.pxe.simulateTx(txRequest, {
304
+ const result = await this.pxe.simulateTx(txRequest, {
261
305
  simulatePublic: true,
262
306
  skipKernels,
263
307
  skipFeeEnforcement,
@@ -265,10 +309,16 @@ export class TestWallet extends BaseWallet {
265
309
  overrides,
266
310
  scopes,
267
311
  });
312
+ const appCallOffset = await this.computeAppCallOffset(from, feeOptions);
313
+ return TxSimulationResultWithAppOffset.fromResultAndOffset(result, appCallOffset);
268
314
  }
269
315
 
270
316
  async proveTx(exec: ExecutionPayload, opts: Omit<SendOptions, 'wait'>): Promise<ProvenTx> {
271
- const fee = await this.completeFeeOptions(opts.from, exec.feePayer, opts.fee?.gasSettings);
317
+ const fee = await this.completeFeeOptions({
318
+ from: opts.from,
319
+ feePayer: exec.feePayer,
320
+ gasSettings: opts.fee?.gasSettings,
321
+ });
272
322
  const txRequest = await this.createTxExecutionRequestFromPayloadAndFee(exec, opts.from, fee);
273
323
  const txProvingResult = await this.pxe.proveTx(txRequest, this.scopesFrom(opts.from, opts.additionalScopes));
274
324
  return new ProvenTx(
@@ -13,6 +13,7 @@ import type {
13
13
  ProfileOptions,
14
14
  SendOptions,
15
15
  SimulateOptions,
16
+ TxSimulationResultWithAppOffset,
16
17
  Wallet,
17
18
  WalletCapabilities,
18
19
  } from '@aztec/aztec.js/wallet';
@@ -29,7 +30,7 @@ import type { ContractArtifact, EventMetadataDefinition, FunctionCall } from '@a
29
30
  import type { AuthWitness } from '@aztec/stdlib/auth-witness';
30
31
  import type { AztecAddress } from '@aztec/stdlib/aztec-address';
31
32
  import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
32
- import type { ExecutionPayload, TxProfileResult, TxSimulationResult, UtilityExecutionResult } from '@aztec/stdlib/tx';
33
+ import type { ExecutionPayload, TxProfileResult, UtilityExecutionResult } from '@aztec/stdlib/tx';
33
34
  import { Tx } from '@aztec/stdlib/tx';
34
35
 
35
36
  import { Worker } from 'worker_threads';
@@ -165,7 +166,7 @@ export class WorkerWallet implements Wallet {
165
166
  return this.call('registerContract', instance, artifact, secretKey);
166
167
  }
167
168
 
168
- simulateTx(exec: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResult> {
169
+ simulateTx(exec: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResultWithAppOffset> {
169
170
  return this.call('simulateTx', exec, opts);
170
171
  }
171
172
 
@@ -1,21 +0,0 @@
1
- /** Samples event-loop utilization, delay histogram, and heap usage per test, writing columnar text to a file. */
2
- export declare class EluMonitor {
3
- private filePath;
4
- private intervalMs;
5
- private timer;
6
- private lastELU;
7
- private histogram;
8
- private testName;
9
- private testStart;
10
- private eluSamples;
11
- constructor(filePath: string, intervalMs?: number);
12
- /** Begin sampling for a test. Writes a header line and starts the periodic sampler. */
13
- startTest(testName: string): void;
14
- /** Stop sampling and write a summary line. */
15
- stopTest(): void;
16
- /** Alias for stopTest — call on process exit to flush any remaining data. */
17
- stop(): void;
18
- private sample;
19
- private writeSummary;
20
- }
21
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWx1X21vbml0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy9lbHVfbW9uaXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxpSEFBaUg7QUFDakgscUJBQWEsVUFBVTtJQUNyQixPQUFPLENBQUMsUUFBUSxDQUFTO0lBQ3pCLE9BQU8sQ0FBQyxVQUFVLENBQVM7SUFDM0IsT0FBTyxDQUFDLEtBQUssQ0FBNkM7SUFDMUQsT0FBTyxDQUFDLE9BQU8sQ0FBbUM7SUFDbEQsT0FBTyxDQUFDLFNBQVMsQ0FBb0I7SUFDckMsT0FBTyxDQUFDLFFBQVEsQ0FBcUI7SUFDckMsT0FBTyxDQUFDLFNBQVMsQ0FBcUI7SUFDdEMsT0FBTyxDQUFDLFVBQVUsQ0FBZ0I7SUFFbEMsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUFFLFVBQVUsQ0FBQyxFQUFFLE1BQU0sRUFJaEQ7SUFFRCx1RkFBdUY7SUFDdkYsU0FBUyxDQUFDLFFBQVEsRUFBRSxNQUFNLEdBQUcsSUFBSSxDQW1CaEM7SUFFRCw4Q0FBOEM7SUFDOUMsUUFBUSxJQUFJLElBQUksQ0FtQmY7SUFFRCwrRUFBNkU7SUFDN0UsSUFBSSxJQUFJLElBQUksQ0FFWDtJQUVELE9BQU8sQ0FBQyxNQUFNO0lBOEJkLE9BQU8sQ0FBQyxZQUFZO0NBbUJyQiJ9
@@ -1 +0,0 @@
1
- {"version":3,"file":"elu_monitor.d.ts","sourceRoot":"","sources":["../../src/fixtures/elu_monitor.ts"],"names":[],"mappings":"AAKA,iHAAiH;AACjH,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,KAAK,CAA6C;IAC1D,OAAO,CAAC,OAAO,CAAmC;IAClD,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,QAAQ,CAAqB;IACrC,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,UAAU,CAAgB;IAElC,YAAY,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAIhD;IAED,uFAAuF;IACvF,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAmBhC;IAED,8CAA8C;IAC9C,QAAQ,IAAI,IAAI,CAmBf;IAED,+EAA6E;IAC7E,IAAI,IAAI,IAAI,CAEX;IAED,OAAO,CAAC,MAAM;IA8Bd,OAAO,CAAC,YAAY;CAmBrB"}
@@ -1,102 +0,0 @@
1
- import { appendFileSync } from 'node:fs';
2
- import { monitorEventLoopDelay, performance } from 'node:perf_hooks';
3
- const NANOS_PER_MS = 1_000_000;
4
- /** Samples event-loop utilization, delay histogram, and heap usage per test, writing columnar text to a file. */ export class EluMonitor {
5
- filePath;
6
- intervalMs;
7
- timer;
8
- lastELU;
9
- histogram;
10
- testName;
11
- testStart;
12
- eluSamples = [];
13
- constructor(filePath, intervalMs){
14
- this.filePath = filePath;
15
- this.intervalMs = intervalMs ?? 2000;
16
- this.histogram = monitorEventLoopDelay({
17
- resolution: 20
18
- });
19
- }
20
- /** Begin sampling for a test. Writes a header line and starts the periodic sampler. */ startTest(testName) {
21
- this.stopTest();
22
- this.testName = testName;
23
- this.testStart = performance.now();
24
- this.eluSamples = [];
25
- appendFileSync(this.filePath, `\n=== Test: ${testName} ===\n`);
26
- appendFileSync(this.filePath, padColumns('TIME', 'ELU', 'EL_DLY_P50', 'EL_DLY_P99', 'EL_DLY_MAX', 'HEAP_MB') + '\n');
27
- this.lastELU = performance.eventLoopUtilization();
28
- this.histogram.enable();
29
- this.timer = setInterval(()=>this.sample(), this.intervalMs);
30
- // Allow the process to exit even if the timer is still running.
31
- this.timer.unref();
32
- }
33
- /** Stop sampling and write a summary line. */ stopTest() {
34
- if (!this.timer) {
35
- return;
36
- }
37
- // Take a final sample before stopping.
38
- this.sample();
39
- clearInterval(this.timer);
40
- this.timer = undefined;
41
- this.histogram.disable();
42
- this.histogram.reset();
43
- this.writeSummary();
44
- this.lastELU = undefined;
45
- this.testName = undefined;
46
- this.testStart = undefined;
47
- this.eluSamples = [];
48
- }
49
- /** Alias for stopTest — call on process exit to flush any remaining data. */ stop() {
50
- this.stopTest();
51
- }
52
- sample() {
53
- const newELU = performance.eventLoopUtilization();
54
- const delta = performance.eventLoopUtilization(newELU, this.lastELU);
55
- this.lastELU = newELU;
56
- const elu = delta.utilization;
57
- this.eluSamples.push(elu);
58
- const p50 = this.histogram.percentile(50) / NANOS_PER_MS;
59
- const p99 = this.histogram.percentile(99) / NANOS_PER_MS;
60
- const max = this.histogram.max / NANOS_PER_MS;
61
- const heapMb = Math.round(process.memoryUsage().heapUsed / (1024 * 1024));
62
- const now = new Date();
63
- const time = [
64
- now.getHours(),
65
- now.getMinutes(),
66
- now.getSeconds()
67
- ].map((n)=>String(n).padStart(2, '0')).join(':');
68
- const line = padColumns(time, elu.toFixed(2), `${p50.toFixed(1)}ms`, `${p99.toFixed(1)}ms`, `${max.toFixed(1)}ms`, String(heapMb));
69
- appendFileSync(this.filePath, line + '\n');
70
- // Reset histogram so next sample only reflects the new interval.
71
- this.histogram.reset();
72
- }
73
- writeSummary() {
74
- if (this.eluSamples.length === 0 || this.testStart === undefined) {
75
- return;
76
- }
77
- const mean = this.eluSamples.reduce((a, b)=>a + b, 0) / this.eluSamples.length;
78
- const maxElu = Math.max(...this.eluSamples);
79
- const sorted = [
80
- ...this.eluSamples
81
- ].sort((a, b)=>a - b);
82
- const p90Elu = sorted[Math.floor(sorted.length * 0.9)] ?? maxElu;
83
- const durationS = ((performance.now() - this.testStart) / 1000).toFixed(1);
84
- let summary = `--- Summary: mean_elu=${mean.toFixed(2)} max_elu=${maxElu.toFixed(2)} p90_elu=${p90Elu.toFixed(2)} duration=${durationS}s`;
85
- if (maxElu > 0.85) {
86
- summary += ' WARNING:ELU>0.85';
87
- }
88
- summary += ' ---\n';
89
- appendFileSync(this.filePath, summary);
90
- }
91
- }
92
- function padColumns(...cols) {
93
- const widths = [
94
- 11,
95
- 7,
96
- 12,
97
- 12,
98
- 12,
99
- 8
100
- ];
101
- return cols.map((col, i)=>col.padEnd(widths[i] ?? 10)).join('');
102
- }
@@ -1,25 +0,0 @@
1
- import type { Logger } from '@aztec/foundation/log';
2
- /** Parsed l2-block-built stats from a sequencer pod log line. */
3
- export type BlockBuiltLogEntry = {
4
- blockNumber: number;
5
- txCount: number;
6
- duration: number;
7
- publicProcessDuration: number;
8
- manaPerSec: number;
9
- privateLogCount: number;
10
- publicLogCount: number;
11
- contractClassLogCount: number;
12
- contractClassLogSize: number;
13
- };
14
- /**
15
- * Fetches l2-block-built log entries from sequencer pods for given block numbers.
16
- * Queries all validator pods (only the proposer will have the log for a given block).
17
- *
18
- * @param namespace - Kubernetes namespace
19
- * @param sinceTime - ISO 8601 timestamp to limit log search (e.g., from before block building was re-enabled)
20
- * @param blockNumbers - Set of block numbers to filter for
21
- * @param logger - Logger instance
22
- * @returns Array of parsed BlockBuiltLogEntry, de-duplicated by blockNumber, sorted ascending
23
- */
24
- export declare function fetchBlockBuiltLogs(namespace: string, sinceTime: string, blockNumbers: Set<number>, logger: Logger): Promise<BlockBuiltLogEntry[]>;
25
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9kX2xvZ3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zcGFydGFuL3V0aWxzL3BvZF9sb2dzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBU3BELGlFQUFpRTtBQUNqRSxNQUFNLE1BQU0sa0JBQWtCLEdBQUc7SUFDL0IsV0FBVyxFQUFFLE1BQU0sQ0FBQztJQUNwQixPQUFPLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLFFBQVEsRUFBRSxNQUFNLENBQUM7SUFDakIscUJBQXFCLEVBQUUsTUFBTSxDQUFDO0lBQzlCLFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsZUFBZSxFQUFFLE1BQU0sQ0FBQztJQUN4QixjQUFjLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLHFCQUFxQixFQUFFLE1BQU0sQ0FBQztJQUM5QixvQkFBb0IsRUFBRSxNQUFNLENBQUM7Q0FDOUIsQ0FBQztBQWNGOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFzQixtQkFBbUIsQ0FDdkMsU0FBUyxFQUFFLE1BQU0sRUFDakIsU0FBUyxFQUFFLE1BQU0sRUFDakIsWUFBWSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFDekIsTUFBTSxFQUFFLE1BQU0sR0FDYixPQUFPLENBQUMsa0JBQWtCLEVBQUUsQ0FBQyxDQWlEL0IifQ==
@@ -1 +0,0 @@
1
- {"version":3,"file":"pod_logs.d.ts","sourceRoot":"","sources":["../../../src/spartan/utils/pod_logs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AASpD,iEAAiE;AACjE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAcF;;;;;;;;;GASG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAiD/B"}
@@ -1,74 +0,0 @@
1
- import { exec } from 'child_process';
2
- import { promisify } from 'util';
3
- import { getSequencers } from './nodes.js';
4
- const execAsync = promisify(exec);
5
- const FIELDS = [
6
- 'blockNumber',
7
- 'txCount',
8
- 'duration',
9
- 'publicProcessDuration',
10
- 'manaPerSec',
11
- 'privateLogCount',
12
- 'publicLogCount',
13
- 'contractClassLogCount',
14
- 'contractClassLogSize'
15
- ];
16
- /**
17
- * Fetches l2-block-built log entries from sequencer pods for given block numbers.
18
- * Queries all validator pods (only the proposer will have the log for a given block).
19
- *
20
- * @param namespace - Kubernetes namespace
21
- * @param sinceTime - ISO 8601 timestamp to limit log search (e.g., from before block building was re-enabled)
22
- * @param blockNumbers - Set of block numbers to filter for
23
- * @param logger - Logger instance
24
- * @returns Array of parsed BlockBuiltLogEntry, de-duplicated by blockNumber, sorted ascending
25
- */ export async function fetchBlockBuiltLogs(namespace, sinceTime, blockNumbers, logger) {
26
- const pods = await getSequencers(namespace);
27
- const entriesByBlock = new Map();
28
- // Subtract 60s from sinceTime to account for clock skew between test runner and k8s pods.
29
- // Block number filtering ensures we only match the right blocks, so extra lines are harmless.
30
- const sinceDate = new Date(new Date(sinceTime).getTime() - 60_000);
31
- const sinceFlag = sinceDate.toISOString();
32
- for (const pod of pods){
33
- try {
34
- const cmd = `kubectl logs ${pod} -n ${namespace} -c aztec --since-time=${sinceFlag}`;
35
- logger.info(`Fetching logs: ${cmd}`);
36
- const { stdout } = await execAsync(cmd, {
37
- maxBuffer: 10 * 1024 * 1024
38
- });
39
- const lines = stdout.split('\n');
40
- const matchingLines = lines.filter((l)=>l.includes('l2-block-built'));
41
- logger.info(`Pod ${pod}: ${lines.length} log lines, ${matchingLines.length} contain l2-block-built`);
42
- for (const line of matchingLines){
43
- try {
44
- const parsed = JSON.parse(line);
45
- if (parsed.eventName !== 'l2-block-built' || !blockNumbers.has(parsed.blockNumber)) {
46
- continue;
47
- }
48
- if (entriesByBlock.has(parsed.blockNumber)) {
49
- continue;
50
- }
51
- const entry = {};
52
- for (const field of FIELDS){
53
- entry[field] = parsed[field] ?? 0;
54
- }
55
- entriesByBlock.set(entry.blockNumber, entry);
56
- logger.verbose(`Parsed l2-block-built log for block ${entry.blockNumber}`, entry);
57
- } catch {
58
- // Not valid JSON, skip
59
- }
60
- }
61
- } catch (err) {
62
- logger.warn(`Failed to fetch logs from pod ${pod}: ${err}`);
63
- }
64
- }
65
- if (entriesByBlock.size < blockNumbers.size) {
66
- const missing = [
67
- ...blockNumbers
68
- ].filter((bn)=>!entriesByBlock.has(bn));
69
- logger.warn(`Missing l2-block-built logs for block(s): ${missing.join(', ')}`);
70
- }
71
- return [
72
- ...entriesByBlock.values()
73
- ].sort((a, b)=>a.blockNumber - b.blockNumber);
74
- }
@@ -1,126 +0,0 @@
1
- import { appendFileSync } from 'node:fs';
2
- import { type EventLoopUtilization, type IntervalHistogram, monitorEventLoopDelay, performance } from 'node:perf_hooks';
3
-
4
- const NANOS_PER_MS = 1_000_000;
5
-
6
- /** Samples event-loop utilization, delay histogram, and heap usage per test, writing columnar text to a file. */
7
- export class EluMonitor {
8
- private filePath: string;
9
- private intervalMs: number;
10
- private timer: ReturnType<typeof setInterval> | undefined;
11
- private lastELU: EventLoopUtilization | undefined;
12
- private histogram: IntervalHistogram;
13
- private testName: string | undefined;
14
- private testStart: number | undefined;
15
- private eluSamples: number[] = [];
16
-
17
- constructor(filePath: string, intervalMs?: number) {
18
- this.filePath = filePath;
19
- this.intervalMs = intervalMs ?? 2000;
20
- this.histogram = monitorEventLoopDelay({ resolution: 20 });
21
- }
22
-
23
- /** Begin sampling for a test. Writes a header line and starts the periodic sampler. */
24
- startTest(testName: string): void {
25
- this.stopTest();
26
-
27
- this.testName = testName;
28
- this.testStart = performance.now();
29
- this.eluSamples = [];
30
-
31
- appendFileSync(this.filePath, `\n=== Test: ${testName} ===\n`);
32
- appendFileSync(
33
- this.filePath,
34
- padColumns('TIME', 'ELU', 'EL_DLY_P50', 'EL_DLY_P99', 'EL_DLY_MAX', 'HEAP_MB') + '\n',
35
- );
36
-
37
- this.lastELU = performance.eventLoopUtilization();
38
- this.histogram.enable();
39
-
40
- this.timer = setInterval(() => this.sample(), this.intervalMs);
41
- // Allow the process to exit even if the timer is still running.
42
- this.timer.unref();
43
- }
44
-
45
- /** Stop sampling and write a summary line. */
46
- stopTest(): void {
47
- if (!this.timer) {
48
- return;
49
- }
50
-
51
- // Take a final sample before stopping.
52
- this.sample();
53
-
54
- clearInterval(this.timer);
55
- this.timer = undefined;
56
- this.histogram.disable();
57
- this.histogram.reset();
58
-
59
- this.writeSummary();
60
-
61
- this.lastELU = undefined;
62
- this.testName = undefined;
63
- this.testStart = undefined;
64
- this.eluSamples = [];
65
- }
66
-
67
- /** Alias for stopTest — call on process exit to flush any remaining data. */
68
- stop(): void {
69
- this.stopTest();
70
- }
71
-
72
- private sample(): void {
73
- const newELU = performance.eventLoopUtilization();
74
- const delta = performance.eventLoopUtilization(newELU, this.lastELU);
75
- this.lastELU = newELU;
76
-
77
- const elu = delta.utilization;
78
- this.eluSamples.push(elu);
79
-
80
- const p50 = this.histogram.percentile(50) / NANOS_PER_MS;
81
- const p99 = this.histogram.percentile(99) / NANOS_PER_MS;
82
- const max = this.histogram.max / NANOS_PER_MS;
83
- const heapMb = Math.round(process.memoryUsage().heapUsed / (1024 * 1024));
84
-
85
- const now = new Date();
86
- const time = [now.getHours(), now.getMinutes(), now.getSeconds()].map(n => String(n).padStart(2, '0')).join(':');
87
-
88
- const line = padColumns(
89
- time,
90
- elu.toFixed(2),
91
- `${p50.toFixed(1)}ms`,
92
- `${p99.toFixed(1)}ms`,
93
- `${max.toFixed(1)}ms`,
94
- String(heapMb),
95
- );
96
- appendFileSync(this.filePath, line + '\n');
97
-
98
- // Reset histogram so next sample only reflects the new interval.
99
- this.histogram.reset();
100
- }
101
-
102
- private writeSummary(): void {
103
- if (this.eluSamples.length === 0 || this.testStart === undefined) {
104
- return;
105
- }
106
-
107
- const mean = this.eluSamples.reduce((a, b) => a + b, 0) / this.eluSamples.length;
108
- const maxElu = Math.max(...this.eluSamples);
109
- const sorted = [...this.eluSamples].sort((a, b) => a - b);
110
- const p90Elu = sorted[Math.floor(sorted.length * 0.9)] ?? maxElu;
111
- const durationS = ((performance.now() - this.testStart) / 1000).toFixed(1);
112
-
113
- let summary = `--- Summary: mean_elu=${mean.toFixed(2)} max_elu=${maxElu.toFixed(2)} p90_elu=${p90Elu.toFixed(2)} duration=${durationS}s`;
114
- if (maxElu > 0.85) {
115
- summary += ' WARNING:ELU>0.85';
116
- }
117
- summary += ' ---\n';
118
-
119
- appendFileSync(this.filePath, summary);
120
- }
121
- }
122
-
123
- function padColumns(...cols: string[]): string {
124
- const widths = [11, 7, 12, 12, 12, 8];
125
- return cols.map((col, i) => col.padEnd(widths[i] ?? 10)).join('');
126
- }