@aztec/end-to-end 3.0.0-nightly.20250915 → 3.0.0-nightly.20250917
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_cross_chain_messaging/cross_chain_messaging_test.d.ts +4 -2
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +1 -1
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +12 -8
- package/dest/e2e_deploy_contract/deploy_test.js +2 -5
- package/dest/e2e_epochs/epochs_test.js +1 -4
- package/dest/e2e_p2p/shared.d.ts.map +1 -1
- package/dest/e2e_p2p/shared.js +3 -4
- package/package.json +37 -37
- package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +14 -8
- package/src/e2e_deploy_contract/deploy_test.ts +2 -2
- package/src/e2e_epochs/epochs_test.ts +1 -1
- package/src/e2e_p2p/shared.ts +4 -2
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import type { AztecNodeConfig } from '@aztec/aztec-node';
|
|
2
2
|
import { AztecAddress, type AztecNode, EthAddress, type Logger, type PXE } from '@aztec/aztec.js';
|
|
3
3
|
import { CheatCodes } from '@aztec/aztec/testing';
|
|
4
|
-
import { type DeployL1ContractsReturnType, type ExtendedViemWalletClient } from '@aztec/ethereum';
|
|
4
|
+
import { type DeployL1ContractsArgs, type DeployL1ContractsReturnType, type ExtendedViemWalletClient } from '@aztec/ethereum';
|
|
5
5
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
6
6
|
import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
|
|
7
7
|
import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
|
|
8
8
|
import type { TestWallet } from '@aztec/test-wallet';
|
|
9
9
|
import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
|
|
10
|
+
import type { SetupOptions } from '../fixtures/utils.js';
|
|
10
11
|
import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
|
|
11
12
|
export declare class CrossChainMessagingTest {
|
|
12
13
|
private snapshotManager;
|
|
@@ -15,6 +16,7 @@ export declare class CrossChainMessagingTest {
|
|
|
15
16
|
pxe: PXE;
|
|
16
17
|
aztecNodeConfig: AztecNodeConfig;
|
|
17
18
|
aztecNodeAdmin: AztecNodeAdmin;
|
|
19
|
+
ctx: SubsystemsContext;
|
|
18
20
|
l1Client: ExtendedViemWalletClient | undefined;
|
|
19
21
|
wallet: TestWallet;
|
|
20
22
|
ownerAddress: AztecAddress;
|
|
@@ -28,7 +30,7 @@ export declare class CrossChainMessagingTest {
|
|
|
28
30
|
outbox: any;
|
|
29
31
|
cheatCodes: CheatCodes;
|
|
30
32
|
deployL1ContractsValues: DeployL1ContractsReturnType;
|
|
31
|
-
constructor(testName: string);
|
|
33
|
+
constructor(testName: string, opts?: SetupOptions, deployL1ContractsArgs?: Partial<DeployL1ContractsArgs>);
|
|
32
34
|
assumeProven(): Promise<void>;
|
|
33
35
|
setup(): Promise<void>;
|
|
34
36
|
snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cross_chain_messaging_test.d.ts","sourceRoot":"","sources":["../../src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,KAAK,SAAS,EAAE,UAAU,EAAE,KAAK,MAAM,EAAE,KAAK,GAAG,EAAgB,MAAM,iBAAiB,CAAC;AAChH,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,EAG9B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAKrD,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAI9E,qBAAa,uBAAuB;IAClC,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAG,SAAS,CAAC;IACtB,GAAG,EAAG,GAAG,CAAC;IACV,eAAe,EAAG,eAAe,CAAC;IAClC,cAAc,EAAG,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"cross_chain_messaging_test.d.ts","sourceRoot":"","sources":["../../src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,KAAK,SAAS,EAAE,UAAU,EAAE,KAAK,MAAM,EAAE,KAAK,GAAG,EAAgB,MAAM,iBAAiB,CAAC;AAChH,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,EAG9B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAKrD,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAI9E,qBAAa,uBAAuB;IAClC,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAG,SAAS,CAAC;IACtB,GAAG,EAAG,GAAG,CAAC;IACV,eAAe,EAAG,eAAe,CAAC;IAClC,cAAc,EAAG,cAAc,CAAC;IAChC,GAAG,EAAG,iBAAiB,CAAC;IAExB,QAAQ,EAAG,wBAAwB,GAAG,SAAS,CAAC;IAEhD,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,qBAAqB,EAAG,qBAAqB,CAAC;IAC9C,UAAU,EAAG,UAAU,CAAC;IACxB,OAAO,EAAG,aAAa,CAAC;IACxB,QAAQ,EAAG,mBAAmB,CAAC;IAE/B,KAAK,EAAG,GAAG,CAAC;IACZ,MAAM,EAAG,GAAG,CAAC;IACb,UAAU,EAAG,UAAU,CAAC;IAExB,uBAAuB,EAAG,2BAA2B,CAAC;gBAE1C,QAAQ,EAAE,MAAM,EAAE,IAAI,GAAE,YAAiB,EAAE,qBAAqB,GAAE,OAAO,CAAC,qBAAqB,CAAM;IAQ3G,YAAY;IAIZ,KAAK;IAUX,QAAQ,GAAI,CAAC,EACX,MAAM,MAAM,EACZ,OAAO,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,UAAS,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B,KAChG,OAAO,CAAC,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAIR,kBAAkB;CA0FzB"}
|
|
@@ -16,6 +16,7 @@ export class CrossChainMessagingTest {
|
|
|
16
16
|
pxe;
|
|
17
17
|
aztecNodeConfig;
|
|
18
18
|
aztecNodeAdmin;
|
|
19
|
+
ctx;
|
|
19
20
|
l1Client;
|
|
20
21
|
wallet;
|
|
21
22
|
ownerAddress;
|
|
@@ -29,21 +30,24 @@ export class CrossChainMessagingTest {
|
|
|
29
30
|
outbox;
|
|
30
31
|
cheatCodes;
|
|
31
32
|
deployL1ContractsValues;
|
|
32
|
-
constructor(testName){
|
|
33
|
+
constructor(testName, opts = {}, deployL1ContractsArgs = {}){
|
|
33
34
|
this.logger = createLogger(`e2e:e2e_cross_chain_messaging:${testName}`);
|
|
34
|
-
this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath
|
|
35
|
+
this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath, opts, {
|
|
36
|
+
initialValidators: [],
|
|
37
|
+
...deployL1ContractsArgs
|
|
38
|
+
});
|
|
35
39
|
}
|
|
36
40
|
async assumeProven() {
|
|
37
41
|
await this.cheatCodes.rollup.markAsProven();
|
|
38
42
|
}
|
|
39
43
|
async setup() {
|
|
40
|
-
|
|
41
|
-
this.aztecNode = aztecNode;
|
|
42
|
-
this.pxe = pxe;
|
|
43
|
-
this.aztecNodeConfig = aztecNodeConfig;
|
|
44
|
+
this.ctx = await this.snapshotManager.setup();
|
|
45
|
+
this.aztecNode = this.ctx.aztecNode;
|
|
46
|
+
this.pxe = this.ctx.pxe;
|
|
47
|
+
this.aztecNodeConfig = this.ctx.aztecNodeConfig;
|
|
44
48
|
this.cheatCodes = await CheatCodes.create(this.aztecNodeConfig.l1RpcUrls, this.pxe);
|
|
45
|
-
this.deployL1ContractsValues = deployL1ContractsValues;
|
|
46
|
-
this.aztecNodeAdmin = aztecNode;
|
|
49
|
+
this.deployL1ContractsValues = this.ctx.deployL1ContractsValues;
|
|
50
|
+
this.aztecNodeAdmin = this.ctx.aztecNode;
|
|
47
51
|
}
|
|
48
52
|
snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
|
|
49
53
|
async teardown() {
|
|
@@ -34,14 +34,11 @@ export class DeployTest {
|
|
|
34
34
|
const instance = await getContractInstanceFromInstantiationParams(contractArtifact.artifact, {
|
|
35
35
|
constructorArgs: initArgs ?? [],
|
|
36
36
|
constructorArtifact: constructorName,
|
|
37
|
-
salt,
|
|
37
|
+
salt: salt ?? Fr.random(),
|
|
38
38
|
publicKeys,
|
|
39
39
|
deployer
|
|
40
40
|
});
|
|
41
|
-
await wallet.registerContract(
|
|
42
|
-
artifact: contractArtifact.artifact,
|
|
43
|
-
instance
|
|
44
|
-
});
|
|
41
|
+
await wallet.registerContract(instance, contractArtifact.artifact);
|
|
45
42
|
return contractArtifact.at(instance.address, wallet);
|
|
46
43
|
}
|
|
47
44
|
async registerRandomAccount() {
|
|
@@ -260,10 +260,7 @@ export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
|
|
|
260
260
|
publicKeys: undefined,
|
|
261
261
|
deployer: undefined
|
|
262
262
|
});
|
|
263
|
-
await wallet.registerContract(
|
|
264
|
-
artifact: SpamContract.artifact,
|
|
265
|
-
instance
|
|
266
|
-
});
|
|
263
|
+
await wallet.registerContract(instance, SpamContract.artifact);
|
|
267
264
|
return SpamContract.at(instance.address, wallet);
|
|
268
265
|
}
|
|
269
266
|
/** Creates an L1 client using a fresh account with funds from anvil, with a tx delayer already set up. */ async createL1Client() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EACL,YAAY,EAEZ,KAAK,MAAM,EACX,QAAQ,EACR,KAAK,MAAM,EAIZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,8BAA8B,EAAE,cAAc,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAErH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAyD,MAAM,mBAAmB,CAAC;AAEtG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAGvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAIjE,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,MAAM,EACd,MAAM,YAAY,EAClB,cAAc,YAAY,EAC1B,QAAQ,MAAM,EACd,OAAM;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,sBAsBpC,CAAC;AAGF,eAAO,MAAM,qCAAqC,GAChD,QAAQ,MAAM,EACd,MAAM,gBAAgB,EACtB,QAAQ,MAAM,EACd,eAAe,kBAAkB,KAChC,OAAO,CAAC,WAAW,CAQrB,CAAC;AAEF,wBAAsB,sCAAsC,CAC1D,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,kBAAkB,GAChC,OAAO,CAAC;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,QAAQ,EAAE,CAAC;IAAC,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"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"}
|
package/dest/e2e_p2p/shared.js
CHANGED
|
@@ -50,11 +50,10 @@ export async function createPXEServiceAndPrepareTransactions(logger, node, numTx
|
|
|
50
50
|
});
|
|
51
51
|
const wallet = new TestWallet(pxe);
|
|
52
52
|
const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
|
|
53
|
-
const testContractInstance = await getContractInstanceFromInstantiationParams(TestContractArtifact, {
|
|
54
|
-
|
|
55
|
-
instance: testContractInstance,
|
|
56
|
-
artifact: TestContractArtifact
|
|
53
|
+
const testContractInstance = await getContractInstanceFromInstantiationParams(TestContractArtifact, {
|
|
54
|
+
salt: Fr.random()
|
|
57
55
|
});
|
|
56
|
+
await wallet.registerContract(testContractInstance, TestContractArtifact);
|
|
58
57
|
const contract = await TestContract.at(testContractInstance.address, wallet);
|
|
59
58
|
const txs = await timesAsync(numTxs, async ()=>{
|
|
60
59
|
const tx = await contract.methods.emit_nullifier(Fr.random()).prove({
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/end-to-end",
|
|
3
|
-
"version": "3.0.0-nightly.
|
|
3
|
+
"version": "3.0.0-nightly.20250917",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"inherits": [
|
|
@@ -25,42 +25,42 @@
|
|
|
25
25
|
"formatting": "run -T prettier --check ./src && run -T eslint ./src"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@aztec/accounts": "3.0.0-nightly.
|
|
29
|
-
"@aztec/archiver": "3.0.0-nightly.
|
|
30
|
-
"@aztec/aztec": "3.0.0-nightly.
|
|
31
|
-
"@aztec/aztec-node": "3.0.0-nightly.
|
|
32
|
-
"@aztec/aztec.js": "3.0.0-nightly.
|
|
33
|
-
"@aztec/bb-prover": "3.0.0-nightly.
|
|
34
|
-
"@aztec/blob-lib": "3.0.0-nightly.
|
|
35
|
-
"@aztec/blob-sink": "3.0.0-nightly.
|
|
36
|
-
"@aztec/bot": "3.0.0-nightly.
|
|
37
|
-
"@aztec/cli": "3.0.0-nightly.
|
|
38
|
-
"@aztec/constants": "3.0.0-nightly.
|
|
39
|
-
"@aztec/entrypoints": "3.0.0-nightly.
|
|
40
|
-
"@aztec/epoch-cache": "3.0.0-nightly.
|
|
41
|
-
"@aztec/ethereum": "3.0.0-nightly.
|
|
42
|
-
"@aztec/foundation": "3.0.0-nightly.
|
|
43
|
-
"@aztec/kv-store": "3.0.0-nightly.
|
|
44
|
-
"@aztec/l1-artifacts": "3.0.0-nightly.
|
|
45
|
-
"@aztec/merkle-tree": "3.0.0-nightly.
|
|
46
|
-
"@aztec/node-keystore": "3.0.0-nightly.
|
|
47
|
-
"@aztec/noir-contracts.js": "3.0.0-nightly.
|
|
48
|
-
"@aztec/noir-noirc_abi": "3.0.0-nightly.
|
|
49
|
-
"@aztec/noir-protocol-circuits-types": "3.0.0-nightly.
|
|
50
|
-
"@aztec/noir-test-contracts.js": "3.0.0-nightly.
|
|
51
|
-
"@aztec/p2p": "3.0.0-nightly.
|
|
52
|
-
"@aztec/protocol-contracts": "3.0.0-nightly.
|
|
53
|
-
"@aztec/prover-client": "3.0.0-nightly.
|
|
54
|
-
"@aztec/prover-node": "3.0.0-nightly.
|
|
55
|
-
"@aztec/pxe": "3.0.0-nightly.
|
|
56
|
-
"@aztec/sequencer-client": "3.0.0-nightly.
|
|
57
|
-
"@aztec/simulator": "3.0.0-nightly.
|
|
58
|
-
"@aztec/slasher": "3.0.0-nightly.
|
|
59
|
-
"@aztec/stdlib": "3.0.0-nightly.
|
|
60
|
-
"@aztec/telemetry-client": "3.0.0-nightly.
|
|
61
|
-
"@aztec/test-wallet": "3.0.0-nightly.
|
|
62
|
-
"@aztec/validator-client": "3.0.0-nightly.
|
|
63
|
-
"@aztec/world-state": "3.0.0-nightly.
|
|
28
|
+
"@aztec/accounts": "3.0.0-nightly.20250917",
|
|
29
|
+
"@aztec/archiver": "3.0.0-nightly.20250917",
|
|
30
|
+
"@aztec/aztec": "3.0.0-nightly.20250917",
|
|
31
|
+
"@aztec/aztec-node": "3.0.0-nightly.20250917",
|
|
32
|
+
"@aztec/aztec.js": "3.0.0-nightly.20250917",
|
|
33
|
+
"@aztec/bb-prover": "3.0.0-nightly.20250917",
|
|
34
|
+
"@aztec/blob-lib": "3.0.0-nightly.20250917",
|
|
35
|
+
"@aztec/blob-sink": "3.0.0-nightly.20250917",
|
|
36
|
+
"@aztec/bot": "3.0.0-nightly.20250917",
|
|
37
|
+
"@aztec/cli": "3.0.0-nightly.20250917",
|
|
38
|
+
"@aztec/constants": "3.0.0-nightly.20250917",
|
|
39
|
+
"@aztec/entrypoints": "3.0.0-nightly.20250917",
|
|
40
|
+
"@aztec/epoch-cache": "3.0.0-nightly.20250917",
|
|
41
|
+
"@aztec/ethereum": "3.0.0-nightly.20250917",
|
|
42
|
+
"@aztec/foundation": "3.0.0-nightly.20250917",
|
|
43
|
+
"@aztec/kv-store": "3.0.0-nightly.20250917",
|
|
44
|
+
"@aztec/l1-artifacts": "3.0.0-nightly.20250917",
|
|
45
|
+
"@aztec/merkle-tree": "3.0.0-nightly.20250917",
|
|
46
|
+
"@aztec/node-keystore": "3.0.0-nightly.20250917",
|
|
47
|
+
"@aztec/noir-contracts.js": "3.0.0-nightly.20250917",
|
|
48
|
+
"@aztec/noir-noirc_abi": "3.0.0-nightly.20250917",
|
|
49
|
+
"@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250917",
|
|
50
|
+
"@aztec/noir-test-contracts.js": "3.0.0-nightly.20250917",
|
|
51
|
+
"@aztec/p2p": "3.0.0-nightly.20250917",
|
|
52
|
+
"@aztec/protocol-contracts": "3.0.0-nightly.20250917",
|
|
53
|
+
"@aztec/prover-client": "3.0.0-nightly.20250917",
|
|
54
|
+
"@aztec/prover-node": "3.0.0-nightly.20250917",
|
|
55
|
+
"@aztec/pxe": "3.0.0-nightly.20250917",
|
|
56
|
+
"@aztec/sequencer-client": "3.0.0-nightly.20250917",
|
|
57
|
+
"@aztec/simulator": "3.0.0-nightly.20250917",
|
|
58
|
+
"@aztec/slasher": "3.0.0-nightly.20250917",
|
|
59
|
+
"@aztec/stdlib": "3.0.0-nightly.20250917",
|
|
60
|
+
"@aztec/telemetry-client": "3.0.0-nightly.20250917",
|
|
61
|
+
"@aztec/test-wallet": "3.0.0-nightly.20250917",
|
|
62
|
+
"@aztec/validator-client": "3.0.0-nightly.20250917",
|
|
63
|
+
"@aztec/world-state": "3.0.0-nightly.20250917",
|
|
64
64
|
"@iarna/toml": "^2.2.5",
|
|
65
65
|
"@jest/globals": "^30.0.0",
|
|
66
66
|
"@noble/curves": "=1.0.0",
|
|
@@ -2,6 +2,7 @@ import type { AztecNodeConfig } from '@aztec/aztec-node';
|
|
|
2
2
|
import { AztecAddress, type AztecNode, EthAddress, type Logger, type PXE, createLogger } from '@aztec/aztec.js';
|
|
3
3
|
import { CheatCodes } from '@aztec/aztec/testing';
|
|
4
4
|
import {
|
|
5
|
+
type DeployL1ContractsArgs,
|
|
5
6
|
type DeployL1ContractsReturnType,
|
|
6
7
|
type ExtendedViemWalletClient,
|
|
7
8
|
createExtendedL1Client,
|
|
@@ -23,6 +24,7 @@ import {
|
|
|
23
24
|
deployAccounts,
|
|
24
25
|
publicDeployAccounts,
|
|
25
26
|
} from '../fixtures/snapshot_manager.js';
|
|
27
|
+
import type { SetupOptions } from '../fixtures/utils.js';
|
|
26
28
|
import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
|
|
27
29
|
|
|
28
30
|
const { E2E_DATA_PATH: dataPath } = process.env;
|
|
@@ -34,6 +36,7 @@ export class CrossChainMessagingTest {
|
|
|
34
36
|
pxe!: PXE;
|
|
35
37
|
aztecNodeConfig!: AztecNodeConfig;
|
|
36
38
|
aztecNodeAdmin!: AztecNodeAdmin;
|
|
39
|
+
ctx!: SubsystemsContext;
|
|
37
40
|
|
|
38
41
|
l1Client!: ExtendedViemWalletClient | undefined;
|
|
39
42
|
|
|
@@ -52,9 +55,12 @@ export class CrossChainMessagingTest {
|
|
|
52
55
|
|
|
53
56
|
deployL1ContractsValues!: DeployL1ContractsReturnType;
|
|
54
57
|
|
|
55
|
-
constructor(testName: string) {
|
|
58
|
+
constructor(testName: string, opts: SetupOptions = {}, deployL1ContractsArgs: Partial<DeployL1ContractsArgs> = {}) {
|
|
56
59
|
this.logger = createLogger(`e2e:e2e_cross_chain_messaging:${testName}`);
|
|
57
|
-
this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath
|
|
60
|
+
this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath, opts, {
|
|
61
|
+
initialValidators: [],
|
|
62
|
+
...deployL1ContractsArgs,
|
|
63
|
+
});
|
|
58
64
|
}
|
|
59
65
|
|
|
60
66
|
async assumeProven() {
|
|
@@ -62,13 +68,13 @@ export class CrossChainMessagingTest {
|
|
|
62
68
|
}
|
|
63
69
|
|
|
64
70
|
async setup() {
|
|
65
|
-
|
|
66
|
-
this.aztecNode = aztecNode;
|
|
67
|
-
this.pxe = pxe;
|
|
68
|
-
this.aztecNodeConfig = aztecNodeConfig;
|
|
71
|
+
this.ctx = await this.snapshotManager.setup();
|
|
72
|
+
this.aztecNode = this.ctx.aztecNode;
|
|
73
|
+
this.pxe = this.ctx.pxe;
|
|
74
|
+
this.aztecNodeConfig = this.ctx.aztecNodeConfig;
|
|
69
75
|
this.cheatCodes = await CheatCodes.create(this.aztecNodeConfig.l1RpcUrls, this.pxe);
|
|
70
|
-
this.deployL1ContractsValues = deployL1ContractsValues;
|
|
71
|
-
this.aztecNodeAdmin = aztecNode;
|
|
76
|
+
this.deployL1ContractsValues = this.ctx.deployL1ContractsValues;
|
|
77
|
+
this.aztecNodeAdmin = this.ctx.aztecNode;
|
|
72
78
|
}
|
|
73
79
|
|
|
74
80
|
snapshot = <T>(
|
|
@@ -66,11 +66,11 @@ export class DeployTest {
|
|
|
66
66
|
const instance = await getContractInstanceFromInstantiationParams(contractArtifact.artifact, {
|
|
67
67
|
constructorArgs: initArgs ?? [],
|
|
68
68
|
constructorArtifact: constructorName,
|
|
69
|
-
salt,
|
|
69
|
+
salt: salt ?? Fr.random(),
|
|
70
70
|
publicKeys,
|
|
71
71
|
deployer,
|
|
72
72
|
});
|
|
73
|
-
await wallet.registerContract(
|
|
73
|
+
await wallet.registerContract(instance, contractArtifact.artifact);
|
|
74
74
|
return contractArtifact.at(instance.address, wallet);
|
|
75
75
|
}
|
|
76
76
|
|
|
@@ -352,7 +352,7 @@ export class EpochsTestContext {
|
|
|
352
352
|
publicKeys: undefined,
|
|
353
353
|
deployer: undefined,
|
|
354
354
|
});
|
|
355
|
-
await wallet.registerContract(
|
|
355
|
+
await wallet.registerContract(instance, SpamContract.artifact);
|
|
356
356
|
return SpamContract.at(instance.address, wallet);
|
|
357
357
|
}
|
|
358
358
|
|
package/src/e2e_p2p/shared.ts
CHANGED
|
@@ -84,8 +84,10 @@ export async function createPXEServiceAndPrepareTransactions(
|
|
|
84
84
|
const wallet = new TestWallet(pxe);
|
|
85
85
|
const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
|
|
86
86
|
|
|
87
|
-
const testContractInstance = await getContractInstanceFromInstantiationParams(TestContractArtifact, {
|
|
88
|
-
|
|
87
|
+
const testContractInstance = await getContractInstanceFromInstantiationParams(TestContractArtifact, {
|
|
88
|
+
salt: Fr.random(),
|
|
89
|
+
});
|
|
90
|
+
await wallet.registerContract(testContractInstance, TestContractArtifact);
|
|
89
91
|
const contract = await TestContract.at(testContractInstance.address, wallet);
|
|
90
92
|
|
|
91
93
|
const txs = await timesAsync(numTxs, async () => {
|