@aztec/end-to-end 1.0.0-nightly.20250805 → 1.0.0-nightly.20250807
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.
|
@@ -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,EAAE,KAAK,0BAA0B,
|
|
1
|
+
{"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
|
|
2
|
-
import { EthAddress } from '@aztec/aztec.js';
|
|
3
|
-
import { L1TxUtils, MultiAdderArtifact, RollupContract, deployL1Contract, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
|
|
2
|
+
import { EthAddress, Fr } from '@aztec/aztec.js';
|
|
3
|
+
import { GSEContract, L1TxUtils, MultiAdderArtifact, RollupContract, deployL1Contract, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
|
|
4
4
|
import { ChainMonitor } from '@aztec/ethereum/test';
|
|
5
5
|
import { createLogger } from '@aztec/foundation/log';
|
|
6
6
|
import { RollupAbi, SlashFactoryAbi, SlasherAbi, SlashingProposerAbi, TestERC20Abi } from '@aztec/l1-artifacts';
|
|
@@ -121,7 +121,8 @@ export class P2PNetworkTest {
|
|
|
121
121
|
const attester = privateKeyToAccount(this.attesterPrivateKeys[keyIndex]);
|
|
122
122
|
validators.push({
|
|
123
123
|
attester: EthAddress.fromString(attester.address),
|
|
124
|
-
withdrawer: EthAddress.fromString(attester.address)
|
|
124
|
+
withdrawer: EthAddress.fromString(attester.address),
|
|
125
|
+
bn254SecretKey: Fr.random().toBigInt()
|
|
125
126
|
});
|
|
126
127
|
this.logger.info(`Adding attester ${attester.address} as validator`);
|
|
127
128
|
}
|
|
@@ -163,12 +164,23 @@ export class P2PNetworkTest {
|
|
|
163
164
|
})));
|
|
164
165
|
const { validators } = this.getValidators();
|
|
165
166
|
this.validators = validators;
|
|
167
|
+
const gseAddress = deployL1ContractsValues.l1ContractAddresses.gseAddress;
|
|
168
|
+
if (!gseAddress) {
|
|
169
|
+
throw new Error('GSE contract not deployed');
|
|
170
|
+
}
|
|
171
|
+
const gseContract = new GSEContract(deployL1ContractsValues.l1Client, gseAddress.toString());
|
|
172
|
+
const makeValidatorTuples = async (validator)=>{
|
|
173
|
+
const registrationTuple = await gseContract.makeRegistrationTuple(validator.bn254SecretKey);
|
|
174
|
+
return {
|
|
175
|
+
attester: validator.attester.toString(),
|
|
176
|
+
withdrawer: validator.withdrawer.toString(),
|
|
177
|
+
...registrationTuple
|
|
178
|
+
};
|
|
179
|
+
};
|
|
180
|
+
const validatorTuples = await Promise.all(validators.map(makeValidatorTuples));
|
|
166
181
|
await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
|
|
167
182
|
hash: await multiAdder.write.addValidators([
|
|
168
|
-
|
|
169
|
-
attester: v.attester.toString(),
|
|
170
|
-
withdrawer: v.withdrawer.toString()
|
|
171
|
-
}))
|
|
183
|
+
validatorTuples
|
|
172
184
|
])
|
|
173
185
|
});
|
|
174
186
|
const timestamp = await cheatCodes.rollup.advanceToEpoch(2n, {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/end-to-end",
|
|
3
|
-
"version": "1.0.0-nightly.
|
|
3
|
+
"version": "1.0.0-nightly.20250807",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"inherits": [
|
|
@@ -25,40 +25,40 @@
|
|
|
25
25
|
"formatting": "run -T prettier --check ./src && run -T eslint ./src"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@aztec/accounts": "1.0.0-nightly.
|
|
29
|
-
"@aztec/archiver": "1.0.0-nightly.
|
|
30
|
-
"@aztec/aztec": "1.0.0-nightly.
|
|
31
|
-
"@aztec/aztec-node": "1.0.0-nightly.
|
|
32
|
-
"@aztec/aztec.js": "1.0.0-nightly.
|
|
33
|
-
"@aztec/bb-prover": "1.0.0-nightly.
|
|
34
|
-
"@aztec/blob-lib": "1.0.0-nightly.
|
|
35
|
-
"@aztec/blob-sink": "1.0.0-nightly.
|
|
36
|
-
"@aztec/bot": "1.0.0-nightly.
|
|
37
|
-
"@aztec/cli": "1.0.0-nightly.
|
|
38
|
-
"@aztec/constants": "1.0.0-nightly.
|
|
39
|
-
"@aztec/entrypoints": "1.0.0-nightly.
|
|
40
|
-
"@aztec/epoch-cache": "1.0.0-nightly.
|
|
41
|
-
"@aztec/ethereum": "1.0.0-nightly.
|
|
42
|
-
"@aztec/foundation": "1.0.0-nightly.
|
|
43
|
-
"@aztec/kv-store": "1.0.0-nightly.
|
|
44
|
-
"@aztec/l1-artifacts": "1.0.0-nightly.
|
|
45
|
-
"@aztec/merkle-tree": "1.0.0-nightly.
|
|
46
|
-
"@aztec/noir-contracts.js": "1.0.0-nightly.
|
|
47
|
-
"@aztec/noir-noirc_abi": "1.0.0-nightly.
|
|
48
|
-
"@aztec/noir-protocol-circuits-types": "1.0.0-nightly.
|
|
49
|
-
"@aztec/noir-test-contracts.js": "1.0.0-nightly.
|
|
50
|
-
"@aztec/p2p": "1.0.0-nightly.
|
|
51
|
-
"@aztec/protocol-contracts": "1.0.0-nightly.
|
|
52
|
-
"@aztec/prover-client": "1.0.0-nightly.
|
|
53
|
-
"@aztec/prover-node": "1.0.0-nightly.
|
|
54
|
-
"@aztec/pxe": "1.0.0-nightly.
|
|
55
|
-
"@aztec/sequencer-client": "1.0.0-nightly.
|
|
56
|
-
"@aztec/simulator": "1.0.0-nightly.
|
|
57
|
-
"@aztec/slasher": "1.0.0-nightly.
|
|
58
|
-
"@aztec/stdlib": "1.0.0-nightly.
|
|
59
|
-
"@aztec/telemetry-client": "1.0.0-nightly.
|
|
60
|
-
"@aztec/validator-client": "1.0.0-nightly.
|
|
61
|
-
"@aztec/world-state": "1.0.0-nightly.
|
|
28
|
+
"@aztec/accounts": "1.0.0-nightly.20250807",
|
|
29
|
+
"@aztec/archiver": "1.0.0-nightly.20250807",
|
|
30
|
+
"@aztec/aztec": "1.0.0-nightly.20250807",
|
|
31
|
+
"@aztec/aztec-node": "1.0.0-nightly.20250807",
|
|
32
|
+
"@aztec/aztec.js": "1.0.0-nightly.20250807",
|
|
33
|
+
"@aztec/bb-prover": "1.0.0-nightly.20250807",
|
|
34
|
+
"@aztec/blob-lib": "1.0.0-nightly.20250807",
|
|
35
|
+
"@aztec/blob-sink": "1.0.0-nightly.20250807",
|
|
36
|
+
"@aztec/bot": "1.0.0-nightly.20250807",
|
|
37
|
+
"@aztec/cli": "1.0.0-nightly.20250807",
|
|
38
|
+
"@aztec/constants": "1.0.0-nightly.20250807",
|
|
39
|
+
"@aztec/entrypoints": "1.0.0-nightly.20250807",
|
|
40
|
+
"@aztec/epoch-cache": "1.0.0-nightly.20250807",
|
|
41
|
+
"@aztec/ethereum": "1.0.0-nightly.20250807",
|
|
42
|
+
"@aztec/foundation": "1.0.0-nightly.20250807",
|
|
43
|
+
"@aztec/kv-store": "1.0.0-nightly.20250807",
|
|
44
|
+
"@aztec/l1-artifacts": "1.0.0-nightly.20250807",
|
|
45
|
+
"@aztec/merkle-tree": "1.0.0-nightly.20250807",
|
|
46
|
+
"@aztec/noir-contracts.js": "1.0.0-nightly.20250807",
|
|
47
|
+
"@aztec/noir-noirc_abi": "1.0.0-nightly.20250807",
|
|
48
|
+
"@aztec/noir-protocol-circuits-types": "1.0.0-nightly.20250807",
|
|
49
|
+
"@aztec/noir-test-contracts.js": "1.0.0-nightly.20250807",
|
|
50
|
+
"@aztec/p2p": "1.0.0-nightly.20250807",
|
|
51
|
+
"@aztec/protocol-contracts": "1.0.0-nightly.20250807",
|
|
52
|
+
"@aztec/prover-client": "1.0.0-nightly.20250807",
|
|
53
|
+
"@aztec/prover-node": "1.0.0-nightly.20250807",
|
|
54
|
+
"@aztec/pxe": "1.0.0-nightly.20250807",
|
|
55
|
+
"@aztec/sequencer-client": "1.0.0-nightly.20250807",
|
|
56
|
+
"@aztec/simulator": "1.0.0-nightly.20250807",
|
|
57
|
+
"@aztec/slasher": "1.0.0-nightly.20250807",
|
|
58
|
+
"@aztec/stdlib": "1.0.0-nightly.20250807",
|
|
59
|
+
"@aztec/telemetry-client": "1.0.0-nightly.20250807",
|
|
60
|
+
"@aztec/validator-client": "1.0.0-nightly.20250807",
|
|
61
|
+
"@aztec/world-state": "1.0.0-nightly.20250807",
|
|
62
62
|
"@iarna/toml": "^2.2.5",
|
|
63
63
|
"@jest/globals": "^30.0.0",
|
|
64
64
|
"@noble/curves": "^1.0.0",
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
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
|
-
import { type AccountWalletWithSecretKey, EthAddress } from '@aztec/aztec.js';
|
|
4
|
+
import { type AccountWalletWithSecretKey, EthAddress, Fr } from '@aztec/aztec.js';
|
|
5
5
|
import {
|
|
6
6
|
type ExtendedViemWalletClient,
|
|
7
|
+
GSEContract,
|
|
7
8
|
L1TxUtils,
|
|
8
9
|
MultiAdderArtifact,
|
|
9
10
|
type Operator,
|
|
@@ -206,6 +207,7 @@ export class P2PNetworkTest {
|
|
|
206
207
|
validators.push({
|
|
207
208
|
attester: EthAddress.fromString(attester.address),
|
|
208
209
|
withdrawer: EthAddress.fromString(attester.address),
|
|
210
|
+
bn254SecretKey: Fr.random().toBigInt(),
|
|
209
211
|
});
|
|
210
212
|
|
|
211
213
|
this.logger.info(`Adding attester ${attester.address} as validator`);
|
|
@@ -255,16 +257,25 @@ export class P2PNetworkTest {
|
|
|
255
257
|
const { validators } = this.getValidators();
|
|
256
258
|
this.validators = validators;
|
|
257
259
|
|
|
260
|
+
const gseAddress = deployL1ContractsValues.l1ContractAddresses.gseAddress!;
|
|
261
|
+
if (!gseAddress) {
|
|
262
|
+
throw new Error('GSE contract not deployed');
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
const gseContract = new GSEContract(deployL1ContractsValues.l1Client, gseAddress.toString());
|
|
266
|
+
|
|
267
|
+
const makeValidatorTuples = async (validator: Operator) => {
|
|
268
|
+
const registrationTuple = await gseContract.makeRegistrationTuple(validator.bn254SecretKey);
|
|
269
|
+
return {
|
|
270
|
+
attester: validator.attester.toString() as `0x${string}`,
|
|
271
|
+
withdrawer: validator.withdrawer.toString() as `0x${string}`,
|
|
272
|
+
...registrationTuple,
|
|
273
|
+
};
|
|
274
|
+
};
|
|
275
|
+
const validatorTuples = await Promise.all(validators.map(makeValidatorTuples));
|
|
276
|
+
|
|
258
277
|
await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
|
|
259
|
-
hash: await multiAdder.write.addValidators([
|
|
260
|
-
this.validators.map(
|
|
261
|
-
v =>
|
|
262
|
-
({
|
|
263
|
-
attester: v.attester.toString() as `0x${string}`,
|
|
264
|
-
withdrawer: v.withdrawer.toString() as `0x${string}`,
|
|
265
|
-
}) as const,
|
|
266
|
-
),
|
|
267
|
-
]),
|
|
278
|
+
hash: await multiAdder.write.addValidators([validatorTuples]),
|
|
268
279
|
});
|
|
269
280
|
|
|
270
281
|
const timestamp = await cheatCodes.rollup.advanceToEpoch(2n, { updateDateProvider: dateProvider });
|