@aztec/end-to-end 0.0.1-commit.9ef841308 → 0.0.1-commit.a4600f49

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -1,193 +0,0 @@
-import type { AztecNodeConfig } from '@aztec/aztec-node';
-import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
-import { waitForProven } from '@aztec/aztec.js/contracts';
-import { type Logger, createLogger } from '@aztec/aztec.js/log';
-import type { AztecNode } from '@aztec/aztec.js/node';
-import type { TxReceipt } from '@aztec/aztec.js/tx';
-import { CheatCodes } from '@aztec/aztec/testing';
-import { createExtendedL1Client } from '@aztec/ethereum/client';
-import { InboxContract, OutboxContract, RollupContract } from '@aztec/ethereum/contracts';
-import type {
-  DeployAztecL1ContractsArgs,
-  DeployAztecL1ContractsReturnType,
-} from '@aztec/ethereum/deploy-aztec-l1-contracts';
-import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
-import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
-import { EpochNumber } from '@aztec/foundation/branded-types';
-import { sleep } from '@aztec/foundation/sleep';
-import { 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 { MNEMONIC } from '../fixtures/fixtures.js';
-import {
-  type EndToEndContext,
-  type SetupOptions,
-  deployAccounts,
-  publicDeployAccounts,
-  setup,
-  teardown,
-} from '../fixtures/setup.js';
-import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
-import type { TestWallet } from '../test-wallet/test_wallet.js';
-
-export class CrossChainMessagingTest {
-  private requireEpochProven: boolean;
-  private setupOptions: SetupOptions;
-  private deployL1ContractsArgs: Partial<DeployAztecL1ContractsArgs>;
-  logger: Logger;
-  context!: EndToEndContext;
-  aztecNode!: AztecNode;
-  aztecNodeConfig!: AztecNodeConfig;
-  aztecNodeAdmin!: AztecNodeAdmin;
-
-  l1Client!: ExtendedViemWalletClient | undefined;
-
-  wallet!: TestWallet;
-  ownerAddress!: AztecAddress;
-  user1Address!: AztecAddress;
-  user2Address!: AztecAddress;
-  crossChainTestHarness!: CrossChainTestHarness;
-  ethAccount!: EthAddress;
-  l2Token!: TokenContract;
-  l2Bridge!: TokenBridgeContract;
-
-  rollup!: RollupContract;
-  inbox!: InboxContract;
-  outbox!: OutboxContract;
-  cheatCodes!: CheatCodes;
-
-  deployL1ContractsValues!: DeployAztecL1ContractsReturnType;
-
-  constructor(
-    testName: string,
-    opts: SetupOptions = {},
-    deployL1ContractsArgs: Partial<DeployAztecL1ContractsArgs> = {},
-  ) {
-    this.logger = createLogger(`e2e:e2e_cross_chain_messaging:${testName}`);
-    this.setupOptions = opts;
-    this.deployL1ContractsArgs = {
-      initialValidators: [],
-      ...deployL1ContractsArgs,
-    };
-    this.requireEpochProven = opts.startProverNode ?? false;
-  }
-
-  async setup() {
-    this.logger.info('Setting up cross chain messaging test');
-    this.context = await setup(0, {
-      ...this.setupOptions,
-      fundSponsoredFPC: true,
-      skipAccountDeployment: true,
-      l1ContractsArgs: this.deployL1ContractsArgs,
-    });
-    await this.applyBaseSetup();
-  }
-
-  async advanceToEpochProven(l2TxReceipt: TxReceipt): Promise<EpochNumber> {
-    const block = await this.aztecNode.getBlock(l2TxReceipt.blockNumber!);
-    const epoch = await this.rollup.getEpochNumberForCheckpoint(block!.checkpointNumber);
-    // Warp to the next epoch.
-    await this.cheatCodes.rollup.advanceToEpoch(EpochNumber(epoch + 1));
-    // Wait for the tx to be proven.
-    await waitForProven(this.aztecNode, l2TxReceipt, { provenTimeout: 300 });
-    // Return the epoch the tx is in.
-    return epoch;
-  }
-
-  async catchUpProvenChain() {
-    const bn = await this.aztecNode.getBlockNumber();
-    while ((await this.aztecNode.getProvenBlockNumber()) < bn) {
-      await sleep(1000);
-    }
-  }
-
-  async teardown() {
-    await teardown(this.context);
-  }
-
-  async applyBaseSetup() {
-    // Set up base context fields
-    this.aztecNode = this.context.aztecNodeService;
-    this.wallet = this.context.wallet;
-    this.aztecNodeConfig = this.context.config;
-    this.cheatCodes = this.context.cheatCodes;
-    this.deployL1ContractsValues = this.context.deployL1ContractsValues;
-    this.aztecNodeAdmin = this.context.aztecNodeService;
-
-    if (this.requireEpochProven) {
-      // Turn off the watcher to prevent it from keep marking blocks as proven.
-      this.context.watcher.setIsMarkingAsProven(false);
-    }
-
-    // Deploy 3 accounts
-    this.logger.info('Applying 3_accounts setup');
-    const { deployedAccounts } = await deployAccounts(
-      3,
-      this.logger,
-    )({
-      wallet: this.context.wallet,
-      initialFundedAccounts: this.context.initialFundedAccounts,
-    });
-    [this.ownerAddress, this.user1Address, this.user2Address] = deployedAccounts.map(a => a.address);
-
-    // Set up cross chain messaging
-    this.logger.info('Applying e2e_cross_chain_messaging setup');
-
-    // Create the token contract state.
-    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}`);
-
-    const crossChainContext = this.crossChainTestHarness.toCrossChainContext();
-
-    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);
-    this.l1Client = l1Client;
-
-    const l1Contracts = this.aztecNodeConfig.l1Contracts;
-    this.rollup = new RollupContract(l1Client, l1Contracts.rollupAddress.toString());
-    this.inbox = new InboxContract(l1Client, l1Contracts.inboxAddress.toString());
-    this.outbox = new OutboxContract(l1Client, l1Contracts.outboxAddress.toString());
-
-    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,
-    );
-  }
-}

package/src/e2e_deploy_contract/deploy_test.ts

@@ -1,85 +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 EndToEndContext, deployAccounts, setup, teardown } from '../fixtures/setup.js';
-import type { TestWallet } from '../test-wallet/test_wallet.js';
-
-export class DeployTest {
-  public context!: EndToEndContext;
-  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}`);
-  }
-
-  async setup() {
-    this.logger.info('Setting up test environment');
-    this.context = await setup(0, {
-      fundSponsoredFPC: true,
-      skipAccountDeployment: true,
-    });
-    this.aztecNode = this.context.aztecNodeService;
-    this.wallet = this.context.wallet;
-    this.aztecNodeAdmin = this.context.aztecNodeService;
-    await this.applyInitialAccount();
-    return this;
-  }
-
-  async teardown() {
-    await teardown(this.context);
-  }
-
-  private async applyInitialAccount() {
-    this.logger.info('Applying initial account setup');
-    const { deployedAccounts } = await deployAccounts(
-      1,
-      this.logger,
-    )({
-      wallet: this.context.wallet,
-      initialFundedAccounts: this.context.initialFundedAccounts,
-    });
-    this.defaultAccountAddress = deployedAccounts[0].address;
-  }
-
-  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;
-};