@aztec/end-to-end 0.86.0-nightly.20250511 → 0.86.0-nightly.20250513

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 (4) hide show
  1. package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
  2. package/dest/e2e_p2p/p2p_network.js +12 -7
  3. package/package.json +34 -34
  4. package/src/e2e_p2p/p2p_network.ts +20 -8
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":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAQlE,OAAO,EAAE,YAAY,EAA0B,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAa9D,OAAO,EAEL,KAAK,iBAAiB,EAGvB,MAAM,iCAAiC,CAAC;AAOzC,eAAO,MAAM,mBAAmB,QAA0C,CAAC;AAE3E,eAAO,MAAM,2BAA2B;;;CAGvC,CAAC;AAEF,qBAAa,cAAc;IA0BhB,gBAAgB,EAAE,MAAM;IACxB,YAAY,EAAE,MAAM;IAC3B,OAAO,CAAC,aAAa;IAGrB,OAAO,CAAC,WAAW,CAAC;IA9BtB,OAAO,CAAC,eAAe,CAAmB;IACnC,qBAAqB,EAAE,KAAK,MAAM,EAAE,CAAC;IACrC,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAC;IAEZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAG,YAAY,CAAC;IAEvB,GAAG,EAAG,iBAAiB,CAAC;IACxB,mBAAmB,EAAE,KAAK,MAAM,EAAE,EAAE,CAAM;IAC1C,kBAAkB,EAAE,MAAM,EAAE,CAAM;IAClC,mBAAmB,EAAE,KAAK,MAAM,EAAE,EAAE,CAAM;IAC1C,iBAAiB,EAAE,MAAM,EAAE,CAAM;IACjC,UAAU,EAAE;QAAE,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,UAAU,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAC/G;IAEE,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC5C,mBAAmB,EAAE,kBAAkB,EAAE,CAAM;IAE/C,MAAM,CAAC,EAAE,0BAA0B,CAAC;IACpC,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B,aAAa,CAAC,EAAE,aAAa,CAAC;gBAGnC,QAAQ,EAAE,MAAM,EACT,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EAC7B,sBAAsB,EAAE,eAAe,EAE/B,WAAW,CAAC,oBAAQ;WAqCjB,MAAM,CAAC,EAClB,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,WAAW,EACX,aAAa,GACd,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;KAC1C;IAcD,IAAI,aAAa,uBAKhB;IAEK,gBAAgB;IActB,aAAa;;;;;;;;;IA0BP,kBAAkB;IAuDlB,YAAY;IAYZ,kBAAkB;IAoBlB,iBAAiB;IAgBjB,WAAW;;;;YAIH,YAAY;IAQpB,KAAK;IAaL,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE;IAanC,QAAQ;CAKf"}
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 { L1TxUtils, RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
2
+ import { L1TxUtils, RollupContract, deployL1Contract, getExpectedAddress, getL1ContractsConfigEnvVars, l1Artifacts } 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';
@@ -139,14 +139,19 @@ export class P2PNetworkTest {
139
139
  abi: TestERC20Abi,
140
140
  client: deployL1ContractsValues.l1Client
141
141
  });
142
+ const { address: multiAdderAddress } = await deployL1Contract(deployL1ContractsValues.l1Client, l1Artifacts.multiAdder.contractAbi, l1Artifacts.multiAdder.contractBytecode, [
143
+ rollup.address,
144
+ deployL1ContractsValues.l1Client.account.address
145
+ ]);
146
+ const multiAdder = getContract({
147
+ address: multiAdderAddress.toString(),
148
+ abi: l1Artifacts.multiAdder.contractAbi,
149
+ client: deployL1ContractsValues.l1Client
150
+ });
142
151
  const stakeNeeded = l1ContractsConfig.minimumStake * BigInt(this.numberOfNodes);
143
152
  await Promise.all([
144
153
  await stakingAsset.write.mint([
145
- deployL1ContractsValues.l1Client.account.address,
146
- stakeNeeded
147
- ], {}),
148
- await stakingAsset.write.approve([
149
- deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
154
+ multiAdder.address,
150
155
  stakeNeeded
151
156
  ], {})
152
157
  ].map((txHash)=>deployL1ContractsValues.l1Client.waitForTransactionReceipt({
@@ -155,7 +160,7 @@ export class P2PNetworkTest {
155
160
  const { validators } = this.getValidators();
156
161
  this.validators = validators;
157
162
  await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
158
- hash: await rollup.write.cheat__InitialiseValidatorSet([
163
+ hash: await multiAdder.write.addValidators([
159
164
  this.validators
160
165
  ])
161
166
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/end-to-end",
3
- "version": "0.86.0-nightly.20250511",
3
+ "version": "0.86.0-nightly.20250513",
4
4
  "type": "module",
5
5
  "exports": "./dest/index.js",
6
6
  "inherits": [
@@ -25,39 +25,39 @@
25
25
  "formatting": "run -T prettier --check ./src && run -T eslint ./src"
26
26
  },
27
27
  "dependencies": {
28
- "@aztec/accounts": "0.86.0-nightly.20250511",
29
- "@aztec/archiver": "0.86.0-nightly.20250511",
30
- "@aztec/aztec": "0.86.0-nightly.20250511",
31
- "@aztec/aztec-node": "0.86.0-nightly.20250511",
32
- "@aztec/aztec.js": "0.86.0-nightly.20250511",
33
- "@aztec/bb-prover": "0.86.0-nightly.20250511",
34
- "@aztec/blob-lib": "0.86.0-nightly.20250511",
35
- "@aztec/blob-sink": "0.86.0-nightly.20250511",
36
- "@aztec/bot": "0.86.0-nightly.20250511",
37
- "@aztec/cli": "0.86.0-nightly.20250511",
38
- "@aztec/constants": "0.86.0-nightly.20250511",
39
- "@aztec/entrypoints": "0.86.0-nightly.20250511",
40
- "@aztec/epoch-cache": "0.86.0-nightly.20250511",
41
- "@aztec/ethereum": "0.86.0-nightly.20250511",
42
- "@aztec/foundation": "0.86.0-nightly.20250511",
43
- "@aztec/kv-store": "0.86.0-nightly.20250511",
44
- "@aztec/l1-artifacts": "0.86.0-nightly.20250511",
45
- "@aztec/merkle-tree": "0.86.0-nightly.20250511",
46
- "@aztec/noir-contracts.js": "0.86.0-nightly.20250511",
47
- "@aztec/noir-noirc_abi": "0.86.0-nightly.20250511",
48
- "@aztec/noir-protocol-circuits-types": "0.86.0-nightly.20250511",
49
- "@aztec/noir-test-contracts.js": "0.86.0-nightly.20250511",
50
- "@aztec/p2p": "0.86.0-nightly.20250511",
51
- "@aztec/protocol-contracts": "0.86.0-nightly.20250511",
52
- "@aztec/prover-client": "0.86.0-nightly.20250511",
53
- "@aztec/prover-node": "0.86.0-nightly.20250511",
54
- "@aztec/pxe": "0.86.0-nightly.20250511",
55
- "@aztec/sequencer-client": "0.86.0-nightly.20250511",
56
- "@aztec/simulator": "0.86.0-nightly.20250511",
57
- "@aztec/stdlib": "0.86.0-nightly.20250511",
58
- "@aztec/telemetry-client": "0.86.0-nightly.20250511",
59
- "@aztec/validator-client": "0.86.0-nightly.20250511",
60
- "@aztec/world-state": "0.86.0-nightly.20250511",
28
+ "@aztec/accounts": "0.86.0-nightly.20250513",
29
+ "@aztec/archiver": "0.86.0-nightly.20250513",
30
+ "@aztec/aztec": "0.86.0-nightly.20250513",
31
+ "@aztec/aztec-node": "0.86.0-nightly.20250513",
32
+ "@aztec/aztec.js": "0.86.0-nightly.20250513",
33
+ "@aztec/bb-prover": "0.86.0-nightly.20250513",
34
+ "@aztec/blob-lib": "0.86.0-nightly.20250513",
35
+ "@aztec/blob-sink": "0.86.0-nightly.20250513",
36
+ "@aztec/bot": "0.86.0-nightly.20250513",
37
+ "@aztec/cli": "0.86.0-nightly.20250513",
38
+ "@aztec/constants": "0.86.0-nightly.20250513",
39
+ "@aztec/entrypoints": "0.86.0-nightly.20250513",
40
+ "@aztec/epoch-cache": "0.86.0-nightly.20250513",
41
+ "@aztec/ethereum": "0.86.0-nightly.20250513",
42
+ "@aztec/foundation": "0.86.0-nightly.20250513",
43
+ "@aztec/kv-store": "0.86.0-nightly.20250513",
44
+ "@aztec/l1-artifacts": "0.86.0-nightly.20250513",
45
+ "@aztec/merkle-tree": "0.86.0-nightly.20250513",
46
+ "@aztec/noir-contracts.js": "0.86.0-nightly.20250513",
47
+ "@aztec/noir-noirc_abi": "0.86.0-nightly.20250513",
48
+ "@aztec/noir-protocol-circuits-types": "0.86.0-nightly.20250513",
49
+ "@aztec/noir-test-contracts.js": "0.86.0-nightly.20250513",
50
+ "@aztec/p2p": "0.86.0-nightly.20250513",
51
+ "@aztec/protocol-contracts": "0.86.0-nightly.20250513",
52
+ "@aztec/prover-client": "0.86.0-nightly.20250513",
53
+ "@aztec/prover-node": "0.86.0-nightly.20250513",
54
+ "@aztec/pxe": "0.86.0-nightly.20250513",
55
+ "@aztec/sequencer-client": "0.86.0-nightly.20250513",
56
+ "@aztec/simulator": "0.86.0-nightly.20250513",
57
+ "@aztec/stdlib": "0.86.0-nightly.20250513",
58
+ "@aztec/telemetry-client": "0.86.0-nightly.20250513",
59
+ "@aztec/validator-client": "0.86.0-nightly.20250513",
60
+ "@aztec/world-state": "0.86.0-nightly.20250513",
61
61
  "@iarna/toml": "^2.2.5",
62
62
  "@jest/globals": "^29.5.0",
63
63
  "@noble/curves": "^1.0.0",
package/src/e2e_p2p/p2p_network.ts CHANGED
@@ -6,8 +6,10 @@ import {
6
6
  type ExtendedViemWalletClient,
7
7
  L1TxUtils,
8
8
  RollupContract,
9
+ deployL1Contract,
9
10
  getExpectedAddress,
10
11
  getL1ContractsConfigEnvVars,
12
+ l1Artifacts,
11
13
  } from '@aztec/ethereum';
12
14
  import { ChainMonitor, EthCheatCodesWithState } from '@aztec/ethereum/test';
13
15
  import { type Logger, createLogger } from '@aztec/foundation/log';
@@ -207,21 +209,31 @@ export class P2PNetworkTest {
207
209
  client: deployL1ContractsValues.l1Client,
208
210
  });
209
211
 
212
+ const { address: multiAdderAddress } = await deployL1Contract(
213
+ deployL1ContractsValues.l1Client,
214
+ l1Artifacts.multiAdder.contractAbi,
215
+ l1Artifacts.multiAdder.contractBytecode,
216
+ [rollup.address, deployL1ContractsValues.l1Client.account.address],
217
+ );
218
+
219
+ const multiAdder = getContract({
220
+ address: multiAdderAddress.toString(),
221
+ abi: l1Artifacts.multiAdder.contractAbi,
222
+ client: deployL1ContractsValues.l1Client,
223
+ });
224
+
210
225
  const stakeNeeded = l1ContractsConfig.minimumStake * BigInt(this.numberOfNodes);
211
226
  await Promise.all(
212
- [
213
- await stakingAsset.write.mint([deployL1ContractsValues.l1Client.account.address, stakeNeeded], {} as any),
214
- await stakingAsset.write.approve(
215
- [deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(), stakeNeeded],
216
- {} as any,
217
- ),
218
- ].map(txHash => deployL1ContractsValues.l1Client.waitForTransactionReceipt({ hash: txHash })),
227
+ [await stakingAsset.write.mint([multiAdder.address, stakeNeeded], {} as any)].map(txHash =>
228
+ deployL1ContractsValues.l1Client.waitForTransactionReceipt({ hash: txHash }),
229
+ ),
219
230
  );
220
231
 
221
232
  const { validators } = this.getValidators();
222
233
  this.validators = validators;
234
+
223
235
  await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
224
- hash: await rollup.write.cheat__InitialiseValidatorSet([this.validators]),
236
+ hash: await multiAdder.write.addValidators([this.validators]),
225
237
  });
226
238
 
227
239
  const slotsInEpoch = await rollup.read.getEpochDuration();