@aztec/end-to-end 0.0.1-commit.d3ec352c → 0.0.1-commit.d58ff9d0

package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts

@@ -1,256 +0,0 @@
-import { AztecAddress } from '@aztec/aztec.js/addresses';
-import { computeSecretHash } from '@aztec/aztec.js/crypto';
-import { Fr } from '@aztec/aztec.js/fields';
-import { type Logger, createLogger } from '@aztec/aztec.js/log';
-import type { AztecNode } from '@aztec/aztec.js/node';
-import type { TxHash } from '@aztec/aztec.js/tx';
-import type { CheatCodes } from '@aztec/aztec/testing';
-import type { TokenContract } from '@aztec/noir-contracts.js/Token';
-import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
-import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
-import type { SequencerClient } from '@aztec/sequencer-client';
-import type { TestWallet } from '@aztec/test-wallet/server';
-
-import { jest } from '@jest/globals';
-
-import {
-  type ISnapshotManager,
-  type SubsystemsContext,
-  createSnapshotManager,
-  deployAccounts,
-  publicDeployAccounts,
-} from '../fixtures/snapshot_manager.js';
-import { TokenSimulator } from '../simulators/token_simulator.js';
-
-const { E2E_DATA_PATH: dataPath } = process.env;
-
-export class Role {
-  private isAdmin = false;
-  private isMinter = false;
-  private isBlacklisted = false;
-
-  withAdmin() {
-    this.isAdmin = true;
-    return this;
-  }
-
-  withMinter() {
-    this.isMinter = true;
-    return this;
-  }
-
-  withBlacklisted() {
-    this.isBlacklisted = true;
-    return this;
-  }
-
-  toNoirStruct() {
-    // We need to use lowercase identifiers as those are what the noir interface expects
-    // eslint-disable-next-line camelcase
-    return { is_admin: this.isAdmin, is_minter: this.isMinter, is_blacklisted: this.isBlacklisted };
-  }
-}
-
-export class BlacklistTokenContractTest {
-  // This value MUST match the same value that we have in the contract
-  static CHANGE_ROLES_DELAY = 86400;
-
-  private snapshotManager: ISnapshotManager;
-  logger: Logger;
-  wallet!: TestWallet;
-  asset!: TokenBlacklistContract;
-  tokenSim!: TokenSimulator;
-  badAccount!: InvalidAccountContract;
-  cheatCodes!: CheatCodes;
-  sequencer!: SequencerClient;
-  aztecNode!: AztecNode;
-
-  adminAddress!: AztecAddress;
-  otherAddress!: AztecAddress;
-  blacklistedAddress!: AztecAddress;
-
-  constructor(testName: string) {
-    this.logger = createLogger(`e2e:e2e_blacklist_token_contract:${testName}`);
-    this.snapshotManager = createSnapshotManager(`e2e_blacklist_token_contract/${testName}`, dataPath);
-  }
-
-  async crossTimestampOfChange() {
-    await this.cheatCodes.warpL2TimeAtLeastBy(
-      this.sequencer,
-      this.aztecNode,
-      BlacklistTokenContractTest.CHANGE_ROLES_DELAY,
-    );
-  }
-
-  /**
-   * Adds two state shifts to snapshot manager.
-   * 1. Add 3 accounts.
-   * 2. Publicly deploy accounts, deploy token contract and a "bad account".
-   */
-  async applyBaseSnapshots() {
-    // Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
-    jest.setTimeout(120_000);
-
-    await this.snapshotManager.snapshot(
-      '3_accounts',
-      deployAccounts(3, this.logger),
-      ({ deployedAccounts }, { cheatCodes, aztecNode, sequencer, wallet }) => {
-        this.cheatCodes = cheatCodes;
-        this.aztecNode = aztecNode;
-        this.sequencer = sequencer;
-        this.wallet = wallet;
-        this.adminAddress = deployedAccounts[0].address;
-        this.otherAddress = deployedAccounts[1].address;
-        this.blacklistedAddress = deployedAccounts[2].address;
-        return Promise.resolve();
-      },
-    );
-
-    await this.snapshotManager.snapshot(
-      'e2e_blacklist_token_contract',
-      async () => {
-        // Create the token contract state.
-        // Move this account thing to addAccounts above?
-        this.logger.verbose(`Public deploy accounts...`);
-        await publicDeployAccounts(this.wallet, [this.adminAddress, this.otherAddress, this.blacklistedAddress]);
-
-        this.logger.verbose(`Deploying TokenContract...`);
-        this.asset = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress)
-          .send({ from: this.adminAddress })
-          .deployed();
-        this.logger.verbose(`Token deployed to ${this.asset.address}`);
-
-        this.logger.verbose(`Deploying bad account...`);
-        this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({ from: this.adminAddress }).deployed();
-        this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
-
-        await this.crossTimestampOfChange();
-
-        return { tokenContractAddress: this.asset.address, badAccountAddress: this.badAccount.address };
-      },
-      async ({ tokenContractAddress, badAccountAddress }) => {
-        // Restore the token contract state.
-        this.asset = TokenBlacklistContract.at(tokenContractAddress, this.wallet);
-        this.logger.verbose(`Token contract address: ${this.asset.address}`);
-
-        this.tokenSim = new TokenSimulator(
-          this.asset as unknown as TokenContract,
-          this.wallet,
-          this.adminAddress,
-          this.logger,
-          [this.adminAddress, this.otherAddress, this.blacklistedAddress],
-        );
-
-        this.badAccount = InvalidAccountContract.at(badAccountAddress, this.wallet);
-        this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
-
-        expect(await this.asset.methods.get_roles(this.adminAddress).simulate({ from: this.adminAddress })).toEqual(
-          new Role().withAdmin().toNoirStruct(),
-        );
-      },
-    );
-  }
-
-  async setup() {
-    await this.snapshotManager.setup();
-  }
-
-  snapshot = <T>(
-    name: string,
-    apply: (context: SubsystemsContext) => Promise<T>,
-    restore: (snapshotData: T, context: SubsystemsContext) => Promise<void> = () => Promise.resolve(),
-  ): Promise<void> => this.snapshotManager.snapshot(name, apply, restore);
-
-  async teardown() {
-    await this.snapshotManager.teardown();
-  }
-
-  async addPendingShieldNoteToPXE(
-    contract: TokenBlacklistContract,
-    recipient: AztecAddress,
-    amount: bigint,
-    secretHash: Fr,
-    txHash: TxHash,
-  ) {
-    const txEffects = await this.aztecNode.getTxEffect(txHash);
-    await contract.methods
-      .deliver_transparent_note(
-        contract.address,
-        amount,
-        secretHash,
-        txHash.hash,
-        txEffects!.data.noteHashes,
-        txEffects!.data.nullifiers[0],
-        recipient,
-      )
-      .simulate({ from: recipient });
-  }
-
-  async applyMintSnapshot() {
-    await this.snapshotManager.snapshot(
-      'mint',
-      async () => {
-        const { asset } = this;
-        const amount = 10000n;
-
-        const adminMinterRole = new Role().withAdmin().withMinter();
-        await this.asset.methods
-          .update_roles(this.adminAddress, adminMinterRole.toNoirStruct())
-          .send({ from: this.adminAddress })
-          .wait();
-
-        const blacklistRole = new Role().withBlacklisted();
-        await this.asset.methods
-          .update_roles(this.blacklistedAddress, blacklistRole.toNoirStruct())
-          .send({ from: this.adminAddress })
-          .wait();
-
-        await this.crossTimestampOfChange();
-
-        expect(await this.asset.methods.get_roles(this.adminAddress).simulate({ from: this.adminAddress })).toEqual(
-          adminMinterRole.toNoirStruct(),
-        );
-
-        this.logger.verbose(`Minting ${amount} publicly...`);
-        await asset.methods.mint_public(this.adminAddress, amount).send({ from: this.adminAddress }).wait();
-
-        this.logger.verbose(`Minting ${amount} privately...`);
-        const secret = Fr.random();
-        const secretHash = await computeSecretHash(secret);
-        const receipt = await asset.methods.mint_private(amount, secretHash).send({ from: this.adminAddress }).wait();
-
-        await this.addPendingShieldNoteToPXE(asset, this.adminAddress, amount, secretHash, receipt.txHash);
-        const txClaim = asset.methods
-          .redeem_shield(this.adminAddress, amount, secret)
-          .send({ from: this.adminAddress });
-        await txClaim.wait();
-        this.logger.verbose(`Minting complete.`);
-
-        return { amount };
-      },
-      async ({ amount }) => {
-        const { asset, tokenSim } = this;
-        tokenSim.mintPublic(this.adminAddress, amount);
-
-        const publicBalance = await asset.methods
-          .balance_of_public(this.adminAddress)
-          .simulate({ from: this.adminAddress });
-        this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
-        expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(this.adminAddress));
-
-        tokenSim.mintPrivate(this.adminAddress, amount);
-        const privateBalance = await asset.methods
-          .balance_of_private(this.adminAddress)
-          .simulate({ from: this.adminAddress });
-        this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
-        expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(this.adminAddress));
-
-        const totalSupply = await asset.methods.total_supply().simulate({ from: this.adminAddress });
-        this.logger.verbose(`Total supply: ${totalSupply}`);
-        expect(totalSupply).toEqual(tokenSim.totalSupply);
-
-        return Promise.resolve();
-      },
-    );
-  }
-}

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -1,179 +0,0 @@
-import type { AztecNodeConfig } from '@aztec/aztec-node';
-import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
-import { type Logger, createLogger } from '@aztec/aztec.js/log';
-import type { AztecNode } from '@aztec/aztec.js/node';
-import { CheatCodes } from '@aztec/aztec/testing';
-import {
-  type DeployL1ContractsArgs,
-  type DeployL1ContractsReturnType,
-  type ExtendedViemWalletClient,
-  createExtendedL1Client,
-  deployL1Contract,
-} from '@aztec/ethereum';
-import { InboxAbi, OutboxAbi, TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts';
-import { TokenContract } from '@aztec/noir-contracts.js/Token';
-import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
-import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
-import type { TestWallet } from '@aztec/test-wallet/server';
-
-import { getContract } from 'viem';
-
-import { MNEMONIC } from '../fixtures/fixtures.js';
-import {
-  type ISnapshotManager,
-  type SubsystemsContext,
-  createSnapshotManager,
-  deployAccounts,
-  publicDeployAccounts,
-} from '../fixtures/snapshot_manager.js';
-import type { SetupOptions } from '../fixtures/utils.js';
-import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
-
-const { E2E_DATA_PATH: dataPath } = process.env;
-
-export class CrossChainMessagingTest {
-  private snapshotManager: ISnapshotManager;
-  logger: Logger;
-  aztecNode!: AztecNode;
-  aztecNodeConfig!: AztecNodeConfig;
-  aztecNodeAdmin!: AztecNodeAdmin;
-  ctx!: SubsystemsContext;
-
-  l1Client!: ExtendedViemWalletClient | undefined;
-
-  wallet!: TestWallet;
-  ownerAddress!: AztecAddress;
-  user1Address!: AztecAddress;
-  user2Address!: AztecAddress;
-  crossChainTestHarness!: CrossChainTestHarness;
-  ethAccount!: EthAddress;
-  l2Token!: TokenContract;
-  l2Bridge!: TokenBridgeContract;
-
-  inbox!: any; // GetContractReturnType<typeof InboxAbi> | undefined;
-  outbox!: any; // GetContractReturnType<typeof OutboxAbi> | undefined;
-  cheatCodes!: CheatCodes;
-
-  deployL1ContractsValues!: DeployL1ContractsReturnType;
-
-  constructor(testName: string, opts: SetupOptions = {}, deployL1ContractsArgs: Partial<DeployL1ContractsArgs> = {}) {
-    this.logger = createLogger(`e2e:e2e_cross_chain_messaging:${testName}`);
-    this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath, opts, {
-      initialValidators: [],
-      ...deployL1ContractsArgs,
-    });
-  }
-
-  async assumeProven() {
-    await this.cheatCodes.rollup.markAsProven();
-  }
-
-  async setup() {
-    this.ctx = await this.snapshotManager.setup();
-    this.aztecNode = this.ctx.aztecNode;
-    this.wallet = this.ctx.wallet;
-    this.aztecNodeConfig = this.ctx.aztecNodeConfig;
-    this.cheatCodes = this.ctx.cheatCodes;
-    this.deployL1ContractsValues = this.ctx.deployL1ContractsValues;
-    this.aztecNodeAdmin = this.ctx.aztecNode;
-  }
-
-  snapshot = <T>(
-    name: string,
-    apply: (context: SubsystemsContext) => Promise<T>,
-    restore: (snapshotData: T, context: SubsystemsContext) => Promise<void> = () => Promise.resolve(),
-  ): Promise<void> => this.snapshotManager.snapshot(name, apply, restore);
-
-  async teardown() {
-    await this.snapshotManager.teardown();
-  }
-
-  async applyBaseSnapshots() {
-    // Note that we are using the same `wallet`, `aztecNodeConfig` and `aztecNode` across all snapshots.
-    // This is to not have issues with different networks.
-
-    await this.snapshotManager.snapshot(
-      '3_accounts',
-      deployAccounts(3, this.logger),
-      ({ deployedAccounts }, { wallet, aztecNodeConfig, aztecNode }) => {
-        [this.ownerAddress, this.user1Address, this.user2Address] = deployedAccounts.map(a => a.address);
-        this.wallet = wallet;
-        this.aztecNode = aztecNode;
-        this.aztecNodeConfig = aztecNodeConfig;
-        return Promise.resolve();
-      },
-    );
-
-    await this.snapshotManager.snapshot(
-      'e2e_cross_chain_messaging',
-      async () => {
-        // Create the token contract state.
-        // Move this account thing to addAccounts above?
-        this.logger.verbose(`Public deploy accounts...`);
-        await publicDeployAccounts(this.wallet, [this.ownerAddress, this.user1Address, this.user2Address]);
-
-        this.l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
-
-        const underlyingERC20Address = await deployL1Contract(this.l1Client, TestERC20Abi, TestERC20Bytecode, [
-          'Underlying',
-          'UND',
-          this.l1Client.account.address,
-        ]).then(({ address }) => address);
-
-        this.logger.verbose(`Setting up cross chain harness...`);
-        this.crossChainTestHarness = await CrossChainTestHarness.new(
-          this.aztecNode,
-          this.l1Client,
-          this.wallet,
-          this.ownerAddress,
-          this.logger,
-          underlyingERC20Address,
-        );
-
-        this.logger.verbose(`L2 token deployed to: ${this.crossChainTestHarness.l2Token.address}`);
-
-        return this.crossChainTestHarness.toCrossChainContext();
-      },
-      crossChainContext => {
-        this.l2Token = TokenContract.at(crossChainContext.l2Token, this.wallet);
-        this.l2Bridge = TokenBridgeContract.at(crossChainContext.l2Bridge, this.wallet);
-
-        // There is an issue with the reviver so we are getting strings sometimes. Working around it here.
-        this.ethAccount = EthAddress.fromString(crossChainContext.ethAccount.toString());
-        const tokenPortalAddress = EthAddress.fromString(crossChainContext.tokenPortal.toString());
-
-        const l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
-
-        const inbox = getContract({
-          address: this.aztecNodeConfig.l1Contracts.inboxAddress.toString(),
-          abi: InboxAbi,
-          client: l1Client,
-        });
-        const outbox = getContract({
-          address: this.aztecNodeConfig.l1Contracts.outboxAddress.toString(),
-          abi: OutboxAbi,
-          client: l1Client,
-        });
-
-        this.crossChainTestHarness = new CrossChainTestHarness(
-          this.aztecNode,
-          this.logger,
-          this.l2Token,
-          this.l2Bridge,
-          this.ethAccount,
-          tokenPortalAddress,
-          crossChainContext.underlying,
-          l1Client,
-          this.aztecNodeConfig.l1Contracts,
-          this.wallet,
-          this.ownerAddress,
-        );
-
-        this.l1Client = l1Client;
-        this.inbox = inbox;
-        this.outbox = outbox;
-        return Promise.resolve();
-      },
-    );
-  }
-}

package/src/e2e_deploy_contract/deploy_test.ts

@@ -1,78 +0,0 @@
-import type { ContractArtifact } from '@aztec/aztec.js/abi';
-import type { AztecAddress } from '@aztec/aztec.js/addresses';
-import { type ContractBase, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
-import { Fr } from '@aztec/aztec.js/fields';
-import type { PublicKeys } from '@aztec/aztec.js/keys';
-import { type Logger, createLogger } from '@aztec/aztec.js/log';
-import type { AztecNode } from '@aztec/aztec.js/node';
-import type { Wallet } from '@aztec/aztec.js/wallet';
-import type { StatefulTestContract } from '@aztec/noir-test-contracts.js/StatefulTest';
-import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
-import type { TestWallet } from '@aztec/test-wallet/server';
-
-import { type ISnapshotManager, createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
-
-const { E2E_DATA_PATH: dataPath } = process.env;
-
-export class DeployTest {
-  private snapshotManager: ISnapshotManager;
-  public logger: Logger;
-  public wallet!: TestWallet;
-  public defaultAccountAddress!: AztecAddress;
-  public aztecNode!: AztecNode;
-  public aztecNodeAdmin!: AztecNodeAdmin;
-
-  constructor(testName: string) {
-    this.logger = createLogger(`e2e:e2e_deploy_contract:${testName}`);
-    this.snapshotManager = createSnapshotManager(`e2e_deploy_contract/${testName}`, dataPath);
-  }
-
-  async setup() {
-    await this.applyInitialAccountSnapshot();
-    const context = await this.snapshotManager.setup();
-    ({ aztecNode: this.aztecNode, wallet: this.wallet } = context);
-    this.aztecNodeAdmin = context.aztecNode;
-    return this;
-  }
-
-  async teardown() {
-    await this.snapshotManager.teardown();
-  }
-
-  private async applyInitialAccountSnapshot() {
-    await this.snapshotManager.snapshot('initial_account', deployAccounts(1, this.logger), ({ deployedAccounts }) => {
-      this.defaultAccountAddress = deployedAccounts[0].address;
-      return Promise.resolve();
-    });
-  }
-
-  async registerContract<T extends ContractBase>(
-    wallet: Wallet,
-    contractArtifact: ContractArtifactClass<T>,
-    opts: {
-      salt?: Fr;
-      publicKeys?: PublicKeys;
-      initArgs?: any[];
-      constructorName?: string;
-      deployer?: AztecAddress;
-    } = {},
-  ): Promise<T> {
-    const { salt, publicKeys, initArgs, constructorName, deployer } = opts;
-    const instance = await getContractInstanceFromInstantiationParams(contractArtifact.artifact, {
-      constructorArgs: initArgs ?? [],
-      constructorArtifact: constructorName,
-      salt: salt ?? Fr.random(),
-      publicKeys,
-      deployer,
-    });
-    await wallet.registerContract(instance, contractArtifact.artifact);
-    return contractArtifact.at(instance.address, wallet);
-  }
-}
-
-export type StatefulContractCtorArgs = Parameters<StatefulTestContract['methods']['constructor']>;
-
-export type ContractArtifactClass<T extends ContractBase> = {
-  at(address: AztecAddress, wallet: Wallet): T;
-  artifact: ContractArtifact;
-};