@aztec/end-to-end 0.87.1 → 0.87.2-nightly.20250524
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/e2e_p2p/p2p_network.d.ts +3 -2
- package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
- package/dest/e2e_p2p/p2p_network.js +5 -4
- package/dest/fixtures/utils.d.ts +2 -3
- package/dest/fixtures/utils.d.ts.map +1 -1
- package/package.json +35 -34
- package/src/e2e_p2p/p2p_network.ts +13 -1
- package/src/fixtures/utils.ts +2 -1
|
@@ -56,13 +56,14 @@ export declare class P2PNetworkTest {
|
|
|
56
56
|
wallet?: AccountWalletWithSecretKey;
|
|
57
57
|
spamContract?: SpamContract;
|
|
58
58
|
bootstrapNode?: BootstrapNode;
|
|
59
|
-
constructor(testName: string, bootstrapNodeEnr: string, bootNodePort: number, numberOfNodes: number, initialValidatorConfig: AztecNodeConfig, metricsPort?: number | undefined);
|
|
60
|
-
static create({ testName, numberOfNodes, basePort, metricsPort, initialConfig, }: {
|
|
59
|
+
constructor(testName: string, bootstrapNodeEnr: string, bootNodePort: number, numberOfNodes: number, initialValidatorConfig: AztecNodeConfig, metricsPort?: number | undefined, startProverNode?: boolean);
|
|
60
|
+
static create({ testName, numberOfNodes, basePort, metricsPort, initialConfig, startProverNode, }: {
|
|
61
61
|
testName: string;
|
|
62
62
|
numberOfNodes: number;
|
|
63
63
|
basePort?: number;
|
|
64
64
|
metricsPort?: number;
|
|
65
65
|
initialConfig?: Partial<AztecNodeConfig>;
|
|
66
|
+
startProverNode?: boolean;
|
|
66
67
|
}): Promise<P2PNetworkTest>;
|
|
67
68
|
get fundedAccount(): InitialAccountData;
|
|
68
69
|
addBootstrapNode(): Promise<void>;
|
|
@@ -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;AAUlE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,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,qCAAqC;;;;CAIjD,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;;;;;;;;;;wTAd4C,CAAC;sBAAsB,CAAC;;;;;;MAcnE;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,EAAE,MAAM,YAAA;
|
|
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;AAUlE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,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,qCAAqC;;;;CAIjD,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;;;;;;;;;;wTAd4C,CAAC;sBAAsB,CAAC;;;;;;MAcnE;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,EAAE,MAAM,YAAA,EAC5B,eAAe,CAAC,EAAE,OAAO;WAsCd,MAAM,CAAC,EAClB,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,WAAW,EACX,aAAa,EACb,eAAe,GAChB,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;QACzC,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B;IAsBD,IAAI,aAAa,uBAKhB;IAEK,gBAAgB;IActB,aAAa;;;;;;;;;IA0BP,kBAAkB;IA0DlB,YAAY;IAYZ,kBAAkB;IAoBlB,iBAAiB;IAgBjB,WAAW;;;;YAIH,YAAY;IAQpB,KAAK;IAaL,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE;IAanC,QAAQ;CAKf"}
|
|
@@ -45,7 +45,7 @@ export class P2PNetworkTest {
|
|
|
45
45
|
spamContract;
|
|
46
46
|
bootstrapNode;
|
|
47
47
|
constructor(testName, bootstrapNodeEnr, bootNodePort, numberOfNodes, initialValidatorConfig, // If set enable metrics collection
|
|
48
|
-
metricsPort){
|
|
48
|
+
metricsPort, startProverNode){
|
|
49
49
|
this.bootstrapNodeEnr = bootstrapNodeEnr;
|
|
50
50
|
this.bootNodePort = bootNodePort;
|
|
51
51
|
this.numberOfNodes = numberOfNodes;
|
|
@@ -72,7 +72,8 @@ export class P2PNetworkTest {
|
|
|
72
72
|
aztecProofSubmissionWindow: initialValidatorConfig.aztecProofSubmissionWindow ?? l1ContractsConfig.aztecProofSubmissionWindow,
|
|
73
73
|
salt: 420,
|
|
74
74
|
metricsPort: metricsPort,
|
|
75
|
-
numberOfInitialFundedAccounts: 2
|
|
75
|
+
numberOfInitialFundedAccounts: 2,
|
|
76
|
+
startProverNode
|
|
76
77
|
}, {
|
|
77
78
|
...initialValidatorConfig,
|
|
78
79
|
aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
|
|
@@ -82,12 +83,12 @@ export class P2PNetworkTest {
|
|
|
82
83
|
initialValidators: []
|
|
83
84
|
});
|
|
84
85
|
}
|
|
85
|
-
static async create({ testName, numberOfNodes, basePort, metricsPort, initialConfig }) {
|
|
86
|
+
static async create({ testName, numberOfNodes, basePort, metricsPort, initialConfig, startProverNode }) {
|
|
86
87
|
const port = basePort || await getPort();
|
|
87
88
|
const bootstrapNodeENR = await getBootstrapNodeEnr(BOOTSTRAP_NODE_PRIVATE_KEY, port);
|
|
88
89
|
const bootstrapNodeEnr = bootstrapNodeENR.encodeTxt();
|
|
89
90
|
const initialValidatorConfig = await createValidatorConfig(initialConfig ?? {}, bootstrapNodeEnr);
|
|
90
|
-
return new P2PNetworkTest(testName, bootstrapNodeEnr, port, numberOfNodes, initialValidatorConfig, metricsPort);
|
|
91
|
+
return new P2PNetworkTest(testName, bootstrapNodeEnr, port, numberOfNodes, initialValidatorConfig, metricsPort, startProverNode);
|
|
91
92
|
}
|
|
92
93
|
get fundedAccount() {
|
|
93
94
|
if (!this.deployedAccounts[0]) {
|
package/dest/fixtures/utils.d.ts
CHANGED
|
@@ -3,9 +3,8 @@ import { type AztecNodeConfig } from '@aztec/aztec-node';
|
|
|
3
3
|
import { type AccountWalletWithSecretKey, type AztecAddress, type AztecNode, type ContractMethod, type Logger, type PXE, type Wallet } from '@aztec/aztec.js';
|
|
4
4
|
import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec.js/testing';
|
|
5
5
|
import { type BlobSinkServer } from '@aztec/blob-sink/server';
|
|
6
|
-
import { type DeployL1ContractsArgs, type DeployL1ContractsReturnType, ForwarderContract } from '@aztec/ethereum';
|
|
6
|
+
import { type DeployL1ContractsArgs, type DeployL1ContractsReturnType, ForwarderContract, type Operator } from '@aztec/ethereum';
|
|
7
7
|
import { startAnvil } from '@aztec/ethereum/test';
|
|
8
|
-
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
9
8
|
import { Fr } from '@aztec/foundation/fields';
|
|
10
9
|
import { TestDateProvider } from '@aztec/foundation/timer';
|
|
11
10
|
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
@@ -61,7 +60,7 @@ export type SetupOptions = {
|
|
|
61
60
|
/** Salt to use in L1 contract deployment */
|
|
62
61
|
salt?: number;
|
|
63
62
|
/** An initial set of validators */
|
|
64
|
-
initialValidators?:
|
|
63
|
+
initialValidators?: Operator[];
|
|
65
64
|
/** Anvil Start time */
|
|
66
65
|
l1StartTime?: number;
|
|
67
66
|
/** The anvil time where we should at the earliest be seeing L2 blocks */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/utils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,KAAK,eAAe,EAAsC,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,YAAY,EACjB,KAAK,SAAS,EAEd,KAAK,cAAc,EACnB,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,MAAM,EAMZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEvE,OAAO,EAAE,KAAK,cAAc,EAAwB,MAAM,yBAAyB,CAAC;AAEpF,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,EAChC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/end-to-end",
|
|
3
|
-
"version": "0.87.
|
|
3
|
+
"version": "0.87.2-nightly.20250524",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"inherits": [
|
|
@@ -25,39 +25,40 @@
|
|
|
25
25
|
"formatting": "run -T prettier --check ./src && run -T eslint ./src"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@aztec/accounts": "0.87.
|
|
29
|
-
"@aztec/archiver": "0.87.
|
|
30
|
-
"@aztec/aztec": "0.87.
|
|
31
|
-
"@aztec/aztec-node": "0.87.
|
|
32
|
-
"@aztec/aztec.js": "0.87.
|
|
33
|
-
"@aztec/bb-prover": "0.87.
|
|
34
|
-
"@aztec/blob-lib": "0.87.
|
|
35
|
-
"@aztec/blob-sink": "0.87.
|
|
36
|
-
"@aztec/bot": "0.87.
|
|
37
|
-
"@aztec/cli": "0.87.
|
|
38
|
-
"@aztec/constants": "0.87.
|
|
39
|
-
"@aztec/entrypoints": "0.87.
|
|
40
|
-
"@aztec/epoch-cache": "0.87.
|
|
41
|
-
"@aztec/ethereum": "0.87.
|
|
42
|
-
"@aztec/foundation": "0.87.
|
|
43
|
-
"@aztec/kv-store": "0.87.
|
|
44
|
-
"@aztec/l1-artifacts": "0.87.
|
|
45
|
-
"@aztec/merkle-tree": "0.87.
|
|
46
|
-
"@aztec/noir-contracts.js": "0.87.
|
|
47
|
-
"@aztec/noir-noirc_abi": "0.87.
|
|
48
|
-
"@aztec/noir-protocol-circuits-types": "0.87.
|
|
49
|
-
"@aztec/noir-test-contracts.js": "0.87.
|
|
50
|
-
"@aztec/p2p": "0.87.
|
|
51
|
-
"@aztec/protocol-contracts": "0.87.
|
|
52
|
-
"@aztec/prover-client": "0.87.
|
|
53
|
-
"@aztec/prover-node": "0.87.
|
|
54
|
-
"@aztec/pxe": "0.87.
|
|
55
|
-
"@aztec/sequencer-client": "0.87.
|
|
56
|
-
"@aztec/simulator": "0.87.
|
|
57
|
-
"@aztec/
|
|
58
|
-
"@aztec/
|
|
59
|
-
"@aztec/
|
|
60
|
-
"@aztec/
|
|
28
|
+
"@aztec/accounts": "0.87.2-nightly.20250524",
|
|
29
|
+
"@aztec/archiver": "0.87.2-nightly.20250524",
|
|
30
|
+
"@aztec/aztec": "0.87.2-nightly.20250524",
|
|
31
|
+
"@aztec/aztec-node": "0.87.2-nightly.20250524",
|
|
32
|
+
"@aztec/aztec.js": "0.87.2-nightly.20250524",
|
|
33
|
+
"@aztec/bb-prover": "0.87.2-nightly.20250524",
|
|
34
|
+
"@aztec/blob-lib": "0.87.2-nightly.20250524",
|
|
35
|
+
"@aztec/blob-sink": "0.87.2-nightly.20250524",
|
|
36
|
+
"@aztec/bot": "0.87.2-nightly.20250524",
|
|
37
|
+
"@aztec/cli": "0.87.2-nightly.20250524",
|
|
38
|
+
"@aztec/constants": "0.87.2-nightly.20250524",
|
|
39
|
+
"@aztec/entrypoints": "0.87.2-nightly.20250524",
|
|
40
|
+
"@aztec/epoch-cache": "0.87.2-nightly.20250524",
|
|
41
|
+
"@aztec/ethereum": "0.87.2-nightly.20250524",
|
|
42
|
+
"@aztec/foundation": "0.87.2-nightly.20250524",
|
|
43
|
+
"@aztec/kv-store": "0.87.2-nightly.20250524",
|
|
44
|
+
"@aztec/l1-artifacts": "0.87.2-nightly.20250524",
|
|
45
|
+
"@aztec/merkle-tree": "0.87.2-nightly.20250524",
|
|
46
|
+
"@aztec/noir-contracts.js": "0.87.2-nightly.20250524",
|
|
47
|
+
"@aztec/noir-noirc_abi": "0.87.2-nightly.20250524",
|
|
48
|
+
"@aztec/noir-protocol-circuits-types": "0.87.2-nightly.20250524",
|
|
49
|
+
"@aztec/noir-test-contracts.js": "0.87.2-nightly.20250524",
|
|
50
|
+
"@aztec/p2p": "0.87.2-nightly.20250524",
|
|
51
|
+
"@aztec/protocol-contracts": "0.87.2-nightly.20250524",
|
|
52
|
+
"@aztec/prover-client": "0.87.2-nightly.20250524",
|
|
53
|
+
"@aztec/prover-node": "0.87.2-nightly.20250524",
|
|
54
|
+
"@aztec/pxe": "0.87.2-nightly.20250524",
|
|
55
|
+
"@aztec/sequencer-client": "0.87.2-nightly.20250524",
|
|
56
|
+
"@aztec/simulator": "0.87.2-nightly.20250524",
|
|
57
|
+
"@aztec/slasher": "0.87.2-nightly.20250524",
|
|
58
|
+
"@aztec/stdlib": "0.87.2-nightly.20250524",
|
|
59
|
+
"@aztec/telemetry-client": "0.87.2-nightly.20250524",
|
|
60
|
+
"@aztec/validator-client": "0.87.2-nightly.20250524",
|
|
61
|
+
"@aztec/world-state": "0.87.2-nightly.20250524",
|
|
61
62
|
"@iarna/toml": "^2.2.5",
|
|
62
63
|
"@jest/globals": "^29.5.0",
|
|
63
64
|
"@noble/curves": "^1.0.0",
|
|
@@ -82,6 +82,7 @@ export class P2PNetworkTest {
|
|
|
82
82
|
initialValidatorConfig: AztecNodeConfig,
|
|
83
83
|
// If set enable metrics collection
|
|
84
84
|
private metricsPort?: number,
|
|
85
|
+
startProverNode?: boolean,
|
|
85
86
|
) {
|
|
86
87
|
this.logger = createLogger(`e2e:e2e_p2p:${testName}`);
|
|
87
88
|
|
|
@@ -105,6 +106,7 @@ export class P2PNetworkTest {
|
|
|
105
106
|
salt: 420,
|
|
106
107
|
metricsPort: metricsPort,
|
|
107
108
|
numberOfInitialFundedAccounts: 2,
|
|
109
|
+
startProverNode,
|
|
108
110
|
},
|
|
109
111
|
{
|
|
110
112
|
...initialValidatorConfig,
|
|
@@ -124,12 +126,14 @@ export class P2PNetworkTest {
|
|
|
124
126
|
basePort,
|
|
125
127
|
metricsPort,
|
|
126
128
|
initialConfig,
|
|
129
|
+
startProverNode,
|
|
127
130
|
}: {
|
|
128
131
|
testName: string;
|
|
129
132
|
numberOfNodes: number;
|
|
130
133
|
basePort?: number;
|
|
131
134
|
metricsPort?: number;
|
|
132
135
|
initialConfig?: Partial<AztecNodeConfig>;
|
|
136
|
+
startProverNode?: boolean;
|
|
133
137
|
}) {
|
|
134
138
|
const port = basePort || (await getPort());
|
|
135
139
|
|
|
@@ -141,7 +145,15 @@ export class P2PNetworkTest {
|
|
|
141
145
|
bootstrapNodeEnr,
|
|
142
146
|
);
|
|
143
147
|
|
|
144
|
-
return new P2PNetworkTest(
|
|
148
|
+
return new P2PNetworkTest(
|
|
149
|
+
testName,
|
|
150
|
+
bootstrapNodeEnr,
|
|
151
|
+
port,
|
|
152
|
+
numberOfNodes,
|
|
153
|
+
initialValidatorConfig,
|
|
154
|
+
metricsPort,
|
|
155
|
+
startProverNode,
|
|
156
|
+
);
|
|
145
157
|
}
|
|
146
158
|
|
|
147
159
|
get fundedAccount() {
|
package/src/fixtures/utils.ts
CHANGED
|
@@ -33,6 +33,7 @@ import {
|
|
|
33
33
|
type DeployL1ContractsReturnType,
|
|
34
34
|
ForwarderContract,
|
|
35
35
|
NULL_KEY,
|
|
36
|
+
type Operator,
|
|
36
37
|
createExtendedL1Client,
|
|
37
38
|
deployL1Contracts,
|
|
38
39
|
getL1ContractsConfigEnvVars,
|
|
@@ -280,7 +281,7 @@ export type SetupOptions = {
|
|
|
280
281
|
/** Salt to use in L1 contract deployment */
|
|
281
282
|
salt?: number;
|
|
282
283
|
/** An initial set of validators */
|
|
283
|
-
initialValidators?:
|
|
284
|
+
initialValidators?: Operator[];
|
|
284
285
|
/** Anvil Start time */
|
|
285
286
|
l1StartTime?: number;
|
|
286
287
|
/** The anvil time where we should at the earliest be seeing L2 blocks */
|