@aztec/end-to-end 0.81.0 → 0.82.0

package/src/shared/uniswap_l1_l2.ts

@@ -12,13 +12,14 @@ import {
 import { CheatCodes } from '@aztec/aztec.js/testing';
 import {
   type DeployL1ContractsReturnType,
+  RollupContract,
   type ViemPublicClient,
   type ViemWalletClient,
   deployL1Contract,
   extractEvent,
 } from '@aztec/ethereum';
 import { sha256ToField } from '@aztec/foundation/crypto';
-import { InboxAbi, RollupAbi, UniswapPortalAbi, UniswapPortalBytecode } from '@aztec/l1-artifacts';
+import { InboxAbi, UniswapPortalAbi, UniswapPortalBytecode } from '@aztec/l1-artifacts';
 import { UniswapContract } from '@aztec/noir-contracts.js/Uniswap';
 
 import { jest } from '@jest/globals';
@@ -90,7 +91,7 @@ export const uniswapL1L2TestSuite = (
     let wethCrossChainHarness: CrossChainTestHarness;
 
     let deployL1ContractsValues: DeployL1ContractsReturnType;
-    let rollup: GetContractReturnType<typeof RollupAbi, ViemWalletClient>;
+    let rollup: RollupContract;
     let uniswapPortal: GetContractReturnType<typeof UniswapPortalAbi, ViemWalletClient>;
     let uniswapPortalAddress: EthAddress;
     let uniswapL2Contract: UniswapContract;
@@ -118,11 +119,10 @@ export const uniswapL1L2TestSuite = (
         throw new Error('This test must be run on a fork of mainnet with the expected fork block');
       }
 
-      rollup = getContract({
-        address: deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
-        abi: RollupAbi,
-        client: deployL1ContractsValues.walletClient,
-      });
+      rollup = new RollupContract(
+        deployL1ContractsValues.publicClient,
+        deployL1ContractsValues.l1ContractAddresses.rollupAddress,
+      );
 
       ownerAddress = ownerWallet.getAddress();
       // sponsorAddress = sponsorWallet.getAddress();
@@ -218,7 +218,7 @@ export const uniswapL1L2TestSuite = (
       // 3. Owner gives uniswap approval to transfer the funds to public to self on its behalf
       logger.info('Approving uniswap to transfer funds to public to self on my behalf');
       const nonceForWETHTransferToPublicApproval = new Fr(1n);
-      await ownerWallet.createAuthWit({
+      const transferToPublicAuhtwit = await ownerWallet.createAuthWit({
         caller: uniswapL2Contract.address,
         action: wethCrossChainHarness.l2Token.methods.transfer_to_public(
           ownerAddress,
@@ -244,7 +244,7 @@ export const uniswapL1L2TestSuite = (
           secretHashForDepositingSwappedDai,
           ownerEthAddress,
         )
-        .send()
+        .send({ authWitnesses: [transferToPublicAuhtwit] })
         .wait();
 
       const swapPrivateFunction = 'swap_private(address,uint256,uint24,address,uint256,bytes32,address)';
@@ -288,7 +288,7 @@ export const uniswapL1L2TestSuite = (
       await wethCrossChainHarness.expectPublicBalanceOnL2(uniswapL2Contract.address, 0n);
 
       // Since the outbox is only consumable when the block is proven, we need to set the block to be proven
-      await cheatCodes.rollup.markAsProven(await rollup.read.getPendingBlockNumber());
+      await cheatCodes.rollup.markAsProven(await rollup.getBlockNumber());
 
       // 5. Consume L2 to L1 message by calling uniswapPortal.swap_private()
       logger.info('Execute withdraw and swap on the uniswapPortal!');
@@ -655,7 +655,7 @@ export const uniswapL1L2TestSuite = (
       // 2. owner gives uniswap approval to transfer the funds to public:
       logger.info('Approving uniswap to transfer funds to public to self on my behalf');
       const nonceForWETHTransferToPublicApproval = new Fr(3n);
-      await ownerWallet.createAuthWit({
+      const transferToPublicAuthwith = await ownerWallet.createAuthWit({
         caller: uniswapL2Contract.address,
         action: wethCrossChainHarness.l2Token.methods.transfer_to_public(
           ownerAddress,
@@ -680,7 +680,7 @@ export const uniswapL1L2TestSuite = (
             Fr.random(),
             ownerEthAddress,
           )
-          .prove(),
+          .prove({ authWitnesses: [transferToPublicAuthwith] }),
       ).rejects.toThrow('Assertion failed: input_asset address is not the same as seen in the bridge contract');
     });
 
@@ -803,7 +803,7 @@ export const uniswapL1L2TestSuite = (
       // Owner gives uniswap approval to transfer the funds to public to self on its behalf
       logger.info('Approving uniswap to transfer the funds to public to self on my behalf');
       const nonceForWETHTransferToPublicApproval = new Fr(4n);
-      await ownerWallet.createAuthWit({
+      const transferToPublicAuhtwit = await ownerWallet.createAuthWit({
         caller: uniswapL2Contract.address,
         action: wethCrossChainHarness.l2Token.methods.transfer_to_public(
           ownerAddress,
@@ -830,7 +830,7 @@ export const uniswapL1L2TestSuite = (
           secretHashForDepositingSwappedDai,
           ownerEthAddress,
         )
-        .send()
+        .send({ authWitnesses: [transferToPublicAuhtwit] })
         .wait();
 
       const swapPrivateContent = sha256ToField([
@@ -899,7 +899,7 @@ export const uniswapL1L2TestSuite = (
       await wethCrossChainHarness.expectPrivateBalanceOnL2(ownerAddress, wethL2BalanceBeforeSwap - wethAmountToBridge);
 
       // Since the outbox is only consumable when the block is proven, we need to set the block to be proven
-      await cheatCodes.rollup.markAsProven(await rollup.read.getPendingBlockNumber());
+      await cheatCodes.rollup.markAsProven(await rollup.getBlockNumber());
 
       // On L1 call swap_public!
       logger.info('call swap_public on L1');
@@ -1029,7 +1029,7 @@ export const uniswapL1L2TestSuite = (
       await wethCrossChainHarness.expectPublicBalanceOnL2(ownerAddress, 0n);
 
       // Since the outbox is only consumable when the block is proven, we need to set the block to be proven
-      await cheatCodes.rollup.markAsProven(await rollup.read.getPendingBlockNumber());
+      await cheatCodes.rollup.markAsProven(await rollup.getBlockNumber());
 
       // Call swap_private on L1
       logger.info('Execute withdraw and swap on the uniswapPortal!');

package/src/simulators/lending_simulator.ts

@@ -1,14 +1,11 @@
 // Convenience struct to hold an account's address and secret that can easily be passed around.
 import { AztecAddress, Fr } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec.js/testing';
+import type { RollupContract } from '@aztec/ethereum';
 import { pedersenHash } from '@aztec/foundation/crypto';
 import type { TestDateProvider } from '@aztec/foundation/timer';
-import type { RollupAbi } from '@aztec/l1-artifacts';
 import type { LendingContract } from '@aztec/noir-contracts.js/Lending';
 
-import type { Account, GetContractReturnType, HttpTransport, WalletClient } from 'viem';
-import type * as chains from 'viem/chains';
-
 import type { TokenSimulator } from './token_simulator.js';
 
 /**
@@ -84,7 +81,7 @@ export class LendingSimulator {
     private rate: bigint,
     private ethereumSlotDuration: number,
     /** the rollup contract */
-    public rollup: GetContractReturnType<typeof RollupAbi, WalletClient<HttpTransport, chains.Chain, Account>>,
+    public rollup: RollupContract,
     /** the lending contract */
     public lendingContract: LendingContract,
     /** the collateral asset used in the lending contract */
@@ -95,10 +92,8 @@ export class LendingSimulator {
 
   async prepare() {
     this.accumulator = BASE;
-    const slot = await this.rollup.read.getSlotAt([
-      BigInt(await this.cc.eth.timestamp()) + BigInt(this.ethereumSlotDuration),
-    ]);
-    this.time = Number(await this.rollup.read.getTimestampForSlot([slot]));
+    const slot = await this.rollup.getSlotAt(BigInt(await this.cc.eth.timestamp()) + BigInt(this.ethereumSlotDuration));
+    this.time = Number(await this.rollup.getTimestampForSlot(slot));
   }
 
   async progressSlots(diff: number, dateProvider?: TestDateProvider) {
@@ -106,8 +101,8 @@ export class LendingSimulator {
       return;
     }
 
-    const slot = await this.rollup.read.getSlotAt([BigInt(await this.cc.eth.timestamp())]);
-    const ts = Number(await this.rollup.read.getTimestampForSlot([slot + BigInt(diff)]));
+    const slot = await this.rollup.getSlotAt(BigInt(await this.cc.eth.timestamp()));
+    const ts = Number(await this.rollup.getTimestampForSlot(slot + BigInt(diff)));
     const timeDiff = ts - this.time;
     this.time = ts;
 
@@ -116,7 +111,7 @@ export class LendingSimulator {
     if (dateProvider) {
       dateProvider.setTime(this.time * 1000);
     }
-    await this.cc.rollup.markAsProven(await this.rollup.read.getPendingBlockNumber());
+    await this.cc.rollup.markAsProven(await this.rollup.getBlockNumber());
     this.accumulator = muldivDown(this.accumulator, computeMultiplier(this.rate, BigInt(timeDiff)), BASE);
   }
 

package/src/spartan/setup_test_wallets.ts

@@ -15,6 +15,7 @@ import {
 import { createEthereumChain, createL1Clients } from '@aztec/ethereum';
 import type { Logger } from '@aztec/foundation/log';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 
 export interface TestWallets {
   pxe: PXE;
@@ -55,7 +56,6 @@ export async function deployTestWalletWithTokens(
   mintAmount: bigint,
   logger: Logger,
   numberOfFundedWallets = 1,
-  initialFeeJuice = 10n ** 22n,
 ): Promise<TestWallets> {
   const pxe = await createCompatibleClient(pxeUrl, logger);
   const node = createAztecNodeClient(nodeUrl);
@@ -70,9 +70,7 @@ export async function deployTestWalletWithTokens(
   const fundedAccounts = await Promise.all(funded.map(a => getSchnorrAccount(pxe, a.secret, a.signingKey, a.salt)));
 
   const claims = await Promise.all(
-    fundedAccounts.map(a =>
-      bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, a.getAddress(), initialFeeJuice, logger),
-    ),
+    fundedAccounts.map(a => bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, a.getAddress(), undefined, logger)),
   );
 
   // Progress by 2 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
@@ -101,15 +99,17 @@ async function bridgeL1FeeJuice(
   mnemonicOrPrivateKey: string,
   pxe: PXE,
   recipient: AztecAddress,
-  amount: bigint,
+  amount: bigint | undefined,
   log: Logger,
 ) {
   const { l1ChainId } = await pxe.getNodeInfo();
   const chain = createEthereumChain(l1RpcUrls, l1ChainId);
   const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
 
+  // docs:start:bridge_fee_juice
   const portal = await L1FeeJuicePortalManager.new(pxe, publicClient, walletClient, log);
   const claim = await portal.bridgeTokensPublic(recipient, amount, true /* mint */);
+  // docs:end:bridge_fee_juice
 
   const isSynced = async () => await pxe.isL1ToL2MessageSynced(Fr.fromHexString(claim.messageHash));
   await retryUntil(isSynced, `message ${claim.messageHash} sync`, 24, 0.5);
@@ -118,9 +118,9 @@ async function bridgeL1FeeJuice(
   return claim;
 }
 
-async function advanceL2Block(node: AztecNode) {
+async function advanceL2Block(node: AztecNode, nodeAdmin?: AztecNodeAdmin) {
   const initialBlockNumber = await node.getBlockNumber();
-  await node!.flushTxs();
+  await nodeAdmin?.flushTxs();
   await retryUntil(async () => (await node.getBlockNumber()) >= initialBlockNumber + 1);
 }
 

package/src/spartan/utils.ts

@@ -1,8 +1,9 @@
-import { createAztecNodeClient, createLogger, sleep } from '@aztec/aztec.js';
+import { createLogger, sleep } from '@aztec/aztec.js';
 import type { RollupCheatCodes } from '@aztec/aztec.js/testing';
 import type { Logger } from '@aztec/foundation/log';
 import { makeBackoff, retry } from '@aztec/foundation/retry';
 import type { SequencerConfig } from '@aztec/sequencer-client';
+import { createAztecNodeAdminClient } from '@aztec/stdlib/interfaces/client';
 
 import { ChildProcess, exec, execSync, spawn } from 'child_process';
 import path from 'path';
@@ -36,6 +37,7 @@ const k8sLocalConfigSchema = z.object({
   INSTANCE_NAME: z.string().min(1, 'INSTANCE_NAME env variable must be set'),
   NAMESPACE: z.string().min(1, 'NAMESPACE env variable must be set'),
   CONTAINER_NODE_PORT: z.coerce.number().default(8080),
+  CONTAINER_NODE_ADMIN_PORT: z.coerce.number().default(8880),
   CONTAINER_SEQUENCER_PORT: z.coerce.number().default(8080),
   CONTAINER_PROVER_NODE_PORT: z.coerce.number().default(8080),
   CONTAINER_PXE_PORT: z.coerce.number().default(8080),
@@ -59,6 +61,7 @@ const k8sGCloudConfigSchema = k8sLocalConfigSchema.extend({
 const directConfigSchema = z.object({
   PXE_URL: z.string().url('PXE_URL must be a valid URL'),
   NODE_URL: z.string().url('NODE_URL must be a valid URL'),
+  NODE_ADMIN_URL: z.string().url('NODE_ADMIN_URL must be a valid URL'),
   ETHEREUM_HOSTS: ethereumHostsSchema,
   K8S: z.literal('false'),
 });
@@ -559,7 +562,7 @@ export async function runAlertCheck(config: EnvConfig, alerts: AlertConfig[], lo
 }
 
 export async function updateSequencerConfig(url: string, config: Partial<SequencerConfig>) {
-  const node = createAztecNodeClient(url);
+  const node = createAztecNodeAdminClient(url);
   // Retry incase the port forward is not ready yet
   await retry(() => node.setConfig(config), 'Update sequencer config', makeBackoff([1, 3, 6]), logger);
 }
@@ -570,7 +573,7 @@ export async function getSequencers(namespace: string) {
   return stdout.split(' ');
 }
 
-export async function updateK8sSequencersConfig(args: {
+async function updateK8sSequencersConfig(args: {
   containerPort: number;
   namespace: string;
   config: Partial<SequencerConfig>;
@@ -593,12 +596,12 @@ export async function updateK8sSequencersConfig(args: {
 export async function updateSequencersConfig(env: EnvConfig, config: Partial<SequencerConfig>) {
   if (isK8sConfig(env)) {
     await updateK8sSequencersConfig({
-      containerPort: env.CONTAINER_NODE_PORT,
+      containerPort: env.CONTAINER_NODE_ADMIN_PORT,
       namespace: env.NAMESPACE,
       config,
     });
   } else {
-    await updateSequencerConfig(env.NODE_URL, config);
+    await updateSequencerConfig(env.NODE_ADMIN_URL, config);
   }
 }