@aztec/end-to-end 0.86.0-nightly.20250425 → 0.86.0
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/bench/utils.d.ts.map +1 -1
- package/dest/bench/utils.js +0 -2
- package/dest/e2e_epochs/epochs_test.d.ts +1 -1
- package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
- package/dest/e2e_epochs/epochs_test.js +1 -3
- package/dest/e2e_prover/e2e_prover_test.d.ts.map +1 -1
- package/dest/e2e_prover/e2e_prover_test.js +1 -2
- package/dest/fixtures/snapshot_manager.js +2 -6
- package/dest/fixtures/utils.d.ts +2 -5
- package/dest/fixtures/utils.d.ts.map +1 -1
- package/dest/fixtures/utils.js +7 -13
- package/package.json +33 -33
- package/src/bench/utils.ts +0 -2
- package/src/e2e_epochs/epochs_test.ts +2 -5
- package/src/e2e_prover/e2e_prover_test.ts +0 -1
- package/src/fixtures/snapshot_manager.ts +2 -2
- package/src/fixtures/utils.ts +18 -14
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAa,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAExF,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,KAAK,UAAU,EAA2C,MAAM,mBAAmB,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAA4C,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAIxH,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAS,MAAM,sBAAsB,CAAC;AAEtF;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAC5B,6BAA6B,CAAC,OAAO,EAAE,CAAC,WAAW,GAAG,YAAY,CAAC,EAAE,CAAC;IACtE,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;;;;GAuBF;AAED,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAuEF;;;;;;;;GAQG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,GAAE,OAAe,GAClC,OAAO,CAAC,MAAM,EAAE,CAAC,CAMnB;AAED,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,QAAQ,iBAI3F;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAa,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAExF,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,KAAK,UAAU,EAA2C,MAAM,mBAAmB,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAA4C,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAIxH,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAS,MAAM,sBAAsB,CAAC;AAEtF;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAC5B,6BAA6B,CAAC,OAAO,EAAE,CAAC,WAAW,GAAG,YAAY,CAAC,EAAE,CAAC;IACtE,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;;;;GAuBF;AAED,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAuEF;;;;;;;;GAQG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,GAAE,OAAe,GAClC,OAAO,CAAC,MAAM,EAAE,CAAC,CAMnB;AAED,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,QAAQ,iBAI3F;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,CAevG"}
|
package/dest/bench/utils.js
CHANGED
|
@@ -139,9 +139,7 @@ export async function waitTxs(txs, context, txWaitOpts) {
|
|
|
139
139
|
l1ChainId,
|
|
140
140
|
rollupVersion
|
|
141
141
|
};
|
|
142
|
-
// docs:start:PXEcreate
|
|
143
142
|
const pxe = await createPXEService(node, pxeConfig);
|
|
144
|
-
// docs:end:PXEcreate
|
|
145
143
|
await pxe.registerContract(contract);
|
|
146
144
|
return pxe;
|
|
147
145
|
}
|
|
@@ -12,7 +12,7 @@ export declare const L2_SLOT_DURATION_IN_L1_SLOTS = 2;
|
|
|
12
12
|
export declare const WORLD_STATE_BLOCK_HISTORY = 2;
|
|
13
13
|
export declare const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
|
|
14
14
|
export declare const ARCHIVER_POLL_INTERVAL = 50;
|
|
15
|
-
export type EpochsTestOpts = Partial<Pick<SetupOptions, 'startProverNode' | 'aztecProofSubmissionWindow' | 'aztecEpochDuration' | 'proverTestDelayMs'
|
|
15
|
+
export type EpochsTestOpts = Partial<Pick<SetupOptions, 'startProverNode' | 'aztecProofSubmissionWindow' | 'aztecEpochDuration' | 'proverTestDelayMs'>>;
|
|
16
16
|
/**
|
|
17
17
|
* Tests building of epochs using fast block times and short epochs.
|
|
18
18
|
* Spawns an aztec node and a prover node with fake proofs.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"epochs_test.d.ts","sourceRoot":"","sources":["../../src/e2e_epochs/epochs_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAM,KAAK,MAAM,EAA8D,MAAM,iBAAiB,CAAC;AAC9G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAkB,KAAK,OAAO,EAAwB,MAAM,sBAAsB,CAAC;AAGxG,OAAO,EAAE,UAAU,EAAuB,MAAM,oBAAoB,CAAC;AAIrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAKrE,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAIlB,MAAM,sBAAsB,CAAC;AAG9B,eAAO,MAAM,kBAAkB,QAAsE,CAAC;AACtG,eAAO,MAAM,4BAA4B,IAAI,CAAC;AAC9C,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAC3C,eAAO,MAAM,gCAAgC,KAAK,CAAC;AACnD,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAEzC,MAAM,MAAM,cAAc,GAAG,OAAO,CAClC,IAAI,
|
|
1
|
+
{"version":3,"file":"epochs_test.d.ts","sourceRoot":"","sources":["../../src/e2e_epochs/epochs_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAM,KAAK,MAAM,EAA8D,MAAM,iBAAiB,CAAC;AAC9G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAkB,KAAK,OAAO,EAAwB,MAAM,sBAAsB,CAAC;AAGxG,OAAO,EAAE,UAAU,EAAuB,MAAM,oBAAoB,CAAC;AAIrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAKrE,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAIlB,MAAM,sBAAsB,CAAC;AAG9B,eAAO,MAAM,kBAAkB,QAAsE,CAAC;AACtG,eAAO,MAAM,4BAA4B,IAAI,CAAC;AAC9C,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAC3C,eAAO,MAAM,gCAAgC,KAAK,CAAC;AACnD,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAEzC,MAAM,MAAM,cAAc,GAAG,OAAO,CAClC,IAAI,CAAC,YAAY,EAAE,iBAAiB,GAAG,4BAA4B,GAAG,oBAAoB,GAAG,mBAAmB,CAAC,CAClH,CAAC;AAEF;;;;GAIG;AACH,qBAAa,iBAAiB;IACrB,OAAO,EAAG,eAAe,CAAC;IAC1B,QAAQ,EAAG,UAAU,CAAC;IACtB,MAAM,EAAG,cAAc,CAAC;IACxB,SAAS,EAAG,iBAAiB,CAAC;IAC9B,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAG,YAAY,CAAC;IACvB,aAAa,EAAG,OAAO,CAAC;IACxB,gBAAgB,EAAG,OAAO,CAAC;IAE3B,WAAW,EAAE,UAAU,EAAE,CAAM;IAC/B,KAAK,EAAE,gBAAgB,EAAE,CAAM;IAE/B,aAAa,EAAG,MAAM,CAAC;WAEV,KAAK,CAAC,IAAI,GAAE,cAAmB;IAMtC,KAAK,CAAC,IAAI,GAAE,cAAmB;IAoE/B,QAAQ;IAOR,gBAAgB;IAgBhB,sBAAsB;IAcnC,OAAO,CAAC,iBAAiB;IAKzB,0FAA0F;IAC7E,oBAAoB,CAAC,KAAK,EAAE,MAAM;IAO/C,sDAAsD;IACzC,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,SAAK;IAShE,iEAAiE;IACpD,4BAA4B,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,SAAK;IASjE,mEAAmE;IACtD,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,UAAU;IAclF,0EAA0E;IAC7D,mBAAmB,CAAC,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,OAAO;CAUtF"}
|
|
@@ -105,9 +105,7 @@ export const ARCHIVER_POLL_INTERVAL = 50;
|
|
|
105
105
|
const proverNode = await withLogNameSuffix(suffix, ()=>createAndSyncProverNode(proverNodePrivateKey, {
|
|
106
106
|
...this.context.config,
|
|
107
107
|
proverId: Fr.fromString(suffix)
|
|
108
|
-
},
|
|
109
|
-
dataDirectory: join(this.context.config.dataDirectory, randomBytes(8).toString('hex'))
|
|
110
|
-
}, this.context.aztecNode));
|
|
108
|
+
}, this.context.aztecNode, join(this.context.config.dataDirectory, randomBytes(8).toString('hex'))));
|
|
111
109
|
this.proverNodes.push(proverNode);
|
|
112
110
|
return proverNode;
|
|
113
111
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/e2e_prover/e2e_prover_test.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,UAAU,EACV,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAqB,KAAK,6BAA6B,EAAuB,MAAM,kBAAkB,CAAC;AAE9G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,KAAK,2BAA2B,EAAoB,MAAM,iBAAiB,CAAC;AAGrF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AASlE;;;;;GAKG;AAEH,qBAAa,cAAc;IA6BvB,OAAO,CAAC,sBAAsB;IAE9B,OAAO,CAAC,UAAU;IA9BpB,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC5C,OAAO,EAAE,0BAA0B,EAAE,CAAM;IAC3C,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,eAAe,EAAG,aAAa,CAAC;IAChC,QAAQ,EAAG,cAAc,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAChC,GAAG,EAAG,UAAU,CAAC;IACjB,UAAU,EAAG,UAAU,CAAC;IACxB,QAAQ,EAAG,cAAc,CAAC;IAC1B,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAChD,oBAAoB,CAAC,EAAE,6BAA6B,CAAC;IACrD,YAAY,EAAE,aAAa,EAAE,CAAM;IACnC,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,mBAAmB,CAAc;IAClC,WAAW,EAAG,2BAA2B,CAAC;IAC1C,aAAa,EAAG,UAAU,CAAC;gBAGhC,QAAQ,EAAE,MAAM,EACR,sBAAsB,EAAE,MAAM,EACtC,QAAQ,EAAE,UAAU,EACZ,UAAU,UAAO;IAW3B;;;;OAIG;IACG,kBAAkB;IAqDlB,KAAK;
|
|
1
|
+
{"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/e2e_prover/e2e_prover_test.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,UAAU,EACV,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAqB,KAAK,6BAA6B,EAAuB,MAAM,kBAAkB,CAAC;AAE9G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,KAAK,2BAA2B,EAAoB,MAAM,iBAAiB,CAAC;AAGrF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AASlE;;;;;GAKG;AAEH,qBAAa,cAAc;IA6BvB,OAAO,CAAC,sBAAsB;IAE9B,OAAO,CAAC,UAAU;IA9BpB,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC5C,OAAO,EAAE,0BAA0B,EAAE,CAAM;IAC3C,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,eAAe,EAAG,aAAa,CAAC;IAChC,QAAQ,EAAG,cAAc,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAChC,GAAG,EAAG,UAAU,CAAC;IACjB,UAAU,EAAG,UAAU,CAAC;IACxB,QAAQ,EAAG,cAAc,CAAC;IAC1B,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAChD,oBAAoB,CAAC,EAAE,6BAA6B,CAAC;IACrD,YAAY,EAAE,aAAa,EAAE,CAAM;IACnC,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,mBAAmB,CAAc;IAClC,WAAW,EAAG,2BAA2B,CAAC;IAC1C,aAAa,EAAG,UAAU,CAAC;gBAGhC,QAAQ,EAAE,MAAM,EACR,sBAAsB,EAAE,MAAM,EACtC,QAAQ,EAAE,UAAU,EACZ,UAAU,UAAO;IAW3B;;;;OAIG;IACG,kBAAkB;IAqDlB,KAAK;YA8JG,WAAW;IAQzB,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAeR,iBAAiB;IA+CjB,cAAc;CAuBrB"}
|
|
@@ -197,8 +197,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
|
|
|
197
197
|
proverNodePollingIntervalMs: 100,
|
|
198
198
|
txGatheringIntervalMs: 1000,
|
|
199
199
|
txGatheringBatchSize: 10,
|
|
200
|
-
txGatheringMaxParallelRequestsPerNode: 100
|
|
201
|
-
proverNodeFailedEpochStore: undefined
|
|
200
|
+
txGatheringMaxParallelRequestsPerNode: 100
|
|
202
201
|
};
|
|
203
202
|
const sponsoredFPCAddress = await getSponsoredFPCAddress();
|
|
204
203
|
const { prefilledPublicData } = await getGenesisValues(this.context.initialFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress));
|
|
@@ -327,9 +327,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
|
|
|
327
327
|
let proverNode = undefined;
|
|
328
328
|
if (opts.startProverNode) {
|
|
329
329
|
logger.verbose('Creating and syncing a simulated prover node...');
|
|
330
|
-
proverNode = await createAndSyncProverNode(`0x${proverNodePrivateKey.toString('hex')}`, aztecNodeConfig,
|
|
331
|
-
dataDirectory: path.join(directoryToCleanup, randomBytes(8).toString('hex'))
|
|
332
|
-
}, aztecNode, prefilledPublicData);
|
|
330
|
+
proverNode = await createAndSyncProverNode(`0x${proverNodePrivateKey.toString('hex')}`, aztecNodeConfig, aztecNode, path.join(directoryToCleanup, randomBytes(8).toString('hex')), prefilledPublicData);
|
|
333
331
|
}
|
|
334
332
|
logger.verbose('Creating pxe...');
|
|
335
333
|
const pxeConfig = getPXEServiceConfig();
|
|
@@ -423,9 +421,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
|
|
|
423
421
|
logger.verbose('Creating and syncing a simulated prover node...');
|
|
424
422
|
const proverNodePrivateKey = getPrivateKeyFromIndex(2);
|
|
425
423
|
const proverNodePrivateKeyHex = `0x${proverNodePrivateKey.toString('hex')}`;
|
|
426
|
-
proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, aztecNodeConfig,
|
|
427
|
-
dataDirectory: path.join(directoryToCleanup, randomBytes(8).toString('hex'))
|
|
428
|
-
}, aztecNode, prefilledPublicData);
|
|
424
|
+
proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, aztecNodeConfig, aztecNode, path.join(directoryToCleanup, randomBytes(8).toString('hex')), prefilledPublicData);
|
|
429
425
|
}
|
|
430
426
|
logger.verbose('Creating pxe...');
|
|
431
427
|
const pxeConfig = getPXEServiceConfig();
|
package/dest/fixtures/utils.d.ts
CHANGED
|
@@ -10,9 +10,8 @@ import { startAnvil } from '@aztec/ethereum/test';
|
|
|
10
10
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
11
11
|
import { Fr } from '@aztec/foundation/fields';
|
|
12
12
|
import { TestDateProvider } from '@aztec/foundation/timer';
|
|
13
|
-
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
14
13
|
import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
|
|
15
|
-
import { type ProverNode
|
|
14
|
+
import { type ProverNode } from '@aztec/prover-node';
|
|
16
15
|
import { type PXEService, type PXEServiceConfig } from '@aztec/pxe/server';
|
|
17
16
|
import type { SequencerClient } from '@aztec/sequencer-client';
|
|
18
17
|
import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
|
|
@@ -79,8 +78,6 @@ export type SetupOptions = {
|
|
|
79
78
|
};
|
|
80
79
|
/** Public data that will be inserted in the tree in genesis */
|
|
81
80
|
genesisPublicData?: PublicDataTreeLeaf[];
|
|
82
|
-
/** Specific config for the prover node, if set. */
|
|
83
|
-
proverNodeConfig?: Partial<ProverNodeConfig>;
|
|
84
81
|
} & Partial<AztecNodeConfig>;
|
|
85
82
|
/** Context for an end-to-end test as returned by the `setup` function */
|
|
86
83
|
export type EndToEndContext = {
|
|
@@ -161,6 +158,6 @@ export declare function getSponsoredFPCAddress(): Promise<AztecAddress>;
|
|
|
161
158
|
*/
|
|
162
159
|
export declare function setupSponsoredFPC(pxe: PXE): Promise<SponsoredFPCContract>;
|
|
163
160
|
export declare function waitForProvenChain(node: AztecNode, targetBlock?: number, timeoutSec?: number, intervalSec?: number): Promise<void>;
|
|
164
|
-
export declare function createAndSyncProverNode(proverNodePrivateKey: `0x${string}`, aztecNodeConfig: AztecNodeConfig,
|
|
161
|
+
export declare function createAndSyncProverNode(proverNodePrivateKey: `0x${string}`, aztecNodeConfig: AztecNodeConfig, aztecNode: AztecNode, dataDirectory: string, prefilledPublicData?: PublicDataTreeLeaf[]): Promise<ProverNode>;
|
|
165
162
|
export declare function createForwarderContract(aztecNodeConfig: AztecNodeConfig, privateKey: `0x${string}`, rollupAddress: Hex): Promise<ForwarderContract>;
|
|
166
163
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -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,EAER,KAAK,MAAM,EAMZ,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEvE,OAAO,EAAE,KAAK,cAAc,EAAwB,MAAM,yBAAyB,CAAC;AAGpF,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,EAChC,iBAAiB,EAOlB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAA0C,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAE1F,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/utils.ts"],"names":[],"mappings":"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"}
|
package/dest/fixtures/utils.js
CHANGED
|
@@ -336,12 +336,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
336
336
|
logger.verbose('Creating and syncing a simulated prover node...');
|
|
337
337
|
const proverNodePrivateKey = getPrivateKeyFromIndex(2);
|
|
338
338
|
const proverNodePrivateKeyHex = `0x${proverNodePrivateKey.toString('hex')}`;
|
|
339
|
-
|
|
340
|
-
const proverNodeConfig = {
|
|
341
|
-
...config.proverNodeConfig,
|
|
342
|
-
dataDirectory: proverNodeDataDirectory
|
|
343
|
-
};
|
|
344
|
-
proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, config, proverNodeConfig, aztecNode);
|
|
339
|
+
proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, config, aztecNode, path.join(directoryToCleanup, randomBytes(8).toString('hex')));
|
|
345
340
|
}
|
|
346
341
|
logger.verbose('Creating a pxe...');
|
|
347
342
|
const { pxe, teardown: pxeTeardown } = await setupPXEService(aztecNode, pxeOpts, logger);
|
|
@@ -517,10 +512,10 @@ export async function waitForProvenChain(node, targetBlock, timeoutSec = 60, int
|
|
|
517
512
|
targetBlock ??= await node.getBlockNumber();
|
|
518
513
|
await retryUntil(async ()=>await node.getProvenBlockNumber() >= targetBlock, 'proven chain status', timeoutSec, intervalSec);
|
|
519
514
|
}
|
|
520
|
-
export async function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig,
|
|
515
|
+
export async function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, aztecNode, dataDirectory, prefilledPublicData = []) {
|
|
521
516
|
// Disable stopping the aztec node as the prover coordination test will kill it otherwise
|
|
522
517
|
// This is only required when stopping the prover node for testing
|
|
523
|
-
const
|
|
518
|
+
const aztecNodeWithoutStop = {
|
|
524
519
|
getTxByHash: aztecNode.getTxByHash.bind(aztecNode),
|
|
525
520
|
getTxsByHash: aztecNode.getTxsByHash.bind(aztecNode),
|
|
526
521
|
stop: ()=>Promise.resolve()
|
|
@@ -531,7 +526,7 @@ export async function createAndSyncProverNode(proverNodePrivateKey, aztecNodeCon
|
|
|
531
526
|
// Creating temp store and archiver for simulated prover node
|
|
532
527
|
const archiverConfig = {
|
|
533
528
|
...aztecNodeConfig,
|
|
534
|
-
dataDirectory
|
|
529
|
+
dataDirectory
|
|
535
530
|
};
|
|
536
531
|
const archiver = await createArchiver(archiverConfig, blobSinkClient, {
|
|
537
532
|
blockUntilSync: true
|
|
@@ -540,6 +535,7 @@ export async function createAndSyncProverNode(proverNodePrivateKey, aztecNodeCon
|
|
|
540
535
|
const proverConfig = {
|
|
541
536
|
...aztecNodeConfig,
|
|
542
537
|
proverCoordinationNodeUrls: [],
|
|
538
|
+
dataDirectory: undefined,
|
|
543
539
|
realProofs: false,
|
|
544
540
|
proverAgentCount: 2,
|
|
545
541
|
publisherPrivateKey: proverNodePrivateKey,
|
|
@@ -548,13 +544,11 @@ export async function createAndSyncProverNode(proverNodePrivateKey, aztecNodeCon
|
|
|
548
544
|
proverNodePollingIntervalMs: 200,
|
|
549
545
|
txGatheringIntervalMs: 1000,
|
|
550
546
|
txGatheringBatchSize: 10,
|
|
551
|
-
txGatheringMaxParallelRequestsPerNode: 10
|
|
552
|
-
proverNodeFailedEpochStore: undefined,
|
|
553
|
-
...proverNodeConfig
|
|
547
|
+
txGatheringMaxParallelRequestsPerNode: 10
|
|
554
548
|
};
|
|
555
549
|
const l1TxUtils = createDelayedL1TxUtils(aztecNodeConfig, proverNodePrivateKey, 'prover-node');
|
|
556
550
|
const proverNode = await createProverNode(proverConfig, {
|
|
557
|
-
aztecNodeTxProvider,
|
|
551
|
+
aztecNodeTxProvider: aztecNodeWithoutStop,
|
|
558
552
|
archiver: archiver,
|
|
559
553
|
l1TxUtils
|
|
560
554
|
}, {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/end-to-end",
|
|
3
|
-
"version": "0.86.0
|
|
3
|
+
"version": "0.86.0",
|
|
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.86.0
|
|
29
|
-
"@aztec/archiver": "0.86.0
|
|
30
|
-
"@aztec/aztec": "0.86.0
|
|
31
|
-
"@aztec/aztec-node": "0.86.0
|
|
32
|
-
"@aztec/aztec.js": "0.86.0
|
|
33
|
-
"@aztec/bb-prover": "0.86.0
|
|
34
|
-
"@aztec/blob-lib": "0.86.0
|
|
35
|
-
"@aztec/blob-sink": "0.86.0
|
|
36
|
-
"@aztec/bot": "0.86.0
|
|
37
|
-
"@aztec/cli": "0.86.0
|
|
38
|
-
"@aztec/constants": "0.86.0
|
|
39
|
-
"@aztec/entrypoints": "0.86.0
|
|
40
|
-
"@aztec/epoch-cache": "0.86.0
|
|
41
|
-
"@aztec/ethereum": "0.86.0
|
|
42
|
-
"@aztec/foundation": "0.86.0
|
|
43
|
-
"@aztec/kv-store": "0.86.0
|
|
44
|
-
"@aztec/l1-artifacts": "0.86.0
|
|
45
|
-
"@aztec/merkle-tree": "0.86.0
|
|
46
|
-
"@aztec/noir-contracts.js": "0.86.0
|
|
47
|
-
"@aztec/noir-noirc_abi": "0.86.0
|
|
48
|
-
"@aztec/noir-protocol-circuits-types": "0.86.0
|
|
49
|
-
"@aztec/p2p": "0.86.0
|
|
50
|
-
"@aztec/protocol-contracts": "0.86.0
|
|
51
|
-
"@aztec/prover-client": "0.86.0
|
|
52
|
-
"@aztec/prover-node": "0.86.0
|
|
53
|
-
"@aztec/pxe": "0.86.0
|
|
54
|
-
"@aztec/sequencer-client": "0.86.0
|
|
55
|
-
"@aztec/simulator": "0.86.0
|
|
56
|
-
"@aztec/stdlib": "0.86.0
|
|
57
|
-
"@aztec/telemetry-client": "0.86.0
|
|
58
|
-
"@aztec/validator-client": "0.86.0
|
|
59
|
-
"@aztec/world-state": "0.86.0
|
|
28
|
+
"@aztec/accounts": "0.86.0",
|
|
29
|
+
"@aztec/archiver": "0.86.0",
|
|
30
|
+
"@aztec/aztec": "0.86.0",
|
|
31
|
+
"@aztec/aztec-node": "0.86.0",
|
|
32
|
+
"@aztec/aztec.js": "0.86.0",
|
|
33
|
+
"@aztec/bb-prover": "0.86.0",
|
|
34
|
+
"@aztec/blob-lib": "0.86.0",
|
|
35
|
+
"@aztec/blob-sink": "0.86.0",
|
|
36
|
+
"@aztec/bot": "0.86.0",
|
|
37
|
+
"@aztec/cli": "0.86.0",
|
|
38
|
+
"@aztec/constants": "0.86.0",
|
|
39
|
+
"@aztec/entrypoints": "0.86.0",
|
|
40
|
+
"@aztec/epoch-cache": "0.86.0",
|
|
41
|
+
"@aztec/ethereum": "0.86.0",
|
|
42
|
+
"@aztec/foundation": "0.86.0",
|
|
43
|
+
"@aztec/kv-store": "0.86.0",
|
|
44
|
+
"@aztec/l1-artifacts": "0.86.0",
|
|
45
|
+
"@aztec/merkle-tree": "0.86.0",
|
|
46
|
+
"@aztec/noir-contracts.js": "0.86.0",
|
|
47
|
+
"@aztec/noir-noirc_abi": "0.86.0",
|
|
48
|
+
"@aztec/noir-protocol-circuits-types": "0.86.0",
|
|
49
|
+
"@aztec/p2p": "0.86.0",
|
|
50
|
+
"@aztec/protocol-contracts": "0.86.0",
|
|
51
|
+
"@aztec/prover-client": "0.86.0",
|
|
52
|
+
"@aztec/prover-node": "0.86.0",
|
|
53
|
+
"@aztec/pxe": "0.86.0",
|
|
54
|
+
"@aztec/sequencer-client": "0.86.0",
|
|
55
|
+
"@aztec/simulator": "0.86.0",
|
|
56
|
+
"@aztec/stdlib": "0.86.0",
|
|
57
|
+
"@aztec/telemetry-client": "0.86.0",
|
|
58
|
+
"@aztec/validator-client": "0.86.0",
|
|
59
|
+
"@aztec/world-state": "0.86.0",
|
|
60
60
|
"@iarna/toml": "^2.2.5",
|
|
61
61
|
"@jest/globals": "^29.5.0",
|
|
62
62
|
"@noble/curves": "^1.0.0",
|
package/src/bench/utils.ts
CHANGED
|
@@ -166,9 +166,7 @@ export async function createNewPXE(node: AztecNode, contract: BenchmarkingContra
|
|
|
166
166
|
l1ChainId,
|
|
167
167
|
rollupVersion,
|
|
168
168
|
} as PXEServiceConfig;
|
|
169
|
-
// docs:start:PXEcreate
|
|
170
169
|
const pxe = await createPXEService(node, pxeConfig);
|
|
171
|
-
// docs:end:PXEcreate
|
|
172
170
|
await pxe.registerContract(contract);
|
|
173
171
|
return pxe;
|
|
174
172
|
}
|
|
@@ -31,10 +31,7 @@ export const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
|
|
|
31
31
|
export const ARCHIVER_POLL_INTERVAL = 50;
|
|
32
32
|
|
|
33
33
|
export type EpochsTestOpts = Partial<
|
|
34
|
-
Pick<
|
|
35
|
-
SetupOptions,
|
|
36
|
-
'startProverNode' | 'aztecProofSubmissionWindow' | 'aztecEpochDuration' | 'proverTestDelayMs' | 'proverNodeConfig'
|
|
37
|
-
>
|
|
34
|
+
Pick<SetupOptions, 'startProverNode' | 'aztecProofSubmissionWindow' | 'aztecEpochDuration' | 'proverTestDelayMs'>
|
|
38
35
|
>;
|
|
39
36
|
|
|
40
37
|
/**
|
|
@@ -146,8 +143,8 @@ export class EpochsTestContext {
|
|
|
146
143
|
createAndSyncProverNode(
|
|
147
144
|
proverNodePrivateKey,
|
|
148
145
|
{ ...this.context.config, proverId: Fr.fromString(suffix) },
|
|
149
|
-
{ dataDirectory: join(this.context.config.dataDirectory!, randomBytes(8).toString('hex')) },
|
|
150
146
|
this.context.aztecNode,
|
|
147
|
+
join(this.context.config.dataDirectory!, randomBytes(8).toString('hex')),
|
|
151
148
|
),
|
|
152
149
|
);
|
|
153
150
|
this.proverNodes.push(proverNode);
|
|
@@ -294,7 +294,6 @@ export class FullProverTest {
|
|
|
294
294
|
txGatheringIntervalMs: 1000,
|
|
295
295
|
txGatheringBatchSize: 10,
|
|
296
296
|
txGatheringMaxParallelRequestsPerNode: 100,
|
|
297
|
-
proverNodeFailedEpochStore: undefined,
|
|
298
297
|
};
|
|
299
298
|
const sponsoredFPCAddress = await getSponsoredFPCAddress();
|
|
300
299
|
const { prefilledPublicData } = await getGenesisValues(
|
|
@@ -436,8 +436,8 @@ async function setupFromFresh(
|
|
|
436
436
|
proverNode = await createAndSyncProverNode(
|
|
437
437
|
`0x${proverNodePrivateKey!.toString('hex')}`,
|
|
438
438
|
aztecNodeConfig,
|
|
439
|
-
{ dataDirectory: path.join(directoryToCleanup, randomBytes(8).toString('hex')) },
|
|
440
439
|
aztecNode,
|
|
440
|
+
path.join(directoryToCleanup, randomBytes(8).toString('hex')),
|
|
441
441
|
prefilledPublicData,
|
|
442
442
|
);
|
|
443
443
|
}
|
|
@@ -560,8 +560,8 @@ async function setupFromState(statePath: string, logger: Logger): Promise<Subsys
|
|
|
560
560
|
proverNode = await createAndSyncProverNode(
|
|
561
561
|
proverNodePrivateKeyHex,
|
|
562
562
|
aztecNodeConfig,
|
|
563
|
-
{ dataDirectory: path.join(directoryToCleanup, randomBytes(8).toString('hex')) },
|
|
564
563
|
aztecNode,
|
|
564
|
+
path.join(directoryToCleanup, randomBytes(8).toString('hex')),
|
|
565
565
|
prefilledPublicData,
|
|
566
566
|
);
|
|
567
567
|
}
|
package/src/fixtures/utils.ts
CHANGED
|
@@ -48,7 +48,6 @@ import { EthAddress } from '@aztec/foundation/eth-address';
|
|
|
48
48
|
import { Fr } from '@aztec/foundation/fields';
|
|
49
49
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
50
50
|
import { TestDateProvider } from '@aztec/foundation/timer';
|
|
51
|
-
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
52
51
|
import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
|
|
53
52
|
import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
|
|
54
53
|
import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
|
|
@@ -295,8 +294,6 @@ export type SetupOptions = {
|
|
|
295
294
|
telemetryConfig?: Partial<TelemetryClientConfig> & { benchmark?: boolean };
|
|
296
295
|
/** Public data that will be inserted in the tree in genesis */
|
|
297
296
|
genesisPublicData?: PublicDataTreeLeaf[];
|
|
298
|
-
/** Specific config for the prover node, if set. */
|
|
299
|
-
proverNodeConfig?: Partial<ProverNodeConfig>;
|
|
300
297
|
} & Partial<AztecNodeConfig>;
|
|
301
298
|
|
|
302
299
|
/** Context for an end-to-end test as returned by the `setup` function */
|
|
@@ -535,9 +532,12 @@ export async function setup(
|
|
|
535
532
|
logger.verbose('Creating and syncing a simulated prover node...');
|
|
536
533
|
const proverNodePrivateKey = getPrivateKeyFromIndex(2);
|
|
537
534
|
const proverNodePrivateKeyHex: Hex = `0x${proverNodePrivateKey!.toString('hex')}`;
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
535
|
+
proverNode = await createAndSyncProverNode(
|
|
536
|
+
proverNodePrivateKeyHex,
|
|
537
|
+
config,
|
|
538
|
+
aztecNode,
|
|
539
|
+
path.join(directoryToCleanup, randomBytes(8).toString('hex')),
|
|
540
|
+
);
|
|
541
541
|
}
|
|
542
542
|
|
|
543
543
|
logger.verbose('Creating a pxe...');
|
|
@@ -777,13 +777,13 @@ export async function waitForProvenChain(node: AztecNode, targetBlock?: number,
|
|
|
777
777
|
export async function createAndSyncProverNode(
|
|
778
778
|
proverNodePrivateKey: `0x${string}`,
|
|
779
779
|
aztecNodeConfig: AztecNodeConfig,
|
|
780
|
-
proverNodeConfig: Partial<ProverNodeConfig> & Pick<DataStoreConfig, 'dataDirectory'>,
|
|
781
780
|
aztecNode: AztecNode,
|
|
781
|
+
dataDirectory: string,
|
|
782
782
|
prefilledPublicData: PublicDataTreeLeaf[] = [],
|
|
783
783
|
) {
|
|
784
784
|
// Disable stopping the aztec node as the prover coordination test will kill it otherwise
|
|
785
785
|
// This is only required when stopping the prover node for testing
|
|
786
|
-
const
|
|
786
|
+
const aztecNodeWithoutStop = {
|
|
787
787
|
getTxByHash: aztecNode.getTxByHash.bind(aztecNode),
|
|
788
788
|
getTxsByHash: aztecNode.getTxsByHash.bind(aztecNode),
|
|
789
789
|
stop: () => Promise.resolve(),
|
|
@@ -792,15 +792,17 @@ export async function createAndSyncProverNode(
|
|
|
792
792
|
const blobSinkClient = createBlobSinkClient(aztecNodeConfig, {
|
|
793
793
|
logger: createLogger('prover-node:blob-sink:client'),
|
|
794
794
|
});
|
|
795
|
-
|
|
796
795
|
// Creating temp store and archiver for simulated prover node
|
|
797
|
-
const archiverConfig = { ...aztecNodeConfig, dataDirectory
|
|
798
|
-
const archiver = await createArchiver(archiverConfig, blobSinkClient, {
|
|
796
|
+
const archiverConfig = { ...aztecNodeConfig, dataDirectory };
|
|
797
|
+
const archiver = await createArchiver(archiverConfig, blobSinkClient, {
|
|
798
|
+
blockUntilSync: true,
|
|
799
|
+
});
|
|
799
800
|
|
|
800
801
|
// Prover node config is for simulated proofs
|
|
801
802
|
const proverConfig: ProverNodeConfig = {
|
|
802
803
|
...aztecNodeConfig,
|
|
803
804
|
proverCoordinationNodeUrls: [],
|
|
805
|
+
dataDirectory: undefined,
|
|
804
806
|
realProofs: false,
|
|
805
807
|
proverAgentCount: 2,
|
|
806
808
|
publisherPrivateKey: proverNodePrivateKey,
|
|
@@ -810,15 +812,17 @@ export async function createAndSyncProverNode(
|
|
|
810
812
|
txGatheringIntervalMs: 1000,
|
|
811
813
|
txGatheringBatchSize: 10,
|
|
812
814
|
txGatheringMaxParallelRequestsPerNode: 10,
|
|
813
|
-
proverNodeFailedEpochStore: undefined,
|
|
814
|
-
...proverNodeConfig,
|
|
815
815
|
};
|
|
816
816
|
|
|
817
817
|
const l1TxUtils = createDelayedL1TxUtils(aztecNodeConfig, proverNodePrivateKey, 'prover-node');
|
|
818
818
|
|
|
819
819
|
const proverNode = await createProverNode(
|
|
820
820
|
proverConfig,
|
|
821
|
-
{
|
|
821
|
+
{
|
|
822
|
+
aztecNodeTxProvider: aztecNodeWithoutStop,
|
|
823
|
+
archiver: archiver as Archiver,
|
|
824
|
+
l1TxUtils,
|
|
825
|
+
},
|
|
822
826
|
{ prefilledPublicData },
|
|
823
827
|
);
|
|
824
828
|
getLogger().info(`Created and synced prover node`, { publisherAddress: l1TxUtils.client.account!.address });
|