Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 29 additions & 24 deletions yarn-project/end-to-end/src/e2e_epochs/epochs_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,30 +121,35 @@ export class EpochsTestContext {

// Set up system without any account nor protocol contracts
// and with faster block times and shorter epochs.
const context = await setup(opts.numberOfAccounts ?? 0, {
automineL1Setup: true,
checkIntervalMs: 50,
archiverPollingIntervalMS: ARCHIVER_POLL_INTERVAL,
worldStateBlockCheckIntervalMS: WORLD_STATE_BLOCK_CHECK_INTERVAL,
aztecEpochDuration,
aztecSlotDuration,
ethereumSlotDuration,
aztecProofSubmissionEpochs,
aztecTargetCommitteeSize: opts.initialValidators?.length ?? 0,
minTxsPerBlock: 0,
realProofs: false,
startProverNode: true,
proverTestDelayMs: opts.proverTestDelayMs ?? 0,
// We use numeric incremental prover ids for simplicity, but we can switch to
// using the prover's eth address if the proverId is used for something in the rollup contract
// Use numeric EthAddress for deterministic prover id
proverId: EthAddress.fromNumber(1),
worldStateBlockHistory: WORLD_STATE_BLOCK_HISTORY,
exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
slasherFlavor: 'none',
l1PublishingTime,
...opts,
});
const context = await setup(
opts.numberOfAccounts ?? 0,
{
automineL1Setup: true,
checkIntervalMs: 50,
archiverPollingIntervalMS: ARCHIVER_POLL_INTERVAL,
worldStateBlockCheckIntervalMS: WORLD_STATE_BLOCK_CHECK_INTERVAL,
aztecEpochDuration,
aztecSlotDuration,
ethereumSlotDuration,
aztecProofSubmissionEpochs,
aztecTargetCommitteeSize: opts.initialValidators?.length ?? 0,
minTxsPerBlock: 0,
realProofs: false,
startProverNode: true,
proverTestDelayMs: opts.proverTestDelayMs ?? 0,
// We use numeric incremental prover ids for simplicity, but we can switch to
// using the prover's eth address if the proverId is used for something in the rollup contract
// Use numeric EthAddress for deterministic prover id
proverId: EthAddress.fromNumber(1),
worldStateBlockHistory: WORLD_STATE_BLOCK_HISTORY,
exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
slasherFlavor: 'none',
l1PublishingTime,
...opts,
},
// Use checkpointed chain tip for PXE to avoid issues with blocks being dropped due to pruned anchor blocks.
{ syncChainTip: 'checkpointed' },
);

this.context = context;
this.proverNodes = context.proverNode ? [context.proverNode] : [];
Expand Down
21 changes: 13 additions & 8 deletions yarn-project/end-to-end/src/e2e_p2p/p2p_network.ts
Original file line number Diff line number Diff line change
Expand Up @@ -351,14 +351,19 @@ export class P2PNetworkTest {

async setup() {
this.logger.info('Setting up subsystems from fresh');
this.context = await setup(0, {
...this.setupOptions,
fundSponsoredFPC: true,
skipAccountDeployment: true,
slasherFlavor: this.setupOptions.slasherFlavor ?? this.deployL1ContractsArgs.slasherFlavor ?? 'none',
aztecTargetCommitteeSize: 0,
l1ContractsArgs: this.deployL1ContractsArgs,
});
this.context = await setup(
0,
{
...this.setupOptions,
fundSponsoredFPC: true,
skipAccountDeployment: true,
slasherFlavor: this.setupOptions.slasherFlavor ?? this.deployL1ContractsArgs.slasherFlavor ?? 'none',
aztecTargetCommitteeSize: 0,
l1ContractsArgs: this.deployL1ContractsArgs,
},
// Use checkpointed chain tip for PXE to avoid issues with blocks being dropped due to pruned anchor blocks.
{ syncChainTip: 'checkpointed' },
);
this.ctx = this.context;

const sponsoredFPCAddress = await getSponsoredFPCAddress();
Expand Down
Loading