@aztec/end-to-end 0.84.0-nightly.20250407 → 0.84.0-nightly.20250409

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.
Files changed (16) hide show
  1. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +2 -2
  2. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
  3. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js +3 -3
  4. package/dest/e2e_p2p/shared.d.ts +7 -1
  5. package/dest/e2e_p2p/shared.d.ts.map +1 -1
  6. package/dest/e2e_p2p/shared.js +30 -1
  7. package/dest/e2e_token_contract/token_contract_test.d.ts +2 -2
  8. package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
  9. package/dest/e2e_token_contract/token_contract_test.js +3 -3
  10. package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
  11. package/dest/shared/cross_chain_test_harness.js +6 -2
  12. package/package.json +32 -32
  13. package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +4 -4
  14. package/src/e2e_p2p/shared.ts +33 -7
  15. package/src/e2e_token_contract/token_contract_test.ts +4 -4
  16. package/src/shared/cross_chain_test_harness.ts +4 -2
package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { type AccountWallet, AztecAddress, type CompleteAddress, Fr, type Logger, type PXE, type TxHash } from '@aztec/aztec.js';
2
- import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
2
+ import { InvalidAccountContract } from '@aztec/noir-contracts.js/InvalidAccount';
3
3
  import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
4
4
  import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
5
5
  import { TokenSimulator } from '../simulators/token_simulator.js';
@@ -26,7 +26,7 @@ export declare class BlacklistTokenContractTest {
26
26
  accounts: CompleteAddress[];
27
27
  asset: TokenBlacklistContract;
28
28
  tokenSim: TokenSimulator;
29
- badAccount: DocsExampleContract;
29
+ badAccount: InvalidAccountContract;
30
30
  admin: AccountWallet;
31
31
  other: AccountWallet;
32
32
  blacklisted: AccountWallet;
package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"blacklist_token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAClB,YAAY,EACZ,KAAK,eAAe,EACpB,EAAE,EACF,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAE3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAIjF,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,IAAI;IACf,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAE9B,SAAS;IAKT,UAAU;IAKV,eAAe;IAKf,YAAY;;;;;CAKb;AAED,qBAAa,0BAA0B;;IAGrC,MAAM,CAAC,KAAK,SAAK;IAEjB,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,GAAG,EAAG,GAAG,CAAC;IACV,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,KAAK,EAAG,sBAAsB,CAAC;IAC/B,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,mBAAmB,CAAC;IAEjC,KAAK,EAAG,aAAa,CAAC;IACtB,KAAK,EAAG,aAAa,CAAC;IACtB,WAAW,EAAG,aAAa,CAAC;gBAEhB,QAAQ,EAAE,MAAM;IAKtB,UAAU,CAAC,MAAM,GAAE,MAAyC;IAMlE;;;;OAIG;IACG,kBAAkB;IA2DlB,KAAK;IAIX,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;IAQR,yBAAyB,CAC7B,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,EACd,MAAM,EAAE,MAAM;IAgBV,iBAAiB;CAmExB"}
1
+ {"version":3,"file":"blacklist_token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAClB,YAAY,EACZ,KAAK,eAAe,EACpB,EAAE,EACF,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAEjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAIjF,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,IAAI;IACf,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAE9B,SAAS;IAKT,UAAU;IAKV,eAAe;IAKf,YAAY;;;;;CAKb;AAED,qBAAa,0BAA0B;;IAGrC,MAAM,CAAC,KAAK,SAAK;IAEjB,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,GAAG,EAAG,GAAG,CAAC;IACV,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,KAAK,EAAG,sBAAsB,CAAC;IAC/B,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,sBAAsB,CAAC;IAEpC,KAAK,EAAG,aAAa,CAAC;IACtB,KAAK,EAAG,aAAa,CAAC;IACtB,WAAW,EAAG,aAAa,CAAC;gBAEhB,QAAQ,EAAE,MAAM;IAKtB,UAAU,CAAC,MAAM,GAAE,MAAyC;IAMlE;;;;OAIG;IACG,kBAAkB;IA2DlB,KAAK;IAIX,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;IAQR,yBAAyB,CAC7B,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,EACd,MAAM,EAAE,MAAM;IAgBV,iBAAiB;CAmExB"}
package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { getSchnorrWallet } from '@aztec/accounts/schnorr';
2
2
  import { Fr, computeSecretHash, createLogger } from '@aztec/aztec.js';
3
3
  import { MAX_NOTE_HASHES_PER_TX } from '@aztec/constants';
4
- import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
4
+ import { InvalidAccountContract } from '@aztec/noir-contracts.js/InvalidAccount';
5
5
  import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
6
6
  import { jest } from '@jest/globals';
7
7
  import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
@@ -81,7 +81,7 @@ export class BlacklistTokenContractTest {
81
81
  this.asset = await TokenBlacklistContract.deploy(this.admin, this.admin.getAddress()).send().deployed();
82
82
  this.logger.verbose(`Token deployed to ${this.asset.address}`);
83
83
  this.logger.verbose(`Deploying bad account...`);
84
- this.badAccount = await DocsExampleContract.deploy(this.wallets[0]).send().deployed();
84
+ this.badAccount = await InvalidAccountContract.deploy(this.wallets[0]).send().deployed();
85
85
  this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
86
86
  await this.mineBlocks();
87
87
  return {
@@ -93,7 +93,7 @@ export class BlacklistTokenContractTest {
93
93
  this.asset = await TokenBlacklistContract.at(tokenContractAddress, this.wallets[0]);
94
94
  this.logger.verbose(`Token contract address: ${this.asset.address}`);
95
95
  this.tokenSim = new TokenSimulator(this.asset, this.wallets[0], this.logger, this.accounts.map((a)=>a.address));
96
- this.badAccount = await DocsExampleContract.at(badAccountAddress, this.wallets[0]);
96
+ this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.wallets[0]);
97
97
  this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
98
98
  expect(await this.asset.methods.get_roles(this.admin.getAddress()).simulate()).toEqual(new Role().withAdmin().toNoirStruct());
99
99
  });
package/dest/e2e_p2p/shared.d.ts CHANGED
@@ -1,10 +1,16 @@
1
1
  import type { InitialAccountData } from '@aztec/accounts/testing';
2
2
  import type { AztecNodeService } from '@aztec/aztec-node';
3
- import { type Logger, type SentTx } from '@aztec/aztec.js';
3
+ import { type Logger, ProvenTx, type SentTx } from '@aztec/aztec.js';
4
4
  import type { SpamContract } from '@aztec/noir-contracts.js/Spam';
5
+ import { PXEService } from '@aztec/pxe/server';
5
6
  import type { NodeContext } from '../fixtures/setup_p2p_test.js';
6
7
  export declare const submitComplexTxsTo: (logger: Logger, spamContract: SpamContract, numTxs: number, opts?: {
7
8
  callPublic?: boolean;
8
9
  }) => Promise<SentTx[]>;
9
10
  export declare const createPXEServiceAndSubmitTransactions: (logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData) => Promise<NodeContext>;
11
+ export declare function createPXEServiceAndPrepareTransactions(logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData): Promise<{
12
+ pxeService: PXEService;
13
+ txs: ProvenTx[];
14
+ node: AztecNodeService;
15
+ }>;
10
16
  //# sourceMappingURL=shared.d.ts.map
package/dest/e2e_p2p/shared.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,EAAY,MAAM,iBAAiB,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAGlE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAIjE,eAAO,MAAM,kBAAkB,WACrB,MAAM,gBACA,YAAY,UAClB,MAAM,SACR;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,sBAwB/B,CAAC;AAGF,eAAO,MAAM,qCAAqC,WACxC,MAAM,QACR,gBAAgB,UACd,MAAM,iBACC,kBAAkB,KAChC,QAAQ,WAAW,CAoBrB,CAAC"}
1
+ {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAM,KAAK,MAAM,EAAE,QAAQ,EAAE,KAAK,MAAM,EAAiD,MAAM,iBAAiB,CAAC;AAExH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,UAAU,EAAyD,MAAM,mBAAmB,CAAC;AAEtG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAIjE,eAAO,MAAM,kBAAkB,WACrB,MAAM,gBACA,YAAY,UAClB,MAAM,SACR;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,sBAwB/B,CAAC;AAGF,eAAO,MAAM,qCAAqC,WACxC,MAAM,QACR,gBAAgB,UACd,MAAM,iBACC,kBAAkB,KAChC,QAAQ,WAAW,CAgBrB,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,CAqB9E"}
package/dest/e2e_p2p/shared.js CHANGED
@@ -1,5 +1,7 @@
1
1
  import { getSchnorrAccount } from '@aztec/accounts/schnorr';
2
- import { TxStatus } from '@aztec/aztec.js';
2
+ import { Fr, TxStatus, getContractInstanceFromDeployParams } from '@aztec/aztec.js';
3
+ import { timesAsync } from '@aztec/foundation/collection';
4
+ import { TestContract, TestContractArtifact } from '@aztec/noir-contracts.js/Test';
3
5
  import { createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe/server';
4
6
  import { submitTxsTo } from '../shared/submit-transactions.js';
5
7
  // submits a set of transactions to the provided Private eXecution Environment (PXE)
@@ -38,3 +40,30 @@ export const createPXEServiceAndSubmitTransactions = async (logger, node, numTxs
38
40
  node
39
41
  };
40
42
  };
43
+ export async function createPXEServiceAndPrepareTransactions(logger, node, numTxs, fundedAccount) {
44
+ const rpcConfig = getRpcConfig();
45
+ rpcConfig.proverEnabled = false;
46
+ const pxe = await createPXEService(node, rpcConfig, true);
47
+ const account = await getSchnorrAccount(pxe, fundedAccount.secret, fundedAccount.signingKey, fundedAccount.salt);
48
+ await account.register();
49
+ const wallet = await account.getWallet();
50
+ const testContractInstance = await getContractInstanceFromDeployParams(TestContractArtifact, {});
51
+ await wallet.registerContract({
52
+ instance: testContractInstance,
53
+ artifact: TestContractArtifact
54
+ });
55
+ const contract = await TestContract.at(testContractInstance.address, wallet);
56
+ const txs = await timesAsync(numTxs, async ()=>{
57
+ const tx = await contract.methods.emit_nullifier(Fr.random()).prove({
58
+ skipPublicSimulation: true
59
+ });
60
+ const txHash = await tx.getTxHash();
61
+ logger.info(`Tx prepared with hash ${txHash}`);
62
+ return tx;
63
+ });
64
+ return {
65
+ txs,
66
+ pxeService: pxe,
67
+ node
68
+ };
69
+ }
package/dest/e2e_token_contract/token_contract_test.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { type AccountWallet, type AztecNode, type CompleteAddress, type Logger } from '@aztec/aztec.js';
2
- import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
2
+ import { InvalidAccountContract } from '@aztec/noir-contracts.js/InvalidAccount';
3
3
  import { TokenContract } from '@aztec/noir-contracts.js/Token';
4
4
  import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
5
5
  import { TokenSimulator } from '../simulators/token_simulator.js';
@@ -13,7 +13,7 @@ export declare class TokenContractTest {
13
13
  accounts: CompleteAddress[];
14
14
  asset: TokenContract;
15
15
  tokenSim: TokenSimulator;
16
- badAccount: DocsExampleContract;
16
+ badAccount: InvalidAccountContract;
17
17
  node: AztecNode;
18
18
  constructor(testName: string);
19
19
  /**
package/dest/e2e_token_contract/token_contract_test.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_token_contract/token_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AACtH,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAI/D,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,iBAAiB;IAC5B,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,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,KAAK,EAAG,aAAa,CAAC;IACtB,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,mBAAmB,CAAC;IACjC,IAAI,EAAG,SAAS,CAAC;gBAEL,QAAQ,EAAE,MAAM;IAO5B;;;;OAIG;IACG,kBAAkB;IAiElB,KAAK;IAIX,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;IAIR,iBAAiB;CAyCxB"}
1
+ {"version":3,"file":"token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_token_contract/token_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AACtH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAI/D,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,iBAAiB;IAC5B,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,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,KAAK,EAAG,aAAa,CAAC;IACtB,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,sBAAsB,CAAC;IACpC,IAAI,EAAG,SAAS,CAAC;gBAEL,QAAQ,EAAE,MAAM;IAO5B;;;;OAIG;IACG,kBAAkB;IAiElB,KAAK;IAIX,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;IAIR,iBAAiB;CAyCxB"}
package/dest/e2e_token_contract/token_contract_test.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { getSchnorrWallet } from '@aztec/accounts/schnorr';
2
2
  import { createLogger } from '@aztec/aztec.js';
3
- import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
3
+ import { InvalidAccountContract } from '@aztec/noir-contracts.js/InvalidAccount';
4
4
  import { TokenContract } from '@aztec/noir-contracts.js/Token';
5
5
  import { jest } from '@jest/globals';
6
6
  import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
@@ -46,7 +46,7 @@ export class TokenContractTest {
46
46
  const asset = await TokenContract.deploy(this.wallets[0], this.accounts[0], TokenContractTest.TOKEN_NAME, TokenContractTest.TOKEN_SYMBOL, TokenContractTest.TOKEN_DECIMALS).send().deployed();
47
47
  this.logger.verbose(`Token deployed to ${asset.address}`);
48
48
  this.logger.verbose(`Deploying bad account...`);
49
- this.badAccount = await DocsExampleContract.deploy(this.wallets[0]).send().deployed();
49
+ this.badAccount = await InvalidAccountContract.deploy(this.wallets[0]).send().deployed();
50
50
  this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
51
51
  return {
52
52
  tokenContractAddress: asset.address,
@@ -57,7 +57,7 @@ export class TokenContractTest {
57
57
  this.asset = await TokenContract.at(tokenContractAddress, this.wallets[0]);
58
58
  this.logger.verbose(`Token contract address: ${this.asset.address}`);
59
59
  this.tokenSim = new TokenSimulator(this.asset, this.wallets[0], this.logger, this.accounts.map((a)=>a.address));
60
- this.badAccount = await DocsExampleContract.at(badAccountAddress, this.wallets[0]);
60
+ this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.wallets[0]);
61
61
  this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
62
62
  expect(await this.asset.methods.get_admin().simulate()).toBe(this.accounts[0].address.toBigInt());
63
63
  });
package/dest/shared/cross_chain_test_harness.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cross_chain_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/cross_chain_test_harness.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cross_chain_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/cross_chain_test_harness.ts"],"names":[],"mappings":"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"}
package/dest/shared/cross_chain_test_harness.js CHANGED
@@ -109,11 +109,15 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
109
109
  address: this.l1TokenManager.tokenAddress.toString(),
110
110
  client: this.walletClient
111
111
  });
112
- await contract.write.mint([
112
+ const balanceBefore = await this.l1TokenManager.getL1TokenBalance(this.ethAccount.toString());
113
+ const hash = await contract.write.mint([
113
114
  this.ethAccount.toString(),
114
115
  amount
115
116
  ]);
116
- expect(await this.l1TokenManager.getL1TokenBalance(this.ethAccount.toString())).toEqual(amount);
117
+ await this.publicClient.waitForTransactionReceipt({
118
+ hash
119
+ });
120
+ expect(await this.l1TokenManager.getL1TokenBalance(this.ethAccount.toString())).toEqual(balanceBefore + amount);
117
121
  }
118
122
  getL1BalanceOf(address) {
119
123
  return this.l1TokenManager.getL1TokenBalance(address.toString());
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/end-to-end",
3
- "version": "0.84.0-nightly.20250407",
3
+ "version": "0.84.0-nightly.20250409",
4
4
  "type": "module",
5
5
  "exports": "./dest/index.js",
6
6
  "inherits": [
@@ -26,37 +26,37 @@
26
26
  "formatting": "run -T prettier --check ./src && run -T eslint ./src"
27
27
  },
28
28
  "dependencies": {
29
- "@aztec/accounts": "0.84.0-nightly.20250407",
30
- "@aztec/archiver": "0.84.0-nightly.20250407",
31
- "@aztec/aztec": "0.84.0-nightly.20250407",
32
- "@aztec/aztec-node": "0.84.0-nightly.20250407",
33
- "@aztec/aztec.js": "0.84.0-nightly.20250407",
34
- "@aztec/bb-prover": "0.84.0-nightly.20250407",
35
- "@aztec/blob-lib": "0.84.0-nightly.20250407",
36
- "@aztec/blob-sink": "0.84.0-nightly.20250407",
37
- "@aztec/bot": "0.84.0-nightly.20250407",
38
- "@aztec/constants": "0.84.0-nightly.20250407",
39
- "@aztec/entrypoints": "0.84.0-nightly.20250407",
40
- "@aztec/epoch-cache": "0.84.0-nightly.20250407",
41
- "@aztec/ethereum": "0.84.0-nightly.20250407",
42
- "@aztec/foundation": "0.84.0-nightly.20250407",
43
- "@aztec/kv-store": "0.84.0-nightly.20250407",
44
- "@aztec/l1-artifacts": "0.84.0-nightly.20250407",
45
- "@aztec/merkle-tree": "0.84.0-nightly.20250407",
46
- "@aztec/noir-contracts.js": "0.84.0-nightly.20250407",
47
- "@aztec/noir-noirc_abi": "0.84.0-nightly.20250407",
48
- "@aztec/noir-protocol-circuits-types": "0.84.0-nightly.20250407",
49
- "@aztec/p2p": "0.84.0-nightly.20250407",
50
- "@aztec/protocol-contracts": "0.84.0-nightly.20250407",
51
- "@aztec/prover-client": "0.84.0-nightly.20250407",
52
- "@aztec/prover-node": "0.84.0-nightly.20250407",
53
- "@aztec/pxe": "0.84.0-nightly.20250407",
54
- "@aztec/sequencer-client": "0.84.0-nightly.20250407",
55
- "@aztec/simulator": "0.84.0-nightly.20250407",
56
- "@aztec/stdlib": "0.84.0-nightly.20250407",
57
- "@aztec/telemetry-client": "0.84.0-nightly.20250407",
58
- "@aztec/validator-client": "0.84.0-nightly.20250407",
59
- "@aztec/world-state": "0.84.0-nightly.20250407",
29
+ "@aztec/accounts": "0.84.0-nightly.20250409",
30
+ "@aztec/archiver": "0.84.0-nightly.20250409",
31
+ "@aztec/aztec": "0.84.0-nightly.20250409",
32
+ "@aztec/aztec-node": "0.84.0-nightly.20250409",
33
+ "@aztec/aztec.js": "0.84.0-nightly.20250409",
34
+ "@aztec/bb-prover": "0.84.0-nightly.20250409",
35
+ "@aztec/blob-lib": "0.84.0-nightly.20250409",
36
+ "@aztec/blob-sink": "0.84.0-nightly.20250409",
37
+ "@aztec/bot": "0.84.0-nightly.20250409",
38
+ "@aztec/constants": "0.84.0-nightly.20250409",
39
+ "@aztec/entrypoints": "0.84.0-nightly.20250409",
40
+ "@aztec/epoch-cache": "0.84.0-nightly.20250409",
41
+ "@aztec/ethereum": "0.84.0-nightly.20250409",
42
+ "@aztec/foundation": "0.84.0-nightly.20250409",
43
+ "@aztec/kv-store": "0.84.0-nightly.20250409",
44
+ "@aztec/l1-artifacts": "0.84.0-nightly.20250409",
45
+ "@aztec/merkle-tree": "0.84.0-nightly.20250409",
46
+ "@aztec/noir-contracts.js": "0.84.0-nightly.20250409",
47
+ "@aztec/noir-noirc_abi": "0.84.0-nightly.20250409",
48
+ "@aztec/noir-protocol-circuits-types": "0.84.0-nightly.20250409",
49
+ "@aztec/p2p": "0.84.0-nightly.20250409",
50
+ "@aztec/protocol-contracts": "0.84.0-nightly.20250409",
51
+ "@aztec/prover-client": "0.84.0-nightly.20250409",
52
+ "@aztec/prover-node": "0.84.0-nightly.20250409",
53
+ "@aztec/pxe": "0.84.0-nightly.20250409",
54
+ "@aztec/sequencer-client": "0.84.0-nightly.20250409",
55
+ "@aztec/simulator": "0.84.0-nightly.20250409",
56
+ "@aztec/stdlib": "0.84.0-nightly.20250409",
57
+ "@aztec/telemetry-client": "0.84.0-nightly.20250409",
58
+ "@aztec/validator-client": "0.84.0-nightly.20250409",
59
+ "@aztec/world-state": "0.84.0-nightly.20250409",
60
60
  "@iarna/toml": "^2.2.5",
61
61
  "@jest/globals": "^29.5.0",
62
62
  "@msgpack/msgpack": "^3.0.0-beta2",
package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts CHANGED
@@ -11,7 +11,7 @@ import {
11
11
  createLogger,
12
12
  } from '@aztec/aztec.js';
13
13
  import { MAX_NOTE_HASHES_PER_TX } from '@aztec/constants';
14
- import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
14
+ import { InvalidAccountContract } from '@aztec/noir-contracts.js/InvalidAccount';
15
15
  import type { TokenContract } from '@aztec/noir-contracts.js/Token';
16
16
  import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
17
17
 
@@ -67,7 +67,7 @@ export class BlacklistTokenContractTest {
67
67
  accounts: CompleteAddress[] = [];
68
68
  asset!: TokenBlacklistContract;
69
69
  tokenSim!: TokenSimulator;
70
- badAccount!: DocsExampleContract;
70
+ badAccount!: InvalidAccountContract;
71
71
 
72
72
  admin!: AccountWallet;
73
73
  other!: AccountWallet;
@@ -119,7 +119,7 @@ export class BlacklistTokenContractTest {
119
119
  this.logger.verbose(`Token deployed to ${this.asset.address}`);
120
120
 
121
121
  this.logger.verbose(`Deploying bad account...`);
122
- this.badAccount = await DocsExampleContract.deploy(this.wallets[0]).send().deployed();
122
+ this.badAccount = await InvalidAccountContract.deploy(this.wallets[0]).send().deployed();
123
123
  this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
124
124
 
125
125
  await this.mineBlocks();
@@ -138,7 +138,7 @@ export class BlacklistTokenContractTest {
138
138
  this.accounts.map(a => a.address),
139
139
  );
140
140
 
141
- this.badAccount = await DocsExampleContract.at(badAccountAddress, this.wallets[0]);
141
+ this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.wallets[0]);
142
142
  this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
143
143
 
144
144
  expect(await this.asset.methods.get_roles(this.admin.getAddress()).simulate()).toEqual(
package/src/e2e_p2p/shared.ts CHANGED
@@ -1,9 +1,11 @@
1
1
  import { getSchnorrAccount } from '@aztec/accounts/schnorr';
2
2
  import type { InitialAccountData } from '@aztec/accounts/testing';
3
3
  import type { AztecNodeService } from '@aztec/aztec-node';
4
- import { type Logger, type SentTx, TxStatus } from '@aztec/aztec.js';
4
+ import { Fr, type Logger, ProvenTx, type SentTx, TxStatus, getContractInstanceFromDeployParams } from '@aztec/aztec.js';
5
+ import { timesAsync } from '@aztec/foundation/collection';
5
6
  import type { SpamContract } from '@aztec/noir-contracts.js/Spam';
6
- import { createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe/server';
7
+ import { TestContract, TestContractArtifact } from '@aztec/noir-contracts.js/Test';
8
+ import { PXEService, createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe/server';
7
9
 
8
10
  import type { NodeContext } from '../fixtures/setup_p2p_test.js';
9
11
  import { submitTxsTo } from '../shared/submit-transactions.js';
@@ -60,9 +62,33 @@ export const createPXEServiceAndSubmitTransactions = async (
60
62
  const wallet = await account.getWallet();
61
63
 
62
64
  const txs = await submitTxsTo(pxeService, numTxs, wallet, logger);
63
- return {
64
- txs,
65
- pxeService,
66
- node,
67
- };
65
+ return { txs, pxeService, node };
68
66
  };
67
+
68
+ export async function createPXEServiceAndPrepareTransactions(
69
+ logger: Logger,
70
+ node: AztecNodeService,
71
+ numTxs: number,
72
+ fundedAccount: InitialAccountData,
73
+ ): Promise<{ pxeService: PXEService; txs: ProvenTx[]; node: AztecNodeService }> {
74
+ const rpcConfig = getRpcConfig();
75
+ rpcConfig.proverEnabled = false;
76
+ const pxe = await createPXEService(node, rpcConfig, true);
77
+
78
+ const account = await getSchnorrAccount(pxe, fundedAccount.secret, fundedAccount.signingKey, fundedAccount.salt);
79
+ await account.register();
80
+ const wallet = await account.getWallet();
81
+
82
+ const testContractInstance = await getContractInstanceFromDeployParams(TestContractArtifact, {});
83
+ await wallet.registerContract({ instance: testContractInstance, artifact: TestContractArtifact });
84
+ const contract = await TestContract.at(testContractInstance.address, wallet);
85
+
86
+ const txs = await timesAsync(numTxs, async () => {
87
+ const tx = await contract.methods.emit_nullifier(Fr.random()).prove({ skipPublicSimulation: true });
88
+ const txHash = await tx.getTxHash();
89
+ logger.info(`Tx prepared with hash ${txHash}`);
90
+ return tx;
91
+ });
92
+
93
+ return { txs, pxeService: pxe, node };
94
+ }
package/src/e2e_token_contract/token_contract_test.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { getSchnorrWallet } from '@aztec/accounts/schnorr';
2
2
  import { type AccountWallet, type AztecNode, type CompleteAddress, type Logger, createLogger } from '@aztec/aztec.js';
3
- import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
3
+ import { InvalidAccountContract } from '@aztec/noir-contracts.js/InvalidAccount';
4
4
  import { TokenContract } from '@aztec/noir-contracts.js/Token';
5
5
 
6
6
  import { jest } from '@jest/globals';
@@ -27,7 +27,7 @@ export class TokenContractTest {
27
27
  accounts: CompleteAddress[] = [];
28
28
  asset!: TokenContract;
29
29
  tokenSim!: TokenSimulator;
30
- badAccount!: DocsExampleContract;
30
+ badAccount!: InvalidAccountContract;
31
31
  node!: AztecNode;
32
32
 
33
33
  constructor(testName: string) {
@@ -77,7 +77,7 @@ export class TokenContractTest {
77
77
  this.logger.verbose(`Token deployed to ${asset.address}`);
78
78
 
79
79
  this.logger.verbose(`Deploying bad account...`);
80
- this.badAccount = await DocsExampleContract.deploy(this.wallets[0]).send().deployed();
80
+ this.badAccount = await InvalidAccountContract.deploy(this.wallets[0]).send().deployed();
81
81
  this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
82
82
 
83
83
  return { tokenContractAddress: asset.address, badAccountAddress: this.badAccount.address };
@@ -94,7 +94,7 @@ export class TokenContractTest {
94
94
  this.accounts.map(a => a.address),
95
95
  );
96
96
 
97
- this.badAccount = await DocsExampleContract.at(badAccountAddress, this.wallets[0]);
97
+ this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.wallets[0]);
98
98
  this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
99
99
 
100
100
  expect(await this.asset.methods.get_admin().simulate()).toBe(this.accounts[0].address.toBigInt());
package/src/shared/cross_chain_test_harness.ts CHANGED
@@ -232,8 +232,10 @@ export class CrossChainTestHarness {
232
232
  address: this.l1TokenManager.tokenAddress.toString(),
233
233
  client: this.walletClient,
234
234
  });
235
- await contract.write.mint([this.ethAccount.toString(), amount]);
236
- expect(await this.l1TokenManager.getL1TokenBalance(this.ethAccount.toString())).toEqual(amount);
235
+ const balanceBefore = await this.l1TokenManager.getL1TokenBalance(this.ethAccount.toString());
236
+ const hash = await contract.write.mint([this.ethAccount.toString(), amount]);
237
+ await this.publicClient.waitForTransactionReceipt({ hash });
238
+ expect(await this.l1TokenManager.getL1TokenBalance(this.ethAccount.toString())).toEqual(balanceBefore + amount);
237
239
  }
238
240
 
239
241
  getL1BalanceOf(address: EthAddress) {