@aztec/end-to-end 0.85.0-nightly.20250418 → 0.85.0-nightly.20250421

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 (5) hide show
  1. package/dest/e2e_p2p/p2p_network.d.ts +5 -0
  2. package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
  3. package/dest/e2e_p2p/p2p_network.js +13 -15
  4. package/package.json +33 -33
  5. package/src/e2e_p2p/p2p_network.ts +28 -15
package/dest/e2e_p2p/p2p_network.d.ts CHANGED
@@ -283,6 +283,11 @@ export declare class P2PNetworkTest {
283
283
  setupAccount(): Promise<void>;
284
284
  deploySpamContract(): Promise<void>;
285
285
  removeInitialNode(): Promise<void>;
286
+ sendDummyTx(): Promise<{
287
+ receipt: import("viem").TransactionReceipt;
288
+ gasPrice: import("@aztec/ethereum").GasPrice;
289
+ }>;
290
+ private _sendDummyTx;
286
291
  setup(): Promise<void>;
287
292
  stopNodes(nodes: AztecNodeService[]): Promise<void>;
288
293
  teardown(): Promise<void>;
package/dest/e2e_p2p/p2p_network.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"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"}
package/dest/e2e_p2p/p2p_network.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
2
- import { RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
2
+ import { L1TxUtils, RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
3
3
  import { ChainMonitor, EthCheatCodesWithState } from '@aztec/ethereum/test';
4
4
  import { createLogger } from '@aztec/foundation/log';
5
5
  import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
@@ -170,13 +170,7 @@ export class P2PNetworkTest {
170
170
  this.logger.debug('Warp failed, time already satisfied');
171
171
  }
172
172
  // Send and await a tx to make sure we mine a block for the warp to correctly progress.
173
- await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
174
- hash: await deployL1ContractsValues.walletClient.sendTransaction({
175
- to: this.baseAccount.address,
176
- value: 1n,
177
- account: this.baseAccount
178
- })
179
- });
173
+ await this._sendDummyTx(deployL1ContractsValues.publicClient, deployL1ContractsValues.walletClient);
180
174
  // Set the system time in the node, only after we have warped the time and waited for a block
181
175
  // Time is only set in the NEXT block
182
176
  dateProvider.setTime(Number(timestamp) * 1000);
@@ -208,13 +202,7 @@ export class P2PNetworkTest {
208
202
  async removeInitialNode() {
209
203
  await this.snapshotManager.snapshot('remove-inital-validator', async ({ deployL1ContractsValues, aztecNode, dateProvider })=>{
210
204
  // Send and await a tx to make sure we mine a block for the warp to correctly progress.
211
- const receipt = await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
212
- hash: await deployL1ContractsValues.walletClient.sendTransaction({
213
- to: this.baseAccount.address,
214
- value: 1n,
215
- account: this.baseAccount
216
- })
217
- });
205
+ const { receipt } = await this._sendDummyTx(deployL1ContractsValues.publicClient, deployL1ContractsValues.walletClient);
218
206
  const block = await deployL1ContractsValues.publicClient.getBlock({
219
207
  blockNumber: receipt.blockNumber
220
208
  });
@@ -222,6 +210,16 @@ export class P2PNetworkTest {
222
210
  await aztecNode.stop();
223
211
  });
224
212
  }
213
+ async sendDummyTx() {
214
+ return await this._sendDummyTx(this.ctx.deployL1ContractsValues.publicClient, this.ctx.deployL1ContractsValues.walletClient);
215
+ }
216
+ async _sendDummyTx(publicClient, walletClient) {
217
+ const l1TxUtils = new L1TxUtils(publicClient, walletClient);
218
+ return await l1TxUtils.sendAndMonitorTransaction({
219
+ to: walletClient.account.address,
220
+ value: 1n
221
+ });
222
+ }
225
223
  async setup() {
226
224
  this.ctx = await this.snapshotManager.setup();
227
225
  const sponsoredFPCAddress = await getSponsoredFPCAddress();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/end-to-end",
3
- "version": "0.85.0-nightly.20250418",
3
+ "version": "0.85.0-nightly.20250421",
4
4
  "type": "module",
5
5
  "exports": "./dest/index.js",
6
6
  "inherits": [
@@ -25,38 +25,38 @@
25
25
  "formatting": "run -T prettier --check ./src && run -T eslint ./src"
26
26
  },
27
27
  "dependencies": {
28
- "@aztec/accounts": "0.85.0-nightly.20250418",
29
- "@aztec/archiver": "0.85.0-nightly.20250418",
30
- "@aztec/aztec": "0.85.0-nightly.20250418",
31
- "@aztec/aztec-node": "0.85.0-nightly.20250418",
32
- "@aztec/aztec.js": "0.85.0-nightly.20250418",
33
- "@aztec/bb-prover": "0.85.0-nightly.20250418",
34
- "@aztec/blob-lib": "0.85.0-nightly.20250418",
35
- "@aztec/blob-sink": "0.85.0-nightly.20250418",
36
- "@aztec/bot": "0.85.0-nightly.20250418",
37
- "@aztec/cli": "0.85.0-nightly.20250418",
38
- "@aztec/constants": "0.85.0-nightly.20250418",
39
- "@aztec/entrypoints": "0.85.0-nightly.20250418",
40
- "@aztec/epoch-cache": "0.85.0-nightly.20250418",
41
- "@aztec/ethereum": "0.85.0-nightly.20250418",
42
- "@aztec/foundation": "0.85.0-nightly.20250418",
43
- "@aztec/kv-store": "0.85.0-nightly.20250418",
44
- "@aztec/l1-artifacts": "0.85.0-nightly.20250418",
45
- "@aztec/merkle-tree": "0.85.0-nightly.20250418",
46
- "@aztec/noir-contracts.js": "0.85.0-nightly.20250418",
47
- "@aztec/noir-noirc_abi": "0.85.0-nightly.20250418",
48
- "@aztec/noir-protocol-circuits-types": "0.85.0-nightly.20250418",
49
- "@aztec/p2p": "0.85.0-nightly.20250418",
50
- "@aztec/protocol-contracts": "0.85.0-nightly.20250418",
51
- "@aztec/prover-client": "0.85.0-nightly.20250418",
52
- "@aztec/prover-node": "0.85.0-nightly.20250418",
53
- "@aztec/pxe": "0.85.0-nightly.20250418",
54
- "@aztec/sequencer-client": "0.85.0-nightly.20250418",
55
- "@aztec/simulator": "0.85.0-nightly.20250418",
56
- "@aztec/stdlib": "0.85.0-nightly.20250418",
57
- "@aztec/telemetry-client": "0.85.0-nightly.20250418",
58
- "@aztec/validator-client": "0.85.0-nightly.20250418",
59
- "@aztec/world-state": "0.85.0-nightly.20250418",
28
+ "@aztec/accounts": "0.85.0-nightly.20250421",
29
+ "@aztec/archiver": "0.85.0-nightly.20250421",
30
+ "@aztec/aztec": "0.85.0-nightly.20250421",
31
+ "@aztec/aztec-node": "0.85.0-nightly.20250421",
32
+ "@aztec/aztec.js": "0.85.0-nightly.20250421",
33
+ "@aztec/bb-prover": "0.85.0-nightly.20250421",
34
+ "@aztec/blob-lib": "0.85.0-nightly.20250421",
35
+ "@aztec/blob-sink": "0.85.0-nightly.20250421",
36
+ "@aztec/bot": "0.85.0-nightly.20250421",
37
+ "@aztec/cli": "0.85.0-nightly.20250421",
38
+ "@aztec/constants": "0.85.0-nightly.20250421",
39
+ "@aztec/entrypoints": "0.85.0-nightly.20250421",
40
+ "@aztec/epoch-cache": "0.85.0-nightly.20250421",
41
+ "@aztec/ethereum": "0.85.0-nightly.20250421",
42
+ "@aztec/foundation": "0.85.0-nightly.20250421",
43
+ "@aztec/kv-store": "0.85.0-nightly.20250421",
44
+ "@aztec/l1-artifacts": "0.85.0-nightly.20250421",
45
+ "@aztec/merkle-tree": "0.85.0-nightly.20250421",
46
+ "@aztec/noir-contracts.js": "0.85.0-nightly.20250421",
47
+ "@aztec/noir-noirc_abi": "0.85.0-nightly.20250421",
48
+ "@aztec/noir-protocol-circuits-types": "0.85.0-nightly.20250421",
49
+ "@aztec/p2p": "0.85.0-nightly.20250421",
50
+ "@aztec/protocol-contracts": "0.85.0-nightly.20250421",
51
+ "@aztec/prover-client": "0.85.0-nightly.20250421",
52
+ "@aztec/prover-node": "0.85.0-nightly.20250421",
53
+ "@aztec/pxe": "0.85.0-nightly.20250421",
54
+ "@aztec/sequencer-client": "0.85.0-nightly.20250421",
55
+ "@aztec/simulator": "0.85.0-nightly.20250421",
56
+ "@aztec/stdlib": "0.85.0-nightly.20250421",
57
+ "@aztec/telemetry-client": "0.85.0-nightly.20250421",
58
+ "@aztec/validator-client": "0.85.0-nightly.20250421",
59
+ "@aztec/world-state": "0.85.0-nightly.20250421",
60
60
  "@iarna/toml": "^2.2.5",
61
61
  "@jest/globals": "^29.5.0",
62
62
  "@noble/curves": "^1.0.0",
package/src/e2e_p2p/p2p_network.ts CHANGED
@@ -2,7 +2,14 @@ import { getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
2
2
  import type { InitialAccountData } from '@aztec/accounts/testing';
3
3
  import type { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
4
4
  import type { AccountWalletWithSecretKey } from '@aztec/aztec.js';
5
- import { RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
5
+ import {
6
+ L1TxUtils,
7
+ RollupContract,
8
+ type ViemPublicClient,
9
+ type ViemWalletClient,
10
+ getExpectedAddress,
11
+ getL1ContractsConfigEnvVars,
12
+ } from '@aztec/ethereum';
6
13
  import { ChainMonitor, EthCheatCodesWithState } from '@aztec/ethereum/test';
7
14
  import { type Logger, createLogger } from '@aztec/foundation/log';
8
15
  import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
@@ -232,13 +239,7 @@ export class P2PNetworkTest {
232
239
  }
233
240
 
234
241
  // Send and await a tx to make sure we mine a block for the warp to correctly progress.
235
- await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
236
- hash: await deployL1ContractsValues.walletClient.sendTransaction({
237
- to: this.baseAccount.address,
238
- value: 1n,
239
- account: this.baseAccount,
240
- }),
241
- });
242
+ await this._sendDummyTx(deployL1ContractsValues.publicClient, deployL1ContractsValues.walletClient);
242
243
 
243
244
  // Set the system time in the node, only after we have warped the time and waited for a block
244
245
  // Time is only set in the NEXT block
@@ -284,13 +285,10 @@ export class P2PNetworkTest {
284
285
  'remove-inital-validator',
285
286
  async ({ deployL1ContractsValues, aztecNode, dateProvider }) => {
286
287
  // Send and await a tx to make sure we mine a block for the warp to correctly progress.
287
- const receipt = await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
288
- hash: await deployL1ContractsValues.walletClient.sendTransaction({
289
- to: this.baseAccount.address,
290
- value: 1n,
291
- account: this.baseAccount,
292
- }),
293
- });
288
+ const { receipt } = await this._sendDummyTx(
289
+ deployL1ContractsValues.publicClient,
290
+ deployL1ContractsValues.walletClient,
291
+ );
294
292
  const block = await deployL1ContractsValues.publicClient.getBlock({
295
293
  blockNumber: receipt.blockNumber,
296
294
  });
@@ -301,6 +299,21 @@ export class P2PNetworkTest {
301
299
  );
302
300
  }
303
301
 
302
+ async sendDummyTx() {
303
+ return await this._sendDummyTx(
304
+ this.ctx.deployL1ContractsValues.publicClient,
305
+ this.ctx.deployL1ContractsValues.walletClient,
306
+ );
307
+ }
308
+
309
+ private async _sendDummyTx(publicClient: ViemPublicClient, walletClient: ViemWalletClient) {
310
+ const l1TxUtils = new L1TxUtils(publicClient, walletClient);
311
+ return await l1TxUtils.sendAndMonitorTransaction({
312
+ to: walletClient.account!.address,
313
+ value: 1n,
314
+ });
315
+ }
316
+
304
317
  async setup() {
305
318
  this.ctx = await this.snapshotManager.setup();
306
319