@aztec/end-to-end 1.0.0-nightly.20250625 → 1.0.0-nightly.20250626
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/fixtures/utils.d.ts.map +1 -1
- package/dest/fixtures/utils.js +35 -6
- package/package.json +35 -35
- package/src/fixtures/utils.ts +34 -5
|
@@ -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,
|
|
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,EAEL,KAAK,0BAA0B,EAC/B,KAAK,YAAY,EACjB,KAAK,SAAS,EAEd,KAAK,cAAc,EACnB,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,MAAM,EAOZ,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,EAEhC,KAAK,QAAQ,EAOd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAA0C,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAI1F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAI9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,OAAO,EAAE,oBAAoB,EAAkC,MAAM,yBAAyB,CAAC;AAE/F,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,gBAAgB,EAAoB,MAAM,oBAAoB,CAAC;AAC9F,OAAO,EACL,KAAK,UAAU,EACf,KAAK,gBAAgB,EAGtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAK/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAGtE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAG3B,MAAM,yBAAyB,CAAC;AASjC,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,SAAS,EAAY,KAAK,iBAAiB,EAAe,MAAM,MAAM,CAAC;AASjG,OAAO,EAAE,0CAA0C,EAAE,MAAM,uCAAuC,CAAC;AACnG,OAAO,EAAE,UAAU,EAAE,CAAC;AAmBtB,eAAO,MAAM,sBAAsB,GAAI,OAAO,MAAM,KAAG,MAAM,GAAG,IAI/D,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,WAAW,MAAM,EAAE,EACnB,SAAS,SAAS,GAAG,iBAAiB,EACtC,QAAQ,MAAM,EACd,OAAM,OAAO,CAAC,qBAAqB,CAAM,EACzC,QAAO,KAAe,yCAcvB,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,SAAS,EACpB,IAAI,GAAE,OAAO,CAAC,gBAAgB,CAAM,EACpC,MAAM,SAAc,EACpB,YAAY,UAAQ,GACnB,OAAO,CAAC;IACT;;OAEG;IACH,GAAG,EAAE,UAAU,CAAC;IAChB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B,CAAC,CA2BD;AAsED,sCAAsC;AACtC,MAAM,MAAM,YAAY,GAAG;IACzB,iBAAiB;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,yFAAyF;IACzF,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,0CAA0C;IAC1C,uBAAuB,CAAC,EAAE,2BAA2B,CAAC;IACtD,4EAA4E;IAC5E,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,6CAA6C;IAC7C,sBAAsB,CAAC,EAAE,EAAE,CAAC;IAC5B,uDAAuD;IACvD,6BAA6B,CAAC,EAAE,MAAM,CAAC;IACvC,0CAA0C;IAC1C,qBAAqB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC7C,4CAA4C;IAC5C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,mCAAmC;IACnC,iBAAiB,CAAC,EAAE,CAAC,QAAQ,GAAG;QAAE,UAAU,EAAE,KAAK,MAAM,EAAE,CAAA;KAAE,CAAC,EAAE,CAAC;IACjE,uBAAuB;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,qCAAqC;IACrC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,4CAA4C;IAC5C,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,6CAA6C;IAC7C,eAAe,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,GAAG;QAAE,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAC3E,+DAA+D;IAC/D,iBAAiB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACzC,mDAAmD;IACnD,gBAAgB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC7C,gEAAgE;IAChE,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,gFAAgF;IAChF,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,6GAA6G;IAC7G,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAE7B,yEAAyE;AACzE,MAAM,MAAM,eAAe,GAAG;IAC5B,0DAA0D;IAC1D,SAAS,EAAE,SAAS,CAAC;IACrB,8FAA8F;IAC9F,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,oEAAoE;IACpE,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC;IACnC,uFAAuF;IACvF,SAAS,EAAE,eAAe,GAAG,SAAS,CAAC;IACvC,+CAA+C;IAC/C,GAAG,EAAE,GAAG,CAAC;IACT,qDAAqD;IACrD,uBAAuB,EAAE,2BAA2B,CAAC;IACrD,oCAAoC;IACpC,MAAM,EAAE,eAAe,CAAC;IACxB,gDAAgD;IAChD,qBAAqB,EAAE,kBAAkB,EAAE,CAAC;IAC5C,mCAAmC;IACnC,MAAM,EAAE,0BAA0B,CAAC;IACnC,8BAA8B;IAC9B,OAAO,EAAE,0BAA0B,EAAE,CAAC;IACtC,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,uBAAuB;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,4EAA4E;IAC5E,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACtC,uHAAuH;IACvH,YAAY,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC3C,mEAAmE;IACnE,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAC;IACrC,uBAAuB;IACvB,eAAe,EAAE,eAAe,GAAG,SAAS,CAAC;IAC7C,kHAAkH;IAClH,oBAAoB,EAAE,oBAAoB,GAAG,SAAS,CAAC;IACvD,uDAAuD;IACvD,mBAAmB,EAAE,kBAAkB,EAAE,GAAG,SAAS,CAAC;IACtD,6CAA6C;IAC7C,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,KAAK,CACzB,gBAAgB,SAAI,EACpB,IAAI,GAAE,YAEL,EACD,OAAO,GAAE,OAAO,CAAC,gBAAgB,CAAM,EACvC,KAAK,GAAE,KAAe,GACrB,OAAO,CAAC,eAAe,CAAC,CA6U1B;AAED;;;;;GAKG;AAGH,wBAAsB,8BAA8B,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,iBA0B9F;AAGD;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,iBAO5E;AAOD;;;GAGG;AACH,wBAAgB,SAAS,WAOxB;AAED,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;AAC1D,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,GAAG,GACV,CAAC,GAAG,SAAS,EAAE,CAAC,YAAY,GAAG;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,EAAE,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAUnF;AAED,wBAAsB,aAAa,CAAC,CAAC,EAAE,CAAC,EACtC,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,EAC/B,MAAM,EAAE,CAAC,EAAE,EACX,eAAe,EAAE,CAAC,EAAE,GACnB,OAAO,CAAC,IAAI,CAAC,CAMf;AAED,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,MAAM,EACnE,aAAa,EAAE,CAAC,EAAE,EAClB,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,EAC/B,MAAM,EAAE,CAAC,EAAE,EACX,aAAa,EAAE,CAAC,EAAE,GACjB,OAAO,CAAC,IAAI,CAAC,CAOf;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,0BAK3C;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,GAAG,kEAQ/C;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,UAAU,SAAK,EAAE,WAAW,SAAI,iBAS/G;AAED,wBAAgB,uBAAuB,CACrC,oBAAoB,EAAE,KAAK,MAAM,EAAE,EACnC,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,EACpF,SAAS,EAAE,SAAS,EACpB,mBAAmB,GAAE,kBAAkB,EAAO,uBA6C/C"}
|
package/dest/fixtures/utils.js
CHANGED
|
@@ -2,7 +2,7 @@ import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
|
|
|
2
2
|
import { deployFundedSchnorrAccounts, generateSchnorrAccounts, getDeployedTestAccounts, getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
|
|
3
3
|
import { createArchiver } from '@aztec/archiver';
|
|
4
4
|
import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
|
|
5
|
-
import { BatchCall, createAztecNodeClient, createLogger, createPXEClient, makeFetch, waitForPXE } from '@aztec/aztec.js';
|
|
5
|
+
import { BatchCall, createAztecNodeClient, createLogger, createPXEClient, makeFetch, sleep, waitForPXE } from '@aztec/aztec.js';
|
|
6
6
|
import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment';
|
|
7
7
|
import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec.js/testing';
|
|
8
8
|
import { createBlobSinkClient } from '@aztec/blob-sink/client';
|
|
@@ -353,9 +353,9 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
353
353
|
}, {
|
|
354
354
|
prefilledPublicData
|
|
355
355
|
});
|
|
356
|
-
const
|
|
357
|
-
if (
|
|
358
|
-
const publisher =
|
|
356
|
+
const sequencerClient = aztecNode.getSequencer();
|
|
357
|
+
if (sequencerClient) {
|
|
358
|
+
const publisher = sequencerClient.sequencer.publisher;
|
|
359
359
|
publisher.l1TxUtils = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, config.ethereumSlotDuration);
|
|
360
360
|
}
|
|
361
361
|
let proverNode = undefined;
|
|
@@ -382,7 +382,36 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
382
382
|
await cheatCodes.rollup.setupEpoch();
|
|
383
383
|
await cheatCodes.rollup.debugRollup();
|
|
384
384
|
}
|
|
385
|
-
const
|
|
385
|
+
const sequencer = sequencerClient.getSequencer();
|
|
386
|
+
const minTxsPerBlock = config.minTxsPerBlock;
|
|
387
|
+
if (minTxsPerBlock === undefined) {
|
|
388
|
+
throw new Error('minTxsPerBlock is undefined in e2e test setup');
|
|
389
|
+
}
|
|
390
|
+
// Transactions built against the genesis state must be included in block 1, otherwise they are dropped.
|
|
391
|
+
// To avoid test failures from dropped transactions, we ensure progression beyond genesis before proceeding.
|
|
392
|
+
// For account deployments, we set minTxsPerBlock=1 and deploy accounts sequentially for guaranteed success.
|
|
393
|
+
// If no accounts need deployment, we await an empty block to confirm network progression. After either path
|
|
394
|
+
// completes, we restore the original minTxsPerBlock setting.
|
|
395
|
+
// For more details on why the tx would be dropped see `validate_include_by_timestamp` function in
|
|
396
|
+
// `noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/components/validation_requests.nr`.
|
|
397
|
+
let accountManagers = [];
|
|
398
|
+
if (numberOfAccounts === 0) {
|
|
399
|
+
// We wait until block 1 is mined to ensure that the network has progressed past genesis.
|
|
400
|
+
sequencer.updateConfig({
|
|
401
|
+
minTxsPerBlock: 0
|
|
402
|
+
});
|
|
403
|
+
while(await pxe.getBlockNumber() === 0){
|
|
404
|
+
await sleep(2000);
|
|
405
|
+
}
|
|
406
|
+
} else {
|
|
407
|
+
sequencer.updateConfig({
|
|
408
|
+
minTxsPerBlock: 1
|
|
409
|
+
});
|
|
410
|
+
accountManagers = await deployFundedSchnorrAccounts(pxe, initialFundedAccounts.slice(0, numberOfAccounts));
|
|
411
|
+
}
|
|
412
|
+
sequencer.updateConfig({
|
|
413
|
+
minTxsPerBlock
|
|
414
|
+
});
|
|
386
415
|
const wallets = await Promise.all(accountManagers.map((account)=>account.getWallet()));
|
|
387
416
|
if (initialFundedAccounts.length < numberOfAccounts) {
|
|
388
417
|
// TODO: Create (numberOfAccounts - initialFundedAccounts.length) wallets without funds.
|
|
@@ -421,7 +450,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
421
450
|
prefilledPublicData,
|
|
422
451
|
proverNode,
|
|
423
452
|
pxe,
|
|
424
|
-
sequencer,
|
|
453
|
+
sequencer: sequencerClient,
|
|
425
454
|
teardown,
|
|
426
455
|
telemetryClient: telemetry,
|
|
427
456
|
wallet: wallets[0],
|
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.20250626",
|
|
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.20250626",
|
|
29
|
+
"@aztec/archiver": "1.0.0-nightly.20250626",
|
|
30
|
+
"@aztec/aztec": "1.0.0-nightly.20250626",
|
|
31
|
+
"@aztec/aztec-node": "1.0.0-nightly.20250626",
|
|
32
|
+
"@aztec/aztec.js": "1.0.0-nightly.20250626",
|
|
33
|
+
"@aztec/bb-prover": "1.0.0-nightly.20250626",
|
|
34
|
+
"@aztec/blob-lib": "1.0.0-nightly.20250626",
|
|
35
|
+
"@aztec/blob-sink": "1.0.0-nightly.20250626",
|
|
36
|
+
"@aztec/bot": "1.0.0-nightly.20250626",
|
|
37
|
+
"@aztec/cli": "1.0.0-nightly.20250626",
|
|
38
|
+
"@aztec/constants": "1.0.0-nightly.20250626",
|
|
39
|
+
"@aztec/entrypoints": "1.0.0-nightly.20250626",
|
|
40
|
+
"@aztec/epoch-cache": "1.0.0-nightly.20250626",
|
|
41
|
+
"@aztec/ethereum": "1.0.0-nightly.20250626",
|
|
42
|
+
"@aztec/foundation": "1.0.0-nightly.20250626",
|
|
43
|
+
"@aztec/kv-store": "1.0.0-nightly.20250626",
|
|
44
|
+
"@aztec/l1-artifacts": "1.0.0-nightly.20250626",
|
|
45
|
+
"@aztec/merkle-tree": "1.0.0-nightly.20250626",
|
|
46
|
+
"@aztec/noir-contracts.js": "1.0.0-nightly.20250626",
|
|
47
|
+
"@aztec/noir-noirc_abi": "1.0.0-nightly.20250626",
|
|
48
|
+
"@aztec/noir-protocol-circuits-types": "1.0.0-nightly.20250626",
|
|
49
|
+
"@aztec/noir-test-contracts.js": "1.0.0-nightly.20250626",
|
|
50
|
+
"@aztec/p2p": "1.0.0-nightly.20250626",
|
|
51
|
+
"@aztec/protocol-contracts": "1.0.0-nightly.20250626",
|
|
52
|
+
"@aztec/prover-client": "1.0.0-nightly.20250626",
|
|
53
|
+
"@aztec/prover-node": "1.0.0-nightly.20250626",
|
|
54
|
+
"@aztec/pxe": "1.0.0-nightly.20250626",
|
|
55
|
+
"@aztec/sequencer-client": "1.0.0-nightly.20250626",
|
|
56
|
+
"@aztec/simulator": "1.0.0-nightly.20250626",
|
|
57
|
+
"@aztec/slasher": "1.0.0-nightly.20250626",
|
|
58
|
+
"@aztec/stdlib": "1.0.0-nightly.20250626",
|
|
59
|
+
"@aztec/telemetry-client": "1.0.0-nightly.20250626",
|
|
60
|
+
"@aztec/validator-client": "1.0.0-nightly.20250626",
|
|
61
|
+
"@aztec/world-state": "1.0.0-nightly.20250626",
|
|
62
62
|
"@iarna/toml": "^2.2.5",
|
|
63
63
|
"@jest/globals": "^30.0.0",
|
|
64
64
|
"@noble/curves": "^1.0.0",
|
package/src/fixtures/utils.ts
CHANGED
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
import { type Archiver, createArchiver } from '@aztec/archiver';
|
|
10
10
|
import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
|
|
11
11
|
import {
|
|
12
|
+
AccountManager,
|
|
12
13
|
type AccountWalletWithSecretKey,
|
|
13
14
|
type AztecAddress,
|
|
14
15
|
type AztecNode,
|
|
@@ -21,6 +22,7 @@ import {
|
|
|
21
22
|
createLogger,
|
|
22
23
|
createPXEClient,
|
|
23
24
|
makeFetch,
|
|
25
|
+
sleep,
|
|
24
26
|
waitForPXE,
|
|
25
27
|
} from '@aztec/aztec.js';
|
|
26
28
|
import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment';
|
|
@@ -569,10 +571,10 @@ export async function setup(
|
|
|
569
571
|
{ dateProvider, blobSinkClient, telemetry, p2pClientDeps, logger: createLogger('node:MAIN-aztec-node') },
|
|
570
572
|
{ prefilledPublicData },
|
|
571
573
|
);
|
|
572
|
-
const
|
|
574
|
+
const sequencerClient = aztecNode.getSequencer();
|
|
573
575
|
|
|
574
|
-
if (
|
|
575
|
-
const publisher = (
|
|
576
|
+
if (sequencerClient) {
|
|
577
|
+
const publisher = (sequencerClient as TestSequencerClient).sequencer.publisher;
|
|
576
578
|
publisher.l1TxUtils = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, config.ethereumSlotDuration);
|
|
577
579
|
}
|
|
578
580
|
|
|
@@ -608,7 +610,34 @@ export async function setup(
|
|
|
608
610
|
await cheatCodes.rollup.debugRollup();
|
|
609
611
|
}
|
|
610
612
|
|
|
611
|
-
const
|
|
613
|
+
const sequencer = sequencerClient!.getSequencer();
|
|
614
|
+
const minTxsPerBlock = config.minTxsPerBlock;
|
|
615
|
+
|
|
616
|
+
if (minTxsPerBlock === undefined) {
|
|
617
|
+
throw new Error('minTxsPerBlock is undefined in e2e test setup');
|
|
618
|
+
}
|
|
619
|
+
|
|
620
|
+
// Transactions built against the genesis state must be included in block 1, otherwise they are dropped.
|
|
621
|
+
// To avoid test failures from dropped transactions, we ensure progression beyond genesis before proceeding.
|
|
622
|
+
// For account deployments, we set minTxsPerBlock=1 and deploy accounts sequentially for guaranteed success.
|
|
623
|
+
// If no accounts need deployment, we await an empty block to confirm network progression. After either path
|
|
624
|
+
// completes, we restore the original minTxsPerBlock setting.
|
|
625
|
+
// For more details on why the tx would be dropped see `validate_include_by_timestamp` function in
|
|
626
|
+
// `noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/components/validation_requests.nr`.
|
|
627
|
+
let accountManagers: AccountManager[] = [];
|
|
628
|
+
if (numberOfAccounts === 0) {
|
|
629
|
+
// We wait until block 1 is mined to ensure that the network has progressed past genesis.
|
|
630
|
+
sequencer.updateConfig({ minTxsPerBlock: 0 });
|
|
631
|
+
while ((await pxe.getBlockNumber()) === 0) {
|
|
632
|
+
await sleep(2000);
|
|
633
|
+
}
|
|
634
|
+
} else {
|
|
635
|
+
sequencer.updateConfig({ minTxsPerBlock: 1 });
|
|
636
|
+
accountManagers = await deployFundedSchnorrAccounts(pxe, initialFundedAccounts.slice(0, numberOfAccounts));
|
|
637
|
+
}
|
|
638
|
+
|
|
639
|
+
sequencer.updateConfig({ minTxsPerBlock });
|
|
640
|
+
|
|
612
641
|
const wallets = await Promise.all(accountManagers.map(account => account.getWallet()));
|
|
613
642
|
if (initialFundedAccounts.length < numberOfAccounts) {
|
|
614
643
|
// TODO: Create (numberOfAccounts - initialFundedAccounts.length) wallets without funds.
|
|
@@ -655,7 +684,7 @@ export async function setup(
|
|
|
655
684
|
prefilledPublicData,
|
|
656
685
|
proverNode,
|
|
657
686
|
pxe,
|
|
658
|
-
sequencer,
|
|
687
|
+
sequencer: sequencerClient,
|
|
659
688
|
teardown,
|
|
660
689
|
telemetryClient: telemetry,
|
|
661
690
|
wallet: wallets[0],
|