@aztec/end-to-end 0.86.0-nightly.20250425 → 0.86.0-nightly.20250427
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.
|
@@ -26,14 +26,14 @@ export const KEY_FLOWS_CONFIG = {
|
|
|
26
26
|
},
|
|
27
27
|
transfers: {
|
|
28
28
|
accounts: [
|
|
29
|
-
'ecdsar1'
|
|
30
|
-
'schnorr'
|
|
29
|
+
'ecdsar1'
|
|
31
30
|
],
|
|
32
31
|
feePaymentMethods: [
|
|
33
32
|
'sponsored_fpc',
|
|
34
|
-
'
|
|
33
|
+
'private_fpc'
|
|
35
34
|
],
|
|
36
35
|
recursions: [
|
|
36
|
+
0,
|
|
37
37
|
1
|
|
38
38
|
]
|
|
39
39
|
}
|
|
@@ -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;
|
|
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
|
@@ -15,6 +15,7 @@ import { DelayedTxUtils, EthCheatCodesWithState, startAnvil } from '@aztec/ether
|
|
|
15
15
|
import { randomBytes } from '@aztec/foundation/crypto';
|
|
16
16
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
17
17
|
import { Fr } from '@aztec/foundation/fields';
|
|
18
|
+
import { withLogNameSuffix } from '@aztec/foundation/log';
|
|
18
19
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
19
20
|
import { TestDateProvider } from '@aztec/foundation/timer';
|
|
20
21
|
import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
|
|
@@ -341,7 +342,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
341
342
|
...config.proverNodeConfig,
|
|
342
343
|
dataDirectory: proverNodeDataDirectory
|
|
343
344
|
};
|
|
344
|
-
proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, config, proverNodeConfig, aztecNode);
|
|
345
|
+
proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, config, proverNodeConfig, aztecNode, prefilledPublicData);
|
|
345
346
|
}
|
|
346
347
|
logger.verbose('Creating a pxe...');
|
|
347
348
|
const { pxe, teardown: pxeTeardown } = await setupPXEService(aztecNode, pxeOpts, logger);
|
|
@@ -517,54 +518,54 @@ export async function waitForProvenChain(node, targetBlock, timeoutSec = 60, int
|
|
|
517
518
|
targetBlock ??= await node.getBlockNumber();
|
|
518
519
|
await retryUntil(async ()=>await node.getProvenBlockNumber() >= targetBlock, 'proven chain status', timeoutSec, intervalSec);
|
|
519
520
|
}
|
|
520
|
-
export
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
521
|
+
export function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, proverNodeConfig, aztecNode, prefilledPublicData = []) {
|
|
522
|
+
return withLogNameSuffix('prover-node', async ()=>{
|
|
523
|
+
// Disable stopping the aztec node as the prover coordination test will kill it otherwise
|
|
524
|
+
// This is only required when stopping the prover node for testing
|
|
525
|
+
const aztecNodeTxProvider = {
|
|
526
|
+
getTxByHash: aztecNode.getTxByHash.bind(aztecNode),
|
|
527
|
+
getTxsByHash: aztecNode.getTxsByHash.bind(aztecNode),
|
|
528
|
+
stop: ()=>Promise.resolve()
|
|
529
|
+
};
|
|
530
|
+
const blobSinkClient = createBlobSinkClient(aztecNodeConfig);
|
|
531
|
+
// Creating temp store and archiver for simulated prover node
|
|
532
|
+
const archiverConfig = {
|
|
533
|
+
...aztecNodeConfig,
|
|
534
|
+
dataDirectory: proverNodeConfig.dataDirectory
|
|
535
|
+
};
|
|
536
|
+
const archiver = await createArchiver(archiverConfig, blobSinkClient, {
|
|
537
|
+
blockUntilSync: true
|
|
538
|
+
});
|
|
539
|
+
// Prover node config is for simulated proofs
|
|
540
|
+
const proverConfig = {
|
|
541
|
+
...aztecNodeConfig,
|
|
542
|
+
proverCoordinationNodeUrls: [],
|
|
543
|
+
realProofs: false,
|
|
544
|
+
proverAgentCount: 2,
|
|
545
|
+
publisherPrivateKey: proverNodePrivateKey,
|
|
546
|
+
proverNodeMaxPendingJobs: 10,
|
|
547
|
+
proverNodeMaxParallelBlocksPerEpoch: 32,
|
|
548
|
+
proverNodePollingIntervalMs: 200,
|
|
549
|
+
txGatheringIntervalMs: 1000,
|
|
550
|
+
txGatheringBatchSize: 10,
|
|
551
|
+
txGatheringMaxParallelRequestsPerNode: 10,
|
|
552
|
+
proverNodeFailedEpochStore: undefined,
|
|
553
|
+
...proverNodeConfig
|
|
554
|
+
};
|
|
555
|
+
const l1TxUtils = createDelayedL1TxUtils(aztecNodeConfig, proverNodePrivateKey, 'prover-node');
|
|
556
|
+
const proverNode = await createProverNode(proverConfig, {
|
|
557
|
+
aztecNodeTxProvider,
|
|
558
|
+
archiver: archiver,
|
|
559
|
+
l1TxUtils
|
|
560
|
+
}, {
|
|
561
|
+
prefilledPublicData
|
|
562
|
+
});
|
|
563
|
+
getLogger().info(`Created and synced prover node`, {
|
|
564
|
+
publisherAddress: l1TxUtils.client.account.address
|
|
565
|
+
});
|
|
566
|
+
await proverNode.start();
|
|
567
|
+
return proverNode;
|
|
565
568
|
});
|
|
566
|
-
await proverNode.start();
|
|
567
|
-
return proverNode;
|
|
568
569
|
}
|
|
569
570
|
function createDelayedL1TxUtils(aztecNodeConfig, privateKey, logName) {
|
|
570
571
|
const l1Client = createExtendedL1Client(aztecNodeConfig.l1RpcUrls, privateKey, foundry);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/end-to-end",
|
|
3
|
-
"version": "0.86.0-nightly.
|
|
3
|
+
"version": "0.86.0-nightly.20250427",
|
|
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-nightly.
|
|
29
|
-
"@aztec/archiver": "0.86.0-nightly.
|
|
30
|
-
"@aztec/aztec": "0.86.0-nightly.
|
|
31
|
-
"@aztec/aztec-node": "0.86.0-nightly.
|
|
32
|
-
"@aztec/aztec.js": "0.86.0-nightly.
|
|
33
|
-
"@aztec/bb-prover": "0.86.0-nightly.
|
|
34
|
-
"@aztec/blob-lib": "0.86.0-nightly.
|
|
35
|
-
"@aztec/blob-sink": "0.86.0-nightly.
|
|
36
|
-
"@aztec/bot": "0.86.0-nightly.
|
|
37
|
-
"@aztec/cli": "0.86.0-nightly.
|
|
38
|
-
"@aztec/constants": "0.86.0-nightly.
|
|
39
|
-
"@aztec/entrypoints": "0.86.0-nightly.
|
|
40
|
-
"@aztec/epoch-cache": "0.86.0-nightly.
|
|
41
|
-
"@aztec/ethereum": "0.86.0-nightly.
|
|
42
|
-
"@aztec/foundation": "0.86.0-nightly.
|
|
43
|
-
"@aztec/kv-store": "0.86.0-nightly.
|
|
44
|
-
"@aztec/l1-artifacts": "0.86.0-nightly.
|
|
45
|
-
"@aztec/merkle-tree": "0.86.0-nightly.
|
|
46
|
-
"@aztec/noir-contracts.js": "0.86.0-nightly.
|
|
47
|
-
"@aztec/noir-noirc_abi": "0.86.0-nightly.
|
|
48
|
-
"@aztec/noir-protocol-circuits-types": "0.86.0-nightly.
|
|
49
|
-
"@aztec/p2p": "0.86.0-nightly.
|
|
50
|
-
"@aztec/protocol-contracts": "0.86.0-nightly.
|
|
51
|
-
"@aztec/prover-client": "0.86.0-nightly.
|
|
52
|
-
"@aztec/prover-node": "0.86.0-nightly.
|
|
53
|
-
"@aztec/pxe": "0.86.0-nightly.
|
|
54
|
-
"@aztec/sequencer-client": "0.86.0-nightly.
|
|
55
|
-
"@aztec/simulator": "0.86.0-nightly.
|
|
56
|
-
"@aztec/stdlib": "0.86.0-nightly.
|
|
57
|
-
"@aztec/telemetry-client": "0.86.0-nightly.
|
|
58
|
-
"@aztec/validator-client": "0.86.0-nightly.
|
|
59
|
-
"@aztec/world-state": "0.86.0-nightly.
|
|
28
|
+
"@aztec/accounts": "0.86.0-nightly.20250427",
|
|
29
|
+
"@aztec/archiver": "0.86.0-nightly.20250427",
|
|
30
|
+
"@aztec/aztec": "0.86.0-nightly.20250427",
|
|
31
|
+
"@aztec/aztec-node": "0.86.0-nightly.20250427",
|
|
32
|
+
"@aztec/aztec.js": "0.86.0-nightly.20250427",
|
|
33
|
+
"@aztec/bb-prover": "0.86.0-nightly.20250427",
|
|
34
|
+
"@aztec/blob-lib": "0.86.0-nightly.20250427",
|
|
35
|
+
"@aztec/blob-sink": "0.86.0-nightly.20250427",
|
|
36
|
+
"@aztec/bot": "0.86.0-nightly.20250427",
|
|
37
|
+
"@aztec/cli": "0.86.0-nightly.20250427",
|
|
38
|
+
"@aztec/constants": "0.86.0-nightly.20250427",
|
|
39
|
+
"@aztec/entrypoints": "0.86.0-nightly.20250427",
|
|
40
|
+
"@aztec/epoch-cache": "0.86.0-nightly.20250427",
|
|
41
|
+
"@aztec/ethereum": "0.86.0-nightly.20250427",
|
|
42
|
+
"@aztec/foundation": "0.86.0-nightly.20250427",
|
|
43
|
+
"@aztec/kv-store": "0.86.0-nightly.20250427",
|
|
44
|
+
"@aztec/l1-artifacts": "0.86.0-nightly.20250427",
|
|
45
|
+
"@aztec/merkle-tree": "0.86.0-nightly.20250427",
|
|
46
|
+
"@aztec/noir-contracts.js": "0.86.0-nightly.20250427",
|
|
47
|
+
"@aztec/noir-noirc_abi": "0.86.0-nightly.20250427",
|
|
48
|
+
"@aztec/noir-protocol-circuits-types": "0.86.0-nightly.20250427",
|
|
49
|
+
"@aztec/p2p": "0.86.0-nightly.20250427",
|
|
50
|
+
"@aztec/protocol-contracts": "0.86.0-nightly.20250427",
|
|
51
|
+
"@aztec/prover-client": "0.86.0-nightly.20250427",
|
|
52
|
+
"@aztec/prover-node": "0.86.0-nightly.20250427",
|
|
53
|
+
"@aztec/pxe": "0.86.0-nightly.20250427",
|
|
54
|
+
"@aztec/sequencer-client": "0.86.0-nightly.20250427",
|
|
55
|
+
"@aztec/simulator": "0.86.0-nightly.20250427",
|
|
56
|
+
"@aztec/stdlib": "0.86.0-nightly.20250427",
|
|
57
|
+
"@aztec/telemetry-client": "0.86.0-nightly.20250427",
|
|
58
|
+
"@aztec/validator-client": "0.86.0-nightly.20250427",
|
|
59
|
+
"@aztec/world-state": "0.86.0-nightly.20250427",
|
|
60
60
|
"@iarna/toml": "^2.2.5",
|
|
61
61
|
"@jest/globals": "^29.5.0",
|
|
62
62
|
"@noble/curves": "^1.0.0",
|
|
@@ -26,9 +26,9 @@ export const KEY_FLOWS_CONFIG: ClientFlowsConfig = {
|
|
|
26
26
|
feePaymentMethods: ['sponsored_fpc'],
|
|
27
27
|
},
|
|
28
28
|
transfers: {
|
|
29
|
-
accounts: ['ecdsar1'
|
|
30
|
-
feePaymentMethods: ['sponsored_fpc', '
|
|
31
|
-
recursions: [1],
|
|
29
|
+
accounts: ['ecdsar1'],
|
|
30
|
+
feePaymentMethods: ['sponsored_fpc', 'private_fpc'],
|
|
31
|
+
recursions: [0, 1],
|
|
32
32
|
},
|
|
33
33
|
};
|
|
34
34
|
|
package/src/fixtures/utils.ts
CHANGED
|
@@ -46,6 +46,7 @@ import { DelayedTxUtils, EthCheatCodesWithState, startAnvil } from '@aztec/ether
|
|
|
46
46
|
import { randomBytes } from '@aztec/foundation/crypto';
|
|
47
47
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
48
48
|
import { Fr } from '@aztec/foundation/fields';
|
|
49
|
+
import { withLogNameSuffix } from '@aztec/foundation/log';
|
|
49
50
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
50
51
|
import { TestDateProvider } from '@aztec/foundation/timer';
|
|
51
52
|
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
@@ -537,7 +538,13 @@ export async function setup(
|
|
|
537
538
|
const proverNodePrivateKeyHex: Hex = `0x${proverNodePrivateKey!.toString('hex')}`;
|
|
538
539
|
const proverNodeDataDirectory = path.join(directoryToCleanup, randomBytes(8).toString('hex'));
|
|
539
540
|
const proverNodeConfig = { ...config.proverNodeConfig, dataDirectory: proverNodeDataDirectory };
|
|
540
|
-
proverNode = await createAndSyncProverNode(
|
|
541
|
+
proverNode = await createAndSyncProverNode(
|
|
542
|
+
proverNodePrivateKeyHex,
|
|
543
|
+
config,
|
|
544
|
+
proverNodeConfig,
|
|
545
|
+
aztecNode,
|
|
546
|
+
prefilledPublicData,
|
|
547
|
+
);
|
|
541
548
|
}
|
|
542
549
|
|
|
543
550
|
logger.verbose('Creating a pxe...');
|
|
@@ -774,56 +781,56 @@ export async function waitForProvenChain(node: AztecNode, targetBlock?: number,
|
|
|
774
781
|
);
|
|
775
782
|
}
|
|
776
783
|
|
|
777
|
-
export
|
|
784
|
+
export function createAndSyncProverNode(
|
|
778
785
|
proverNodePrivateKey: `0x${string}`,
|
|
779
786
|
aztecNodeConfig: AztecNodeConfig,
|
|
780
787
|
proverNodeConfig: Partial<ProverNodeConfig> & Pick<DataStoreConfig, 'dataDirectory'>,
|
|
781
788
|
aztecNode: AztecNode,
|
|
782
789
|
prefilledPublicData: PublicDataTreeLeaf[] = [],
|
|
783
790
|
) {
|
|
784
|
-
|
|
785
|
-
|
|
786
|
-
|
|
787
|
-
|
|
788
|
-
|
|
789
|
-
|
|
790
|
-
|
|
791
|
-
|
|
792
|
-
const blobSinkClient = createBlobSinkClient(aztecNodeConfig, {
|
|
793
|
-
logger: createLogger('prover-node:blob-sink:client'),
|
|
794
|
-
});
|
|
791
|
+
return withLogNameSuffix('prover-node', async () => {
|
|
792
|
+
// Disable stopping the aztec node as the prover coordination test will kill it otherwise
|
|
793
|
+
// This is only required when stopping the prover node for testing
|
|
794
|
+
const aztecNodeTxProvider = {
|
|
795
|
+
getTxByHash: aztecNode.getTxByHash.bind(aztecNode),
|
|
796
|
+
getTxsByHash: aztecNode.getTxsByHash.bind(aztecNode),
|
|
797
|
+
stop: () => Promise.resolve(),
|
|
798
|
+
};
|
|
795
799
|
|
|
796
|
-
|
|
797
|
-
|
|
798
|
-
|
|
799
|
-
|
|
800
|
-
|
|
801
|
-
|
|
802
|
-
|
|
803
|
-
|
|
804
|
-
|
|
805
|
-
|
|
806
|
-
|
|
807
|
-
|
|
808
|
-
|
|
809
|
-
|
|
810
|
-
|
|
811
|
-
|
|
812
|
-
|
|
813
|
-
|
|
814
|
-
|
|
815
|
-
|
|
800
|
+
const blobSinkClient = createBlobSinkClient(aztecNodeConfig);
|
|
801
|
+
|
|
802
|
+
// Creating temp store and archiver for simulated prover node
|
|
803
|
+
const archiverConfig = { ...aztecNodeConfig, dataDirectory: proverNodeConfig.dataDirectory };
|
|
804
|
+
const archiver = await createArchiver(archiverConfig, blobSinkClient, { blockUntilSync: true });
|
|
805
|
+
|
|
806
|
+
// Prover node config is for simulated proofs
|
|
807
|
+
const proverConfig: ProverNodeConfig = {
|
|
808
|
+
...aztecNodeConfig,
|
|
809
|
+
proverCoordinationNodeUrls: [],
|
|
810
|
+
realProofs: false,
|
|
811
|
+
proverAgentCount: 2,
|
|
812
|
+
publisherPrivateKey: proverNodePrivateKey,
|
|
813
|
+
proverNodeMaxPendingJobs: 10,
|
|
814
|
+
proverNodeMaxParallelBlocksPerEpoch: 32,
|
|
815
|
+
proverNodePollingIntervalMs: 200,
|
|
816
|
+
txGatheringIntervalMs: 1000,
|
|
817
|
+
txGatheringBatchSize: 10,
|
|
818
|
+
txGatheringMaxParallelRequestsPerNode: 10,
|
|
819
|
+
proverNodeFailedEpochStore: undefined,
|
|
820
|
+
...proverNodeConfig,
|
|
821
|
+
};
|
|
816
822
|
|
|
817
|
-
|
|
823
|
+
const l1TxUtils = createDelayedL1TxUtils(aztecNodeConfig, proverNodePrivateKey, 'prover-node');
|
|
818
824
|
|
|
819
|
-
|
|
820
|
-
|
|
821
|
-
|
|
822
|
-
|
|
823
|
-
|
|
824
|
-
|
|
825
|
-
|
|
826
|
-
|
|
825
|
+
const proverNode = await createProverNode(
|
|
826
|
+
proverConfig,
|
|
827
|
+
{ aztecNodeTxProvider, archiver: archiver as Archiver, l1TxUtils },
|
|
828
|
+
{ prefilledPublicData },
|
|
829
|
+
);
|
|
830
|
+
getLogger().info(`Created and synced prover node`, { publisherAddress: l1TxUtils.client.account!.address });
|
|
831
|
+
await proverNode.start();
|
|
832
|
+
return proverNode;
|
|
833
|
+
});
|
|
827
834
|
}
|
|
828
835
|
|
|
829
836
|
function createDelayedL1TxUtils(aztecNodeConfig: AztecNodeConfig, privateKey: `0x${string}`, logName: string) {
|