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

package/src/e2e_fees/fees_test.ts

@@ -1,382 +0,0 @@
-import type { AztecAddress } 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, RollupContract, createExtendedL1Client } from '@aztec/ethereum';
-import { ChainMonitor } from '@aztec/ethereum/test';
-import { BlockNumber } from '@aztec/foundation/branded-types';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { sleep } from '@aztec/foundation/sleep';
-import { TestERC20Abi } from '@aztec/l1-artifacts';
-import { AppSubscriptionContract } from '@aztec/noir-contracts.js/AppSubscription';
-import { FPCContract } from '@aztec/noir-contracts.js/FPC';
-import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
-import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
-import { TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token';
-import { CounterContract } from '@aztec/noir-test-contracts.js/Counter';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
-import { GasSettings } from '@aztec/stdlib/gas';
-import { TestWallet } from '@aztec/test-wallet/server';
-
-import { getContract } from 'viem';
-
-import { MNEMONIC } from '../fixtures/fixtures.js';
-import {
-  type ISnapshotManager,
-  type SubsystemsContext,
-  createSnapshotManager,
-  deployAccounts,
-} from '../fixtures/snapshot_manager.js';
-import { mintTokensToPrivate } from '../fixtures/token_utils.js';
-import {
-  type BalancesFn,
-  type SetupOptions,
-  ensureAccountContractsPublished,
-  getBalancesFn,
-  setupSponsoredFPC,
-} from '../fixtures/utils.js';
-import { FeeJuicePortalTestingHarnessFactory, type GasBridgingTestHarness } from '../shared/gas_portal_test_harness.js';
-
-const { E2E_DATA_PATH: dataPath } = process.env;
-
-/**
- * Test fixture for testing fees. Provides the following snapshots:
- * InitialAccounts: Initializes 3 Schnorr account contracts.
- * PublicDeployAccounts: Deploys the accounts publicly.
- * DeployFeeJuice: Deploys the Fee Juice contract.
- * FPCSetup: Deploys BananaCoin and FPC contracts, and bridges gas from L1.
- * SponsoredFPCSetup: Deploys Sponsored FPC contract, and bridges gas from L1.
- * FundAlice: Mints private and public bananas to Alice.
- * SetupSubscription: Deploys a counter contract and a subscription contract, and mints Fee Juice to the subscription contract.
- */
-export class FeesTest {
-  private snapshotManager: ISnapshotManager;
-  private accounts: AztecAddress[] = [];
-
-  public logger: Logger;
-  public aztecNode!: AztecNode;
-  public cheatCodes!: CheatCodes;
-
-  public wallet!: TestWallet;
-  public aliceAddress!: AztecAddress;
-  public bobAddress!: AztecAddress;
-  public sequencerAddress!: AztecAddress;
-  public coinbase!: EthAddress;
-
-  public fpcAdmin!: AztecAddress;
-
-  public gasSettings!: GasSettings;
-
-  public rollupContract!: RollupContract;
-
-  public feeJuiceContract!: FeeJuiceContract;
-  public bananaCoin!: BananaCoin;
-  public bananaFPC!: FPCContract;
-  public sponsoredFPC!: SponsoredFPCContract;
-  public counterContract!: CounterContract;
-  public subscriptionContract!: AppSubscriptionContract;
-  public feeJuiceBridgeTestHarness!: GasBridgingTestHarness;
-
-  public context!: SubsystemsContext;
-  public chainMonitor!: ChainMonitor;
-
-  public getCoinbaseBalance!: () => Promise<bigint>;
-  public getCoinbaseSequencerRewards!: () => Promise<bigint>;
-  public getGasBalanceFn!: BalancesFn;
-  public getBananaPublicBalanceFn!: BalancesFn;
-  public getBananaPrivateBalanceFn!: BalancesFn;
-  public getProverFee!: (blockNumber: BlockNumber) => Promise<bigint>;
-
-  public readonly ALICE_INITIAL_BANANAS = BigInt(1e22);
-  public readonly SUBSCRIPTION_AMOUNT = BigInt(1e19);
-  public readonly APP_SPONSORED_TX_GAS_LIMIT = BigInt(10e9);
-
-  constructor(
-    testName: string,
-    private numberOfAccounts = 3,
-    setupOptions: Partial<SetupOptions & DeployL1ContractsArgs> = {},
-  ) {
-    if (!numberOfAccounts) {
-      throw new Error('There must be at least 1 initial account.');
-    }
-    setupOptions.coinbase ??= EthAddress.random();
-    this.coinbase = setupOptions.coinbase!;
-    this.logger = createLogger(`e2e:e2e_fees:${testName}`);
-    this.snapshotManager = createSnapshotManager(
-      `e2e_fees/${testName}-${numberOfAccounts}`,
-      dataPath,
-      { startProverNode: true, ...setupOptions },
-      { ...setupOptions },
-    );
-  }
-
-  async setup() {
-    const context = await this.snapshotManager.setup();
-
-    this.rollupContract = RollupContract.getFromConfig(context.aztecNodeConfig);
-    this.chainMonitor = new ChainMonitor(this.rollupContract, context.dateProvider, this.logger, 200).start();
-
-    return this;
-  }
-
-  async teardown() {
-    await this.chainMonitor.stop();
-    await this.snapshotManager.teardown();
-  }
-
-  setIsMarkingAsProven(b: boolean) {
-    this.context.watcher.setIsMarkingAsProven(b);
-  }
-
-  async catchUpProvenChain() {
-    const bn = await this.aztecNode.getBlockNumber();
-    while ((await this.aztecNode.getProvenBlockNumber()) < bn) {
-      await sleep(1000);
-    }
-  }
-
-  async getBlockRewards() {
-    const blockReward = await this.rollupContract.getCheckpointReward();
-    const rewardConfig = await this.rollupContract.getRewardConfig();
-
-    const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(
-      EthAddress.fromString(rewardConfig.rewardDistributor),
-    );
-
-    const toDistribute = balance > blockReward ? blockReward : balance;
-    const sequencerBlockRewards = (toDistribute * BigInt(rewardConfig.sequencerBps)) / 10000n;
-    const proverBlockRewards = toDistribute - sequencerBlockRewards;
-
-    return { sequencerBlockRewards, proverBlockRewards };
-  }
-
-  async mintAndBridgeFeeJuice(minter: AztecAddress, recipient: AztecAddress) {
-    const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(recipient);
-    const { claimSecret: secret, messageLeafIndex: index } = claim;
-    await this.feeJuiceContract.methods
-      .claim(recipient, claim.claimAmount, secret, index)
-      .send({ from: minter })
-      .wait();
-  }
-
-  /** Alice mints bananaCoin tokens privately to the target address and redeems them. */
-  async mintPrivateBananas(amount: bigint, address: AztecAddress) {
-    const balanceBefore = await this.bananaCoin.methods
-      .balance_of_private(address)
-      .simulate({ from: this.aliceAddress });
-
-    await mintTokensToPrivate(this.bananaCoin, this.aliceAddress, address, amount);
-
-    const balanceAfter = await this.bananaCoin.methods
-      .balance_of_private(address)
-      .simulate({ from: this.aliceAddress });
-    expect(balanceAfter).toEqual(balanceBefore + amount);
-  }
-
-  public async applyBaseSnapshots() {
-    await this.applyInitialAccountsSnapshot();
-    await this.applyPublicDeployAccountsSnapshot();
-    await this.applySetupFeeJuiceSnapshot();
-    await this.applyDeployBananaTokenSnapshot();
-  }
-
-  async applyInitialAccountsSnapshot() {
-    await this.snapshotManager.snapshot(
-      'initial_accounts',
-      deployAccounts(this.numberOfAccounts, this.logger),
-      async ({ deployedAccounts }, { wallet, aztecNode, cheatCodes }) => {
-        this.wallet = wallet;
-        this.aztecNode = aztecNode;
-        this.gasSettings = GasSettings.default({ maxFeesPerGas: (await this.aztecNode.getCurrentBaseFees()).mul(2) });
-        this.cheatCodes = cheatCodes;
-        this.accounts = deployedAccounts.map(a => a.address);
-        this.accounts.forEach((a, i) => this.logger.verbose(`Account ${i} address: ${a}`));
-        [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.accounts.slice(0, 3);
-
-        // We set Alice as the FPC admin to avoid the need for deployment of another account.
-        this.fpcAdmin = this.aliceAddress;
-
-        const canonicalFeeJuice = await getCanonicalFeeJuice();
-        this.feeJuiceContract = FeeJuiceContract.at(canonicalFeeJuice.address, this.wallet);
-      },
-    );
-  }
-
-  async applyPublicDeployAccountsSnapshot() {
-    await this.snapshotManager.snapshot('public_deploy_accounts', () =>
-      ensureAccountContractsPublished(this.wallet, this.accounts),
-    );
-  }
-
-  async applySetupFeeJuiceSnapshot() {
-    await this.snapshotManager.snapshot(
-      'setup_fee_juice',
-      async () => {},
-      async (_data, context) => {
-        this.context = context;
-
-        this.feeJuiceContract = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.wallet);
-
-        this.getGasBalanceFn = getBalancesFn(
-          '⛽',
-          this.feeJuiceContract.methods.balance_of_public,
-          this.aliceAddress,
-          this.logger,
-        );
-
-        this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
-          aztecNode: context.aztecNode,
-          aztecNodeAdmin: context.aztecNode,
-          l1Client: context.deployL1ContractsValues.l1Client,
-          wallet: this.wallet,
-          logger: this.logger,
-        });
-      },
-    );
-  }
-
-  async applyDeployBananaTokenSnapshot() {
-    await this.snapshotManager.snapshot(
-      'deploy_banana_token',
-      async () => {
-        const bananaCoin = await BananaCoin.deploy(this.wallet, this.aliceAddress, 'BC', 'BC', 18n)
-          .send({ from: this.aliceAddress })
-          .deployed();
-        this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
-        return { bananaCoinAddress: bananaCoin.address };
-      },
-      ({ bananaCoinAddress }) => {
-        this.bananaCoin = BananaCoin.at(bananaCoinAddress, this.wallet);
-        const logger = this.logger;
-        this.getBananaPublicBalanceFn = getBalancesFn(
-          '🍌.public',
-          this.bananaCoin.methods.balance_of_public,
-          this.aliceAddress,
-          logger,
-        );
-        this.getBananaPrivateBalanceFn = getBalancesFn(
-          '🍌.private',
-          this.bananaCoin.methods.balance_of_private,
-          this.aliceAddress,
-          logger,
-        );
-        return Promise.resolve();
-      },
-    );
-  }
-
-  public async applyFPCSetupSnapshot() {
-    await this.snapshotManager.snapshot(
-      'fpc_setup',
-      async context => {
-        const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-        expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
-
-        const bananaCoin = this.bananaCoin;
-        const bananaFPC = await FPCContract.deploy(this.wallet, bananaCoin.address, this.fpcAdmin)
-          .send({ from: this.aliceAddress })
-          .deployed();
-
-        this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
-
-        await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(bananaFPC.address, this.aliceAddress);
-
-        return {
-          bananaFPCAddress: bananaFPC.address,
-          feeJuiceAddress: feeJuiceContract.address,
-          l1FeeJuiceAddress: this.feeJuiceBridgeTestHarness.l1FeeJuiceAddress,
-          rollupAddress: context.deployL1ContractsValues.l1ContractAddresses.rollupAddress,
-        };
-      },
-      (data, context) => {
-        const bananaFPC = FPCContract.at(data.bananaFPCAddress, this.wallet);
-        this.bananaFPC = bananaFPC;
-
-        this.getCoinbaseBalance = async () => {
-          const l1Client = createExtendedL1Client(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
-          const gasL1 = getContract({
-            address: data.l1FeeJuiceAddress.toString(),
-            abi: TestERC20Abi,
-            client: l1Client,
-          });
-          return await gasL1.read.balanceOf([this.coinbase.toString()]);
-        };
-
-        this.getCoinbaseSequencerRewards = async () => {
-          return await this.rollupContract.getSequencerRewards(this.coinbase);
-        };
-
-        this.getProverFee = async (blockNumber: BlockNumber) => {
-          const block = await this.aztecNode.getBlock(blockNumber);
-
-          // @todo @lherskind As we deal with #13601
-          // Right now the value is from `FeeLib.sol`
-          const L1_GAS_PER_EPOCH_VERIFIED = 1000000n;
-
-          // We round up
-          const mulDiv = (a: bigint, b: bigint, c: bigint) => (a * b) / c + ((a * b) % c > 0n ? 1n : 0n);
-
-          const { baseFee } = await this.rollupContract.getL1FeesAt(block!.header.globalVariables.timestamp);
-          const proverCost =
-            mulDiv(
-              mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, await this.rollupContract.getEpochDuration()),
-              1n,
-              await this.rollupContract.getManaTarget(),
-            ) + (await this.rollupContract.getProvingCostPerMana());
-
-          const price = await this.rollupContract.getFeeAssetPerEth();
-
-          const mana = block!.header.totalManaUsed.toBigInt();
-          return mulDiv(mana * proverCost, price, 10n ** 9n);
-        };
-        return Promise.resolve();
-      },
-    );
-  }
-
-  public async applySponsoredFPCSetupSnapshot() {
-    await this.snapshotManager.snapshot(
-      'sponsored_fpc_setup',
-      async context => {
-        const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-        expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
-
-        const sponsoredFPC = await setupSponsoredFPC(this.wallet);
-        this.logger.info(`SponsoredFPC at ${sponsoredFPC.address}`);
-
-        return {
-          sponsoredFPCAddress: sponsoredFPC.address,
-        };
-      },
-      data => {
-        this.sponsoredFPC = SponsoredFPCContract.at(data.sponsoredFPCAddress, this.wallet);
-        return Promise.resolve();
-      },
-    );
-  }
-
-  public async applyFundAliceWithBananas() {
-    await this.snapshotManager.snapshot(
-      'fund_alice',
-      async () => {
-        await this.mintPrivateBananas(this.ALICE_INITIAL_BANANAS, this.aliceAddress);
-        await this.bananaCoin.methods
-          .mint_to_public(this.aliceAddress, this.ALICE_INITIAL_BANANAS)
-          .send({ from: this.aliceAddress })
-          .wait();
-      },
-      () => Promise.resolve(),
-    );
-  }
-
-  public async applyFundAliceWithPrivateBananas() {
-    await this.snapshotManager.snapshot(
-      'fund_alice_with_private_bananas',
-      async () => {
-        await this.mintPrivateBananas(this.ALICE_INITIAL_BANANAS, this.aliceAddress);
-      },
-      () => Promise.resolve(),
-    );
-  }
-}

package/src/e2e_l1_publisher/write_json.ts

@@ -1,77 +0,0 @@
-import { AztecAddress } from '@aztec/aztec.js/addresses';
-import type { L2Block } from '@aztec/aztec.js/block';
-import { Fr } from '@aztec/aztec.js/fields';
-import { BatchedBlob, Blob, getEthBlobEvaluationInputs, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
-import { EthAddress } from '@aztec/foundation/eth-address';
-
-import { writeFile } from 'fs/promises';
-
-const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
-
-/**
- * Creates a json object that can be used to test the solidity contract.
- * The json object must be put into
- */
-export async function writeJson(
-  fileName: string,
-  block: L2Block,
-  l1ToL2Content: Fr[],
-  blobs: Blob[],
-  batchedBlob: BatchedBlob,
-  recipientAddress: AztecAddress,
-  deployerAddress: `0x${string}`,
-): Promise<void> {
-  if (!AZTEC_GENERATE_TEST_DATA) {
-    return;
-  }
-  // Path relative to the package.json in the end-to-end folder
-  const path = `../../l1-contracts/test/fixtures/${fileName}.json`;
-
-  const asHex = (value: Fr | Buffer | EthAddress | AztecAddress, size = 64) => {
-    const buffer = Buffer.isBuffer(value) ? value : value.toBuffer();
-    return `0x${buffer.toString('hex').padStart(size, '0')}`;
-  };
-
-  const jsonObject = {
-    populate: {
-      l1ToL2Content: l1ToL2Content.map(value => asHex(value)),
-      recipient: asHex(recipientAddress.toField()),
-      sender: deployerAddress,
-    },
-    messages: {
-      l2ToL1Messages: block.body.txEffects.flatMap(txEffect => txEffect.l2ToL1Msgs).map(value => asHex(value)),
-    },
-    checkpoint: {
-      // The json formatting in forge is a bit brittle, so we convert Fr to a number in the few values below.
-      // This should not be a problem for testing as long as the values are not larger than u32.
-      archive: asHex(block.archive.root),
-      blobCommitments: getPrefixedEthBlobCommitments(blobs),
-      batchedBlobInputs: getEthBlobEvaluationInputs(batchedBlob),
-      checkpointNumber: block.number,
-      body: `0x${block.body.toBuffer().toString('hex')}`,
-      header: {
-        lastArchiveRoot: asHex(block.header.lastArchive.root),
-        blockHeadersHash: asHex(block.header.blockHeadersHash),
-        contentCommitment: {
-          blobsHash: asHex(block.header.contentCommitment.blobsHash),
-          inHash: asHex(block.header.contentCommitment.inHash),
-          outHash: asHex(block.header.contentCommitment.outHash),
-        },
-        slotNumber: Number(block.header.globalVariables.slotNumber),
-        timestamp: Number(block.header.globalVariables.timestamp),
-        coinbase: asHex(block.header.globalVariables.coinbase, 40),
-        feeRecipient: asHex(block.header.globalVariables.feeRecipient),
-        gasFees: {
-          feePerDaGas: Number(block.header.globalVariables.gasFees.feePerDaGas),
-          feePerL2Gas: Number(block.header.globalVariables.gasFees.feePerL2Gas),
-        },
-        totalManaUsed: block.header.totalManaUsed.toNumber(),
-      },
-      headerHash: asHex(block.getCheckpointHeader().hash()),
-      numTxs: block.body.txEffects.length,
-    },
-  };
-
-  const output = JSON.stringify(jsonObject, null, 2);
-  await writeFile(path, output, 'utf8');
-}

package/src/e2e_nested_contract/nested_contract_test.ts

@@ -1,96 +0,0 @@
-import { AztecAddress } from '@aztec/aztec.js/addresses';
-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 { ChildContract } from '@aztec/noir-test-contracts.js/Child';
-import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
-
-import {
-  type ISnapshotManager,
-  type SubsystemsContext,
-  createSnapshotManager,
-  deployAccounts,
-  publicDeployAccounts,
-} from '../fixtures/snapshot_manager.js';
-
-const { E2E_DATA_PATH: dataPath } = process.env;
-
-export class NestedContractTest {
-  private snapshotManager: ISnapshotManager;
-  logger: Logger;
-  wallet!: Wallet;
-  defaultAccountAddress!: AztecAddress;
-  aztecNode!: AztecNode;
-
-  parentContract!: ParentContract;
-  childContract!: ChildContract;
-
-  constructor(
-    testName: string,
-    private numberOfAccounts = 1,
-  ) {
-    this.logger = createLogger(`e2e:e2e_nested_contract:${testName}`);
-    this.snapshotManager = createSnapshotManager(`e2e_nested_contract/${testName}-${numberOfAccounts}`, dataPath);
-  }
-
-  /**
-   * Adds two state shifts to snapshot manager.
-   * 1. Add 3 accounts.
-   * 2. Publicly deploy accounts
-   */
-  async applyBaseSnapshots() {
-    await this.snapshotManager.snapshot(
-      'accounts',
-      deployAccounts(this.numberOfAccounts, this.logger),
-      ({ deployedAccounts }, { wallet, aztecNode }) => {
-        this.wallet = wallet;
-        [{ address: this.defaultAccountAddress }] = deployedAccounts;
-        this.aztecNode = aztecNode;
-        return Promise.resolve();
-      },
-    );
-
-    await this.snapshotManager.snapshot(
-      'public_deploy',
-      async () => {},
-      async () => {
-        this.logger.verbose(`Public deploy accounts...`);
-        await publicDeployAccounts(this.wallet, [this.defaultAccountAddress]);
-      },
-    );
-  }
-
-  async setup() {
-    await this.snapshotManager.setup();
-  }
-
-  async teardown() {
-    await this.snapshotManager.teardown();
-  }
-
-  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 applyManualSnapshots() {
-    await this.snapshotManager.snapshot(
-      'manual',
-      async () => {
-        const parentContract = await ParentContract.deploy(this.wallet)
-          .send({ from: this.defaultAccountAddress })
-          .deployed();
-        const childContract = await ChildContract.deploy(this.wallet)
-          .send({ from: this.defaultAccountAddress })
-          .deployed();
-        return { parentContractAddress: parentContract.address, childContractAddress: childContract.address };
-      },
-      ({ parentContractAddress, childContractAddress }) => {
-        this.parentContract = ParentContract.at(parentContractAddress, this.wallet);
-        this.childContract = ChildContract.at(childContractAddress, this.wallet);
-        return Promise.resolve();
-      },
-    );
-  }
-}